diff --git a/home-configuration.scm b/home-configuration.scm
index 2a55ac8..9326386 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -10,9 +10,8 @@
              (gnu services)
              (guix gexp)
              (gnu home services)
-             (gnu home services shells))
-
-(load "packages.scm")
+             (gnu home services shells)
+             (fox packages))
 
 (if (equal? "lighthouse" (getlogin))
     (home-environment
diff --git a/packages.scm b/modules/fox/packages.scm
similarity index 85%
rename from packages.scm
rename to modules/fox/packages.scm
index 45e41f0..f95081d 100644
--- a/packages.scm
+++ b/modules/fox/packages.scm
@@ -1,13 +1,19 @@
-(use-modules (guix licenses)
-             (guix packages)
-             (guix download)
-             (guix git-download)
-             (guix utils)
-             (gnu packages)
-             (gnu packages emacs)
-             (gnu home services shepherd)
-             (guix build-system copy)
-             (gnu services))
+(define-module (fox packages)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu home services)
+  #:use-module (gnu home services shepherd)
+  #:use-module (guix build-system copy)
+  #:use-module (gnu services)
+  #:export (zellij
+            oh-my-zsh-service-type
+            home-emacs-service-type))
 
 (define-public oh-my-zsh
   (let ((commit "ca5471fe496f00007727fd26db762d19519c2e8f")