diff --git a/.gitmodules b/.gitmodules
index b51b926..29be075 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,23 +3,28 @@
 	url = https://github.com/anishathalye/dotbot.git
 	ignore = dirty
 
-[submodule "dotbot-plugins/dotbot-brew"]
-	path = dotbot-plugins/dotbot-brew
+[submodule "dotbot-brew"]
+	path = dotbot-brew
 	url = https://github.com/wren/dotbot-brew.git
 	ignore = dirty
 
-[submodule "dotbot-plugins/dotbot-if"]
-	path = dotbot-plugins/dotbot-if
+[submodule "dotbot-if"]
+	path = dotbot-if
 	url = https://github.com/wonderbeyond/dotbot-if.git
 	ignore = dirty
 
-[submodule "dotbot-plugins/dotbot-gh-extension"]
-	path = dotbot-plugins/dotbot-gh-extension
+[submodule "dotbot-ifplatform"]
+	path = dotbot-ifplatform
+	url = https://github.com/ssbanerje/dotbot-ifplatform.git
+	ignore = dirty
+
+[submodule "dotbot-gh-extension"]
+	path = dotbot-gh-extension
 	url = https://github.com/fundor333/dotbot-gh-extension.git
 	ignore = dirty
 
-[submodule "dotbot-plugins/dotbot-golang"]
-	path = dotbot-plugins/dotbot-golang
+[submodule "dotbot-golang"]
+	path = dotbot-golang
 	url = https://github.com/delicb/dotbot-golang.git
 	ignore = dirty
 
@@ -35,6 +40,4 @@
 	url = https://github.com/ivuorinen/astronvim_config.git
 	update = rebase
 	branch = main
-[submodule "dotbot-plugins/dotbot-ifplatform"]
-	path = dotbot-plugins/dotbot-ifplatform
-	url = https://github.com/ssbanerje/dotbot-ifplatform.git
+	ignore = dirty
diff --git a/add-submodules.sh b/add-submodules.sh
new file mode 100644
index 0000000..74b1ed4
--- /dev/null
+++ b/add-submodules.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git dotbot-brew
+git submodule add --name dotbot-gh-extension -f https://github.com/fundor333/dotbot-gh-extension.git dotbot-gh-extension
+git submodule add --name dotbot-golang -f https://github.com/delicb/dotbot-golang.git dotbot-golang
+git submodule add --name dotbot-if -f https://github.com/wonderbeyond/dotbot-if.git dotbot-if
+git submodule add --name dotbot-ifplatform -f https://github.com/ssbanerje/dotbot-ifplatform.git dotbot-ifplatform
diff --git a/dotbot-plugins/dotbot-brew b/dotbot-brew
similarity index 100%
rename from dotbot-plugins/dotbot-brew
rename to dotbot-brew
diff --git a/dotbot-plugins/dotbot-gh-extension b/dotbot-gh-extension
similarity index 100%
rename from dotbot-plugins/dotbot-gh-extension
rename to dotbot-gh-extension
diff --git a/dotbot-plugins/dotbot-golang b/dotbot-golang
similarity index 100%
rename from dotbot-plugins/dotbot-golang
rename to dotbot-golang
diff --git a/dotbot-plugins/dotbot-if b/dotbot-if
similarity index 100%
rename from dotbot-plugins/dotbot-if
rename to dotbot-if
diff --git a/dotbot-plugins/dotbot-ifplatform b/dotbot-ifplatform
similarity index 100%
rename from dotbot-plugins/dotbot-ifplatform
rename to dotbot-ifplatform
diff --git a/install b/install
index 25d62e1..ef8b03c 100755
--- a/install
+++ b/install
@@ -14,11 +14,10 @@ git submodule update --init --recursive
 
 "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
   -d "${BASEDIR}" \
-  --plugin-dir=dotbot-plugins/dotbot-brew \
-  --plugin-dir=dotbot-plugins/dotbot-gh-extension \
-  --plugin-dir=dotbot-plugins/dotbot-golang \
-  --plugin-dir=dotbot-plugins/dotbot-if \
-  --plugin-dir=dotbot-plugins/dotbot-ifplatform \
-  -p dotbot-plugins/dotbot-if/if.py \
+  --plugin-dir=dotbot-brew \
+  --plugin-dir=dotbot-gh-extension \
+  --plugin-dir=dotbot-golang \
+  --plugin-dir=dotbot-if \
+  --plugin-dir=dotbot-ifplatform \
   -c "${CONFIG}" \
   "${@}"
diff --git a/install.conf.yaml b/install.conf.yaml
index 86272ba..b1ee44d 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -3,6 +3,8 @@
     brewfile:
       stderr: true
       stdout: true
+    create:
+      mode: 755
     link:
       create: true
       relink: true
@@ -42,12 +44,12 @@
       prefix: "."
 
 - shell:
-    - [ git submodule update --init --recursive --force ]
-    - [ bash scripts/install-npm-packages.sh ]
+    - [git submodule update --init --recursive --force]
+    - [bash scripts/install-npm-packages.sh]
 
 - ifmacos:
     - shell:
-        - [ bash scripts/set-macos-defaults.sh ]
+        - [bash scripts/set-macos-defaults.sh]
     - brewfile:
         - Brewfile
 
@@ -114,5 +116,4 @@
     - VildMedPap/gh-orgstats
     - vilmibm/gh-screensaver
     - vilmibm/gh-user-status
-
 #