diff --git a/Makefile b/Makefile
index 162cbb95a..9d8480819 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ CXXFLAGS =  -std=c++11 -O2 -march=native -Wall -Wextra -Wshadow -Iinclude  -Iben
 LIBFLAGS = -ldouble-conversion
 
 EXECUTABLES=parse jsoncheck minifiercompetition parsingcompetition
-HEADERS=include/jsonparser.h include/common_defs.h include/jsonioutil.h benchmark/benchmark.h benchmark/linux/linux-perf-events.h include/simdjson_internal.h include/stage1_find_marks.h include/stage2_flatten.h include/stage3_ape_machine.h include/stage4_shovel_machine.h 
+HEADERS=include/jsonparser/jsonparser.h include/jsonparser/common_defs.h include/jsonparser/jsonioutil.h benchmark/benchmark.h benchmark/linux/linux-perf-events.h include/jsonparser/simdjson_internal.h include/jsonparser/stage1_find_marks.h include/jsonparser/stage2_flatten.h include/jsonparser/stage3_ape_machine.h include/jsonparser/stage4_shovel_machine.h
 LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/stage1_find_marks.cpp     src/stage2_flatten.cpp        src/stage3_ape_machine.cpp    src/stage4_shovel_machine.cpp
-MINIFIERHEADERS=include/jsonminifier.h include/simdprune_tables.h
+MINIFIERHEADERS=include/jsonparser/jsonminifier.h include/jsonparser/simdprune_tables.h
 MINIFIERLIBFILES=src/jsonminifier.cpp
 
 EXTRA_EXECUTABLES=parsenocheesy parsenodep8
diff --git a/benchmark/minifiercompetition.cpp b/benchmark/minifiercompetition.cpp
index c1c59a293..5e602f1a3 100644
--- a/benchmark/minifiercompetition.cpp
+++ b/benchmark/minifiercompetition.cpp
@@ -1,24 +1,15 @@
-//#include "avxprocessing.h"
-
-//#include "avxminifier.h"
-//#include "scalarminifier.h"
 #include <iostream>
 
 #include "benchmark.h"
-#include "jsonioutil.h"
-#include "jsonminifier.h"
+#include "jsonparser/jsonioutil.h"
+#include "jsonparser/jsonminifier.h"
 
-#include "jsonminifier.h"
-//#include "jsonstruct.h"
 // #define RAPIDJSON_SSE2 // bad
 // #define RAPIDJSON_SSE42 // bad
 #include "rapidjson/document.h"
 #include "rapidjson/reader.h" // you have to check in the submodule
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
-//#include "util.h"
-
-// colorfuldisplay(ParsedJson & pj, const u8 * buf)
 
 using namespace rapidjson;
 using namespace std;
diff --git a/benchmark/parse.cpp b/benchmark/parse.cpp
index e2bfe19ca..1af571fe2 100644
--- a/benchmark/parse.cpp
+++ b/benchmark/parse.cpp
@@ -1,4 +1,4 @@
-#include "common_defs.h"
+#include "jsonparser/common_defs.h"
 #include "double-conversion/double-conversion.h"
 #include "linux-perf-events.h"
 #include <algorithm>
@@ -33,12 +33,12 @@ using namespace double_conversion;
 
 //#define DEBUG
 
-#include "jsonioutil.h"
-#include "simdjson_internal.h"
-#include "stage1_find_marks.h"
-#include "stage2_flatten.h"
-#include "stage3_ape_machine.h"
-#include "stage4_shovel_machine.h"
+#include "jsonparser/jsonioutil.h"
+#include "jsonparser/simdjson_internal.h"
+#include "jsonparser/stage1_find_marks.h"
+#include "jsonparser/stage2_flatten.h"
+#include "jsonparser/stage3_ape_machine.h"
+#include "jsonparser/stage4_shovel_machine.h"
 using namespace std;
 
 // https://stackoverflow.com/questions/2616906/how-do-i-output-coloured-text-to-a-linux-terminal
diff --git a/benchmark/parsingcompetition.cpp b/benchmark/parsingcompetition.cpp
index 41b0a48ac..dca069e32 100644
--- a/benchmark/parsingcompetition.cpp
+++ b/benchmark/parsingcompetition.cpp
@@ -1,8 +1,8 @@
 
-#include "jsonparser.h"
+#include "jsonparser/jsonparser.h"
 
 #include "benchmark.h"
-//#include "jsonstruct.h"
+
 // #define RAPIDJSON_SSE2 // bad
 // #define RAPIDJSON_SSE42 // bad
 #include "rapidjson/document.h"
@@ -10,7 +10,6 @@
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
 
-// colorfuldisplay(ParsedJson & pj, const u8 * buf)
 
 using namespace rapidjson;
 using namespace std;
diff --git a/include/common_defs.h b/include/jsonparser/common_defs.h
similarity index 100%
rename from include/common_defs.h
rename to include/jsonparser/common_defs.h
diff --git a/include/jsonioutil.h b/include/jsonparser/jsonioutil.h
similarity index 100%
rename from include/jsonioutil.h
rename to include/jsonparser/jsonioutil.h
diff --git a/include/jsonminifier.h b/include/jsonparser/jsonminifier.h
similarity index 100%
rename from include/jsonminifier.h
rename to include/jsonparser/jsonminifier.h
diff --git a/include/jsonparser.h b/include/jsonparser/jsonparser.h
similarity index 100%
rename from include/jsonparser.h
rename to include/jsonparser/jsonparser.h
diff --git a/include/simdjson_internal.h b/include/jsonparser/simdjson_internal.h
similarity index 100%
rename from include/simdjson_internal.h
rename to include/jsonparser/simdjson_internal.h
diff --git a/include/simdprune_tables.h b/include/jsonparser/simdprune_tables.h
similarity index 100%
rename from include/simdprune_tables.h
rename to include/jsonparser/simdprune_tables.h
diff --git a/include/stage1_find_marks.h b/include/jsonparser/stage1_find_marks.h
similarity index 100%
rename from include/stage1_find_marks.h
rename to include/jsonparser/stage1_find_marks.h
diff --git a/include/stage2_flatten.h b/include/jsonparser/stage2_flatten.h
similarity index 100%
rename from include/stage2_flatten.h
rename to include/jsonparser/stage2_flatten.h
diff --git a/include/stage3_ape_machine.h b/include/jsonparser/stage3_ape_machine.h
similarity index 100%
rename from include/stage3_ape_machine.h
rename to include/jsonparser/stage3_ape_machine.h
diff --git a/include/stage4_shovel_machine.h b/include/jsonparser/stage4_shovel_machine.h
similarity index 100%
rename from include/stage4_shovel_machine.h
rename to include/jsonparser/stage4_shovel_machine.h
diff --git a/include/transitions.h b/include/jsonparser/transitions.h
similarity index 100%
rename from include/transitions.h
rename to include/jsonparser/transitions.h
diff --git a/scripts/transitions/Makefile b/scripts/transitions/Makefile
index 635ed4fba..2fffa436d 100644
--- a/scripts/transitions/Makefile
+++ b/scripts/transitions/Makefile
@@ -1,7 +1,7 @@
 all:../../include/transitions.h
 
 ../../include/transitions.h: generatetransitions
-	./generatetransitions > ../../include/transitions.h
+	./generatetransitions > ../../include/jsonparser/transitions.h
 
 generatetransitions:  generatetransitions.cpp
 	$(CXX) -o generatetransitions  generatetransitions.cpp  -I../../include
diff --git a/src/jsonioutil.cpp b/src/jsonioutil.cpp
index 823e67437..581afe8e9 100644
--- a/src/jsonioutil.cpp
+++ b/src/jsonioutil.cpp
@@ -1,4 +1,4 @@
-#include "jsonioutil.h"
+#include "jsonparser/jsonioutil.h"
 #include <cstring>
 std::pair<u8 *, size_t> get_corpus(std::string filename) {
   std::ifstream is(filename, std::ios::binary);
diff --git a/src/jsonminifier.cpp b/src/jsonminifier.cpp
index 9735020ab..d21657583 100644
--- a/src/jsonminifier.cpp
+++ b/src/jsonminifier.cpp
@@ -67,7 +67,7 @@ size_t jsonminify(const unsigned char *bytes, size_t howmany,
 #include <x86intrin.h>
 #endif // _MSC_VER
 
-#include "simdprune_tables.h"
+#include "jsonparser/simdprune_tables.h"
 #include <cstring>
 #ifndef __clang__
 static inline __m256i _mm256_loadu2_m128i(__m128i const *__addr_hi,
diff --git a/src/jsonparser.cpp b/src/jsonparser.cpp
index 62f4f63e9..ccedadcbe 100644
--- a/src/jsonparser.cpp
+++ b/src/jsonparser.cpp
@@ -1,4 +1,4 @@
-#include "jsonparser.h"
+#include "jsonparser/jsonparser.h"
 
 // allocate a ParsedJson structure that can support document
 // up to len bytes.
diff --git a/src/stage1_find_marks.cpp b/src/stage1_find_marks.cpp
index 4881f5ef4..afd192b83 100644
--- a/src/stage1_find_marks.cpp
+++ b/src/stage1_find_marks.cpp
@@ -8,8 +8,8 @@
 
 #include <cassert>
 
-#include "common_defs.h"
-#include "simdjson_internal.h"
+#include "jsonparser/common_defs.h"
+#include "jsonparser/simdjson_internal.h"
 
 using namespace std;
 
diff --git a/src/stage2_flatten.cpp b/src/stage2_flatten.cpp
index ab75da3de..d4ec8f41d 100644
--- a/src/stage2_flatten.cpp
+++ b/src/stage2_flatten.cpp
@@ -8,8 +8,8 @@
 
 #include <cassert>
 
-#include "common_defs.h"
-#include "simdjson_internal.h"
+#include "jsonparser/common_defs.h"
+#include "jsonparser/simdjson_internal.h"
 
 #ifndef NO_PDEP_WIDTH
 #define NO_PDEP_WIDTH 8
diff --git a/src/stage3_ape_machine.cpp b/src/stage3_ape_machine.cpp
index e2f6982b9..592e71ed5 100644
--- a/src/stage3_ape_machine.cpp
+++ b/src/stage3_ape_machine.cpp
@@ -9,8 +9,8 @@
 #include <cassert>
 #include <cstring>
 
-#include "common_defs.h"
-#include "simdjson_internal.h"
+#include "jsonparser/common_defs.h"
+#include "jsonparser/simdjson_internal.h"
 
 // the ape machine consists of two parts:
 //
@@ -111,7 +111,7 @@ const u32 MAX_STATES = 16;
  * Better to precompute the (small) result into a header file.
  */
 // u32 trans[MAX_STATES][256];
-#include "transitions.h"
+#include "jsonparser/transitions.h"
 
 u32 states[MAX_DEPTH];
 const int START_STATE = 1;
diff --git a/src/stage4_shovel_machine.cpp b/src/stage4_shovel_machine.cpp
index 556b43974..8655c2f77 100644
--- a/src/stage4_shovel_machine.cpp
+++ b/src/stage4_shovel_machine.cpp
@@ -9,8 +9,8 @@
 #include <cassert>
 #include <cstring>
 
-#include "common_defs.h"
-#include "simdjson_internal.h"
+#include "jsonparser/common_defs.h"
+#include "jsonparser/simdjson_internal.h"
 
 // they are { 0x7b } 0x7d : 0x3a [ 0x5b ] 0x5d , 0x2c
 // these go into the first 3 buckets of the comparison (1/2/4)
diff --git a/tests/jsoncheck.cpp b/tests/jsoncheck.cpp
index 1a552bb81..67b11b3b7 100644
--- a/tests/jsoncheck.cpp
+++ b/tests/jsoncheck.cpp
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "jsonparser.h"
+#include "jsonparser/jsonparser.h"
 
 /**
  * Does the file filename ends with the given extension.