diff --git a/src/lovr/graphics.c b/src/lovr/graphics.c
index 0454dc75..1316e8d0 100644
--- a/src/lovr/graphics.c
+++ b/src/lovr/graphics.c
@@ -1,8 +1,8 @@
 #include "graphics.h"
-#include "buffer.h"
-#include "model.h"
-#include "shader.h"
-#include "skybox.h"
+#include "types/buffer.h"
+#include "types/model.h"
+#include "types/shader.h"
+#include "types/skybox.h"
 #include "../graphics/graphics.h"
 #include "../filesystem/filesystem.h"
 #include "../util.h"
diff --git a/src/lovr/headset.c b/src/lovr/headset.c
index 5bcae9de..0c8b49c5 100644
--- a/src/lovr/headset.c
+++ b/src/lovr/headset.c
@@ -1,5 +1,5 @@
 #include "headset.h"
-#include "controller.h"
+#include "types/controller.h"
 #include "../headset/headset.h"
 #include "../util.h"
 
diff --git a/src/lovr/buffer.c b/src/lovr/types/buffer.c
similarity index 99%
rename from src/lovr/buffer.c
rename to src/lovr/types/buffer.c
index 15e7b09a..8411fa4c 100644
--- a/src/lovr/buffer.c
+++ b/src/lovr/types/buffer.c
@@ -1,6 +1,5 @@
 #include "buffer.h"
-#include "graphics.h"
-#include "../graphics/buffer.h"
+#include "../graphics.h"
 
 void luax_pushbuffer(lua_State* L, Buffer* buffer) {
   if (buffer == NULL) {
diff --git a/src/lovr/buffer.h b/src/lovr/types/buffer.h
similarity index 95%
rename from src/lovr/buffer.h
rename to src/lovr/types/buffer.h
index 44d6e895..31b98d3b 100644
--- a/src/lovr/buffer.h
+++ b/src/lovr/types/buffer.h
@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../graphics/buffer.h"
+#include "../../graphics/buffer.h"
 
 void luax_pushbuffer(lua_State* L, Buffer* buffer);
 int luax_pushvertex(lua_State* L, void* vertex, BufferFormat format);
diff --git a/src/lovr/controller.c b/src/lovr/types/controller.c
similarity index 100%
rename from src/lovr/controller.c
rename to src/lovr/types/controller.c
diff --git a/src/lovr/controller.h b/src/lovr/types/controller.h
similarity index 93%
rename from src/lovr/controller.h
rename to src/lovr/types/controller.h
index 241cbe17..940af86f 100644
--- a/src/lovr/controller.h
+++ b/src/lovr/types/controller.h
@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../headset/headset.h"
+#include "../../headset/headset.h"
 
 void luax_pushcontroller(lua_State* L, Controller* controller);
 Controller* luax_checkcontroller(lua_State* L, int index);
diff --git a/src/lovr/model.c b/src/lovr/types/model.c
similarity index 100%
rename from src/lovr/model.c
rename to src/lovr/types/model.c
diff --git a/src/lovr/model.h b/src/lovr/types/model.h
similarity index 88%
rename from src/lovr/model.h
rename to src/lovr/types/model.h
index 73959bd7..2de7c725 100644
--- a/src/lovr/model.h
+++ b/src/lovr/types/model.h
@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../graphics/model.h"
+#include "../../graphics/model.h"
 
 void luax_pushmodel(lua_State* L, Model* model);
 Model* luax_checkmodel(lua_State* L, int index);
diff --git a/src/lovr/shader.c b/src/lovr/types/shader.c
similarity index 100%
rename from src/lovr/shader.c
rename to src/lovr/types/shader.c
diff --git a/src/lovr/shader.h b/src/lovr/types/shader.h
similarity index 88%
rename from src/lovr/shader.h
rename to src/lovr/types/shader.h
index 09e9b48f..dd744bab 100644
--- a/src/lovr/shader.h
+++ b/src/lovr/types/shader.h
@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../graphics/shader.h"
+#include "../../graphics/shader.h"
 
 void luax_pushshader(lua_State* L, Shader* shader);
 Shader* luax_checkshader(lua_State* L, int index);
diff --git a/src/lovr/skybox.c b/src/lovr/types/skybox.c
similarity index 100%
rename from src/lovr/skybox.c
rename to src/lovr/types/skybox.c
diff --git a/src/lovr/skybox.h b/src/lovr/types/skybox.h
similarity index 79%
rename from src/lovr/skybox.h
rename to src/lovr/types/skybox.h
index b97a65cd..2a7528fa 100644
--- a/src/lovr/skybox.h
+++ b/src/lovr/types/skybox.h
@@ -1,8 +1,8 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../graphics/skybox.h"
-#include "../graphics/graphics.h"
+#include "../../graphics/skybox.h"
+#include "../../graphics/graphics.h"
 
 void luax_pushskybox(lua_State* L, Skybox* skybox);
 Skybox* luax_checkskybox(lua_State* L, int index);