diff --git a/flake.lock b/flake.lock
index 23dd826..670d7e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1635839387,
-        "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=",
+        "lastModified": 1636044164,
+        "narHash": "sha256-RI9QjS8NBrfVTp6dzmcEVKNNjxYGBf26+/7ihDA/USc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "288faaa5a65e72e37e6027024829b15c8bb69286",
+        "rev": "70c5b268e10025c70823767f4fb49e240b40151d",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,8 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1635994901,
-        "narHash": "sha256-Ghok2ROCcBOvMA1TVO6LLfvzLqP6wXgVuIGK9OTDx7A=",
-        "ref": "flaketest",
-        "rev": "a0fae18689d3f1f0ec8741ab03cc07bd3a769b9a",
-        "revCount": 9,
+        "lastModified": 1636132244,
+        "narHash": "sha256-uIfXaXszC0YSgEjPWE97o/JR4WS5bqJ8BcrKYz9ex4Y=",
         "type": "git",
         "url": "file:///home/daniel/go/src/i3utils"
       },
diff --git a/flake.nix b/flake.nix
index 9c436d1..2508c4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
         homeDirectory = "/home/daniel";
         configuration = {
           imports = [
-            ./user/dingbox/home.nix
+            ./user/daniel/home.nix
             ({ pkgs, ... }: {
               nixpkgs.overlays = [ i3utils.overlay ];
             })
diff --git a/user/dingbox/home.nix b/user/daniel/home.nix
similarity index 92%
rename from user/dingbox/home.nix
rename to user/daniel/home.nix
index a70e945..ad320aa 100644
--- a/user/dingbox/home.nix
+++ b/user/daniel/home.nix
@@ -2,10 +2,10 @@
 
 {
 	imports = [
-                ../alacritty
-		../i3
-		../neovim
-		../polybar
+                ../progs/alacritty
+		../progs/i3
+		../progs/neovim
+		../progs/polybar
 	];
 
 	# Let Home Manager install and manage itself.
@@ -66,7 +66,7 @@
 		userName = "Daniel Patterson";
 		userEmail = "me@danielpatterson.dev";
 	};
-	
+
 	programs.starship.enable = true;
 
         programs.vscode = {
diff --git a/user/miniding/home.nix b/user/miniding/home.nix
deleted file mode 100644
index 754f61d..0000000
--- a/user/miniding/home.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ pkgs, ... }:
-
-{
-	imports = [
-		../i3
-		../polybar
-	];
-
-	# Let Home Manager install and manage itself.
-	programs.home-manager.enable = true;
-
-	home.username = "daniel";
-	home.homeDirectory = "/home/daniel";
-
-	home.file.".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors";
-
-	xsession.enable = true;
-	services.dunst.enable = true;
-
-	home.packages = with pkgs; 
-	[
-		(import ../common/i3utils)
-		alacritty
-		chezmoi
-		element-desktop
-		feh
-		fzf
-		go_1_17
-		i3
-		i3lock
-		lazygit
-		nerdfonts
-		oh-my-zsh
-		pavucontrol
-		restic
-		rofi
-		starship
-		xclip
-	];
-
-	home.keyboard = {
-		layout = "gb";
-		options = [
-			"caps:escape"
-		];
-	};
-
-	programs = {
-		zsh = {
-			enable = true;
-			oh-my-zsh = {
-				enable = true;
-				plugins = [ "git" "fzf" ];
-				theme = "agnoster";
-			};
-		};
-	};
-
-	programs.git = {
-		enable = true;
-		userName = "Daniel Patterson";
-		userEmail = "me@danielpatterson.dev";
-	};
-	
-	programs.starship.enable = true;
-
-	programs.neovim.enable = true;
-	programs.neovim.viAlias = true;
-	programs.neovim.vimAlias = true;
-
-	home.stateVersion = "21.05";
-}
diff --git a/user/alacritty/default.nix b/user/progs/alacritty/default.nix
similarity index 100%
rename from user/alacritty/default.nix
rename to user/progs/alacritty/default.nix
diff --git a/user/i3/default.nix b/user/progs/i3/default.nix
similarity index 100%
rename from user/i3/default.nix
rename to user/progs/i3/default.nix
diff --git a/user/neovim/default.nix b/user/progs/neovim/default.nix
similarity index 100%
rename from user/neovim/default.nix
rename to user/progs/neovim/default.nix
diff --git a/user/polybar/config b/user/progs/polybar/config
similarity index 100%
rename from user/polybar/config
rename to user/progs/polybar/config
diff --git a/user/polybar/default.nix b/user/progs/polybar/default.nix
similarity index 100%
rename from user/polybar/default.nix
rename to user/progs/polybar/default.nix