diff --git a/README.md b/README.md
new file mode 100644
index 0000000..77f7d4b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# My personal Nix setup files
+
diff --git a/flake.nix b/flake.nix
index 18347f5..9b59530 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
 	    home-manager.extraSpecialArgs = { inherit nixpkgs-unstable; };
-            home-manager.users.nki = import ./macbook-home.nix;
+            home-manager.users.nki = import ./home/macbook-home.nix;
           }	
       ];
       inputs = { 
diff --git a/X11/alacritty.nix b/home/X11/alacritty.nix
similarity index 100%
rename from X11/alacritty.nix
rename to home/X11/alacritty.nix
diff --git a/X11/default.nix b/home/X11/default.nix
similarity index 100%
rename from X11/default.nix
rename to home/X11/default.nix
diff --git a/X11/hidpi.nix b/home/X11/hidpi.nix
similarity index 100%
rename from X11/hidpi.nix
rename to home/X11/hidpi.nix
diff --git a/X11/i3.nix b/home/X11/i3.nix
similarity index 100%
rename from X11/i3.nix
rename to home/X11/i3.nix
diff --git a/X11/packages.nix b/home/X11/packages.nix
similarity index 100%
rename from X11/packages.nix
rename to home/X11/packages.nix
diff --git a/X11/wallpaper.jpg b/home/X11/wallpaper.jpg
similarity index 100%
rename from X11/wallpaper.jpg
rename to home/X11/wallpaper.jpg
diff --git a/common.nix b/home/common.nix
similarity index 100%
rename from common.nix
rename to home/common.nix
diff --git a/config.nix b/home/config.nix
similarity index 100%
rename from config.nix
rename to home/config.nix
diff --git a/firefox.nix b/home/firefox.nix
similarity index 100%
rename from firefox.nix
rename to home/firefox.nix
diff --git a/fish/change_cmd.fish b/home/fish/change_cmd.fish
similarity index 100%
rename from fish/change_cmd.fish
rename to home/fish/change_cmd.fish
diff --git a/fish/fish.nix b/home/fish/fish.nix
similarity index 100%
rename from fish/fish.nix
rename to home/fish/fish.nix
diff --git a/fish/pls.fish b/home/fish/pls.fish
similarity index 100%
rename from fish/pls.fish
rename to home/fish/pls.fish
diff --git a/kagami-pc-home.nix b/home/kagami-pc-home.nix
similarity index 100%
rename from kagami-pc-home.nix
rename to home/kagami-pc-home.nix
diff --git a/kakoune/autoload/markdown.kak b/home/kakoune/autoload/markdown.kak
similarity index 100%
rename from kakoune/autoload/markdown.kak
rename to home/kakoune/autoload/markdown.kak
diff --git a/kakoune/kak-lsp.nix b/home/kakoune/kak-lsp.nix
similarity index 100%
rename from kakoune/kak-lsp.nix
rename to home/kakoune/kak-lsp.nix
diff --git a/kakoune/kak-lsp.toml b/home/kakoune/kak-lsp.toml
similarity index 100%
rename from kakoune/kak-lsp.toml
rename to home/kakoune/kak-lsp.toml
diff --git a/kakoune/kak.nix b/home/kakoune/kak.nix
similarity index 100%
rename from kakoune/kak.nix
rename to home/kakoune/kak.nix
diff --git a/kakoune/kakrc b/home/kakoune/kakrc
similarity index 100%
rename from kakoune/kakrc
rename to home/kakoune/kakrc
diff --git a/kakoune/latex.kak b/home/kakoune/latex.kak
similarity index 100%
rename from kakoune/latex.kak
rename to home/kakoune/latex.kak
diff --git a/kakoune/racket.kak b/home/kakoune/racket.kak
similarity index 100%
rename from kakoune/racket.kak
rename to home/kakoune/racket.kak
diff --git a/kakoune/source-pwd b/home/kakoune/source-pwd
similarity index 100%
rename from kakoune/source-pwd
rename to home/kakoune/source-pwd
diff --git a/mac-home.nix b/home/mac-home.nix
similarity index 100%
rename from mac-home.nix
rename to home/mac-home.nix
diff --git a/macbook-home.nix b/home/macbook-home.nix
similarity index 100%
rename from macbook-home.nix
rename to home/macbook-home.nix
diff --git a/osu.nix b/home/osu.nix
similarity index 100%
rename from osu.nix
rename to home/osu.nix