diff --git a/flake.nix b/flake.nix
index 309db11c..6e7f79f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
       xdg-runtime-dir = "/tmp/xdg-rt";
 
       mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
-      mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home.nix {
+      mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
         inherit username home-dir prompt-color pkgs xdg-runtime-dir;
 
         kak-pkg = kak.packages.${system}.kak;
@@ -44,10 +44,10 @@
         ansi-utils = ansi-utils.packages.${system};
         unambig-path = unambig-path.packages.${system}.unambig-path;
       };
-      mkLaptop = {system, pkgs} : import ./laptop.nix {
+      mkLaptop = {system, pkgs} : import ./home/graphical.nix {
         inherit pkgs xdg-runtime-dir;
       };
-      mkMac = {system, pkgs, laptop} : import ./mac.nix {
+      mkMac = {system, pkgs, laptop} : import ./home/mac.nix {
         emacs = laptop.programs.emacs.package;
         inherit pkgs xdg-runtime-dir;
       };
@@ -56,7 +56,7 @@
         inherit system pkgs;
       };
     in {
-      homeConfigurations."xenia" =
+      homeConfigurations."xenia@Joe-Bidens-MacBook-Pro.local" =
         let
           system = "aarch64-darwin";
           pkgs = mkPkgs system;
diff --git a/alacritty/alacritty.nix b/home/alacritty/alacritty.nix
similarity index 100%
rename from alacritty/alacritty.nix
rename to home/alacritty/alacritty.nix
diff --git a/alacritty/keybinds.nix b/home/alacritty/keybinds.nix
similarity index 100%
rename from alacritty/keybinds.nix
rename to home/alacritty/keybinds.nix
diff --git a/home.nix b/home/common.nix
similarity index 99%
rename from home.nix
rename to home/common.nix
index b01811f0..f1a3e13e 100644
--- a/home.nix
+++ b/home/common.nix
@@ -100,7 +100,7 @@ in rec {
           echo -en "%{\033[0m%} ";
         )'
       ''
-      + builtins.readFile ./dotfiles/zshrc;
+      + builtins.readFile ../dotfiles/zshrc;
   };
 
   programs.direnv = {
diff --git a/extras.nix b/home/extras.nix
similarity index 100%
rename from extras.nix
rename to home/extras.nix
diff --git a/laptop.nix b/home/graphical.nix
similarity index 89%
rename from laptop.nix
rename to home/graphical.nix
index 34ae0a4b..cd25c15b 100644
--- a/laptop.nix
+++ b/home/graphical.nix
@@ -18,7 +18,7 @@ in rec {
       vterm bind-key rust-mode lsp-mode company meow agda2-mode haskell-mode
       terraform-mode nix-mode insert-kaomoji
     ];
-    extraConfig = builtins.readFile ./dotfiles/init.el;
+    extraConfig = builtins.readFile ../dotfiles/init.el;
   };
 
 }
diff --git a/kak.nix b/home/kak.nix
similarity index 99%
rename from kak.nix
rename to home/kak.nix
index 5a51f798..d0d303cd 100644
--- a/kak.nix
+++ b/home/kak.nix
@@ -96,5 +96,5 @@ in
     };
   };
 
-  extraConfig = kak-lsp-config-line + "\n" + builtins.readFile ./dotfiles/kakrc ;
+  extraConfig = kak-lsp-config-line + "\n" + builtins.readFile ../dotfiles/kakrc ;
 }
diff --git a/mac.nix b/home/mac.nix
similarity index 100%
rename from mac.nix
rename to home/mac.nix