diff --git a/configs/cloud.nix b/configs/cloud.nix
index 0994be8..cdc3311 100644
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
-    <modules/seafile.nix>
-    <modules/google-drive.nix>
-    <modules/dropbox.nix>
+    <niveum/modules/seafile.nix>
+    <niveum/modules/google-drive.nix>
+    <niveum/modules/dropbox.nix>
   ];
 
   niveum.dropbox = {
diff --git a/configs/default.nix b/configs/default.nix
index 06b8aa3..b7b7287 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -4,59 +4,59 @@ let
 in
 {
   imports = [
-    <modules/constants.nix>
+    <niveum/modules/constants.nix>
     {
       services.dbus.packages = [ pkgs.gnome3.dconf ];
     }
     <home-manager/nixos>
-    # <configs/mopidy.nix>
-    <configs/alacritty.nix>
-    <configs/bash.nix>
-    <configs/bluetooth.nix>
-    <configs/chromium.nix>
-    <configs/cloud.nix>
-    <configs/compton.nix>
-    <configs/default.nix>
-    <configs/direnv.nix>
-    # <configs/home-assistant.nix>
-    <configs/distrobump.nix>
-    <configs/docker.nix>
-    <configs/dunst.nix>
-    <configs/fonts.nix>
-    <configs/git.nix>
-    <configs/hledger.nix>
-    <configs/htop.nix>
-    <configs/hu-berlin.nix>
-    <configs/i3.nix>
-    <configs/kdeconnect.nix>
-    <configs/keybase.nix>
-    <configs/keyboard.nix>
-    <configs/mail.nix>
-    <configs/mpv.nix>
-    <configs/nano.nix>
-    <configs/neovim.nix>
-    # <configs/newsboat.nix> (broken)
-    <configs/nixpkgs-unstable.nix>
-    <configs/packages>
-    <configs/printing.nix>
-    <configs/random-background.nix>
-    <configs/redshift.nix>
-    <configs/retiolum.nix>
-    <configs/rofi.nix>
-    <configs/sncli.nix>
-    <configs/ssh.nix>
-    <configs/sudo.nix>
-    <configs/themes/mac-os.nix>
-    <configs/theming.nix>
-    <configs/tmux.nix>
-    <configs/todo-txt.nix>
-    <configs/traadfri.nix>
-    <configs/unclutter.nix>
-    # <configs/urxvt.nix>
-    <configs/vscode.nix>
-    <configs/xautolock.nix>
-    # <configs/xresources.nix>
-    <configs/zsh.nix>
+    # ./mopidy.nix
+    ./alacritty.nix
+    ./bash.nix
+    ./bluetooth.nix
+    ./chromium.nix
+    ./cloud.nix
+    ./compton.nix
+    ./default.nix
+    ./direnv.nix
+    # ./home-assistant.nix
+    ./distrobump.nix
+    ./docker.nix
+    ./dunst.nix
+    ./fonts.nix
+    ./git.nix
+    ./hledger.nix
+    ./htop.nix
+    ./hu-berlin.nix
+    ./i3.nix
+    ./kdeconnect.nix
+    ./keybase.nix
+    ./keyboard.nix
+    ./mail.nix
+    ./mpv.nix
+    ./nano.nix
+    ./neovim.nix
+    # ./newsboat.nix (broken)
+    ./nixpkgs-unstable.nix
+    ./packages
+    ./printing.nix
+    ./random-background.nix
+    ./redshift.nix
+    ./retiolum.nix
+    ./rofi.nix
+    ./sncli.nix
+    ./ssh.nix
+    ./sudo.nix
+    ./themes/mac-os.nix
+    ./theming.nix
+    ./tmux.nix
+    ./todo-txt.nix
+    ./traadfri.nix
+    ./unclutter.nix
+    # ./urxvt.nix
+    ./vscode.nix
+    ./xautolock.nix
+    # ./xresources.nix
+    ./zsh.nix
     {
       niveum.user = {
         github = "kmein";
@@ -83,40 +83,40 @@ in
         packageOverrides = pkgs: {
           python3Packages = pkgs.python3Packages.override {
             overrides = new: old: {
-              spotify-cli-linux = new.callPackage <packages/spotify-cli-linux.nix> {};
-              instaloader = new.callPackage <packages/instaloader.nix> {};
-              sncli = new.callPackage <packages/sncli.nix> {};
+              spotify-cli-linux = new.callPackage <niveum/packages/spotify-cli-linux.nix> {};
+              instaloader = new.callPackage <niveum/packages/instaloader.nix> {};
+              sncli = new.callPackage <niveum/packages/sncli.nix> {};
             };
           };
           haskellPackages = pkgs.haskellPackages.override {
             overrides = new: old: {
-              blessings = new.callPackage <packages/blessings.nix> {};
+              blessings = new.callPackage <niveum/packages/blessings.nix> {};
               scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
             };
           };
 
-          git-quick-stats = pkgs.callPackage <packages/git-quick-stats.nix> {};
+          git-quick-stats = pkgs.callPackage <niveum/packages/git-quick-stats.nix> {};
           writeDash = pkgs.writers.writeDash;
           writeDashBin = pkgs.writers.writeDashBin;
-          iolanguage = pkgs.callPackage <packages/iolanguage.nix> {};
-          nix-git = pkgs.callPackage <packages/nix-git.nix> {};
+          iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
+          nix-git = pkgs.callPackage <niveum/packages/nix-git.nix> {};
 
           kmein = {
-            autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
-            bvg = pkgs.callPackage <packages/bvg.nix> {};
-            daybook = pkgs.callPackage <packages/daybook.nix> {};
-            genius = pkgs.callPackage <packages/genius.nix> {};
-            instaget = pkgs.callPackage <packages/instaget.nix> {};
-            literature-quote = pkgs.callPackage <packages/literature-quote.nix> {};
-            n = pkgs.callPackage <packages/n.nix> {};
-            depp = pkgs.callPackage <packages/depp.nix> {};
-            odyssey = pkgs.callPackage <packages/odyssey.nix> {};
-            wttr = pkgs.callPackage <packages/wttr.nix> {};
-            nav = pkgs.callPackage <packages/nav.nix> {};
-            dirmir = pkgs.callPackage <packages/dirmir.nix> {};
-            favicon = pkgs.callPackage <packages/favicon.nix> {};
-            tolino-screensaver = pkgs.callPackage <packages/tolino-screensaver.nix> {};
-            # fzf-wrappers = pkgs.callPackage <packages/fzf-wrappers.nix> {}; (broken)
+            autorenkalender = pkgs.callPackage <niveum/packages/autorenkalender.nix> {};
+            bvg = pkgs.callPackage <niveum/packages/bvg.nix> {};
+            daybook = pkgs.callPackage <niveum/packages/daybook.nix> {};
+            genius = pkgs.callPackage <niveum/packages/genius.nix> {};
+            instaget = pkgs.callPackage <niveum/packages/instaget.nix> {};
+            literature-quote = pkgs.callPackage <niveum/packages/literature-quote.nix> {};
+            n = pkgs.callPackage <niveum/packages/n.nix> {};
+            depp = pkgs.callPackage <niveum/packages/depp.nix> {};
+            odyssey = pkgs.callPackage <niveum/packages/odyssey.nix> {};
+            wttr = pkgs.callPackage <niveum/packages/wttr.nix> {};
+            nav = pkgs.callPackage <niveum/packages/nav.nix> {};
+            dirmir = pkgs.callPackage <niveum/packages/dirmir.nix> {};
+            favicon = pkgs.callPackage <niveum/packages/favicon.nix> {};
+            tolino-screensaver = pkgs.callPackage <niveum/packages/tolino-screensaver.nix> {};
+            # fzf-wrappers = pkgs.callPackage <niveum/packages/fzf-wrappers.nix> {}; (broken)
             slide =
               let slide-package = pkgs.fetchFromGitHub {
                 owner = "kmein";
diff --git a/configs/hledger.nix b/configs/hledger.nix
index c184ef5..ee582d5 100644
--- a/configs/hledger.nix
+++ b/configs/hledger.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  imports = [ <modules/hledger.nix> ];
+  imports = [ <niveum/modules/hledger.nix> ];
 
   niveum.hledger = {
     enable = true;
diff --git a/configs/i3.nix b/configs/i3.nix
index 1ab5f13..b981c5d 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -62,7 +62,7 @@ in with config.niveum; {
           };
         };
         statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${pkgs.writeText "i3status-rust.toml" (
-          import <dot/i3status-rust.nix> {
+          import <niveum/dot/i3status-rust.nix> {
             wifi-interface = networkInterfaces.wireless;
             batteryBlock = batteryBlocks.default;
             inherit (config.niveum) colours;
diff --git a/configs/keyboard.nix b/configs/keyboard.nix
index 836bb0f..bf89ebf 100644
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
-let inherit (import <lib> { inherit lib; }) commaSep;
+let inherit (import <niveum/lib> { inherit lib; }) commaSep;
 in {
   services.xserver = {
     layout = commaSep [ "de" "gr" "ru" ];
diff --git a/configs/mopidy.nix b/configs/mopidy.nix
index f5e86d1..28a071d 100644
--- a/configs/mopidy.nix
+++ b/configs/mopidy.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }:
-let secrets = import <dot/secrets.nix>;
+let secrets = import <niveum/dot/secrets.nix>;
 in {
   services.mopidy = {
     enable = true;
diff --git a/configs/neovim.nix b/configs/neovim.nix
index d9668b2..dac8662 100644
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -7,20 +7,20 @@
 
   nixpkgs.config.packageOverrides = pkgs: {
     vimPlugins = pkgs.vimPlugins // {
-      cheat-sh-vim = pkgs.callPackage <packages/vimPlugins/cheat-sh.nix> {};
-      vim-fetch = pkgs.callPackage <packages/vimPlugins/vim-fetch.nix> {};
-      vim-colors-paramount = pkgs.callPackage <packages/vimPlugins/vim-colors-paramount.nix> {};
-      vim-256noir = pkgs.callPackage <packages/vimPlugins/vim-256noir.nix> {};
-      todo-txt-vim = pkgs.callPackage <packages/vimPlugins/todo-txt-vim.nix> {};
-      jq-vim = pkgs.callPackage <packages/vimPlugins/jq-vim.nix> {};
-      vim-fsharp = pkgs.callPackage <packages/vimPlugins/vim-fsharp.nix> {};
+      cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
+      vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
+      vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};
+      vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> {};
+      todo-txt-vim = pkgs.callPackage <niveum/packages/vimPlugins/todo-txt-vim.nix> {};
+      jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> {};
+      vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> {};
     };
   };
 
   environment.systemPackages = [
     (pkgs.neovim.override {
       configure = {
-        customRC = builtins.readFile <dot/init.vim>;
+        customRC = builtins.readFile <niveum/dot/init.vim>;
         packages.nvim = with pkgs.vimPlugins; {
           start = [
             ale
diff --git a/configs/retiolum.nix b/configs/retiolum.nix
index c3fb0c1..1f01c45 100644
--- a/configs/retiolum.nix
+++ b/configs/retiolum.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  imports = [ <modules/retiolum.nix> ];
+  imports = [ <niveum/modules/retiolum.nix> ];
 
   fileSystems."/mnt/lassulusflix" = {
     device = "prism.r:/export";
diff --git a/configs/sncli.nix b/configs/sncli.nix
index af2f198..2093f59 100644
--- a/configs/sncli.nix
+++ b/configs/sncli.nix
@@ -1,5 +1,5 @@
 { pkgs, lib, ... }:
-let secrets = import <dot/secrets.nix>;
+let secrets = import <niveum/dot/secrets.nix>;
 in {
   environment.systemPackages = [ pkgs.python3Packages.sncli ];
 
diff --git a/configs/todoist.nix b/configs/todoist.nix
index d8d3e60..76492c7 100644
--- a/configs/todoist.nix
+++ b/configs/todoist.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 let
-  secrets = import <dot/secrets.nix>;
+  secrets = import <niveum/dot/secrets.nix>;
 in {
-  imports = [ <modules/todoist.nix> ];
+  imports = [ <niveum/modules/todoist.nix> ];
 
   niveum.todoist = {
     enable = true;
diff --git a/configs/traadfri.nix b/configs/traadfri.nix
index 63763e9..9297660 100644
--- a/configs/traadfri.nix
+++ b/configs/traadfri.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, ... }:
 {
-  imports = [ <modules/traadfri.nix> ];
+  imports = [ <niveum/modules/traadfri.nix> ];
 
   niveum.traadfri = {
     enable = true;
diff --git a/deploy.nix b/deploy.nix
index 07c9ab7..03dcd14 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -7,36 +7,29 @@ let
   pkgs = import "${krops}/pkgs" {};
   importJson = (import <nixpkgs> {}).lib.importJSON;
 
-  niveum = {
-    lib.file = toString ./lib;
-    packages.file = toString ./packages;
-    configs.file = toString ./configs;
-    dot.file = toString ./dot;
-    modules.file = toString ./modules;
-    nixos-config.symlink = "system/configuration.nix";
-
-    nixpkgs.git = {
-      url = https://github.com/NixOS/nixpkgs-channels;
-      ref = (importJson ./nixpkgs.json).rev;
-    };
-    nixos-unstable.git = {
-      url = https://github.com/NixOS/nixpkgs-channels;
-      ref = "07d4df5";
-    };
-    home-manager.git = {
-      url = https://github.com/rycee/home-manager;
-      ref = "31e8494";
-    };
-    stockholm.git = {
-      url = https://cgit.krebsco.de/stockholm;
-      ref = "421a9792";
-    };
-  };
-
   regularSystem = path: name: {
     source = lib.evalSource [
-      (niveum // {
+      {
+        niveum.file = toString ./.;
         system.file = toString path;
+        nixos-config.symlink = "system/configuration.nix";
+
+        nixpkgs.git = {
+          url = https://github.com/NixOS/nixpkgs-channels;
+          ref = (importJson ./nixpkgs.json).rev;
+        };
+        nixos-unstable.git = {
+          url = https://github.com/NixOS/nixpkgs-channels;
+          ref = "07d4df5";
+        };
+        home-manager.git = {
+          url = https://github.com/rycee/home-manager;
+          ref = "31e8494";
+        };
+        stockholm.git = {
+          url = https://cgit.krebsco.de/stockholm;
+          ref = "421a9792";
+        };
         secrets.pass = {
           dir = toString ~/.password-store/systems;
           inherit name;
@@ -45,7 +38,7 @@ let
           dir = toString ~/.password-store;
           name = "shared";
         };
-      })
+      }
     ];
     target = "root@${name}:22022";
   };
diff --git a/modules/default.nix b/modules/default.nix
index 39361fc..15d40ba 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,9 +1,9 @@
 {
   imports = [
-    <modules/constants.nix>
-    <modules/dropbox.nix>
-    <modules/google-drive.nix>
-    <modules/retiolum.nix>
-    <modules/seafile.nix>
+    ./constants.nix
+    ./dropbox.nix
+    ./google-drive.nix
+    ./retiolum.nix
+    ./seafile.nix
   ];
 }
diff --git a/modules/todoist.nix b/modules/todoist.nix
index cc0e41c..56edda6 100644
--- a/modules/todoist.nix
+++ b/modules/todoist.nix
@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.niveum.todoist;
-  todoist = pkgs.unstable.callPackage <packages/todoist.nix> {};
+  todoist = pkgs.unstable.callPackage <niveum/packages/todoist.nix> {};
 in {
   options.niveum.todoist = {
     enable = mkEnableOption "todoist CLI";
diff --git a/modules/traadfri.nix b/modules/traadfri.nix
index ce8e44a..6e68d25 100644
--- a/modules/traadfri.nix
+++ b/modules/traadfri.nix
@@ -10,7 +10,7 @@ let
       sha256 = "0rvnc95yww4sc9qkg1pvdcgin3vx381fhx8kwcb6hlg30lpdhhrz";
     };
     in pkgs.python3Packages.callPackage traadfri-package {
-      libcoap = pkgs.callPackage <packages/libcoap.nix> {};
+      libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {};
     };
 in
 {
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index a8c770b..f56117f 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -84,13 +84,13 @@ in {
   imports = [
     ./hardware-configuration.nix
     ./containers.nix
-    <configs/distrobump.nix>
-    <configs/nixpkgs-unstable.nix>
-    <configs/save-space.nix>
-    <configs/tmux.nix>
-    <configs/traadfri.nix>
-    <modules/retiolum.nix>
-    <modules/telegram-bot.nix>
+    <niveum/configs/distrobump.nix>
+    <niveum/configs/nixpkgs-unstable.nix>
+    <niveum/configs/save-space.nix>
+    <niveum/configs/tmux.nix>
+    <niveum/configs/traadfri.nix>
+    <niveum/modules/retiolum.nix>
+    <niveum/modules/telegram-bot.nix>
     {
       nixpkgs.config.packageOverrides = pkgs: {
         writeDash = pkgs.writers.writeDash;
@@ -103,7 +103,7 @@ in {
     {
       services.matterbridge = {
         enable = true;
-        configPath = toString (pkgs.writeText "matterbridge.toml" (import <dot/matterbridge.nix> {
+        configPath = toString (pkgs.writeText "matterbridge.toml" (import <niveum/dot/matterbridge.nix> {
           token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
         }));
       };
@@ -151,7 +151,7 @@ in {
   };
 
   environment.variables.TERM = "linux";
-  environment.variables.HTOPRC = toString <dot/htoprc>;
+  environment.variables.HTOPRC = toString <niveum/dot/htoprc>;
 
   environment.systemPackages = with pkgs; [
     git
diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix
index ee723eb..d9e9892 100644
--- a/systems/catullus/containers.nix
+++ b/systems/catullus/containers.nix
@@ -14,8 +14,8 @@ let
   };
 in {
   nixpkgs.config.packageOverrides = pkgs: {
-    autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
-    literature-quote = pkgs.callPackage <packages/literature-quote.nix> {};
+    autorenkalender = pkgs.callPackage <niveum/packages/autorenkalender.nix> {};
+    literature-quote = pkgs.callPackage <niveum/packages/literature-quote.nix> {};
     telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {};
     telegram-reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {};
     telegram-odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {};
diff --git a/systems/homeros/configuration.nix b/systems/homeros/configuration.nix
index 2c9a5d5..3013c4f 100644
--- a/systems/homeros/configuration.nix
+++ b/systems/homeros/configuration.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    <configs/default.nix>
+    <niveum/configs/default.nix>
     ./hardware-configuration.nix
   ];
 
diff --git a/systems/scardanelli/configuration.nix b/systems/scardanelli/configuration.nix
index af2e52f..27bca39 100644
--- a/systems/scardanelli/configuration.nix
+++ b/systems/scardanelli/configuration.nix
@@ -3,7 +3,7 @@ let
   sshKey.rilke = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWRcTILWzSzOAWqwBjJC97K9wKm+pfxk15L5AiTUlUMyBzVQsU+d2jUEe1rmp+kjVXL0qgNMI+eBzEAzaafUMdCPeIkMyeiOlXaYxq8NHApcZUSYV9CmzWqePj8Dlu8uexoF3TJi6tj3mmGM8BY50qkwk4mlT/5xLPPnh/HHyFmoZlj6183Z4vJRnK8UZ6x2gevVaE36lP27MikZ/MQ6/PaHJ5TNZy63rQwzKXw6ZQMx4JU22CwyZqPn1wjlGEkpJFOBKtnypURdVBsPydaZd/I7b/13FMwso2hSUoXqeV6iaeno2FWOrB3cAaFogNWKPRkEacKEE5mQOvLGGdG1Xp u0_a138@localhost";
 in {
   imports = [
-    <configs/default.nix>
+    <niveum/configs/default.nix>
     ./hardware-configuration.nix
   ];
 
diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix
index 897a181..ccd0de8 100644
--- a/systems/wilde/configuration.nix
+++ b/systems/wilde/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    <configs/default.nix>
+    <niveum/configs/default.nix>
     ./hardware-configuration.nix
     <stockholm/krebs/2configs/hw/x220.nix>
   ];