diff --git a/home/home.nix b/home/home.nix
index 79c17d4..96d72dd 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -4,7 +4,7 @@ let
   secrets = import ../secrets.nix;
 in
 {
-  imports = (import ./wm) ++ (import ./shell) ++ (import ./progs);
+  imports = (import ./ui) ++ (import ./shell) ++ (import ./progs);
 
   # targets.genericLinux.enable = true;
 
@@ -21,7 +21,6 @@ in
   };
 
   home.packages = with pkgs; [
-    # TODO: move packages to separate modules
     kotatogram-desktop
     docker-compose
 
@@ -37,20 +36,18 @@ in
     # haskell
     stylish-haskell # formatter
 
-    # database
-    postgresql_12   # 🤷 I need only psql
-
     # browser
     librewolf       # a fork of firefox, focused on privacy, security and freedom
 
     # for work
     google-cloud-sdk
     kubectl
+    postgresql_12   # 🤷 I need only psql
   ];
 
-  # window manager
-  wm = {
-    xmonad.enable = true;
+  # user interface
+  ui = {
+    wm.xmonad.enable = true;
     bar.polybar.enable = true;
   };
 
@@ -65,9 +62,8 @@ in
   progs = {
     git = with secrets.git; {
       enable = true;
-      inherit userName;
-      inherit userEmail;
       gpgKey = gpgSigningKey;
+      inherit userName userEmail;
     };
 
     # password manager
diff --git a/home/wm/bar/default.nix b/home/ui/bar/default.nix
similarity index 100%
rename from home/wm/bar/default.nix
rename to home/ui/bar/default.nix
diff --git a/home/wm/bar/polybar/config.nix b/home/ui/bar/polybar/config.nix
similarity index 96%
rename from home/wm/bar/polybar/config.nix
rename to home/ui/bar/polybar/config.nix
index 7b0daf5..08ade6f 100644
--- a/home/wm/bar/polybar/config.nix
+++ b/home/ui/bar/polybar/config.nix
@@ -70,7 +70,7 @@ with lib;
     };
   };
 
-  "module/xmonad" = mkIf config.wm.xmonad.enable {
+  "module/xmonad" = mkIf config.ui.wm.xmonad.enable {
     type = "custom/script";
     exec = "${pkgs.xmonad-log}/bin/xmonad-log";
     tail = true;
diff --git a/home/wm/bar/polybar/default.nix b/home/ui/bar/polybar/default.nix
similarity index 92%
rename from home/wm/bar/polybar/default.nix
rename to home/ui/bar/polybar/default.nix
index 13b1692..e8d2744 100644
--- a/home/wm/bar/polybar/default.nix
+++ b/home/ui/bar/polybar/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.wm.bar.polybar;
+  cfg = config.ui.bar.polybar;
   pcfg = config.services.polybar;
 
   # TODO: create a theme
@@ -14,7 +14,7 @@ let
   polybarConfig = import ./config.nix { inherit lib config pkgs colors; };
 in
 {
-  options.wm.bar.polybar = {
+  options.ui.bar.polybar = {
     enable = mkOption {
       type = types.bool;
       default = false;
diff --git a/home/ui/default.nix b/home/ui/default.nix
new file mode 100644
index 0000000..50ff19e
--- /dev/null
+++ b/home/ui/default.nix
@@ -0,0 +1 @@
+(import ./wm) ++ (import ./bar)
diff --git a/home/ui/wm/default.nix b/home/ui/wm/default.nix
new file mode 100644
index 0000000..3046618
--- /dev/null
+++ b/home/ui/wm/default.nix
@@ -0,0 +1 @@
+[ ./xmonad ]
diff --git a/home/wm/xmonad/config.hs b/home/ui/wm/xmonad/config.hs
similarity index 100%
rename from home/wm/xmonad/config.hs
rename to home/ui/wm/xmonad/config.hs
diff --git a/home/wm/xmonad/default.nix b/home/ui/wm/xmonad/default.nix
similarity index 85%
rename from home/wm/xmonad/default.nix
rename to home/ui/wm/xmonad/default.nix
index 2796f9f..7340f23 100644
--- a/home/wm/xmonad/default.nix
+++ b/home/ui/wm/xmonad/default.nix
@@ -3,10 +3,11 @@
 with lib;
 
 let
-  cfg = config.wm.xmonad;
+  uiCfg = config.ui;
+  cfg = uiCfg.wm.xmonad;
 in
 {
-  options.wm.xmonad = {
+  options.ui.wm.xmonad = {
     enable = mkOption {
       type = types.bool;
       default = false;
@@ -29,7 +30,7 @@ in
         enable = true;
         enableContribAndExtras = true;
         config = ./config.hs;
-        extraPackages = mkIf config.wm.bar.polybar.enable (hp: [
+        extraPackages = mkIf uiCfg.bar.polybar.enable (hp: [
           hp.dbus
           hp.monad-logger
         ]);
diff --git a/home/wm/default.nix b/home/wm/default.nix
deleted file mode 100644
index a675759..0000000
--- a/home/wm/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-[ ./xmonad ] ++ (import ./bar)