diff --git a/.gitmodules b/.gitmodules
index 3a248350..db4c6d6e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,8 @@
 	path = dotfiles/config/taffybar/taffybar
 	url = ../taffybar.git
 [submodule "dotfiles/xmonad/xmonad"]
-	path = dotfiles/xmonad/xmonad
+	path = dotfiles/config/xmonad/xmonad
 	url = ../xmonad.git
 [submodule "dotfiles/xmonad/xmonad-contrib"]
-	path = dotfiles/xmonad/xmonad-contrib
+	path = dotfiles/config/xmonad/xmonad-contrib
 	url = ../xmonad-contrib.git
diff --git a/dotfiles/xmonad/.gitignore b/dotfiles/config/xmonad/.gitignore
similarity index 100%
rename from dotfiles/xmonad/.gitignore
rename to dotfiles/config/xmonad/.gitignore
diff --git a/dotfiles/xmonad/ChangeLog.md b/dotfiles/config/xmonad/ChangeLog.md
similarity index 100%
rename from dotfiles/xmonad/ChangeLog.md
rename to dotfiles/config/xmonad/ChangeLog.md
diff --git a/dotfiles/xmonad/LICENSE b/dotfiles/config/xmonad/LICENSE
similarity index 100%
rename from dotfiles/xmonad/LICENSE
rename to dotfiles/config/xmonad/LICENSE
diff --git a/dotfiles/xmonad/Setup.hs b/dotfiles/config/xmonad/Setup.hs
similarity index 100%
rename from dotfiles/xmonad/Setup.hs
rename to dotfiles/config/xmonad/Setup.hs
diff --git a/dotfiles/xmonad/build b/dotfiles/config/xmonad/build
similarity index 100%
rename from dotfiles/xmonad/build
rename to dotfiles/config/xmonad/build
diff --git a/dotfiles/xmonad/imalison-xmonad.cabal b/dotfiles/config/xmonad/imalison-xmonad.cabal
similarity index 100%
rename from dotfiles/xmonad/imalison-xmonad.cabal
rename to dotfiles/config/xmonad/imalison-xmonad.cabal
diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/config/xmonad/stack.yaml
similarity index 100%
rename from dotfiles/xmonad/stack.yaml
rename to dotfiles/config/xmonad/stack.yaml
diff --git a/dotfiles/xmonad/taffybar b/dotfiles/config/xmonad/taffybar
similarity index 100%
rename from dotfiles/xmonad/taffybar
rename to dotfiles/config/xmonad/taffybar
diff --git a/dotfiles/xmonad/xmonad b/dotfiles/config/xmonad/xmonad
similarity index 100%
rename from dotfiles/xmonad/xmonad
rename to dotfiles/config/xmonad/xmonad
diff --git a/dotfiles/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
similarity index 100%
rename from dotfiles/xmonad/xmonad-contrib
rename to dotfiles/config/xmonad/xmonad-contrib
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
similarity index 100%
rename from dotfiles/xmonad/xmonad.hs
rename to dotfiles/config/xmonad/xmonad.hs