move some headers around

16 files changed, 20 insertions, 22 deletions

diff --git a/editor/app.cpp b/editor/app.cpp
index f89aa002..e28f1a72 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -1,7 +1,7 @@
 #include "app.hpp"
 #include "compat/assert.hpp"
-#include "main/floormat-main.hpp"
-#include "main/floormat.hpp"
+#include "floormat/main.hpp"
+#include "floormat/settings.hpp"
 #include "src/loader.hpp"
 #include "world.hpp"
 #include <Corrade/Utility/Arguments.h>
diff --git a/editor/app.hpp b/editor/app.hpp
index 663b4923..1cf118f9 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -6,7 +6,7 @@
 #include "draw/wireframe-mesh.hpp"
 #include "draw/wireframe-quad.hpp"
 #include "draw/wireframe-box.hpp"
-#include "main/floormat-app.hpp"
+#include "floormat/app.hpp"
 
 #include <memory>
 #include <optional>
diff --git a/editor/camera.cpp b/editor/camera.cpp
index 529f55e9..300f0c61 100644
--- a/editor/camera.cpp
+++ b/editor/camera.cpp
@@ -1,7 +1,7 @@
 #include "app.hpp"
 #include "src/global-coords.hpp"
 #include "shaders/tile-shader.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/main.hpp"
 #include <Magnum/GL/DefaultFramebuffer.h>
 
 namespace floormat {
diff --git a/editor/draw.cpp b/editor/draw.cpp
index 4150bc27..2b047c6b 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -1,5 +1,5 @@
 #include "app.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/main.hpp"
 #include "shaders/tile-shader.hpp"
 #include <Magnum/GL/DebugOutput.h>
 
diff --git a/editor/events.cpp b/editor/events.cpp
index cfa0b904..cd846a96 100644
--- a/editor/events.cpp
+++ b/editor/events.cpp
@@ -1,7 +1,7 @@
 #include "app.hpp"
 
-#include "main/floormat-main.hpp"
-#include "main/floormat-events.hpp"
+#include "floormat/main.hpp"
+#include "floormat/events.hpp"
 #include "src/world.hpp"
 
 #include <utility>
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
index b627d34f..7a34f5fc 100644
--- a/editor/imgui.cpp
+++ b/editor/imgui.cpp
@@ -1,5 +1,5 @@
 #include "app.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/main.hpp"
 #include <Magnum/GL/Renderer.h>
 #include "imgui-raii.hpp"
 
diff --git a/editor/update.cpp b/editor/update.cpp
index 734ed7b5..c0595c45 100644
--- a/editor/update.cpp
+++ b/editor/update.cpp
@@ -1,7 +1,7 @@
 #include "app.hpp"
 #include "src/chunk.hpp"
-#include "main/floormat-events.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/events.hpp"
+#include "floormat/main.hpp"
 
 namespace floormat {
 
diff --git a/main/floormat-app.hpp b/floormat/app.hpp
index 60ecc52c..60ecc52c 100644
--- a/main/floormat-app.hpp
+++ b/floormat/app.hpp
diff --git a/main/floormat-events.hpp b/floormat/events.hpp
index 97c5f171..97c5f171 100644
--- a/main/floormat-events.hpp
+++ b/floormat/events.hpp
diff --git a/main/floormat-main.hpp b/floormat/main.hpp
index 6ba3b4c8..6ba3b4c8 100644
--- a/main/floormat-main.hpp
+++ b/floormat/main.hpp
diff --git a/main/floormat.hpp b/floormat/settings.hpp
index 3bf4b492..0a526478 100644
--- a/main/floormat.hpp
+++ b/floormat/settings.hpp
@@ -33,4 +33,3 @@ struct fm_settings
 };
 
 } // namespace floormat
-
diff --git a/main/floormat-app.cpp b/main/app.cpp
index 2f69c0da..91b4ccaf 100644
--- a/main/floormat-app.cpp
+++ b/main/app.cpp
@@ -1,5 +1,5 @@
-#include "floormat-app.hpp"
-#include "floormat.hpp"
+#include "floormat/app.hpp"
+#include "floormat/settings.hpp"
 
 namespace floormat {
 
diff --git a/main/debug.cpp b/main/debug.cpp
index f46c63d5..a8483cd0 100644
--- a/main/debug.cpp
+++ b/main/debug.cpp
@@ -1,4 +1,4 @@
-#include "floormat-main-impl.hpp"
+#include "main-impl.hpp"
 #include <chrono>
 
 namespace floormat {
diff --git a/main/floormat-events.cpp b/main/events.cpp
index 0ef380fb..ac8f0766 100644
--- a/main/floormat-events.cpp
+++ b/main/events.cpp
@@ -1,6 +1,6 @@
-#include "floormat-main-impl.hpp"
-#include "floormat-app.hpp"
-#include "floormat-events.hpp"
+#include "main-impl.hpp"
+#include "floormat/app.hpp"
+#include "floormat/events.hpp"
 #include "compat/assert.hpp"
 #include <SDL_events.h>
 #include <SDL_video.h>
diff --git a/main/floormat-main-impl.cpp b/main/main-impl.cpp
index 1f35024e..856635d2 100644
--- a/main/floormat-main-impl.cpp
+++ b/main/main-impl.cpp
@@ -1,6 +1,5 @@
-#include "floormat-main-impl.hpp"
-#include "floormat.hpp"
-#include "floormat-app.hpp"
+#include "main-impl.hpp"
+#include "floormat/app.hpp"
 #include "compat/assert.hpp"
 #include "compat/fpu.hpp"
 #include "src/chunk.hpp"
diff --git a/main/floormat-main-impl.hpp b/main/main-impl.hpp
index e0a7f1e1..39a877fe 100644
--- a/main/floormat-main-impl.hpp
+++ b/main/main-impl.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "floormat.hpp"
-#include "floormat-main.hpp"
+#include "floormat/main.hpp"
+#include "floormat/settings.hpp"
 #include "src/world.hpp"
 #include "draw/floor-mesh.hpp"
 #include "draw/wall-mesh.hpp"