9 files changed, 7 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27e4bd6..25c7560 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 project(gfx-all)
 
+add_subdirectory(app)
 add_subdirectory(gfx)
-add_subdirectory(gfx-app)
 add_subdirectory(gfx-iso)
 add_subdirectory(game)
diff --git a/gfx-app/CMakeLists.txt b/app/CMakeLists.txt
index d9cb80f..7e60351 100644
--- a/gfx-app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 project(gfx-app)
 
 add_library(gfx-app
-  src/gfx_app.c)
+  src/app.c)
 
 target_include_directories(gfx-app PUBLIC
   include/)
diff --git a/gfx-app/README.md b/app/README.md
index b21d1aa..b21d1aa 100644
--- a/gfx-app/README.md
+++ b/app/README.md
diff --git a/gfx-app/include/gfx/gfx_app.h b/app/include/gfx/app.h
index ffff4bc..ffff4bc 100644
--- a/gfx-app/include/gfx/gfx_app.h
+++ b/app/include/gfx/app.h
diff --git a/gfx-app/src/gfx_app.c b/app/src/app.c
index a93756c..b6d10ca 100644
--- a/gfx-app/src/gfx_app.c
+++ b/app/src/app.c
@@ -1,4 +1,4 @@
-#include <gfx/gfx_app.h>
+#include <gfx/app.h>
 
 #include <GLFW/glfw3.h>
 #include <log/log.h>
diff --git a/game/src/game.c b/game/src/game.c
index dc4ab84..bc85691 100644
--- a/game/src/game.c
+++ b/game/src/game.c
@@ -10,8 +10,8 @@
 
 #include "plugins/plugin.h"
 
+#include <gfx/app.h>
 #include <gfx/gfx.h>
-#include <gfx/gfx_app.h>
 #include <gfx/render_backend.h>
 #include <gfx/renderer.h>
 #include <gfx/scene/camera.h>
diff --git a/game/src/plugins/pong.c b/game/src/plugins/pong.c
index 3a0b825..070cc6f 100644
--- a/game/src/plugins/pong.c
+++ b/game/src/plugins/pong.c
@@ -1,7 +1,7 @@
 #include "plugin.h"
 
+#include <gfx/app.h>
 #include <gfx/gfx.h>
-#include <gfx/gfx_app.h>
 #include <gfx/renderer.h>
 
 #include <math/mat4.h>
diff --git a/gfx-iso/include/isogfx/app.h b/gfx-iso/include/isogfx/app.h
index 0a0fcc1..769af6d 100644
--- a/gfx-iso/include/isogfx/app.h
+++ b/gfx-iso/include/isogfx/app.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/gfx_app.h>
+#include <gfx/app.h>
 
 #include <stdbool.h>
 
diff --git a/gfx-iso/src/app.c b/gfx-iso/src/app.c
index 079ac96..8e0a45a 100644
--- a/gfx-iso/src/app.c
+++ b/gfx-iso/src/app.c
@@ -1,8 +1,8 @@
 #include <isogfx/app.h>
 #include <isogfx/isogfx.h>
 
+#include <gfx/app.h>
 #include <gfx/gfx.h>
-#include <gfx/gfx_app.h>
 #include <gfx/render_backend.h>
 #include <gfx/renderer.h>
 #include <gfx/scene.h>