diff --git a/hcore/include/simulator/canvas.h b/hcore/include/simulator/canvas.h
deleted file mode 100644
index fdafa1e..0000000
--- a/hcore/include/simulator/canvas.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CANVAS_H
-#define CANVAS_H
-
-#include <simulator/scene.h>
-
-namespace canvas {
-
-class Canvas {
-public:
-    Canvas();
-    ~Canvas();
-
-    SceneId loadScene(Scene &scene);
-
-private:
-    // Add private members here
-};
-
-} // namespace canvas
-
-#endif // CANVAS_H
\ No newline at end of file
diff --git a/hcore/include/simulator/simulator.h b/hcore/include/simulator/simulator.h
index e24a81f..b02ed01 100644
--- a/hcore/include/simulator/simulator.h
+++ b/hcore/include/simulator/simulator.h
@@ -1,22 +1,30 @@
 #ifndef SIMULATOR_H
 #define SIMULATOR_H
 
-#include <simulator/canvas.h>
+#include <simulator/scene.h>
 
 namespace simulator {
 
 class Simulator {
 public:
-    Simulator();
-    ~Simulator();
+    Simulator(const Simulator&) = delete;
+    void operator=(const Simulator&) = delete;
+
+    static Simulator& instance()
+    {
+        static Simulator instance;
+        return instance;
+    }
 
     void initialize();
-    void run();
-    void stop();
+    void loadScene(scene::Scene::Id sceneId, scene::Scene &scene);
 
 private:
-    bool isRunning;
-    Canvas canvas;
+    Simulator() = default;
+    ~Simulator() = default;
+
+    scene::Scene::Id sceneId;
+    scene::Scene scene;
 };
 
 }