diff --git a/src/app/GameApplication.cpp b/src/app/GameApplication.cpp
new file mode 100644
index 0000000..24843b9
--- /dev/null
+++ b/src/app/GameApplication.cpp
@@ -0,0 +1,16 @@
+#include "GameApplication.h"
+
+GameApplication::GameApplication() {
+    m_gameSession = std::make_unique<GameSession>();
+    m_inputManager = std::make_unique<InputManager>();
+
+}
+
+void GameApplication::initialize() {
+    m_gameSession->initialize();
+    
+}
+
+SDL_AppResult GameApplication::handleInputEvent(SDL_Event* event) {
+    
+}
\ No newline at end of file
diff --git a/src/app/GameApplication.h b/src/app/GameApplication.h
new file mode 100644
index 0000000..46c3e8c
--- /dev/null
+++ b/src/app/GameApplication.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "core/GameSession.h"
+
+#include "input/InputManager.h"
+#include "utils/Config.h"
+
+
+class GameApplication {
+private:
+    
+    std::unique_ptr<GameSession> m_gameSession;
+    std::unique_ptr<Renderer> m_renderer;
+    std::unique_ptr<InputManager> m_inputManager;
+    GameConfig m_config;
+
+public:
+    GameApplication();
+    ~GameApplication();
+    void initialize();
+    SDL_AppResult handleInputEvent(SDL_Event* event);
+    void run();
+
+};
\ No newline at end of file
diff --git a/src/core/Board.cpp b/src/game/Board.cpp
similarity index 100%
rename from src/core/Board.cpp
rename to src/game/Board.cpp
diff --git a/src/core/Board.h b/src/game/Board.h
similarity index 100%
rename from src/core/Board.h
rename to src/game/Board.h
diff --git a/src/core/ComponentManager.cpp b/src/game/ComponentManager.cpp
similarity index 100%
rename from src/core/ComponentManager.cpp
rename to src/game/ComponentManager.cpp
diff --git a/src/core/ComponentManager.h b/src/game/ComponentManager.h
similarity index 100%
rename from src/core/ComponentManager.h
rename to src/game/ComponentManager.h
diff --git a/src/core/GameSession.cpp b/src/game/GameSession.cpp
similarity index 100%
rename from src/core/GameSession.cpp
rename to src/game/GameSession.cpp
diff --git a/src/core/GameSession.h b/src/game/GameSession.h
similarity index 100%
rename from src/core/GameSession.h
rename to src/game/GameSession.h
diff --git a/src/core/GameTypes.h b/src/game/GameTypes.h
similarity index 100%
rename from src/core/GameTypes.h
rename to src/game/GameTypes.h
diff --git a/src/core/Piece.cpp b/src/game/Piece.cpp
similarity index 100%
rename from src/core/Piece.cpp
rename to src/game/Piece.cpp
diff --git a/src/core/Piece.h b/src/game/Piece.h
similarity index 100%
rename from src/core/Piece.h
rename to src/game/Piece.h
diff --git a/src/core/Rule.cpp b/src/game/Rule.cpp
similarity index 100%
rename from src/core/Rule.cpp
rename to src/game/Rule.cpp
diff --git a/src/core/Rule.h b/src/game/Rule.h
similarity index 100%
rename from src/core/Rule.h
rename to src/game/Rule.h
diff --git a/src/core/testcore.cpp b/src/game/testcore.cpp
similarity index 100%
rename from src/core/testcore.cpp
rename to src/game/testcore.cpp
diff --git a/src/ui/Render.cpp b/src/ui/BoardRenderer.cpp
similarity index 100%
rename from src/ui/Render.cpp
rename to src/ui/BoardRenderer.cpp
diff --git a/src/ui/Render.h b/src/ui/BoardRenderer.h
similarity index 100%
rename from src/ui/Render.h
rename to src/ui/BoardRenderer.h