diff --git a/assets/scene/minesweeper.lua b/assets/scene/minesweeper.lua
index edde3ce..70094cd 100644
--- a/assets/scene/minesweeper.lua
+++ b/assets/scene/minesweeper.lua
@@ -187,17 +187,18 @@ function sceneRender()
   if INPUT_POINTER then
     mouseX = inputGetValue(INPUT_ACTION_POINTERX) * screenGetWidth()
     mouseY = inputGetValue(INPUT_ACTION_POINTERY) * screenGetHeight()
+
+    -- Draw cursor
+    spriteBatchPush(
+      nil,
+      mouseX - 2, mouseY - 2,
+      mouseX + 2, mouseY + 2,
+      colorRed(),
+      0, 0,
+      1, 1
+    )
   end
 
-  -- Draw cursor
-  spriteBatchPush(
-    nil,
-    mouseX - 2, mouseY - 2,
-    mouseX + 2, mouseY + 2,
-    colorRed(),
-    0, 0,
-    1, 1
-  )
 
   textDraw(10, 10, "Hello World")
   
diff --git a/src/asset/type/assetpalette.h b/src/asset/type/assetpalette.h
index 82ed2e0..cc328f2 100644
--- a/src/asset/type/assetpalette.h
+++ b/src/asset/type/assetpalette.h
@@ -7,7 +7,7 @@
 
 #pragma once
 #include "error/error.h"
-#include "display/palette/palette.h"
+#include "display/texture/palette.h"
 
 typedef struct assetentire_s assetentire_t;
 
diff --git a/src/asset/type/assettexture.c b/src/asset/type/assettexture.c
index 0dbf9bc..bcdca88 100644
--- a/src/asset/type/assettexture.c
+++ b/src/asset/type/assettexture.c
@@ -8,7 +8,7 @@
 #include "assettexture.h"
 #include "asset/assettype.h"
 #include "assert/assert.h"
-#include "display/texture.h"
+#include "display/texture/texture.h"
 #include "util/endian.h"
 
 errorret_t assetTextureLoad(assetentire_t entire) {
diff --git a/src/asset/type/assettileset.c b/src/asset/type/assettileset.c
index f7c214a..ea485e0 100644
--- a/src/asset/type/assettileset.c
+++ b/src/asset/type/assettileset.c
@@ -7,7 +7,7 @@
 
 #include "asset/asset.h"
 #include "assert/assert.h"
-#include "display/tileset/tileset.h"
+#include "display/texture/tileset.h"
 #include "util/memory.h"
 #include "util/endian.h"
 
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index 71d8fc9..7766e05 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -9,7 +9,6 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
     display.c
     framebuffer.c
     screen.c
-    texture.c
     spritebatch.c
     text.c
 )
@@ -17,8 +16,7 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
 # Subdirectories
 add_subdirectory(camera)
 add_subdirectory(mesh)
-add_subdirectory(palette)
-add_subdirectory(tileset)
+add_subdirectory(texture)
 
 if(DUSK_TARGET_SYSTEM STREQUAL "linux")
   target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
diff --git a/src/display/framebuffer.h b/src/display/framebuffer.h
index aa63488..3c7fd44 100644
--- a/src/display/framebuffer.h
+++ b/src/display/framebuffer.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "display/texture.h"
+#include "display/texture/texture.h"
 
 #define FRAMEBUFFER_CLEAR_COLOR (1 << 0)
 #define FRAMEBUFFER_CLEAR_DEPTH (1 << 1)
diff --git a/src/display/spritebatch.h b/src/display/spritebatch.h
index 9e236b3..4704de2 100644
--- a/src/display/spritebatch.h
+++ b/src/display/spritebatch.h
@@ -7,7 +7,7 @@
 
 #pragma once
 #include "display/mesh/quad.h"
-#include "display/texture.h"
+#include "display/texture/texture.h"
 
 #define SPRITEBATCH_SPRITES_MAX 128
 #define SPRITEBATCH_VERTEX_COUNT (SPRITEBATCH_SPRITES_MAX * QUAD_VERTEX_COUNT) 
diff --git a/src/display/text.h b/src/display/text.h
index 963dfb1..8b46536 100644
--- a/src/display/text.h
+++ b/src/display/text.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "asset/asset.h"
-#include "display/texture.h"
-#include "display/tileset/tileset.h"
+#include "display/texture/texture.h"
+#include "display/texture/tileset.h"
 
 #define TEXT_CHAR_START '!'
 
diff --git a/src/display/palette/CMakeLists.txt b/src/display/texture/CMakeLists.txt
similarity index 88%
rename from src/display/palette/CMakeLists.txt
rename to src/display/texture/CMakeLists.txt
index be5f8fb..23ab16b 100644
--- a/src/display/palette/CMakeLists.txt
+++ b/src/display/texture/CMakeLists.txt
@@ -6,5 +6,7 @@
 # Sources
 target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
+    tileset.c
+    texture.c
     palette.c
 )
\ No newline at end of file
diff --git a/src/display/palette/palette.c b/src/display/texture/palette.c
similarity index 100%
rename from src/display/palette/palette.c
rename to src/display/texture/palette.c
diff --git a/src/display/palette/palette.h b/src/display/texture/palette.h
similarity index 100%
rename from src/display/palette/palette.h
rename to src/display/texture/palette.h
diff --git a/src/display/texture.c b/src/display/texture/texture.c
similarity index 99%
rename from src/display/texture.c
rename to src/display/texture/texture.c
index e7a1ee5..3bcc750 100644
--- a/src/display/texture.c
+++ b/src/display/texture/texture.c
@@ -75,6 +75,7 @@ void textureInit(
           
         GLenum err = glGetError();
         if(err != GL_NO_ERROR) {
+          printf("GL Error uploading palette texture: %d\n", err);
           assertUnreachable("GL error uploading palette texture");
         }
         break;
diff --git a/src/display/texture.h b/src/display/texture/texture.h
similarity index 97%
rename from src/display/texture.h
rename to src/display/texture/texture.h
index c3e0ead..b10b676 100644
--- a/src/display/texture.h
+++ b/src/display/texture/texture.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "display/color.h"
 #include "display/displaydefs.h"
-#include "display/palette/palette.h"
+#include "display/texture/palette.h"
 
 typedef enum {
   #if DISPLAY_SDL2
diff --git a/src/display/tileset/tileset.c b/src/display/texture/tileset.c
similarity index 100%
rename from src/display/tileset/tileset.c
rename to src/display/texture/tileset.c
diff --git a/src/display/tileset/tileset.h b/src/display/texture/tileset.h
similarity index 100%
rename from src/display/tileset/tileset.h
rename to src/display/texture/tileset.h
diff --git a/src/display/tileset/CMakeLists.txt b/src/display/tileset/CMakeLists.txt
deleted file mode 100644
index 5d521d0..0000000
--- a/src/display/tileset/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2025 Dominic Masters
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-# Sources
-target_sources(${DUSK_LIBRARY_TARGET_NAME}
-  PUBLIC
-    tileset.c
-)
\ No newline at end of file
diff --git a/src/script/module/display/moduletexture.c b/src/script/module/display/moduletexture.c
index 4c3621b..1c1732b 100644
--- a/src/script/module/display/moduletexture.c
+++ b/src/script/module/display/moduletexture.c
@@ -7,7 +7,7 @@
 
 #include "moduletexture.h"
 #include "asset/asset.h"
-#include "display/texture.h"
+#include "display/texture/texture.h"
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "util/string.h"
diff --git a/src/script/module/display/moduletileset.c b/src/script/module/display/moduletileset.c
index ff68251..368411e 100644
--- a/src/script/module/display/moduletileset.c
+++ b/src/script/module/display/moduletileset.c
@@ -7,7 +7,7 @@
 
 #include "moduletileset.h"
 #include "assert/assert.h"
-#include "display/tileset/tileset.h"
+#include "display/texture/tileset.h"
 #include "util/memory.h"
 #include "util/string.h"
 #include "debug/debug.h"