diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 81481e14b..5af541258 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,10 +12,8 @@ with import <stockholm/lib>;
       then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
       else override;
   in {}
+  // import ./simple pkgs oldpkgs
   // import ./writers.nix pkgs oldpkgs
-  // mapAttrs (_: flip callPackage {})
-              (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
-                           (subdirsOf ./.))
   // {
     empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
 
@@ -33,13 +31,12 @@ with import <stockholm/lib>;
             (builtins.readDir ./haskell-overrides));
     };
 
-    ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
+    ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
 
-    buildbot = callPackage ./buildbot {};
-    buildbot-full = callPackage ./buildbot {
+    buildbot-full = callPackage ./simple/buildbot {
       plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
     };
-    buildbot-worker = callPackage ./buildbot/worker.nix {};
+    buildbot-worker = callPackage ./simple/buildbot/worker.nix {};
 
     # https://github.com/proot-me/PRoot/issues/106
     proot = pkgs.writeDashBin "proot" ''
diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
similarity index 100%
rename from krebs/5pkgs/Reaktor/default.nix
rename to krebs/5pkgs/simple/Reaktor/default.nix
diff --git a/krebs/5pkgs/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
similarity index 100%
rename from krebs/5pkgs/Reaktor/plugins.nix
rename to krebs/5pkgs/simple/Reaktor/plugins.nix
diff --git a/krebs/5pkgs/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/random-emoji.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
diff --git a/krebs/5pkgs/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/random-issue.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/sed-plugin.py
rename to krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
diff --git a/krebs/5pkgs/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/shack-correct.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/simple/apt-cacher-ng/default.nix
similarity index 100%
rename from krebs/5pkgs/apt-cacher-ng/default.nix
rename to krebs/5pkgs/simple/apt-cacher-ng/default.nix
diff --git a/krebs/5pkgs/bepasty-client-cli/default.nix b/krebs/5pkgs/simple/bepasty-client-cli/default.nix
similarity index 100%
rename from krebs/5pkgs/bepasty-client-cli/default.nix
rename to krebs/5pkgs/simple/bepasty-client-cli/default.nix
diff --git a/krebs/5pkgs/buildbot/default.nix b/krebs/5pkgs/simple/buildbot/default.nix
similarity index 100%
rename from krebs/5pkgs/buildbot/default.nix
rename to krebs/5pkgs/simple/buildbot/default.nix
diff --git a/krebs/5pkgs/buildbot/worker.nix b/krebs/5pkgs/simple/buildbot/worker.nix
similarity index 100%
rename from krebs/5pkgs/buildbot/worker.nix
rename to krebs/5pkgs/simple/buildbot/worker.nix
diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-api/default.nix
rename to krebs/5pkgs/simple/cac-api/default.nix
diff --git a/krebs/5pkgs/cac-cert/cac.pem b/krebs/5pkgs/simple/cac-cert/cac.pem
similarity index 100%
rename from krebs/5pkgs/cac-cert/cac.pem
rename to krebs/5pkgs/simple/cac-cert/cac.pem
diff --git a/krebs/5pkgs/cac-cert/default.nix b/krebs/5pkgs/simple/cac-cert/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-cert/default.nix
rename to krebs/5pkgs/simple/cac-cert/default.nix
diff --git a/krebs/5pkgs/cac-panel/default.nix b/krebs/5pkgs/simple/cac-panel/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-panel/default.nix
rename to krebs/5pkgs/simple/cac-panel/default.nix
diff --git a/krebs/5pkgs/collectd-connect-time/default.nix b/krebs/5pkgs/simple/collectd-connect-time/default.nix
similarity index 100%
rename from krebs/5pkgs/collectd-connect-time/default.nix
rename to krebs/5pkgs/simple/collectd-connect-time/default.nix
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
new file mode 100644
index 000000000..2f6799759
--- /dev/null
+++ b/krebs/5pkgs/simple/default.nix
@@ -0,0 +1,10 @@
+with import <stockholm/lib>;
+
+self: super:
+listToAttrs
+  (map
+    (name: nameValuePair (removeSuffix ".nix" name)
+                         (super.callPackage (./. + "/${name}") {}))
+    (filter
+      (name: name != "default.nix" && !hasPrefix "." name)
+      (attrNames (readDir ./.))))
diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix
similarity index 100%
rename from krebs/5pkgs/dic/default.nix
rename to krebs/5pkgs/simple/dic/default.nix
diff --git a/krebs/5pkgs/drivedroid-gen-repo/default.nix b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
similarity index 100%
rename from krebs/5pkgs/drivedroid-gen-repo/default.nix
rename to krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/simple/fortclientsslvpn/default.nix
similarity index 100%
rename from krebs/5pkgs/fortclientsslvpn/default.nix
rename to krebs/5pkgs/simple/fortclientsslvpn/default.nix
diff --git a/krebs/5pkgs/games-user-env/default.nix b/krebs/5pkgs/simple/games-user-env/default.nix
similarity index 100%
rename from krebs/5pkgs/games-user-env/default.nix
rename to krebs/5pkgs/simple/games-user-env/default.nix
diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/simple/get/default.nix
similarity index 100%
rename from krebs/5pkgs/get/default.nix
rename to krebs/5pkgs/simple/get/default.nix
diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
similarity index 100%
rename from krebs/5pkgs/git-hooks/default.nix
rename to krebs/5pkgs/simple/git-hooks/default.nix
diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
similarity index 100%
rename from krebs/5pkgs/github-hosts-sync/default.nix
rename to krebs/5pkgs/simple/github-hosts-sync/default.nix
diff --git a/krebs/5pkgs/go-shortener/default.nix b/krebs/5pkgs/simple/go-shortener/default.nix
similarity index 100%
rename from krebs/5pkgs/go-shortener/default.nix
rename to krebs/5pkgs/simple/go-shortener/default.nix
diff --git a/krebs/5pkgs/go-shortener/packages.nix b/krebs/5pkgs/simple/go-shortener/packages.nix
similarity index 100%
rename from krebs/5pkgs/go-shortener/packages.nix
rename to krebs/5pkgs/simple/go-shortener/packages.nix
diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/simple/goify/default.nix
similarity index 100%
rename from krebs/5pkgs/goify/default.nix
rename to krebs/5pkgs/simple/goify/default.nix
diff --git a/krebs/5pkgs/hashPassword/default.nix b/krebs/5pkgs/simple/hashPassword/default.nix
similarity index 100%
rename from krebs/5pkgs/hashPassword/default.nix
rename to krebs/5pkgs/simple/hashPassword/default.nix
diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix
similarity index 100%
rename from krebs/5pkgs/htgen/default.nix
rename to krebs/5pkgs/simple/htgen/default.nix
diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
similarity index 100%
rename from krebs/5pkgs/irc-announce/default.nix
rename to krebs/5pkgs/simple/irc-announce/default.nix
diff --git a/krebs/5pkgs/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
similarity index 100%
rename from krebs/5pkgs/kpaste/default.nix
rename to krebs/5pkgs/simple/kpaste/default.nix
diff --git a/krebs/5pkgs/krebspaste/default.nix b/krebs/5pkgs/simple/krebspaste/default.nix
similarity index 100%
rename from krebs/5pkgs/krebspaste/default.nix
rename to krebs/5pkgs/simple/krebspaste/default.nix
diff --git a/krebs/5pkgs/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix
similarity index 100%
rename from krebs/5pkgs/krebszones/default.nix
rename to krebs/5pkgs/simple/krebszones/default.nix
diff --git a/krebs/5pkgs/logf/default.nix b/krebs/5pkgs/simple/logf/default.nix
similarity index 100%
rename from krebs/5pkgs/logf/default.nix
rename to krebs/5pkgs/simple/logf/default.nix
diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/simple/much/cabal.nix
similarity index 100%
rename from krebs/5pkgs/much/cabal.nix
rename to krebs/5pkgs/simple/much/cabal.nix
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/simple/much/default.nix
similarity index 100%
rename from krebs/5pkgs/much/default.nix
rename to krebs/5pkgs/simple/much/default.nix
diff --git a/krebs/5pkgs/netcup/default.nix b/krebs/5pkgs/simple/netcup/default.nix
similarity index 100%
rename from krebs/5pkgs/netcup/default.nix
rename to krebs/5pkgs/simple/netcup/default.nix
diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/simple/newsbot-js/default.nix
similarity index 100%
rename from krebs/5pkgs/newsbot-js/default.nix
rename to krebs/5pkgs/simple/newsbot-js/default.nix
diff --git a/krebs/5pkgs/newsbot-js/packages.nix b/krebs/5pkgs/simple/newsbot-js/packages.nix
similarity index 100%
rename from krebs/5pkgs/newsbot-js/packages.nix
rename to krebs/5pkgs/simple/newsbot-js/packages.nix
diff --git a/krebs/5pkgs/noVNC/default.nix b/krebs/5pkgs/simple/noVNC/default.nix
similarity index 100%
rename from krebs/5pkgs/noVNC/default.nix
rename to krebs/5pkgs/simple/noVNC/default.nix
diff --git a/krebs/5pkgs/painload/default.nix b/krebs/5pkgs/simple/painload/default.nix
similarity index 100%
rename from krebs/5pkgs/painload/default.nix
rename to krebs/5pkgs/simple/painload/default.nix
diff --git a/krebs/5pkgs/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
similarity index 100%
rename from krebs/5pkgs/passwdqc-utils/default.nix
rename to krebs/5pkgs/simple/passwdqc-utils/default.nix
diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix
similarity index 100%
rename from krebs/5pkgs/populate/default.nix
rename to krebs/5pkgs/simple/populate/default.nix
diff --git a/krebs/5pkgs/posix-array/default.nix b/krebs/5pkgs/simple/posix-array/default.nix
similarity index 100%
rename from krebs/5pkgs/posix-array/default.nix
rename to krebs/5pkgs/simple/posix-array/default.nix
diff --git a/krebs/5pkgs/pssh/default.nix b/krebs/5pkgs/simple/pssh/default.nix
similarity index 100%
rename from krebs/5pkgs/pssh/default.nix
rename to krebs/5pkgs/simple/pssh/default.nix
diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/simple/push/default.nix
similarity index 100%
rename from krebs/5pkgs/push/default.nix
rename to krebs/5pkgs/simple/push/default.nix
diff --git a/krebs/5pkgs/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
similarity index 100%
rename from krebs/5pkgs/realwallpaper/default.nix
rename to krebs/5pkgs/simple/realwallpaper/default.nix
diff --git a/krebs/5pkgs/repo-sync/default.nix b/krebs/5pkgs/simple/repo-sync/default.nix
similarity index 100%
rename from krebs/5pkgs/repo-sync/default.nix
rename to krebs/5pkgs/simple/repo-sync/default.nix
diff --git a/krebs/5pkgs/retiolum-bootstrap/default.nix b/krebs/5pkgs/simple/retiolum-bootstrap/default.nix
similarity index 100%
rename from krebs/5pkgs/retiolum-bootstrap/default.nix
rename to krebs/5pkgs/simple/retiolum-bootstrap/default.nix
diff --git a/krebs/5pkgs/rutorrent/default.nix b/krebs/5pkgs/simple/rutorrent/default.nix
similarity index 100%
rename from krebs/5pkgs/rutorrent/default.nix
rename to krebs/5pkgs/simple/rutorrent/default.nix
diff --git a/krebs/5pkgs/tarantool/default.nix b/krebs/5pkgs/simple/tarantool/default.nix
similarity index 100%
rename from krebs/5pkgs/tarantool/default.nix
rename to krebs/5pkgs/simple/tarantool/default.nix
diff --git a/krebs/5pkgs/tinc_graphs/default.nix b/krebs/5pkgs/simple/tinc_graphs/default.nix
similarity index 100%
rename from krebs/5pkgs/tinc_graphs/default.nix
rename to krebs/5pkgs/simple/tinc_graphs/default.nix
diff --git a/krebs/5pkgs/translate-shell/default.nix b/krebs/5pkgs/simple/translate-shell/default.nix
similarity index 100%
rename from krebs/5pkgs/translate-shell/default.nix
rename to krebs/5pkgs/simple/translate-shell/default.nix
diff --git a/krebs/5pkgs/treq/default.nix b/krebs/5pkgs/simple/treq/default.nix
similarity index 100%
rename from krebs/5pkgs/treq/default.nix
rename to krebs/5pkgs/simple/treq/default.nix
diff --git a/krebs/5pkgs/untilport/default.nix b/krebs/5pkgs/simple/untilport/default.nix
similarity index 100%
rename from krebs/5pkgs/untilport/default.nix
rename to krebs/5pkgs/simple/untilport/default.nix
diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/simple/urlwatch/default.nix
similarity index 100%
rename from krebs/5pkgs/urlwatch/default.nix
rename to krebs/5pkgs/simple/urlwatch/default.nix
diff --git a/krebs/5pkgs/weechat/default.nix b/krebs/5pkgs/simple/weechat/default.nix
similarity index 100%
rename from krebs/5pkgs/weechat/default.nix
rename to krebs/5pkgs/simple/weechat/default.nix
diff --git a/krebs/5pkgs/whatsupnix/default.nix b/krebs/5pkgs/simple/whatsupnix/default.nix
similarity index 100%
rename from krebs/5pkgs/whatsupnix/default.nix
rename to krebs/5pkgs/simple/whatsupnix/default.nix
diff --git a/krebs/5pkgs/whatsupnix/whatsupnix.bash b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
similarity index 100%
rename from krebs/5pkgs/whatsupnix/whatsupnix.bash
rename to krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
diff --git a/krebs/5pkgs/with-tmpdir/default.nix b/krebs/5pkgs/simple/with-tmpdir/default.nix
similarity index 100%
rename from krebs/5pkgs/with-tmpdir/default.nix
rename to krebs/5pkgs/simple/with-tmpdir/default.nix
diff --git a/krebs/5pkgs/youtube-tools/default.nix b/krebs/5pkgs/simple/youtube-tools/default.nix
similarity index 100%
rename from krebs/5pkgs/youtube-tools/default.nix
rename to krebs/5pkgs/simple/youtube-tools/default.nix
diff --git a/krebs/5pkgs/zandronum-bin/default.nix b/krebs/5pkgs/simple/zandronum-bin/default.nix
similarity index 100%
rename from krebs/5pkgs/zandronum-bin/default.nix
rename to krebs/5pkgs/simple/zandronum-bin/default.nix