diff --git a/nixos/configuration.nix b/configuration.nix
similarity index 95%
rename from nixos/configuration.nix
rename to configuration.nix
index 5e1500b..e837b14 100644
--- a/nixos/configuration.nix
+++ b/configuration.nix
@@ -11,6 +11,10 @@
     eza
   ];
 
+  # imports = [
+  #   ./
+  # ];
+
   # For SSH access
   services.openssh.enable = true;
 
diff --git a/flake.nix b/flake.nix
index ddf4a67..b83076a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,6 +56,9 @@
       };
     };
 
+    homeManagerModules.default = ./homeManagerModules;
+    nixosModules.default = ./nixosModules;
+
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
diff --git a/home-manager/default.nix b/home-manager/default.nix
new file mode 100644
index 0000000..9cc4bfd
--- /dev/null
+++ b/home-manager/default.nix
@@ -0,0 +1,9 @@
+{ user, repoPath, ... }:
+{
+  programs.home-manager.enable = true;
+  home = {
+    stateVersion = "24.05";
+    username = "${user}";
+    homeDirectory = "${repoPath}";
+  };
+}
\ No newline at end of file
diff --git a/nixos/loki.nix b/nixosModules/services/loki.nix
similarity index 100%
rename from nixos/loki.nix
rename to nixosModules/services/loki.nix
diff --git a/nixos/vscode/flake.nix b/nixosModules/vscode/flake.nix
similarity index 100%
rename from nixos/vscode/flake.nix
rename to nixosModules/vscode/flake.nix