diff --git a/.vscode/settings.json b/.vscode/settings.json
index 79b53ab4..559caec9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -29,6 +29,7 @@
         "stb_ds.h": "c",
         "test.h": "c",
         "stdlib.h": "c",
-        "chunk_test_utils.h": "c"
+        "chunk_test_utils.h": "c",
+        "sparsesimulator.h": "c"
     }
 }
\ No newline at end of file
diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index d0fc3739..a8d9ea11 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1247,6 +1247,7 @@ Fix doxygen also pointing at native code lib folder
 
 (14/06/2024)
 Fix arena loading
+Refactoring fluid sim code
 
 
 
diff --git a/src/main/c/src/CMakeLists.txt b/src/main/c/src/CMakeLists.txt
index 66538c03..592bd3c4 100644
--- a/src/main/c/src/CMakeLists.txt
+++ b/src/main/c/src/CMakeLists.txt
@@ -17,6 +17,8 @@ add_library(StormEngine SHARED ${SOURCES})
 
 # include public dirs
 target_include_directories(StormEngine PUBLIC ${PROJECT_SOURCE_DIR}/src/main/c/includes)
+# include public dirs
+target_include_directories(StormEngine PUBLIC ${PROJECT_SOURCE_DIR}/src/main/c/lib)
 
 # set props for the lib
 target_compile_options(StormEngine PRIVATE -m64 -mavx -mavx2)
diff --git a/src/main/c/src/fluid/chunk.c b/src/main/c/src/fluid/queue/chunk.c
similarity index 100%
rename from src/main/c/src/fluid/chunk.c
rename to src/main/c/src/fluid/queue/chunk.c
diff --git a/src/main/c/src/fluid/chunkmask.c b/src/main/c/src/fluid/queue/chunkmask.c
similarity index 91%
rename from src/main/c/src/fluid/chunkmask.c
rename to src/main/c/src/fluid/queue/chunkmask.c
index 96547dc4..81228574 100644
--- a/src/main/c/src/fluid/chunkmask.c
+++ b/src/main/c/src/fluid/queue/chunkmask.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 
-#include "../../includes/fluid/utilities.h"
-#include "../../includes/fluid/chunkmask.h"
+#include "fluid/utilities.h"
+#include "fluid/chunkmask.h"
 
 const uint32_t CHUNK_INDEX_ARR[] = {
     CHUNK_000, CHUNK_100, CHUNK_200,
diff --git a/src/main/c/src/fluid/islandsolver.c b/src/main/c/src/fluid/queue/islandsolver.c
similarity index 99%
rename from src/main/c/src/fluid/islandsolver.c
rename to src/main/c/src/fluid/queue/islandsolver.c
index 4e2f88ba..b3b48c92 100644
--- a/src/main/c/src/fluid/islandsolver.c
+++ b/src/main/c/src/fluid/queue/islandsolver.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../../lib/stb/stb_ds.h"
+#include "stb/stb_ds.h"
 
 #include "fluid/islandsolver.h"
 #include "fluid/chunk.h"
diff --git a/src/main/c/src/fluid/javainterface.c b/src/main/c/src/fluid/queue/javainterface.c
similarity index 97%
rename from src/main/c/src/fluid/javainterface.c
rename to src/main/c/src/fluid/queue/javainterface.c
index 1ab74769..6d19684b 100644
--- a/src/main/c/src/fluid/javainterface.c
+++ b/src/main/c/src/fluid/queue/javainterface.c
@@ -3,14 +3,14 @@
 //library includes
 //include stb ds
 #define STB_DS_IMPLEMENTATION
-#include "../../lib/stb/stb_ds.h"
+#include "stb/stb_ds.h"
 
 //local includes
-#include "../../includes/fluid/chunk.h"
-#include "../../includes/fluid/chunkmask.h"
-#include "../../includes/fluid/utilities.h"
-#include "../../includes/fluid/simulation.h"
-#include "../../includes/fluid/metadatacalc.h"
+#include "fluid/chunk.h"
+#include "fluid/chunkmask.h"
+#include "fluid/utilities.h"
+#include "fluid/simulation.h"
+#include "fluid/metadatacalc.h"
 
 
 //defines
diff --git a/src/main/c/src/fluid/metadatacalc.c b/src/main/c/src/fluid/queue/metadatacalc.c
similarity index 96%
rename from src/main/c/src/fluid/metadatacalc.c
rename to src/main/c/src/fluid/queue/metadatacalc.c
index 9855a7f9..efe1827e 100644
--- a/src/main/c/src/fluid/metadatacalc.c
+++ b/src/main/c/src/fluid/queue/metadatacalc.c
@@ -2,9 +2,9 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "../../includes/fluid/utilities.h"
-#include "../../includes/fluid/chunkmask.h"
-#include "../../includes/fluid/metadatacalc.h"
+#include "fluid/utilities.h"
+#include "fluid/chunkmask.h"
+#include "fluid/metadatacalc.h"
 
 #define UPDATE_THRESHOLD 0.1
 
diff --git a/src/main/c/src/fluid/sim/cellular/cellular.c b/src/main/c/src/fluid/sim/cellular/cellular.c
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main/c/src/fluid/densitystep.c b/src/main/c/src/fluid/sim/grid/densitystep.c
similarity index 97%
rename from src/main/c/src/fluid/densitystep.c
rename to src/main/c/src/fluid/sim/grid/densitystep.c
index 97d04257..1afb2a18 100644
--- a/src/main/c/src/fluid/densitystep.c
+++ b/src/main/c/src/fluid/sim/grid/densitystep.c
@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <jni.h>
 
-#include "../../includes/fluid/utilities.h"
-#include "../../includes/fluid/chunkmask.h"
-#include "../../includes/fluid/environment.h"
-#include "../../includes/fluid/chunk.h"
+#include "fluid/utilities.h"
+#include "fluid/chunkmask.h"
+#include "fluid/environment.h"
+#include "fluid/chunk.h"
 
 
 /**
diff --git a/src/main/c/src/fluid/fluidsim.c b/src/main/c/src/fluid/sim/grid/fluidsim.c
similarity index 98%
rename from src/main/c/src/fluid/fluidsim.c
rename to src/main/c/src/fluid/sim/grid/fluidsim.c
index ba8de418..cf395f87 100644
--- a/src/main/c/src/fluid/fluidsim.c
+++ b/src/main/c/src/fluid/sim/grid/fluidsim.c
@@ -1,15 +1,15 @@
 #include <stdint.h>
 
 //native interfaces
-#include "../../includes/native/electrosphere_server_fluid_simulator_FluidAcceleratedSimulator.h"
+#include "native/electrosphere_server_fluid_simulator_FluidAcceleratedSimulator.h"
 
 //fluid lib
-#include "../../includes/fluid/utilities.h"
-#include "../../includes/fluid/chunkmask.h"
-#include "../../includes/fluid/mainFunctions.h"
-#include "../../includes/fluid/chunk.h"
-#include "../../includes/fluid/simulation.h"
-#include "../../includes/fluid/solver_consts.h"
+#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"
 
 #ifndef SAVE_STEPS
 #define SAVE_STEPS 0
diff --git a/src/main/c/src/fluid/velocitystep.c b/src/main/c/src/fluid/sim/grid/velocitystep.c
similarity index 99%
rename from src/main/c/src/fluid/velocitystep.c
rename to src/main/c/src/fluid/sim/grid/velocitystep.c
index c53e32b6..814c436e 100644
--- a/src/main/c/src/fluid/velocitystep.c
+++ b/src/main/c/src/fluid/sim/grid/velocitystep.c
@@ -2,10 +2,10 @@
 #include <immintrin.h>
 #include <stdint.h>
 
-#include "../../includes/fluid/utilities.h"
-#include "../../includes/fluid/chunkmask.h"
-#include "../../includes/fluid/chunk.h"
-#include "../../includes/fluid/solver_consts.h"
+#include "fluid/utilities.h"
+#include "fluid/chunkmask.h"
+#include "fluid/chunk.h"
+#include "fluid/solver_consts.h"
 
 
 #define BOUND_NO_DIR 0
diff --git a/src/main/c/src/fluid/sparsesimulator.c b/src/main/c/src/fluid/sim/sparse/sparsesimulator.c
similarity index 99%
rename from src/main/c/src/fluid/sparsesimulator.c
rename to src/main/c/src/fluid/sim/sparse/sparsesimulator.c
index 210b976b..9c17a943 100644
--- a/src/main/c/src/fluid/sparsesimulator.c
+++ b/src/main/c/src/fluid/sim/sparse/sparsesimulator.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <immintrin.h>
 
-#include "../../lib/stb/stb_ds.h"
+#include "stb/stb_ds.h"
 
 #include "fluid/chunk.h"
 #include "fluid/islandsolver.h"