diff --git a/pkgs/index.nix b/pkgs/index.nix
index d3373479..30a4a2dc 100644
--- a/pkgs/index.nix
+++ b/pkgs/index.nix
@@ -10,43 +10,43 @@ let
     "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
 
   bscPkgs = {
-    bench6 = callPackage ./pkgs/bench6/default.nix { };
-    bigotes = callPackage ./pkgs/bigotes/default.nix { };
-    clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
-    clangOmpss2Nanos6 = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nanos6; };
-    clangOmpss2Nodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmp; };
-    clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
-    clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
-    #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
-    gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
-    intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
-    jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { };
-    #lmbench = callPackage ./pkgs/lmbench/default.nix { }; # Broken
-    mcxx = callPackage ./pkgs/mcxx/default.nix { };
-    nanos6 = callPackage ./pkgs/nanos6/default.nix { };
+    bench6 = callPackage ./bench6/default.nix { };
+    bigotes = callPackage ./bigotes/default.nix { };
+    clangOmpss2 = callPackage ./llvm-ompss2/default.nix { };
+    clangOmpss2Nanos6 = callPackage ./llvm-ompss2/default.nix { ompss2rt = final.nanos6; };
+    clangOmpss2Nodes = callPackage ./llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmp; };
+    clangOmpss2NodesOmpv = callPackage ./llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
+    clangOmpss2Unwrapped = callPackage ./llvm-ompss2/clang.nix { };
+    #extrae = callPackage ./extrae/default.nix { }; # Broken and outdated
+    gpi-2 = callPackage ./gpi-2/default.nix { };
+    intelPackages_2023 = callPackage ./intel-oneapi/2023.nix { };
+    jemallocNanos6 = callPackage ./nanos6/jemalloc.nix { };
+    #lmbench = callPackage ./lmbench/default.nix { }; # Broken
+    mcxx = callPackage ./mcxx/default.nix { };
+    nanos6 = callPackage ./nanos6/default.nix { };
     nanos6Debug = final.nanos6.override { enableDebug = true; };
-    nixtools = callPackage ./pkgs/nixtools/default.nix { };
+    nixtools = callPackage ./nixtools/default.nix { };
     # Broken because of pkgsStatic.libcap
     # See: https://github.com/NixOS/nixpkgs/pull/268791
-    #nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { };
-    nodes = callPackage ./pkgs/nodes/default.nix { };
-    nosv = callPackage ./pkgs/nosv/default.nix { };
-    openmp = callPackage ./pkgs/llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; };
+    #nix-wrap = callPackage ./nix-wrap/default.nix { };
+    nodes = callPackage ./nodes/default.nix { };
+    nosv = callPackage ./nosv/default.nix { };
+    openmp = callPackage ./llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; };
     openmpv = final.openmp.override { enableNosv = true; enableOvni = true; };
-    osumb = callPackage ./pkgs/osu/default.nix { };
-    ovni = callPackage ./pkgs/ovni/default.nix { };
+    osumb = callPackage ./osu/default.nix { };
+    ovni = callPackage ./ovni/default.nix { };
     ovniGit = final.ovni.override { useGit = true; };
-    paraverKernel = callPackage ./pkgs/paraver/kernel.nix { };
-    #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
-    #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned
-    sonar = callPackage ./pkgs/sonar/default.nix { };
+    paraverKernel = callPackage ./paraver/kernel.nix { };
+    #pscom = callPackage ./parastation/pscom.nix { }; # Unmaintaned
+    #psmpi = callPackage ./parastation/psmpi.nix { }; # Unmaintaned
+    sonar = callPackage ./sonar/default.nix { };
     stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; };
     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
     stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
-    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
-    tampi = callPackage ./pkgs/tampi/default.nix { };
-    wxparaver = callPackage ./pkgs/paraver/default.nix { };
+    tagaspi = callPackage ./tagaspi/default.nix { };
+    tampi = callPackage ./tampi/default.nix { };
+    wxparaver = callPackage ./paraver/default.nix { };
   };
 
 in bscPkgs // {