diff --git a/.vscode/settings.json b/.vscode/settings.json
index 559caec9..4df2dd9e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -30,6 +30,7 @@
         "test.h": "c",
         "stdlib.h": "c",
         "chunk_test_utils.h": "c",
-        "sparsesimulator.h": "c"
+        "sparsesimulator.h": "c",
+        "environment.h": "c"
     }
 }
\ No newline at end of file
diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index a8d9ea11..eece847f 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1248,6 +1248,7 @@ Fix doxygen also pointing at native code lib folder
 (14/06/2024)
 Fix arena loading
 Refactoring fluid sim code
+Refactoring fluid sim headers
 
 
 
diff --git a/src/main/c/includes/fluid/environment.h b/src/main/c/includes/fluid/env/environment.h
similarity index 100%
rename from src/main/c/includes/fluid/environment.h
rename to src/main/c/includes/fluid/env/environment.h
diff --git a/src/main/c/includes/fluid/utilities.h b/src/main/c/includes/fluid/env/utilities.h
similarity index 91%
rename from src/main/c/includes/fluid/utilities.h
rename to src/main/c/includes/fluid/env/utilities.h
index e951296a..5baecb03 100644
--- a/src/main/c/includes/fluid/utilities.h
+++ b/src/main/c/includes/fluid/env/utilities.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include "chunk.h"
+#include "fluid/queue/chunk.h"
 
 #ifndef UTILITIES_H
 #define UTILITIES_H
diff --git a/src/main/c/includes/fluid/chunk.h b/src/main/c/includes/fluid/queue/chunk.h
similarity index 100%
rename from src/main/c/includes/fluid/chunk.h
rename to src/main/c/includes/fluid/queue/chunk.h
diff --git a/src/main/c/includes/fluid/chunkmask.h b/src/main/c/includes/fluid/queue/chunkmask.h
similarity index 100%
rename from src/main/c/includes/fluid/chunkmask.h
rename to src/main/c/includes/fluid/queue/chunkmask.h
diff --git a/src/main/c/includes/fluid/islandsolver.h b/src/main/c/includes/fluid/queue/islandsolver.h
similarity index 98%
rename from src/main/c/includes/fluid/islandsolver.h
rename to src/main/c/includes/fluid/queue/islandsolver.h
index 8cbbb7da..ceff8ca6 100644
--- a/src/main/c/includes/fluid/islandsolver.h
+++ b/src/main/c/includes/fluid/queue/islandsolver.h
@@ -6,7 +6,7 @@
 #ifndef ISLANDSOLVER_H
 #define ISLANDSOLVER_H
 
-#include "chunk.h"
+#include "fluid/queue/chunk.h"
 
 /**
  * A set of sparse matricies for simulating fluids
diff --git a/src/main/c/includes/fluid/metadatacalc.h b/src/main/c/includes/fluid/queue/metadatacalc.h
similarity index 85%
rename from src/main/c/includes/fluid/metadatacalc.h
rename to src/main/c/includes/fluid/queue/metadatacalc.h
index 749b8ca2..b7f59a8c 100644
--- a/src/main/c/includes/fluid/metadatacalc.h
+++ b/src/main/c/includes/fluid/queue/metadatacalc.h
@@ -1,8 +1,8 @@
 #ifndef METADATACALC
 #define METADATACALC
 
-#include "./chunk.h"
-#include "./environment.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/env/environment.h"
 
 
 /**
diff --git a/src/main/c/includes/fluid/mainFunctions.h b/src/main/c/includes/fluid/sim/grid/mainFunctions.h
similarity index 99%
rename from src/main/c/includes/fluid/mainFunctions.h
rename to src/main/c/includes/fluid/sim/grid/mainFunctions.h
index aba4c033..d1daed6b 100644
--- a/src/main/c/includes/fluid/mainFunctions.h
+++ b/src/main/c/includes/fluid/sim/grid/mainFunctions.h
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "environment.h"
+#include "fluid/env/environment.h"
 
 #ifndef MAINFUNC
 #define MAINFUNC
diff --git a/src/main/c/includes/fluid/simulation.h b/src/main/c/includes/fluid/sim/grid/simulation.h
similarity index 84%
rename from src/main/c/includes/fluid/simulation.h
rename to src/main/c/includes/fluid/sim/grid/simulation.h
index bf97216a..abba77d7 100644
--- a/src/main/c/includes/fluid/simulation.h
+++ b/src/main/c/includes/fluid/sim/grid/simulation.h
@@ -1,8 +1,8 @@
 #ifndef SIMULATION_H
 #define SIMULATION_H
 
-#include "./chunk.h"
-#include "./environment.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/env/environment.h"
 
 /**
  * Performs the main simulation
diff --git a/src/main/c/includes/fluid/solver_consts.h b/src/main/c/includes/fluid/sim/grid/solver_consts.h
similarity index 100%
rename from src/main/c/includes/fluid/solver_consts.h
rename to src/main/c/includes/fluid/sim/grid/solver_consts.h
diff --git a/src/main/c/includes/fluid/sparsesimulator.h b/src/main/c/includes/fluid/sim/sparse/sparsesimulator.h
similarity index 98%
rename from src/main/c/includes/fluid/sparsesimulator.h
rename to src/main/c/includes/fluid/sim/sparse/sparsesimulator.h
index 8c5eac93..674e8d67 100644
--- a/src/main/c/includes/fluid/sparsesimulator.h
+++ b/src/main/c/includes/fluid/sim/sparse/sparsesimulator.h
@@ -4,7 +4,7 @@
 //Must be included for public functions to be imported/exported on windows
 #include "public.h"
 
-#include "chunk.h"
+#include "fluid/queue/chunk.h"
 
 /**
  * Simulates a sparse array
diff --git a/src/main/c/src/fluid/queue/chunk.c b/src/main/c/src/fluid/queue/chunk.c
index fa62f63d..eeb7f725 100644
--- a/src/main/c/src/fluid/queue/chunk.c
+++ b/src/main/c/src/fluid/queue/chunk.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 
 
-#include "fluid/chunk.h"
-#include "fluid/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/env/utilities.h"
 
 
 
diff --git a/src/main/c/src/fluid/queue/chunkmask.c b/src/main/c/src/fluid/queue/chunkmask.c
index 81228574..647795e2 100644
--- a/src/main/c/src/fluid/queue/chunkmask.c
+++ b/src/main/c/src/fluid/queue/chunkmask.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 
-#include "fluid/utilities.h"
-#include "fluid/chunkmask.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/chunkmask.h"
 
 const uint32_t CHUNK_INDEX_ARR[] = {
     CHUNK_000, CHUNK_100, CHUNK_200,
diff --git a/src/main/c/src/fluid/queue/islandsolver.c b/src/main/c/src/fluid/queue/islandsolver.c
index b3b48c92..8c5f313b 100644
--- a/src/main/c/src/fluid/queue/islandsolver.c
+++ b/src/main/c/src/fluid/queue/islandsolver.c
@@ -3,8 +3,8 @@
 
 #include "stb/stb_ds.h"
 
-#include "fluid/islandsolver.h"
-#include "fluid/chunk.h"
+#include "fluid/queue/islandsolver.h"
+#include "fluid/queue/chunk.h"
 
 
 
diff --git a/src/main/c/src/fluid/queue/javainterface.c b/src/main/c/src/fluid/queue/javainterface.c
index 6d19684b..826a651b 100644
--- a/src/main/c/src/fluid/queue/javainterface.c
+++ b/src/main/c/src/fluid/queue/javainterface.c
@@ -6,11 +6,11 @@
 #include "stb/stb_ds.h"
 
 //local includes
-#include "fluid/chunk.h"
-#include "fluid/chunkmask.h"
-#include "fluid/utilities.h"
-#include "fluid/simulation.h"
-#include "fluid/metadatacalc.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/env/utilities.h"
+#include "fluid/sim/grid/simulation.h"
+#include "fluid/queue/metadatacalc.h"
 
 
 //defines
diff --git a/src/main/c/src/fluid/queue/metadatacalc.c b/src/main/c/src/fluid/queue/metadatacalc.c
index efe1827e..301fabc4 100644
--- a/src/main/c/src/fluid/queue/metadatacalc.c
+++ b/src/main/c/src/fluid/queue/metadatacalc.c
@@ -2,9 +2,9 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "fluid/utilities.h"
-#include "fluid/chunkmask.h"
-#include "fluid/metadatacalc.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/queue/metadatacalc.h"
 
 #define UPDATE_THRESHOLD 0.1
 
diff --git a/src/main/c/src/fluid/sim/grid/densitystep.c b/src/main/c/src/fluid/sim/grid/densitystep.c
index 1afb2a18..94c8ca39 100644
--- a/src/main/c/src/fluid/sim/grid/densitystep.c
+++ b/src/main/c/src/fluid/sim/grid/densitystep.c
@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <jni.h>
 
-#include "fluid/utilities.h"
-#include "fluid/chunkmask.h"
-#include "fluid/environment.h"
-#include "fluid/chunk.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/env/environment.h"
+#include "fluid/queue/chunk.h"
 
 
 /**
diff --git a/src/main/c/src/fluid/sim/grid/fluidsim.c b/src/main/c/src/fluid/sim/grid/fluidsim.c
index cf395f87..619e0151 100644
--- a/src/main/c/src/fluid/sim/grid/fluidsim.c
+++ b/src/main/c/src/fluid/sim/grid/fluidsim.c
@@ -4,12 +4,12 @@
 #include "native/electrosphere_server_fluid_simulator_FluidAcceleratedSimulator.h"
 
 //fluid lib
-#include "fluid/utilities.h"
-#include "fluid/chunkmask.h"
-#include "fluid/mainFunctions.h"
-#include "fluid/chunk.h"
-#include "fluid/simulation.h"
-#include "fluid/solver_consts.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/sim/grid/mainFunctions.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/sim/grid/simulation.h"
+#include "fluid/sim/grid/solver_consts.h"
 
 #ifndef SAVE_STEPS
 #define SAVE_STEPS 0
diff --git a/src/main/c/src/fluid/sim/grid/velocitystep.c b/src/main/c/src/fluid/sim/grid/velocitystep.c
index 814c436e..cbd4cd42 100644
--- a/src/main/c/src/fluid/sim/grid/velocitystep.c
+++ b/src/main/c/src/fluid/sim/grid/velocitystep.c
@@ -2,10 +2,10 @@
 #include <immintrin.h>
 #include <stdint.h>
 
-#include "fluid/utilities.h"
-#include "fluid/chunkmask.h"
-#include "fluid/chunk.h"
-#include "fluid/solver_consts.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/sim/grid/solver_consts.h"
 
 
 #define BOUND_NO_DIR 0
diff --git a/src/main/c/src/fluid/sim/sparse/sparsesimulator.c b/src/main/c/src/fluid/sim/sparse/sparsesimulator.c
index 9c17a943..c944106c 100644
--- a/src/main/c/src/fluid/sim/sparse/sparsesimulator.c
+++ b/src/main/c/src/fluid/sim/sparse/sparsesimulator.c
@@ -4,10 +4,10 @@
 
 #include "stb/stb_ds.h"
 
-#include "fluid/chunk.h"
-#include "fluid/islandsolver.h"
-#include "fluid/sparsesimulator.h"
-#include "fluid/utilities.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/queue/islandsolver.h"
+#include "fluid/sim/sparse/sparsesimulator.h"
+#include "fluid/env/utilities.h"
 
 #define LINEARSOLVERTIMES 10
 
diff --git a/test/c/fluid/chunk_test_utils.h b/test/c/fluid/chunk_test_utils.h
index 4ce34877..7302658c 100644
--- a/test/c/fluid/chunk_test_utils.h
+++ b/test/c/fluid/chunk_test_utils.h
@@ -2,7 +2,7 @@
 #ifndef CHUNK_TEST_UTILS_H
 #define CHUNK_TEST_UTILS_H
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
 
 
 /**
diff --git a/test/c/fluid/chunk_tests.c b/test/c/fluid/chunk_tests.c
index 669fb0f3..4a54acbe 100644
--- a/test/c/fluid/chunk_tests.c
+++ b/test/c/fluid/chunk_tests.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fluid/chunk.h"
-#include "fluid/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/env/utilities.h"
 #include "../test.h"
 
 
diff --git a/test/c/fluid/islandsolver_tests.c b/test/c/fluid/islandsolver_tests.c
index dae321ae..505bdee2 100644
--- a/test/c/fluid/islandsolver_tests.c
+++ b/test/c/fluid/islandsolver_tests.c
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fluid/chunk.h"
-#include "fluid/chunkmask.h"
-#include "fluid/utilities.h"
-#include "fluid/islandsolver.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/islandsolver.h"
 #include "../test.h"
 #include "chunk_test_utils.h"
 
diff --git a/test/c/fluid/sparsesimulator_tests.c b/test/c/fluid/sparsesimulator_tests.c
index 0651bf02..e329c695 100644
--- a/test/c/fluid/sparsesimulator_tests.c
+++ b/test/c/fluid/sparsesimulator_tests.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fluid/chunk.h"
-#include "fluid/chunkmask.h"
-#include "fluid/utilities.h"
-#include "fluid/islandsolver.h"
-#include "fluid/sparsesimulator.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/env/utilities.h"
+#include "fluid/queue/islandsolver.h"
+#include "fluid/sim/sparse/sparsesimulator.h"
 #include "../test.h"
 #include "chunk_test_utils.h"