Refator pass 1

src/ui/uiconsole.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "display/tileset.h"
-#include "display/texture/texture.h"
+#include "display/tileset/tileset.h"
+#include "display/texture.h"
 
 /**
  * Renders the console UI.

src/ui/uifps.c

@@ -10,7 +10,7 @@
 #include "console/console.h"
 #include "util/string.h"
 #include "ui/uitext.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 
 void uiFPSRender(const tileset_t *tileset, texture_t *texture) {
   if(stringCompare(consoleVarGet("fps")->value, "0") == 0) {

src/ui/uifps.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "display/tileset.h"
-#include "display/texture/texture.h"
+#include "display/tileset/tileset.h"
+#include "display/texture.h"
 
 /**
  * Renders the FPS counter UI.

src/ui/uiframe.c

@@ -6,7 +6,7 @@
  */
 
 #include "uiframe.h"
-#include "display/spritebatch/spritebatch.h"
+#include "display/spritebatch.h"
 #include "assert/assert.h"
 #include <math.h>
 

src/ui/uiframe.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "display/tileset.h"
-#include "display/texture/texture.h"
+#include "display/tileset/tileset.h"
+#include "display/texture.h"
 
 /**
  * Draw a UI Frame (using the 9-slice technique).

src/ui/uitext.c

@@ -9,7 +9,7 @@
 #include "asset/assetmanager.h"
 #include "assert/assert.h"
 #include "util/memory.h"
-#include "display/spritebatch/spritebatch.h"
+#include "display/spritebatch.h"
 
 void uiTextDrawChar(
   const float_t x,