diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix
index 14e6723..e978d3c 100644
--- a/hosts/macbook/default.nix
+++ b/hosts/macbook/default.nix
@@ -1,8 +1,8 @@
 { emacs-larstvei, ... }:
 {
   imports = [
-    ../../modules/core.nix
-    ../../modules/macos.nix
+    ../../system
+    ../../system/darwin
   ];
 
   home-manager = {
diff --git a/modules/macos.nix b/system/darwin/default.nix
similarity index 96%
rename from modules/macos.nix
rename to system/darwin/default.nix
index f622ceb..9232127 100644
--- a/modules/macos.nix
+++ b/system/darwin/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
 
-  fonts.packages = import ../home/fonts { inherit pkgs; };
+  fonts.packages = import ../../home/fonts { inherit pkgs; };
 
   users.users = {
     larstvei = {
diff --git a/modules/core.nix b/system/default.nix
similarity index 100%
rename from modules/core.nix
rename to system/default.nix