diff --git a/flake.nix b/flake.nix
index de8b95c..b14b98a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,8 @@
 {
 	description = "A simple NixOS flake";
 
+	outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules)
+
 	inputs = {
 		# NixOS official package source, using the nixos-26.05 branch here
 		nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
@@ -13,23 +15,26 @@
 			url = "github:schembriaiden/helium-browser-nix-flake";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
+		flake-parts.url = "github:hercules-ci/flake-parts";
+		flake-file.url = "github:vic/flake-file";
+		import-tree.url = "github:vic/import-tree";
 	};
 
-	outputs = { self, nixpkgs, home-manager, helium, ... }@inputs: {
-		nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
-			specialArgs = { inherit inputs; };
-			modules = [
-				# Import the previous configuration.nix we used,
-				# so the old configuration file still takes effect
-				./configuration.nix
-				home-manager.nixosModules.home-manager
-				{
-					home-manager.useGlobalPkgs = true;
-					home-manager.useUserPackages = true;
-					home-manager.users.snurm = import ./home.nix;
-					home-manager.backupFileExtension = "backup";
-				}
-			];
-		};
-	};
+	#outputs = { self, nixpkgs, home-manager, helium, ... }@inputs: {
+	#	nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+	#		specialArgs = { inherit inputs; };
+	#		modules = [
+	#			# Import the previous configuration.nix we used,
+	#			# so the old configuration file still takes effect
+	#			./configuration.nix
+	#			home-manager.nixosModules.home-manager
+	#			{
+	#				home-manager.useGlobalPkgs = true;
+	#				home-manager.useUserPackages = true;
+	#				home-manager.users.snurm = import ./home.nix;
+	#				home-manager.backupFileExtension = "backup";
+	#			}
+	#		];
+	#	};
+	#};
 }
diff --git a/home.nix b/home.nix
deleted file mode 100644
index 9c6a4d1..0000000
--- a/home.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, pkgs, inputs, ...}:
-
-{
-	imports = [
-		programs/default.nix
-	];
-	home.username = "snurm";
-	home.homeDirectory = "/home/snurm";
-	home.stateVersion = "26.05";
-	programs.home-manager.enable = true;
-
-	programs.git = {
-		enable = true;
-		settings.user = {
-			name = "snurm";
-			email = "user@example.com";
-		};
-	};
-
-	programs.kitty = {
-		enable = true;
-		font = {
-			name ="JetBrains Mono";
-			size = 10;
-		};		
-		settings = {
-			confirm_os_window_close = 0;
-			enable_auto_bell = false;
-			mouse_hide_wait = "-1.0";
-			background_opacity = "0.5";
-			background_blur = 5;
-		};
-	};
-
-	home.packages = with pkgs; [
-		fastfetch
-	];
-}
diff --git a/hyprland/default.nix b/hyprland/default.nix
deleted file mode 100644
index dbaa756..0000000
--- a/hyprland/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-}
diff --git a/hyprland/hyprland.lua b/hyprland/hyprland.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/configuration.nix b/modules/desktopModule.nix
similarity index 98%
rename from configuration.nix
rename to modules/desktopModule.nix
index d725e66..2619436 100644
--- a/configuration.nix
+++ b/modules/desktopModule.nix
@@ -5,6 +5,7 @@
 { config, pkgs, inputs, ... }:
 
 {
+	flake.nixosModules.desktopModule = { pkgs, ... }: {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
@@ -136,4 +137,5 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "25.11"; # Did you read the comment?
 
+	};
 }
diff --git a/modules/desktopSystem.nix b/modules/desktopSystem.nix
new file mode 100644
index 0000000..f7669eb
--- /dev/null
+++ b/modules/desktopSystem.nix
@@ -0,0 +1,7 @@
+{ inputs, self, ... } : {
+	flake.nixosConfigurations.desktopSystem = inputs.nixpkgs.lib.nixosSystem {
+		modules = [
+			self.nixosModules.desktopModule
+		];
+	};
+}
diff --git a/hardware-configuration.nix b/modules/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to modules/hardware-configuration.nix
diff --git a/modules/home.nix b/modules/home.nix
new file mode 100644
index 0000000..d26f42a
--- /dev/null
+++ b/modules/home.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, inputs, ...}:
+
+{
+	imports = [
+		inputs.home-manager.flakeModules.home-manager
+	];
+
+	homeConfigurations.snurm = home-manager.lib.homeManagerConfiguration {
+		home.username = "snurm";
+		home.homeDirectory = "/home/snurm";
+		home.stateVersion = "26.05";
+		programs.home-manager.enable = true;
+
+		programs.git = {
+			enable = true;
+			settings.user = {
+				name = "snurm";
+				email = "user@example.com";
+			};
+		};
+
+		programs.kitty = {
+			enable = true;
+			font = {
+				name = "JetBrains Mono";
+				size = 10;
+			};		
+			settings = {
+				confirm_os_window_close = 0;
+				enable_auto_bell = false;
+				mouse_hide_wait = "-1.0";
+				background_opacity = "0.5";
+				background_blur = 5;
+			};
+		};
+
+		home.packages = with pkgs; [
+			fastfetch
+		];
+	};
+}
diff --git a/programs/browser.nix b/programs/browser.nix
deleted file mode 100644
index 7278641..0000000
--- a/programs/browser.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-}
diff --git a/programs/default.nix b/programs/default.nix
deleted file mode 100644
index c14d312..0000000
--- a/programs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	imports = [
-		./browser.nix
-	];
-}