diff --git a/haversine_02/include/argparser.h b/haversine_02/include/generator/gen_argparser.h
similarity index 68%
rename from haversine_02/include/argparser.h
rename to haversine_02/include/generator/gen_argparser.h
index 219875c..bea6ba7 100644
--- a/haversine_02/include/argparser.h
+++ b/haversine_02/include/generator/gen_argparser.h
@@ -1,5 +1,5 @@
-#ifndef ARGPARSER_H
-#define ARGPARSER_H
+#ifndef GEN_ARGPARSER_H
+#define GEN_ARGPARSER_H
 
 #include "aliases.h"
 #include <argp.h>
@@ -12,4 +12,4 @@ struct GeneratorArgs {
 
 GeneratorArgs parse_args(i32 argc, char *argv[]);
 
-#endif // !ARGPARSER_H
+#endif // !GEN_ARGPARSER_H
diff --git a/haversine_02/include/generator.h b/haversine_02/include/generator/generator.h
similarity index 100%
rename from haversine_02/include/generator.h
rename to haversine_02/include/generator/generator.h
diff --git a/haversine_02/src/argparser.cpp b/haversine_02/src/generator/gen_argparser.cpp
similarity index 84%
rename from haversine_02/src/argparser.cpp
rename to haversine_02/src/generator/gen_argparser.cpp
index a42ba85..148043b 100644
--- a/haversine_02/src/argparser.cpp
+++ b/haversine_02/src/generator/gen_argparser.cpp
@@ -1,15 +1,16 @@
-#include "argparser.h"
+#include "generator/gen_argparser.h"
+#include "aliases.h"
 #include <argp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-static error_t argp_parser(i32 key, char *arg, argp_state *state);
+INTERNAL error_t argp_parser(i32 key, char *arg, argp_state *state);
 
-static argp parser = {};
+INTERNAL argp parser = {};
 
-static argp_option options[] = {
+INTERNAL argp_option options[] = {
     {.name = "seed", .key = 's', .arg = "SEED"},
     {.name = "cluster", .key = 'c'},
     {0, 0, 0, 0, 0, 0},
diff --git a/haversine_02/src/generator.cpp b/haversine_02/src/generator/generator.cpp
similarity index 98%
rename from haversine_02/src/generator.cpp
rename to haversine_02/src/generator/generator.cpp
index 81c27bf..93f9f02 100644
--- a/haversine_02/src/generator.cpp
+++ b/haversine_02/src/generator/generator.cpp
@@ -1,4 +1,4 @@
-#include "generator.h"
+#include "generator/generator.h"
 #include "aliases.h"
 #include "point_types.h"
 #include <math.h>
diff --git a/haversine_02/src/genmain.cpp b/haversine_02/src/generator/main.cpp
similarity index 92%
rename from haversine_02/src/genmain.cpp
rename to haversine_02/src/generator/main.cpp
index e2c030f..c58b9a6 100644
--- a/haversine_02/src/genmain.cpp
+++ b/haversine_02/src/generator/main.cpp
@@ -1,11 +1,10 @@
 #include "aliases.h"
-#include "argparser.h"
-#include "generator.h"
+#include "generator/gen_argparser.h"
+#include "generator/generator.h"
 #include "haversine.h"
 #include "point_types.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
 
 #define EARTH_RADIUS_KM 6371.0
 
diff --git a/haversine_02/src/jsonparse.cpp b/haversine_02/src/jsonparse.cpp
deleted file mode 100644
index e0e7723..0000000
--- a/haversine_02/src/jsonparse.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "aliases.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-i32 main(i32 argc, char *argv[]) {
-  if (argc < 2) {
-    printf("Missing filename\n");
-
-    return EXIT_FAILURE;
-  }
-
-  const char *filename = argv[1];
-
-  FILE *fp = fopen(filename, "r");
-  if (!fp) {
-    printf("Failed to open file: %s\n", filename);
-
-    return EXIT_FAILURE;
-  }
-
-  fseek(fp, 0, SEEK_END);
-
-  u64 length = ftell(fp);
-
-  fseek(fp, 0, SEEK_SET);
-
-  char text[length + 1];
-
-  memset(text, 0, length);
-
-  fread(text, sizeof(char), length, fp);
-  text[length] = '\0';
-
-  const char *delim = ", \t\n";
-
-  char *token = strtok(text, delim);
-  while (token) {
-    printf("TOKEN: %s\n", token);
-
-    token = strtok(NULL, delim);
-  }
-
-  fclose(fp);
-
-  return EXIT_SUCCESS;
-}