diff --git a/overlay.nix b/overlay.nix
index 575c542..6a0286e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -277,6 +277,29 @@ let
         mpi = self.bsc.mpi;
       };
 
+      hist = callPackage ./garlic/pp/hist { };
+
+      tool = callPackage ./garlic/sh/default.nix {
+        sshHost = "mn1";
+      };
+
+      # Post processing tools
+      pp = with self.bsc.garlicTools; rec {
+        store = callPackage ./garlic/pp/store.nix { };
+        resultFromTrebuchet = trebuchetStage: (store {
+          experimentStage = getExperimentStage trebuchetStage;
+          inherit trebuchetStage;
+        });
+        timetable = callPackage ./garlic/pp/timetable.nix { };
+        rPlot = callPackage ./garlic/pp/rplot.nix { };
+        timetableFromTrebuchet = tre: timetable (resultFromTrebuchet tre);
+        mergeDatasets = callPackage ./garlic/pp/merge.nix { };
+
+        # Takes a list of experiments and returns a file that contains
+        # all timetable results from the experiments.
+        merge = exps: mergeDatasets (map timetableFromTrebuchet exps);
+      };
+
       # Experiments
       exp = {
         nbody = rec {
@@ -310,29 +333,6 @@ let
         };
       };
 
-      hist = callPackage ./garlic/pp/hist { };
-
-      tool = callPackage ./garlic/sh/default.nix {
-        sshHost = "mn1";
-      };
-
-      # Post processing tools
-      pp = with self.bsc.garlicTools; rec {
-        store = callPackage ./garlic/pp/store.nix { };
-        resultFromTrebuchet = trebuchetStage: (store {
-          experimentStage = getExperimentStage trebuchetStage;
-          inherit trebuchetStage;
-        });
-        timetable = callPackage ./garlic/pp/timetable.nix { };
-        rPlot = callPackage ./garlic/pp/rplot.nix { };
-        timetableFromTrebuchet = tre: timetable (resultFromTrebuchet tre);
-        mergeDatasets = callPackage ./garlic/pp/merge.nix { };
-
-        # Takes a list of experiments and returns a file that contains
-        # all timetable results from the experiments.
-        merge = exps: mergeDatasets (map timetableFromTrebuchet exps);
-      };
-
       # Datasets used in the figures
       ds = with self.bsc.garlic; with pp; {
         nbody = with exp.nbody; {