diff --git a/flake.nix b/flake.nix
index b7e819d..75e6c88 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,5 @@
 {
   description = "Soothing pastel theme for Nix";
-
   inputs = {
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -9,7 +8,7 @@
   };
 
   outputs = _: {
-    nixosModules.default = import ./nixos;
-    homeManagerModules.default = import ./home-manager;
+    nixosModules.catppuccin = import ./nixos;
+    homeManagerModules.catppuccin = import ./home-manager;
   };
 }
diff --git a/home-manager/bat.nix b/modules/home-manager/bat.nix
similarity index 100%
rename from home-manager/bat.nix
rename to modules/home-manager/bat.nix
diff --git a/home-manager/default.nix b/modules/home-manager/default.nix
similarity index 100%
rename from home-manager/default.nix
rename to modules/home-manager/default.nix
diff --git a/home-manager/starship.nix b/modules/home-manager/starship.nix
similarity index 100%
rename from home-manager/starship.nix
rename to modules/home-manager/starship.nix
diff --git a/nixos/default.nix b/modules/nixos/default.nix
similarity index 100%
rename from nixos/default.nix
rename to modules/nixos/default.nix