diff --git a/demos/demo1-wireframes/src/main.cpp b/demos/demo1-wireframes/src/main.cpp
index 7891b92..78773a2 100644
--- a/demos/demo1-wireframes/src/main.cpp
+++ b/demos/demo1-wireframes/src/main.cpp
@@ -1,6 +1,6 @@
-#include <libgba-sprite-engine/scene.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
-#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/scene.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
 
 #include "wirescene.h"
 
diff --git a/demos/demo1-wireframes/src/wirescene.cpp b/demos/demo1-wireframes/src/wirescene.cpp
index 102e001..0488dfa 100644
--- a/demos/demo1-wireframes/src/wirescene.cpp
+++ b/demos/demo1-wireframes/src/wirescene.cpp
@@ -2,9 +2,9 @@
 // Created by Wouter Groeneveld on 02/08/18.
 //
 
-#include <libgba-sprite-engine/gba/tonc_memdef.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
-#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-bitmap-engine/gba/tonc_memdef.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/background/text_stream.h>
 #include "wirescene.h"
 
 
diff --git a/demos/demo1-wireframes/src/wirescene.h b/demos/demo1-wireframes/src/wirescene.h
index 278ea0c..4c22a19 100644
--- a/demos/demo1-wireframes/src/wirescene.h
+++ b/demos/demo1-wireframes/src/wirescene.h
@@ -5,9 +5,9 @@
 #ifndef GBA_SPRITE_ENGINE_SAMPLE_START_SCENE_H
 #define GBA_SPRITE_ENGINE_SAMPLE_START_SCENE_H
 
-#include <libgba-sprite-engine/scene.h>
-#include <libgba-sprite-engine/mesh.h>
-#include <libgba-sprite-engine/camera.h>
+#include <libgba-bitmap-engine/scene.h>
+#include <libgba-bitmap-engine/mesh.h>
+#include <libgba-bitmap-engine/camera.h>
 #include <memory>
 
 class WireScene : public Scene {
diff --git a/demos/demo2-blender-import/converter.js b/demos/demo2-blender-import/converter.js
index 74a90f5..0d02cef 100644
--- a/demos/demo2-blender-import/converter.js
+++ b/demos/demo2-blender-import/converter.js
@@ -14,7 +14,7 @@ var args = process.argv.slice(2);
 var jsonObject = JSON.parse(fs.readFileSync(args[0], 'utf8'));
 
 var result =
-    "#include <libgba-sprite-engine/mesh.h>\n" +
+    "#include <libgba-bitmap-engine/mesh.h>\n" +
     "Mesh* createMesh() { \n" +
     "\t auto obj = new Mesh();\n";
 
diff --git a/demos/demo2-blender-import/src/main.cpp b/demos/demo2-blender-import/src/main.cpp
index 84c231d..3a0c455 100644
--- a/demos/demo2-blender-import/src/main.cpp
+++ b/demos/demo2-blender-import/src/main.cpp
@@ -2,9 +2,9 @@
 // Created by Wouter Groeneveld on 11/07/20.
 //
 
-#include <libgba-sprite-engine/scene.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
-#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/scene.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
 
 #include "monkey.h"
 
diff --git a/demos/demo2-blender-import/src/mesh.cpp b/demos/demo2-blender-import/src/mesh.cpp
index 1f88183..9ee5e51 100644
--- a/demos/demo2-blender-import/src/mesh.cpp
+++ b/demos/demo2-blender-import/src/mesh.cpp
@@ -1,4 +1,4 @@
-#include <libgba-sprite-engine/mesh.h>
+#include <libgba-bitmap-engine/mesh.h>
 Mesh* createMesh() { 
 	 auto obj = new Mesh();
 	 obj->add(VectorFx::fromFloat(1.5308085657314598e-17, 3.061616997868383e-17, 0.25));
diff --git a/demos/demo2-blender-import/src/monkey.cpp b/demos/demo2-blender-import/src/monkey.cpp
index 27aee70..d3628bb 100644
--- a/demos/demo2-blender-import/src/monkey.cpp
+++ b/demos/demo2-blender-import/src/monkey.cpp
@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 11/07/20.
 //
 
-#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-bitmap-engine/background/text_stream.h>
 #include "monkey.h"
 
 // BLACK, [white->black] from 0xFFFF / 252
diff --git a/demos/demo2-blender-import/src/monkey.h b/demos/demo2-blender-import/src/monkey.h
index 95e60cb..1a12593 100644
--- a/demos/demo2-blender-import/src/monkey.h
+++ b/demos/demo2-blender-import/src/monkey.h
@@ -5,10 +5,10 @@
 #ifndef GBA_BITMAP_ENGINE_PROJECT_MONKEY_H
 #define GBA_BITMAP_ENGINE_PROJECT_MONKEY_H
 
-#include <libgba-sprite-engine/scene.h>
-#include <libgba-sprite-engine/mesh.h>
-#include <libgba-sprite-engine/camera.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/scene.h>
+#include <libgba-bitmap-engine/mesh.h>
+#include <libgba-bitmap-engine/camera.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
 #include <memory>
 
 // forward declaration of generated mesh.cpp file
diff --git a/engine/include/libgba-sprite-engine/background/text_stream.h b/engine/include/libgba-bitmap-engine/background/text_stream.h
similarity index 96%
rename from engine/include/libgba-sprite-engine/background/text_stream.h
rename to engine/include/libgba-bitmap-engine/background/text_stream.h
index 9f9cec6..bc60dc7 100644
--- a/engine/include/libgba-sprite-engine/background/text_stream.h
+++ b/engine/include/libgba-bitmap-engine/background/text_stream.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <memory>
 
-#include <libgba-sprite-engine/gba/tonc_types.h>
+#include <libgba-bitmap-engine/gba/tonc_types.h>
 
 #define TEXT_WIDTH 8
 
diff --git a/engine/include/libgba-sprite-engine/camera.h b/engine/include/libgba-bitmap-engine/camera.h
similarity index 93%
rename from engine/include/libgba-sprite-engine/camera.h
rename to engine/include/libgba-bitmap-engine/camera.h
index f57f359..9bb7232 100644
--- a/engine/include/libgba-sprite-engine/camera.h
+++ b/engine/include/libgba-bitmap-engine/camera.h
@@ -5,7 +5,7 @@
 #ifndef GBA_BITMAP_ENGINE_PROJECT_CAMERA_H
 #define GBA_BITMAP_ENGINE_PROJECT_CAMERA_H
 
-#include <libgba-sprite-engine/vectorfx.h>
+#include <libgba-bitmap-engine/vectorfx.h>
 
 class Camera {
 private:
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_asminc.h b/engine/include/libgba-bitmap-engine/gba/tonc_asminc.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_asminc.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_asminc.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_bios.h b/engine/include/libgba-bitmap-engine/gba/tonc_bios.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_bios.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_bios.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_core.h b/engine/include/libgba-bitmap-engine/gba/tonc_core.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_core.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_core.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_core_stub.h b/engine/include/libgba-bitmap-engine/gba/tonc_core_stub.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_core_stub.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_core_stub.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_math.h b/engine/include/libgba-bitmap-engine/gba/tonc_math.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_math.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_math.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_math_stub.h b/engine/include/libgba-bitmap-engine/gba/tonc_math_stub.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_math_stub.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_math_stub.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_memdef.h b/engine/include/libgba-bitmap-engine/gba/tonc_memdef.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_memdef.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_memdef.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_memmap.h b/engine/include/libgba-bitmap-engine/gba/tonc_memmap.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_memmap.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_memmap.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_oam.h b/engine/include/libgba-bitmap-engine/gba/tonc_oam.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_oam.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_oam.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_types.h b/engine/include/libgba-bitmap-engine/gba/tonc_types.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/tonc_types.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_types.h
diff --git a/engine/include/libgba-sprite-engine/gba/tonc_video.h b/engine/include/libgba-bitmap-engine/gba/tonc_video.h
similarity index 94%
rename from engine/include/libgba-sprite-engine/gba/tonc_video.h
rename to engine/include/libgba-bitmap-engine/gba/tonc_video.h
index 3c57f7a..a0f30e4 100644
--- a/engine/include/libgba-sprite-engine/gba/tonc_video.h
+++ b/engine/include/libgba-bitmap-engine/gba/tonc_video.h
@@ -6,8 +6,8 @@
 #ifndef GBA_BITMAP_ENGINE_PROJECT_TONC_VIDEO_H
 #define GBA_BITMAP_ENGINE_PROJECT_TONC_VIDEO_H
 
-#include <libgba-sprite-engine/gba/tonc_types.h>
-#include <libgba-sprite-engine/gba/toolbox.h>
+#include <libgba-bitmap-engine/gba/tonc_types.h>
+#include <libgba-bitmap-engine/gba/toolbox.h>
 
 void bmp8_plot(int x, int y, u32 clr, void *dstBase, uint dstP);
 
diff --git a/engine/include/libgba-sprite-engine/gba/toolbox.h b/engine/include/libgba-bitmap-engine/gba/toolbox.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/gba/toolbox.h
rename to engine/include/libgba-bitmap-engine/gba/toolbox.h
diff --git a/engine/include/libgba-sprite-engine/math.h b/engine/include/libgba-bitmap-engine/math.h
similarity index 94%
rename from engine/include/libgba-sprite-engine/math.h
rename to engine/include/libgba-bitmap-engine/math.h
index 6bbedec..1981d65 100644
--- a/engine/include/libgba-sprite-engine/math.h
+++ b/engine/include/libgba-bitmap-engine/math.h
@@ -5,11 +5,11 @@
 #ifndef GBA_BITMAP_ENGINE_PROJECT_MATH_H
 #define GBA_BITMAP_ENGINE_PROJECT_MATH_H
 
-#include <libgba-sprite-engine/gba/tonc_types.h>
+#include <libgba-bitmap-engine/gba/tonc_types.h>
 #ifdef CODE_COMPILED_AS_PART_OF_TEST
-    #include <libgba-sprite-engine/gba/tonc_math_stub.h>
+    #include <libgba-bitmap-engine/gba/tonc_math_stub.h>
 #else
-    #include <libgba-sprite-engine/gba/tonc_math.h>
+    #include <libgba-bitmap-engine/gba/tonc_math.h>
 #endif
 
 #include <cmath>
diff --git a/engine/include/libgba-sprite-engine/matrixfx.h b/engine/include/libgba-bitmap-engine/matrixfx.h
similarity index 98%
rename from engine/include/libgba-sprite-engine/matrixfx.h
rename to engine/include/libgba-bitmap-engine/matrixfx.h
index 0606ec4..06e82c5 100644
--- a/engine/include/libgba-sprite-engine/matrixfx.h
+++ b/engine/include/libgba-bitmap-engine/matrixfx.h
@@ -6,15 +6,15 @@
 #define GBA_BITMAP_ENGINE_PROJECT_GBAMATRIX_H
 
 #define MATRIX_DIMENSION 16
-#include <libgba-sprite-engine/math.h>
-#include <libgba-sprite-engine/vectorfx.h>
+#include <libgba-bitmap-engine/math.h>
+#include <libgba-bitmap-engine/vectorfx.h>
 
 #include <cstdio>
 
 #ifdef CODE_COMPILED_AS_PART_OF_TEST
-    #include <libgba-sprite-engine/gba/tonc_math_stub.h>
+    #include <libgba-bitmap-engine/gba/tonc_math_stub.h>
     #else
-    #include <libgba-sprite-engine/gba/tonc_math.h>
+    #include <libgba-bitmap-engine/gba/tonc_math.h>
 #endif
 
 class MatrixFx {
diff --git a/engine/include/libgba-sprite-engine/mesh.h b/engine/include/libgba-bitmap-engine/mesh.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/mesh.h
rename to engine/include/libgba-bitmap-engine/mesh.h
diff --git a/engine/include/libgba-sprite-engine/palette/combined_palette.h b/engine/include/libgba-bitmap-engine/palette/combined_palette.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/palette/combined_palette.h
rename to engine/include/libgba-bitmap-engine/palette/combined_palette.h
diff --git a/engine/include/libgba-sprite-engine/palette/palette_manager.h b/engine/include/libgba-bitmap-engine/palette/palette_manager.h
similarity index 95%
rename from engine/include/libgba-sprite-engine/palette/palette_manager.h
rename to engine/include/libgba-bitmap-engine/palette/palette_manager.h
index dfd6b99..c7a6403 100644
--- a/engine/include/libgba-sprite-engine/palette/palette_manager.h
+++ b/engine/include/libgba-bitmap-engine/palette/palette_manager.h
@@ -5,8 +5,8 @@
 #ifndef GBA_SPRITE_ENGINE_PALETTE_MANAGER_H
 #define GBA_SPRITE_ENGINE_PALETTE_MANAGER_H
 
-#include <libgba-sprite-engine/gba/tonc_memmap.h>
-#include <libgba-sprite-engine/gba/tonc_types.h>
+#include <libgba-bitmap-engine/gba/tonc_memmap.h>
+#include <libgba-bitmap-engine/gba/tonc_types.h>
 #include "combined_palette.h"
 
 #define PALETTE_BANK_SIZE 16
diff --git a/engine/include/libgba-sprite-engine/renderer/gba_engine.h b/engine/include/libgba-bitmap-engine/renderer/gba_engine.h
similarity index 84%
rename from engine/include/libgba-sprite-engine/renderer/gba_engine.h
rename to engine/include/libgba-bitmap-engine/renderer/gba_engine.h
index 2e3f2ac..c8260f7 100644
--- a/engine/include/libgba-sprite-engine/renderer/gba_engine.h
+++ b/engine/include/libgba-bitmap-engine/renderer/gba_engine.h
@@ -6,14 +6,14 @@
 #define GBA_SPRITE_ENGINE_GBAENGINE_H
 
 
-#include <libgba-sprite-engine/gba/tonc_memmap.h>
-#include <libgba-sprite-engine/gba/tonc_memmap.h>
-#include <libgba-sprite-engine/vectorfx.h>
-#include <libgba-sprite-engine/matrixfx.h>
-#include <libgba-sprite-engine/renderer/renderer.h>
-#include "libgba-sprite-engine/scene.h"
-#include "libgba-sprite-engine/sound_control.h"
-#include "libgba-sprite-engine/timer.h"
+#include <libgba-bitmap-engine/gba/tonc_memmap.h>
+#include <libgba-bitmap-engine/gba/tonc_memmap.h>
+#include <libgba-bitmap-engine/vectorfx.h>
+#include <libgba-bitmap-engine/matrixfx.h>
+#include <libgba-bitmap-engine/renderer/renderer.h>
+#include <libgba-bitmap-engine/scene.h>
+#include <libgba-bitmap-engine/sound_control.h>
+#include <libgba-bitmap-engine/timer.h>
 
 
 const unsigned int black[VRAM_PAGE_SIZE] = {};
diff --git a/engine/include/libgba-sprite-engine/renderer/renderer.h b/engine/include/libgba-bitmap-engine/renderer/renderer.h
similarity index 92%
rename from engine/include/libgba-sprite-engine/renderer/renderer.h
rename to engine/include/libgba-bitmap-engine/renderer/renderer.h
index 2d1f7a8..f21e414 100644
--- a/engine/include/libgba-sprite-engine/renderer/renderer.h
+++ b/engine/include/libgba-bitmap-engine/renderer/renderer.h
@@ -5,8 +5,8 @@
 #ifndef GBA_BITMAP_ENGINE_PROJECT_RENDERER_H
 #define GBA_BITMAP_ENGINE_PROJECT_RENDERER_H
 
-#include <libgba-sprite-engine/matrixfx.h>
-#include <libgba-sprite-engine/mesh.h>
+#include <libgba-bitmap-engine/matrixfx.h>
+#include <libgba-bitmap-engine/mesh.h>
 
 class GBAEngine;
 
diff --git a/engine/include/libgba-sprite-engine/scene.h b/engine/include/libgba-bitmap-engine/scene.h
similarity index 90%
rename from engine/include/libgba-sprite-engine/scene.h
rename to engine/include/libgba-bitmap-engine/scene.h
index 0c837ce..7f8cad4 100644
--- a/engine/include/libgba-sprite-engine/scene.h
+++ b/engine/include/libgba-bitmap-engine/scene.h
@@ -8,9 +8,9 @@
 #include <vector>
 #include <memory>
 #include <functional>
-#include <libgba-sprite-engine/camera.h>
-#include <libgba-sprite-engine/mesh.h>
-#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/camera.h>
+#include <libgba-bitmap-engine/mesh.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
 
 class GBAEngine;
 
diff --git a/engine/include/libgba-sprite-engine/sound_control.h b/engine/include/libgba-bitmap-engine/sound_control.h
similarity index 93%
rename from engine/include/libgba-sprite-engine/sound_control.h
rename to engine/include/libgba-bitmap-engine/sound_control.h
index 8c1f275..9cee2d8 100644
--- a/engine/include/libgba-sprite-engine/sound_control.h
+++ b/engine/include/libgba-bitmap-engine/sound_control.h
@@ -5,10 +5,10 @@
 #ifndef GBA_SPRITE_ENGINE_SOUND_H
 #define GBA_SPRITE_ENGINE_SOUND_H
 
-#include <libgba-sprite-engine/gba/tonc_types.h>
-#include <libgba-sprite-engine/gba/tonc_memdef.h>
+#include <libgba-bitmap-engine/gba/tonc_types.h>
+#include <libgba-bitmap-engine/gba/tonc_memdef.h>
 #include <memory>
-#include <libgba-sprite-engine/gba/tonc_memmap.h>
+#include <libgba-bitmap-engine/gba/tonc_memmap.h>
 
 #define CLOCK 16777216
 #define CYCLES_PER_BLANK 280806
diff --git a/engine/include/libgba-sprite-engine/timer.h b/engine/include/libgba-bitmap-engine/timer.h
similarity index 100%
rename from engine/include/libgba-sprite-engine/timer.h
rename to engine/include/libgba-bitmap-engine/timer.h
diff --git a/engine/include/libgba-sprite-engine/vectorfx.h b/engine/include/libgba-bitmap-engine/vectorfx.h
similarity index 95%
rename from engine/include/libgba-sprite-engine/vectorfx.h
rename to engine/include/libgba-bitmap-engine/vectorfx.h
index e7bdc36..0abe56b 100644
--- a/engine/include/libgba-sprite-engine/vectorfx.h
+++ b/engine/include/libgba-bitmap-engine/vectorfx.h
@@ -9,13 +9,13 @@
 
 #include <string>
 #include <deque>
-#include <libgba-sprite-engine/gba/tonc_bios.h>
-#include <libgba-sprite-engine/math.h>
+#include <libgba-bitmap-engine/gba/tonc_bios.h>
+#include <libgba-bitmap-engine/math.h>
 
 #ifdef CODE_COMPILED_AS_PART_OF_TEST
-    #include <libgba-sprite-engine/gba/tonc_math_stub.h>
+    #include <libgba-bitmap-engine/gba/tonc_math_stub.h>
 #else
-    #include <libgba-sprite-engine/gba/tonc_math.h>
+    #include <libgba-bitmap-engine/gba/tonc_math.h>
 #endif
 
 
diff --git a/engine/include/libgba-bitmap-engine/vertex.h b/engine/include/libgba-bitmap-engine/vertex.h
new file mode 100644
index 0000000..a42c34b
--- /dev/null
+++ b/engine/include/libgba-bitmap-engine/vertex.h
@@ -0,0 +1,15 @@
+//
+// Created by Wouter Groeneveld on 15/07/20.
+//
+
+#ifndef GBA_BITMAP_ENGINE_PROJECT_VERTEX_H
+#define GBA_BITMAP_ENGINE_PROJECT_VERTEX_H
+
+#include <libgba-bitmap-engine/vertex.h>
+
+class Vertex {
+private:
+    VectorFx coords;
+};
+
+#endif //GBA_BITMAP_ENGINE_PROJECT_VERTEX_H
diff --git a/engine/src/background/text_stream.cpp b/engine/src/background/text_stream.cpp
index 9bc51c6..3858900 100644
--- a/engine/src/background/text_stream.cpp
+++ b/engine/src/background/text_stream.cpp
@@ -2,9 +2,9 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <libgba-sprite-engine/gba/tonc_memmap.h>
-#include <libgba-sprite-engine/palette/palette_manager.h>
-#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-bitmap-engine/gba/tonc_memmap.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/background/text_stream.h>
 
 #include <memory>
 
diff --git a/engine/src/gba/tonc_bios.s b/engine/src/gba/tonc_bios.s
index d572631..86716e9 100644
--- a/engine/src/gba/tonc_bios.s
+++ b/engine/src/gba/tonc_bios.s
@@ -5,7 +5,7 @@
 //! \author J Vijn
 //! \date 20071130 - 20090801
 
-#include <libgba-sprite-engine/gba/tonc_asminc.h>
+#include <libgba-bitmap-engine/gba/tonc_asminc.h>
 
 @ === SoftReset [00h] =================================================
 @ DECL: void SoftReset();
diff --git a/engine/src/gba/tonc_bmp8.cpp b/engine/src/gba/tonc_bmp8.cpp
index e3891ba..f39d18b 100644
--- a/engine/src/gba/tonc_bmp8.cpp
+++ b/engine/src/gba/tonc_bmp8.cpp
@@ -3,9 +3,9 @@
 //
 
 //! Plot a single pixel on a 8-bit buffer
-#include <libgba-sprite-engine/gba/tonc_types.h>
-#include <libgba-sprite-engine/gba/tonc_core.h>
-#include <libgba-sprite-engine/gba/toolbox.h>
+#include <libgba-bitmap-engine/gba/tonc_types.h>
+#include <libgba-bitmap-engine/gba/tonc_core.h>
+#include <libgba-bitmap-engine/gba/toolbox.h>
 
 /*!
 	\param x		X-coord.
diff --git a/engine/src/math.cpp b/engine/src/math.cpp
index 37a6966..0abefe4 100644
--- a/engine/src/math.cpp
+++ b/engine/src/math.cpp
@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 08/07/20.
 //
 
-#include <libgba-sprite-engine/math.h>
+#include <libgba-bitmap-engine/math.h>
 
 FIXED HALF = float2fx(0.5);
 FIXED ONE = int2fx(1);
diff --git a/engine/src/mesh.cpp b/engine/src/mesh.cpp
index ffe2d33..cb8e9cc 100644
--- a/engine/src/mesh.cpp
+++ b/engine/src/mesh.cpp
@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 08/07/20.
 //
 
-#include <libgba-sprite-engine/mesh.h>
+#include <libgba-bitmap-engine/mesh.h>
 #include <memory>
 
 
diff --git a/engine/src/palette/combined_palette.cpp b/engine/src/palette/combined_palette.cpp
index c918a67..bc25f64 100644
--- a/engine/src/palette/combined_palette.cpp
+++ b/engine/src/palette/combined_palette.cpp
@@ -3,7 +3,7 @@
 //
 
 
-#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
 
 void CombinedPalette::increaseBrightness(PaletteManager& palette, int bank, int index, u32 intensity) {
     auto current = palette.get(bank, index);
diff --git a/engine/src/palette/palette_manager.cpp b/engine/src/palette/palette_manager.cpp
index 2303ef9..aefc270 100644
--- a/engine/src/palette/palette_manager.cpp
+++ b/engine/src/palette/palette_manager.cpp
@@ -3,11 +3,11 @@
 //
 
 #ifdef CODE_COMPILED_AS_PART_OF_TEST
-#include <libgba-sprite-engine/gba/tonc_core_stub.h>
+#include <libgba-bitmap-engine/gba/tonc_core_stub.h>
 #else
-#include <libgba-sprite-engine/gba/tonc_core.h>
+#include <libgba-bitmap-engine/gba/tonc_core.h>
 #endif
-#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
 
 const COLOR defaultPaletteData[PALETTE_MAX_SIZE] __attribute__((aligned(4))) = {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/engine/src/renderer/gba_engine.cpp b/engine/src/renderer/gba_engine.cpp
index 7cdce11..80692d7 100644
--- a/engine/src/renderer/gba_engine.cpp
+++ b/engine/src/renderer/gba_engine.cpp
@@ -2,14 +2,14 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <libgba-sprite-engine/gba/tonc_memdef.h>
-#include <libgba-sprite-engine/gba/tonc_video.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/gba/tonc_memdef.h>
+#include <libgba-bitmap-engine/gba/tonc_video.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
 #include <cstring>
-#include <libgba-sprite-engine/gba/tonc_core.h>
-#include <libgba-sprite-engine/matrixfx.h>
-#include <libgba-sprite-engine/background/text_stream.h>
-#include <libgba-sprite-engine/mesh.h>
+#include <libgba-bitmap-engine/gba/tonc_core.h>
+#include <libgba-bitmap-engine/matrixfx.h>
+#include <libgba-bitmap-engine/background/text_stream.h>
+#include <libgba-bitmap-engine/mesh.h>
 
 std::unique_ptr<SoundControl> GBAEngine::activeChannelA;
 std::unique_ptr<SoundControl> GBAEngine::activeChannelB;
diff --git a/engine/src/renderer/pixelrenderer.cpp b/engine/src/renderer/pixelrenderer.cpp
index 25ce634..181a48d 100644
--- a/engine/src/renderer/pixelrenderer.cpp
+++ b/engine/src/renderer/pixelrenderer.cpp
@@ -2,8 +2,8 @@
 // Created by Wouter Groeneveld on 11/07/20.
 //
 
-#include <libgba-sprite-engine/renderer/renderer.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/renderer/renderer.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
 
 void PixelRenderer::render(const MatrixFx &transformationMatrix, const Mesh* mesh) {
     for (auto &vertex : mesh->vertices()) {
diff --git a/engine/src/renderer/raserizerrenderer.cpp b/engine/src/renderer/raserizerrenderer.cpp
index 0bdfc59..201a313 100644
--- a/engine/src/renderer/raserizerrenderer.cpp
+++ b/engine/src/renderer/raserizerrenderer.cpp
@@ -2,10 +2,10 @@
 // Created by Wouter Groeneveld on 11/07/20.
 //
 
-#include <libgba-sprite-engine/renderer/renderer.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
-#include <libgba-sprite-engine/math.h>
-#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-bitmap-engine/renderer/renderer.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/math.h>
+#include <libgba-bitmap-engine/background/text_stream.h>
 
 // drawing line between 2 points from left to right
 // papb -> pcpd
diff --git a/engine/src/renderer/wirerenderer.cpp b/engine/src/renderer/wirerenderer.cpp
index ae42614..893708a 100644
--- a/engine/src/renderer/wirerenderer.cpp
+++ b/engine/src/renderer/wirerenderer.cpp
@@ -2,8 +2,8 @@
 // Created by Wouter Groeneveld on 11/07/20.
 //
 
-#include <libgba-sprite-engine/renderer/renderer.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/renderer/renderer.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
 
 void WiredRenderer::render(const MatrixFx &transformationMatrix, const Mesh* mesh) {
     for (auto &face : mesh->faces()) {
diff --git a/engine/src/scene.cpp b/engine/src/scene.cpp
index fde8575..80d0e64 100644
--- a/engine/src/scene.cpp
+++ b/engine/src/scene.cpp
@@ -2,6 +2,6 @@
 // Created by Wouter Groeneveld on 09/08/18.
 //
 
-#include <libgba-sprite-engine/scene.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/scene.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
 
diff --git a/engine/src/sound_control.cpp b/engine/src/sound_control.cpp
index 017cd28..cfd4cc7 100644
--- a/engine/src/sound_control.cpp
+++ b/engine/src/sound_control.cpp
@@ -2,8 +2,8 @@
 // Created by Wouter Groeneveld on 07/08/18.
 //
 
-#include <libgba-sprite-engine/gba/tonc_memmap.h>
-#include <libgba-sprite-engine/sound_control.h>
+#include <libgba-bitmap-engine/gba/tonc_memmap.h>
+#include <libgba-bitmap-engine/sound_control.h>
 
 void SoundControl::accept(const void *data, int totalSamples, int ticksPerSample)  {
     this->data = data;
diff --git a/engine/src/timer.cpp b/engine/src/timer.cpp
index a8908c1..7a04db7 100644
--- a/engine/src/timer.cpp
+++ b/engine/src/timer.cpp
@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 06/12/18.
 //
 
-#include <libgba-sprite-engine/timer.h>
+#include <libgba-bitmap-engine/timer.h>
 #include <sstream>
 
 void Timer::onvblank() {
diff --git a/engine/src/vectorfx.cpp b/engine/src/vectorfx.cpp
index da26c92..c508301 100644
--- a/engine/src/vectorfx.cpp
+++ b/engine/src/vectorfx.cpp
@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 14/12/18.
 //
 
-#include <libgba-sprite-engine/vectorfx.h>
+#include <libgba-bitmap-engine/vectorfx.h>
 
 
 std::deque<VECTOR> VectorFx::bresenhamLineTo(VECTOR dest) {
diff --git a/test/fixedpoinmathtest.cpp b/test/fixedpoinmathtest.cpp
index fa69c02..08ccfbe 100644
--- a/test/fixedpoinmathtest.cpp
+++ b/test/fixedpoinmathtest.cpp
@@ -5,8 +5,8 @@
 #include <gtest/gtest.h>
 #include <math.h>
 #include <cmath>
-#include <libgba-sprite-engine/gba/tonc_math_stub.h>
-#include <libgba-sprite-engine/math.h>
+#include <libgba-bitmap-engine/gba/tonc_math_stub.h>
+#include <libgba-bitmap-engine/math.h>
 
 class FpSuite : public ::testing::Test {
 protected:
diff --git a/test/matrixfxtest.cpp b/test/matrixfxtest.cpp
index ba40910..2075e01 100644
--- a/test/matrixfxtest.cpp
+++ b/test/matrixfxtest.cpp
@@ -4,12 +4,12 @@
 
 #include <gtest/gtest.h>
 #include <math.h>
-#include <libgba-sprite-engine/matrixfx.h>
-#include <libgba-sprite-engine/math.h>
-#include <libgba-sprite-engine/mesh.h>
-#include <libgba-sprite-engine/camera.h>
-#include <libgba-sprite-engine/renderer/gba_engine.h>
-#include <libgba-sprite-engine/gba/toolbox.h>
+#include <libgba-bitmap-engine/matrixfx.h>
+#include <libgba-bitmap-engine/math.h>
+#include <libgba-bitmap-engine/mesh.h>
+#include <libgba-bitmap-engine/camera.h>
+#include <libgba-bitmap-engine/renderer/gba_engine.h>
+#include <libgba-bitmap-engine/gba/toolbox.h>
 
 class MatrixFxSuite : public ::testing::Test {
 protected:
diff --git a/test/palettetest.cpp b/test/palettetest.cpp
index 54ae733..28fbd2a 100644
--- a/test/palettetest.cpp
+++ b/test/palettetest.cpp
@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 04/08/18.
 //
 
-#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-bitmap-engine/palette/palette_manager.h>
 #include "gtest/gtest.h"
 
 class SomePaletteManager : public PaletteManager {
diff --git a/test/timertest.cpp b/test/timertest.cpp
index 12dee6b..7c4109b 100644
--- a/test/timertest.cpp
+++ b/test/timertest.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <gtest/gtest.h>
-#include <libgba-sprite-engine/timer.h>
+#include <libgba-bitmap-engine/timer.h>
 
 class TimerSuite : public ::testing::Test {
 protected:
diff --git a/test/vectorfxtest.cpp b/test/vectorfxtest.cpp
index 2577a10..b539b9b 100644
--- a/test/vectorfxtest.cpp
+++ b/test/vectorfxtest.cpp
@@ -5,7 +5,7 @@
 
 
 #include <gtest/gtest.h>
-#include <libgba-sprite-engine/vectorfx.h>
+#include <libgba-bitmap-engine/vectorfx.h>
 #include "tonc_bios_stub.h"
 
 class VectorFxSuite : public ::testing::Test {