diff --git a/CMakeLists.txt b/CMakeLists.txt
index 234d5a9..7f4c56f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,16 @@ project(spectrum LANGUAGES CXX)
 find_package(SDL3 REQUIRED CONFIG)
 
 add_executable(spectrum
-    source/core/main.cpp
+    source/main.cpp
     source/core/rendering/video.cpp
-    source/core/system/director.cpp
+    source/game/director.cpp
+    source/game/scenes/test.cpp
 )
 
 target_compile_features(spectrum PRIVATE cxx_std_20)
 
 target_include_directories(spectrum PRIVATE
-    source/core
+    source
 )
 
 target_link_libraries(spectrum PRIVATE SDL3::SDL3)
diff --git a/source/core/rendering/video.cpp b/source/core/rendering/video.cpp
index 09e8351..f44c7e7 100644
--- a/source/core/rendering/video.cpp
+++ b/source/core/rendering/video.cpp
@@ -1,4 +1,6 @@
-#include "rendering/video.hpp"
+// video.cpp
+
+#include "video.hpp"
 
 #include <SDL3/SDL.h>
 
@@ -54,7 +56,7 @@ auto Video::initSDL() -> int {
         SDL_Quit();
         return 1;
     }
-    //SDL_SetTextureScaleMode(game_texture_, toSdlScaleMode(config_.texture_filter));
+    // SDL_SetTextureScaleMode(game_texture_, toSdlScaleMode(config_.texture_filter));
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
         "Video subsystem initialized successfully");
diff --git a/source/core/rendering/video.hpp b/source/core/rendering/video.hpp
index 8af90f9..b01562b 100644
--- a/source/core/rendering/video.hpp
+++ b/source/core/rendering/video.hpp
@@ -1,3 +1,5 @@
+// video.hpp
+
 #pragma once
 
 #include <SDL3/SDL.h>
diff --git a/source/core/system/director.cpp b/source/core/system/director.cpp
deleted file mode 100644
index 6a5a803..0000000
--- a/source/core/system/director.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "system/director.hpp"
-
-#include "rendering/video.hpp"
-#include "system/defaults.hpp"
-
-Director::Director() {
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-        "Game start!");
-
-    video = std::make_shared<Video>(
-        Video::Config{
-            Defaults::Video::FULLSCREEN,
-            Defaults::Video::ZOOM,
-            Defaults::Video::WIDTH,
-            Defaults::Video::HEIGHT});
-}
-
-Director::~Director() {
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-        "Bye!");
-    SDL_Quit();
-}
-
-auto Director::iterate() -> int {
-    return 0;
-}
\ No newline at end of file
diff --git a/source/core/system/director.hpp b/source/core/system/director.hpp
deleted file mode 100644
index 2659510..0000000
--- a/source/core/system/director.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "rendering/video.hpp"
-
-class Director {
-   public:
-    Director();
-    ~Director();
-
-    auto iterate() -> int;
-
-   private:
-    std::shared_ptr<Video> video;
-};
\ No newline at end of file
diff --git a/source/core/system/defaults.hpp b/source/game/defaults.hpp
similarity index 92%
rename from source/core/system/defaults.hpp
rename to source/game/defaults.hpp
index 0f4b1b0..9d18006 100644
--- a/source/core/system/defaults.hpp
+++ b/source/game/defaults.hpp
@@ -1,3 +1,5 @@
+// defaults.hpp
+
 #pragma once
 
 namespace Defaults::Video {
diff --git a/source/game/director.cpp b/source/game/director.cpp
new file mode 100644
index 0000000..4af4279
--- /dev/null
+++ b/source/game/director.cpp
@@ -0,0 +1,51 @@
+// director.cpp
+
+#include "director.hpp"
+
+#include "core/rendering/video.hpp"
+#include "defaults.hpp"
+#include "game/scenes/scenes.hpp"
+#include "game/scenes/test.hpp"
+
+Director::Director() {
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+        "Game start!");
+
+    video_ = std::make_shared<Video>(
+        Video::Config{
+            Defaults::Video::FULLSCREEN,
+            Defaults::Video::ZOOM,
+            Defaults::Video::WIDTH,
+            Defaults::Video::HEIGHT});
+    scene_ = std::make_unique<Test>();
+}
+
+Director::~Director() {
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+        "Bye!");
+    SDL_Quit();
+}
+
+auto Director::iterate() -> int {
+    while (scene_) {
+        scene_->render();
+        switch (scene_->update()) {
+            case Scenes::CONTINUE:
+                break;
+            case Scenes::LOGO:
+                break;
+            case Scenes::INTRO:
+                break;
+            case Scenes::GAME:
+                break;
+            case Scenes::TEST:
+                scene_ = std::make_unique<Test>();
+                break;
+            case Scenes::QUIT:
+                scene_.reset();
+                break;
+        }
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/source/game/director.hpp b/source/game/director.hpp
new file mode 100644
index 0000000..c05a3b7
--- /dev/null
+++ b/source/game/director.hpp
@@ -0,0 +1,23 @@
+// director.hpp
+
+#pragma once
+
+#include <memory>
+
+#include "core/rendering/video.hpp"
+#include "game/scenes/scene.hpp"
+
+class Director {
+   public:
+    Director();
+    ~Director();
+
+    auto iterate() -> int;
+
+   private:
+    // Core
+    std::shared_ptr<Video> video_;
+
+    // Game
+    std::unique_ptr<Scene> scene_;
+};
\ No newline at end of file
diff --git a/source/game/scenes/scene.hpp b/source/game/scenes/scene.hpp
new file mode 100644
index 0000000..02bd27c
--- /dev/null
+++ b/source/game/scenes/scene.hpp
@@ -0,0 +1,13 @@
+// scene.hpp
+
+#pragma once
+
+#include "scenes.hpp"
+
+class Scene {
+   public:
+    virtual ~Scene() = default;
+
+    virtual auto update() -> Scenes = 0;
+    virtual void render() = 0;
+};
\ No newline at end of file
diff --git a/source/game/scenes/scenes.hpp b/source/game/scenes/scenes.hpp
new file mode 100644
index 0000000..02b603c
--- /dev/null
+++ b/source/game/scenes/scenes.hpp
@@ -0,0 +1,12 @@
+// scenes.hpp
+
+#pragma once
+
+enum class Scenes {
+    INTRO,
+    LOGO,
+    GAME,
+    TEST,
+    CONTINUE,
+    QUIT
+};
\ No newline at end of file
diff --git a/source/game/scenes/test.cpp b/source/game/scenes/test.cpp
new file mode 100644
index 0000000..e63692b
--- /dev/null
+++ b/source/game/scenes/test.cpp
@@ -0,0 +1,16 @@
+// test.cpp
+
+#include "test.hpp"
+
+#include <iostream>
+
+
+auto Test::update() -> Scenes {
+    static int count = 0;
+    std::cout << count++ << "\n";
+    if (count == 100) { return Scenes::QUIT; }
+    return Scenes::CONTINUE;
+}
+
+void Test::render() {
+}
diff --git a/source/game/scenes/test.hpp b/source/game/scenes/test.hpp
new file mode 100644
index 0000000..bbd4e5c
--- /dev/null
+++ b/source/game/scenes/test.hpp
@@ -0,0 +1,11 @@
+// test.hpp
+
+#pragma once
+
+#include "scene.hpp"
+
+class Test final : public Scene {
+   public:
+    auto update() -> Scenes override;
+    void render() override;
+};
diff --git a/source/core/main.cpp b/source/main.cpp
similarity index 55%
rename from source/core/main.cpp
rename to source/main.cpp
index 7e8e660..4caaa89 100644
--- a/source/core/main.cpp
+++ b/source/main.cpp
@@ -1,8 +1,10 @@
+// main.cpp
+
 #include <memory>
 
-#include "system/director.hpp"
+#include "game/director.hpp"
 
 auto main() -> int {
     auto director = std::make_unique<Director>();
-    return 0;
+    return director->iterate();
 }