diff --git a/oni/home/common/services.scm b/oni/home/common/services.scm
deleted file mode 100644
index eb3a3d8..0000000
--- a/oni/home/common/services.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(define-module (oni home common services)
-  #:use-module (oni home services rofi))
diff --git a/oni/home/common/config.scm b/oni/home/config/common.scm
similarity index 99%
rename from oni/home/common/config.scm
rename to oni/home/config/common.scm
index ccd29f3..d1c946e 100644
--- a/oni/home/common/config.scm
+++ b/oni/home/config/common.scm
@@ -1,4 +1,4 @@
-(define-module (oni home common config)
+(define-module (oni home config common)
   #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services shells)
diff --git a/oni/home/data/config.scm b/oni/home/config/data.scm
similarity index 98%
rename from oni/home/data/config.scm
rename to oni/home/config/data.scm
index 74a33cf..18d5108 100644
--- a/oni/home/data/config.scm
+++ b/oni/home/config/data.scm
@@ -1,4 +1,4 @@
-(define-module (oni home data config)
+(define-module (oni home config data)
   #:use-module (gnu home)
   #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
@@ -23,7 +23,7 @@
   #:use-module (oni home services environment)
   #:use-module (oni packages hlwm-run-or-raise)
   #:use-module (oni packages pick-random-wallpaper)
-  #:use-moudle (oni home common config))
+  #:use-module (oni home config common))
 
 (home-environment
  (packages (list (specification->package+output "glibc-locales")
diff --git a/oni/home/rincewind/config.scm b/oni/home/config/rincewind.scm
similarity index 97%
rename from oni/home/rincewind/config.scm
rename to oni/home/config/rincewind.scm
index e31d7fc..be107da 100644
--- a/oni/home/rincewind/config.scm
+++ b/oni/home/config/rincewind.scm
@@ -1,4 +1,4 @@
-(define-module (oni home data config)
+(define-module (oni home config rincewind)
   #:use-module (gnu home services guix)
   #:use-module (gnu home services)
   #:use-module (gnu home)
@@ -16,7 +16,7 @@
   #:use-module (guix packages)
   #:use-module (guix store)
   #:use-module (guix transformations)
-  #:use-module (oni home common config)
+  #:use-module (oni home config common)
   #:use-module (oni home services dunst)
   #:use-module (oni home services emacs)
   #:use-module (oni home services environment)