diff --git a/editor/build.gradle b/editor/build.gradle
index 71a38afa..aa617105 100644
--- a/editor/build.gradle
+++ b/editor/build.gradle
@@ -49,9 +49,9 @@ dependencies {
 }
 
 task provideGameEngine(type: Copy) {
-    dependsOn(":game:build")
+    dependsOn(":engine:build")
 
-    from project(':game').file('build/libs/game.jar')
+    from project(':engine').file('build/libs/engine.jar')
     into file("build/resources/main/engine")
 }
 
@@ -83,8 +83,4 @@ processResources {
     dependsOn(provideGameEngine)
     dependsOn(provideApiDependencies)
     dependsOn(provideApi)
-}
-
-build {
-    dependsOn(":proto:build")
-}
+}
\ No newline at end of file
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/build/game/DefaultGameEngineProvider.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/build/game/DefaultGameEngineProvider.kt
index 2b7e8360..97447378 100644
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/build/game/DefaultGameEngineProvider.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/build/game/DefaultGameEngineProvider.kt
@@ -34,6 +34,6 @@ class DefaultGameEngineProvider : GameEngineProvider {
    }
 
    companion object {
-      private const val GAME_ENGINE_JAR = "/engine/game.jar"
+      private const val GAME_ENGINE_JAR = "/engine/engine.jar"
    }
 }
\ No newline at end of file
diff --git a/engine/build.gradle b/engine/build.gradle
index 8502452a..ebf793af 100644
--- a/engine/build.gradle
+++ b/engine/build.gradle
@@ -7,11 +7,15 @@
  */
 
 plugins {
-    id 'java-library'
+    id 'java'
+    id 'application'
     id 'org.springframework.boot' version "$springBootVersion"
     id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
 }
 
+group 'com.bartlomiejpluta.base'
+version 'unspecified'
+
 import org.gradle.internal.os.OperatingSystem
 
 switch (OperatingSystem.current()) {
@@ -42,18 +46,20 @@ repositories {
 }
 
  bootJar {
-     enabled = false
- }
-
- jar {
      enabled = true
  }
 
+ jar {
+     enabled = false
+ }
+
 dependencies {
-    api platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
+    implementation project(":proto")
+    implementation project(":api")
 
     // LWJGL
-    api "org.lwjgl:lwjgl-glfw"
+    implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
+    implementation "org.lwjgl:lwjgl-glfw"
     implementation "org.lwjgl:lwjgl"
     implementation "org.lwjgl:lwjgl-assimp"
     implementation "org.lwjgl:lwjgl-bgfx"
@@ -75,10 +81,15 @@ dependencies {
     runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
 
     // Spring
-    api 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
     // This dependency is used by the application.
-    api "org.joml:joml:${jomlVersion}"
+    implementation "org.joml:joml:${jomlVersion}"
+}
+
+application {
+    // Define the main class for the application.
+    mainClass = 'com.bartlomiejpluta.base.engine.App'
 }
\ No newline at end of file
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java
deleted file mode 100644
index 650d9c1d..00000000
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.bartlomiejpluta.base.core.engine;
-
-public interface GameEngine {
-   void start();
-}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java
deleted file mode 100644
index e33df040..00000000
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.bartlomiejpluta.base.core.gl.render;
-
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-
-public interface Renderable {
-   void render(Window window, Camera camera, ShaderManager shaderManager);
-}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java
deleted file mode 100644
index ec2485c1..00000000
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.bartlomiejpluta.base.core.gl.render;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-
-public interface Renderer extends Cleanable {
-   void init();
-   void render(Window window, Camera camera, Renderable renderable);
-}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/fps/FPSMonitor.java b/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/fps/FPSMonitor.java
deleted file mode 100644
index 49fd8f4f..00000000
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/fps/FPSMonitor.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.bartlomiejpluta.base.core.profiling.fps;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.core.logic.Updatable;
-
-public interface FPSMonitor extends Updatable, Cleanable {
-}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/MeshManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/MeshManager.java
deleted file mode 100644
index 01e8b712..00000000
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/MeshManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.bartlomiejpluta.base.core.util.mesh;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-
-public interface MeshManager extends Cleanable {
-   Mesh createQuad(float width, float height, float originX, float originY);
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/App.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/App.java
similarity index 89%
rename from game/src/main/java/com/bartlomiejpluta/base/game/App.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/App.java
index dcc9042b..57d4db7d 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/App.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/App.java
@@ -1,9 +1,9 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package com.bartlomiejpluta.base.game;
+package com.bartlomiejpluta.base.engine;
 
-import com.bartlomiejpluta.base.core.engine.GameEngine;
+import com.bartlomiejpluta.base.engine.core.engine.GameEngine;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/common/asset/Asset.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/common/asset/Asset.java
similarity index 81%
rename from game/src/main/java/com/bartlomiejpluta/base/game/common/asset/Asset.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/common/asset/Asset.java
index 7f722014..9aceeefb 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/common/asset/Asset.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/common/asset/Asset.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.common.asset;
+package com.bartlomiejpluta.base.engine.common.asset;
 
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/common/manager/AssetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/common/manager/AssetManager.java
similarity index 64%
rename from game/src/main/java/com/bartlomiejpluta/base/game/common/manager/AssetManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/common/manager/AssetManager.java
index 343df2f6..2e27aff7 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/common/manager/AssetManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/common/manager/AssetManager.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.common.manager;
+package com.bartlomiejpluta.base.engine.common.manager;
 
 public interface AssetManager<A, T> {
    void registerAsset(A asset);
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/common/serial/Deserializer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/common/serial/Deserializer.java
similarity index 72%
rename from game/src/main/java/com/bartlomiejpluta/base/game/common/serial/Deserializer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/common/serial/Deserializer.java
index deeec1d2..51d54fe1 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/common/serial/Deserializer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/common/serial/Deserializer.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.common.serial;
+package com.bartlomiejpluta.base.engine.common.serial;
 
-import com.bartlomiejpluta.base.core.error.AppException;
+import com.bartlomiejpluta.base.engine.error.AppException;
 
 import java.io.InputStream;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java
similarity index 87%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java
index ee2d14f8..478f3b9d 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java
@@ -1,11 +1,11 @@
-package com.bartlomiejpluta.base.core.engine;
+package com.bartlomiejpluta.base.engine.core.engine;
 
-import com.bartlomiejpluta.base.core.gc.OffHeapGarbageCollector;
-import com.bartlomiejpluta.base.core.logic.GameLogic;
-import com.bartlomiejpluta.base.core.thread.ThreadManager;
-import com.bartlomiejpluta.base.core.time.ChronoMeter;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.ui.WindowManager;
+import com.bartlomiejpluta.base.engine.gc.OffHeapGarbageCollector;
+import com.bartlomiejpluta.base.engine.logic.GameLogic;
+import com.bartlomiejpluta.base.engine.thread.ThreadManager;
+import com.bartlomiejpluta.base.engine.time.ChronoMeter;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.ui.WindowManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java
new file mode 100644
index 00000000..0a376fb3
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java
@@ -0,0 +1,5 @@
+package com.bartlomiejpluta.base.engine.core.engine;
+
+public interface GameEngine {
+   void start();
+}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java
similarity index 84%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java
index 4c052bcb..9d0d9745 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java
@@ -1,11 +1,11 @@
-package com.bartlomiejpluta.base.core.gl.object.material;
+package com.bartlomiejpluta.base.engine.core.gl.object.material;
 
-import com.bartlomiejpluta.base.core.gl.object.texture.Texture;
-import com.bartlomiejpluta.base.core.gl.render.Renderable;
-import com.bartlomiejpluta.base.core.gl.shader.constant.UniformName;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.Texture;
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderable;
+import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
 import lombok.Getter;
 import org.joml.Vector2f;
 import org.joml.Vector4f;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java
similarity index 88%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java
index 1226d2a8..7d98eecb 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.core.gl.object.mesh;
+package com.bartlomiejpluta.base.engine.core.gl.object.mesh;
 
-import com.bartlomiejpluta.base.core.gc.Disposable;
-import com.bartlomiejpluta.base.core.gl.render.Renderable;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderable;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.gc.Disposable;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
 import org.lwjgl.opengl.GL15;
 import org.lwjgl.system.MemoryStack;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/DefaultTextureManager.java
similarity index 91%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/DefaultTextureManager.java
index 81af7942..e99118ad 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/DefaultTextureManager.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.gl.object.texture;
+package com.bartlomiejpluta.base.engine.core.gl.object.texture;
 
-import com.bartlomiejpluta.base.core.util.res.ResourcesManager;
+import com.bartlomiejpluta.base.engine.util.res.ResourcesManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java
similarity index 92%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java
index d8aa5a16..46d01725 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.core.gl.object.texture;
+package com.bartlomiejpluta.base.engine.core.gl.object.texture;
 
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.core.gc.Disposable;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.gc.Disposable;
 import lombok.Getter;
 import org.joml.Vector2f;
 import org.lwjgl.system.MemoryStack;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java
similarity index 59%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java
index cbf93713..1df619e1 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.gl.object.texture;
+package com.bartlomiejpluta.base.engine.core.gl.object.texture;
 
-import com.bartlomiejpluta.base.core.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
 
 public interface TextureManager extends Cleanable {
    Texture loadTexture(String textureFileName);
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java
similarity index 86%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java
index fee0ad32..499e9e45 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.core.gl.render;
+package com.bartlomiejpluta.base.engine.core.gl.render;
 
-import com.bartlomiejpluta.base.core.gl.shader.constant.UniformName;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderable.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderable.java
new file mode 100644
index 00000000..bd933e48
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderable.java
@@ -0,0 +1,9 @@
+package com.bartlomiejpluta.base.engine.core.gl.render;
+
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+
+public interface Renderable {
+   void render(Window window, Camera camera, ShaderManager shaderManager);
+}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java
new file mode 100644
index 00000000..917af826
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java
@@ -0,0 +1,10 @@
+package com.bartlomiejpluta.base.engine.core.gl.render;
+
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+
+public interface Renderer extends Cleanable {
+   void init();
+   void render(Window window, Camera camera, Renderable renderable);
+}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/constant/UniformName.java
similarity index 85%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/constant/UniformName.java
index a29a23df..243a1275 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/constant/UniformName.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.gl.shader.constant;
+package com.bartlomiejpluta.base.engine.core.gl.shader.constant;
 
 public interface UniformName {
    String UNI_VIEW_MODEL_MATRIX = "viewModelMatrix";
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java
similarity index 93%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java
index df65904c..4e4b0d93 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.core.gl.shader.manager;
+package com.bartlomiejpluta.base.engine.core.gl.shader.manager;
 
-import com.bartlomiejpluta.base.core.gl.shader.program.ShaderProgram;
-import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform;
-import com.bartlomiejpluta.base.core.util.res.ResourcesManager;
+import com.bartlomiejpluta.base.engine.core.gl.shader.program.ShaderProgram;
+import com.bartlomiejpluta.base.engine.core.gl.shader.uniform.Uniform;
+import com.bartlomiejpluta.base.engine.util.res.ResourcesManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.joml.*;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/ShaderManager.java
similarity index 87%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/ShaderManager.java
index 13566263..58530af5 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/ShaderManager.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.core.gl.shader.manager;
+package com.bartlomiejpluta.base.engine.core.gl.shader.manager;
 
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform;
+import com.bartlomiejpluta.base.engine.core.gl.shader.uniform.Uniform;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
 import org.joml.*;
 
 public interface ShaderManager extends Cleanable {
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/ShaderProgram.java
similarity index 95%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/ShaderProgram.java
index bc8c885d..4b86f869 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/ShaderProgram.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.core.gl.shader.program;
+package com.bartlomiejpluta.base.engine.core.gl.shader.program;
 
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.core.gc.Disposable;
-import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform;
+import com.bartlomiejpluta.base.engine.core.gl.shader.uniform.Uniform;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.gc.Disposable;
 import lombok.extern.slf4j.Slf4j;
 import org.joml.*;
 import org.lwjgl.system.MemoryStack;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/uniform/Uniform.java
similarity index 55%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/uniform/Uniform.java
index 83245764..5a683f1e 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/uniform/Uniform.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.gl.shader.uniform;
+package com.bartlomiejpluta.base.engine.core.gl.shader.uniform;
 
-import com.bartlomiejpluta.base.core.gl.shader.program.ShaderProgram;
+import com.bartlomiejpluta.base.engine.core.gl.shader.program.ShaderProgram;
 
 public interface Uniform {
    void createUniform(ShaderProgram shaderProgram, String uniformName);
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/error/AppException.java
similarity index 92%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/error/AppException.java
index 197102e5..c70b484e 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/error/AppException.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.error;
+package com.bartlomiejpluta.base.engine.error;
 
 public class AppException extends RuntimeException {
    public AppException() {
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/Cleanable.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/Cleanable.java
similarity index 53%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gc/Cleanable.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/gc/Cleanable.java
index a9a20b1e..6658402f 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/Cleanable.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/Cleanable.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.gc;
+package com.bartlomiejpluta.base.engine.gc;
 
 public interface Cleanable {
    void cleanUp();
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/DefaultOffHeapGarbageCollector.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java
similarity index 93%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gc/DefaultOffHeapGarbageCollector.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java
index 549d5538..5579f02a 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/DefaultOffHeapGarbageCollector.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.gc;
+package com.bartlomiejpluta.base.engine.gc;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/Disposable.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/Disposable.java
similarity index 54%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gc/Disposable.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/gc/Disposable.java
index 47825fa3..c84cf33e 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/Disposable.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/Disposable.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.gc;
+package com.bartlomiejpluta.base.engine.gc;
 
 public interface Disposable {
    void dispose();
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/OffHeapGarbageCollector.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/OffHeapGarbageCollector.java
similarity index 59%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/gc/OffHeapGarbageCollector.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/gc/OffHeapGarbageCollector.java
index 68bdb2b7..679873d9 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/gc/OffHeapGarbageCollector.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/OffHeapGarbageCollector.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.gc;
+package com.bartlomiejpluta.base.engine.gc;
 
 public interface OffHeapGarbageCollector {
    void cleanUp();
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/input/GLFWKeyboard.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/input/GLFWKeyboard.java
similarity index 98%
rename from game/src/main/java/com/bartlomiejpluta/base/game/input/GLFWKeyboard.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/input/GLFWKeyboard.java
index 09e47a57..da473fd0 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/input/GLFWKeyboard.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/input/GLFWKeyboard.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.game.input;
+package com.bartlomiejpluta.base.engine.input;
 
 import com.bartlomiejpluta.base.api.input.Key;
 import com.bartlomiejpluta.base.api.input.Keyboard;
-import com.bartlomiejpluta.base.core.ui.Window;
+import com.bartlomiejpluta.base.engine.ui.Window;
 import lombok.RequiredArgsConstructor;
 
 import static org.lwjgl.glfw.GLFW.*;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java
similarity index 63%
rename from game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java
index 76727cb8..5837c776 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java
@@ -1,22 +1,21 @@
-package com.bartlomiejpluta.base.game.logic;
+package com.bartlomiejpluta.base.engine.logic;
 
 import com.bartlomiejpluta.base.api.runner.GameRunner;
-import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
-import com.bartlomiejpluta.base.core.gl.render.Renderer;
-import com.bartlomiejpluta.base.core.logic.GameLogic;
-import com.bartlomiejpluta.base.core.profiling.fps.FPSMonitor;
-import com.bartlomiejpluta.base.core.profiling.time.TimeProfilerService;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.game.entity.manager.EntityManager;
-import com.bartlomiejpluta.base.game.image.manager.ImageManager;
-import com.bartlomiejpluta.base.game.map.manager.MapManager;
-import com.bartlomiejpluta.base.game.project.loader.ClassLoader;
-import com.bartlomiejpluta.base.game.project.loader.ProjectLoader;
-import com.bartlomiejpluta.base.game.project.model.Project;
-import com.bartlomiejpluta.base.game.project.model.RenderableContext;
-import com.bartlomiejpluta.base.game.tileset.manager.TileSetManager;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager;
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderer;
+import com.bartlomiejpluta.base.engine.project.loader.ClassLoader;
+import com.bartlomiejpluta.base.engine.project.loader.ProjectLoader;
+import com.bartlomiejpluta.base.engine.project.model.Project;
+import com.bartlomiejpluta.base.engine.project.model.RenderableContext;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.util.profiling.fps.FPSMonitor;
+import com.bartlomiejpluta.base.engine.util.profiling.time.TimeProfilerService;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.entity.manager.EntityManager;
+import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager;
+import com.bartlomiejpluta.base.engine.world.map.manager.MapManager;
+import com.bartlomiejpluta.base.engine.world.tileset.manager.TileSetManager;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java
similarity index 53%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java
index 3a6ea588..27122ed2 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.core.logic;
+package com.bartlomiejpluta.base.engine.logic;
 
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.core.ui.Window;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.ui.Window;
 
 public interface GameLogic extends Cleanable {
    void init(Window window);
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/logic/Updatable.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/Updatable.java
similarity index 55%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/logic/Updatable.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/logic/Updatable.java
index 4590e7e0..de95763a 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/logic/Updatable.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/Updatable.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.logic;
+package com.bartlomiejpluta.base.engine.logic;
 
 public interface Updatable {
    void update(float dt);
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/config/ProjectConfiguration.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/config/ProjectConfiguration.java
similarity index 89%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/config/ProjectConfiguration.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/config/ProjectConfiguration.java
index 4dae0883..52abacd8 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/config/ProjectConfiguration.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/config/ProjectConfiguration.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.project.config;
+package com.bartlomiejpluta.base.engine.project.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/ClassLoader.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/ClassLoader.java
similarity index 58%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/loader/ClassLoader.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/ClassLoader.java
index 988c7d5d..aeadc3a9 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/ClassLoader.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/ClassLoader.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.project.loader;
+package com.bartlomiejpluta.base.engine.project.loader;
 
 public interface ClassLoader {
    <T> Class<T> loadClass(String className);
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/DefaultClassLoader.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/DefaultClassLoader.java
similarity index 77%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/loader/DefaultClassLoader.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/DefaultClassLoader.java
index dc496c3a..27f2aaaf 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/DefaultClassLoader.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/DefaultClassLoader.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.project.loader;
+package com.bartlomiejpluta.base.engine.project.loader;
 
-import com.bartlomiejpluta.base.core.error.AppException;
+import com.bartlomiejpluta.base.engine.error.AppException;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/DefaultProjectLoader.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/DefaultProjectLoader.java
similarity index 66%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/loader/DefaultProjectLoader.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/DefaultProjectLoader.java
index bf588ac3..000aa0b4 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/DefaultProjectLoader.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/DefaultProjectLoader.java
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.game.project.loader;
+package com.bartlomiejpluta.base.engine.project.loader;
 
-import com.bartlomiejpluta.base.game.entity.manager.EntitySetManager;
-import com.bartlomiejpluta.base.game.image.manager.ImageManager;
-import com.bartlomiejpluta.base.game.map.manager.MapManager;
-import com.bartlomiejpluta.base.game.project.config.ProjectConfiguration;
-import com.bartlomiejpluta.base.game.project.model.Project;
-import com.bartlomiejpluta.base.game.project.serial.ProjectDeserializer;
-import com.bartlomiejpluta.base.game.tileset.manager.TileSetManager;
+import com.bartlomiejpluta.base.engine.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.project.model.Project;
+import com.bartlomiejpluta.base.engine.project.serial.ProjectDeserializer;
+import com.bartlomiejpluta.base.engine.world.entity.manager.EntitySetManager;
+import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager;
+import com.bartlomiejpluta.base.engine.world.map.manager.MapManager;
+import com.bartlomiejpluta.base.engine.world.tileset.manager.TileSetManager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/ProjectLoader.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/ProjectLoader.java
new file mode 100644
index 00000000..052d4dcb
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/loader/ProjectLoader.java
@@ -0,0 +1,7 @@
+package com.bartlomiejpluta.base.engine.project.loader;
+
+import com.bartlomiejpluta.base.engine.project.model.Project;
+
+public interface ProjectLoader {
+   Project loadProject();
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/model/Project.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/Project.java
similarity index 59%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/model/Project.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/Project.java
index a00ed069..e35fae1f 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/model/Project.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/Project.java
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.game.project.model;
+package com.bartlomiejpluta.base.engine.project.model;
 
-import com.bartlomiejpluta.base.game.entity.asset.EntitySetAsset;
-import com.bartlomiejpluta.base.game.image.asset.ImageAsset;
-import com.bartlomiejpluta.base.game.map.asset.GameMapAsset;
-import com.bartlomiejpluta.base.game.tileset.asset.TileSetAsset;
+import com.bartlomiejpluta.base.engine.world.entity.asset.EntitySetAsset;
+import com.bartlomiejpluta.base.engine.world.image.asset.ImageAsset;
+import com.bartlomiejpluta.base.engine.world.map.asset.GameMapAsset;
+import com.bartlomiejpluta.base.engine.world.tileset.asset.TileSetAsset;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java
similarity index 70%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java
index aa6c384a..1532203d 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java
@@ -1,23 +1,23 @@
-package com.bartlomiejpluta.base.game.project.model;
+package com.bartlomiejpluta.base.engine.project.model;
 
 import com.bartlomiejpluta.base.api.context.Context;
 import com.bartlomiejpluta.base.api.entity.Entity;
 import com.bartlomiejpluta.base.api.input.Keyboard;
 import com.bartlomiejpluta.base.api.map.MapHandler;
-import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
-import com.bartlomiejpluta.base.core.gl.render.Renderable;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.logic.Updatable;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.game.entity.manager.EntityManager;
-import com.bartlomiejpluta.base.game.image.manager.ImageManager;
-import com.bartlomiejpluta.base.game.input.GLFWKeyboard;
-import com.bartlomiejpluta.base.game.map.manager.MapManager;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
-import com.bartlomiejpluta.base.game.project.loader.ClassLoader;
-import com.bartlomiejpluta.base.game.tileset.manager.TileSetManager;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager;
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderable;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.input.GLFWKeyboard;
+import com.bartlomiejpluta.base.engine.logic.Updatable;
+import com.bartlomiejpluta.base.engine.project.loader.ClassLoader;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.entity.manager.EntityManager;
+import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager;
+import com.bartlomiejpluta.base.engine.world.map.manager.MapManager;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
+import com.bartlomiejpluta.base.engine.world.tileset.manager.TileSetManager;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.joml.Vector2f;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/project/serial/ProjectDeserializer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/serial/ProjectDeserializer.java
new file mode 100644
index 00000000..1d3322ea
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/serial/ProjectDeserializer.java
@@ -0,0 +1,7 @@
+package com.bartlomiejpluta.base.engine.project.serial;
+
+import com.bartlomiejpluta.base.engine.common.serial.Deserializer;
+import com.bartlomiejpluta.base.engine.project.model.Project;
+
+public abstract class ProjectDeserializer extends Deserializer<Project> {
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/serial/ProtobufProjectDeserializer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/serial/ProtobufProjectDeserializer.java
similarity index 80%
rename from game/src/main/java/com/bartlomiejpluta/base/game/project/serial/ProtobufProjectDeserializer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/project/serial/ProtobufProjectDeserializer.java
index ee431c8b..92ed7b5b 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/serial/ProtobufProjectDeserializer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/serial/ProtobufProjectDeserializer.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.game.project.serial;
+package com.bartlomiejpluta.base.engine.project.serial;
 
-import com.bartlomiejpluta.base.game.entity.asset.EntitySetAsset;
-import com.bartlomiejpluta.base.game.image.asset.ImageAsset;
-import com.bartlomiejpluta.base.game.map.asset.GameMapAsset;
-import com.bartlomiejpluta.base.game.project.model.Project;
-import com.bartlomiejpluta.base.game.tileset.asset.TileSetAsset;
+import com.bartlomiejpluta.base.engine.project.model.Project;
+import com.bartlomiejpluta.base.engine.world.entity.asset.EntitySetAsset;
+import com.bartlomiejpluta.base.engine.world.image.asset.ImageAsset;
+import com.bartlomiejpluta.base.engine.world.map.asset.GameMapAsset;
+import com.bartlomiejpluta.base.engine.world.tileset.asset.TileSetAsset;
 import com.bartlomiejpluta.base.proto.ProjectProto;
 import org.springframework.stereotype.Component;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/thread/ThreadManager.java
similarity index 80%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/thread/ThreadManager.java
index bee61600..d0d22fc3 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/thread/ThreadManager.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.thread;
+package com.bartlomiejpluta.base.engine.thread;
 
 import org.springframework.stereotype.Component;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/time/ChronoMeter.java
similarity index 89%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/time/ChronoMeter.java
index 030fd609..2c490108 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/time/ChronoMeter.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.time;
+package com.bartlomiejpluta.base.engine.time;
 
 public class ChronoMeter {
    private double latchedTime;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/Window.java
similarity index 97%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/ui/Window.java
index abbe69d5..947d10fb 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/Window.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.ui;
+package com.bartlomiejpluta.base.engine.ui;
 
-import com.bartlomiejpluta.base.core.error.AppException;
+import com.bartlomiejpluta.base.engine.error.AppException;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/WindowManager.java
similarity index 83%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/ui/WindowManager.java
index c89d7145..3ff9bf78 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/WindowManager.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.ui;
+package com.bartlomiejpluta.base.engine.ui;
 
 import org.springframework.stereotype.Component;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/util/math/MathUtil.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/math/MathUtil.java
similarity index 92%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/util/math/MathUtil.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/util/math/MathUtil.java
index c4f9ebd0..6310d544 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/util/math/MathUtil.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/math/MathUtil.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.util.math;
+package com.bartlomiejpluta.base.engine.util.math;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/DefaultMeshManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/DefaultMeshManager.java
similarity index 90%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/DefaultMeshManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/DefaultMeshManager.java
index 50e19206..b5bc8210 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/DefaultMeshManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/DefaultMeshManager.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.util.mesh;
+package com.bartlomiejpluta.base.engine.util.mesh;
 
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.joml.Vector2f;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java
new file mode 100644
index 00000000..ec1eac6b
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java
@@ -0,0 +1,8 @@
+package com.bartlomiejpluta.base.engine.util.mesh;
+
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+
+public interface MeshManager extends Cleanable {
+   Mesh createQuad(float width, float height, float originX, float originY);
+}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/fps/FPSMonitor.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/fps/FPSMonitor.java
new file mode 100644
index 00000000..5e7131cc
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/fps/FPSMonitor.java
@@ -0,0 +1,7 @@
+package com.bartlomiejpluta.base.engine.util.profiling.fps;
+
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.logic.Updatable;
+
+public interface FPSMonitor extends Updatable, Cleanable {
+}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/fps/LogFPSMonitor.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/fps/LogFPSMonitor.java
similarity index 96%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/profiling/fps/LogFPSMonitor.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/fps/LogFPSMonitor.java
index f945c83b..9250a6ed 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/fps/LogFPSMonitor.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/fps/LogFPSMonitor.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.profiling.fps;
+package com.bartlomiejpluta.base.engine.util.profiling.fps;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/time/DefaultTimeProfilerService.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/time/DefaultTimeProfilerService.java
similarity index 91%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/profiling/time/DefaultTimeProfilerService.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/time/DefaultTimeProfilerService.java
index 020437e4..19d13607 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/time/DefaultTimeProfilerService.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/time/DefaultTimeProfilerService.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.profiling.time;
+package com.bartlomiejpluta.base.engine.util.profiling.time;
 
-import com.bartlomiejpluta.base.core.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/time/TimeProfilerService.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/time/TimeProfilerService.java
similarity index 58%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/profiling/time/TimeProfilerService.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/time/TimeProfilerService.java
index 839addeb..2308773a 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/profiling/time/TimeProfilerService.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/profiling/time/TimeProfilerService.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.profiling.time;
+package com.bartlomiejpluta.base.engine.util.profiling.time;
 
 public interface TimeProfilerService {
    void measure(String key, Runnable task);
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/res/ResourcesManager.java
similarity index 90%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/util/res/ResourcesManager.java
index 3250878a..c5868193 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/res/ResourcesManager.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.core.util.res;
+package com.bartlomiejpluta.base.engine.util.res;
 
-import com.bartlomiejpluta.base.core.error.AppException;
+import com.bartlomiejpluta.base.engine.error.AppException;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/animation/AnimatedSprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/AnimatedSprite.java
similarity index 69%
rename from game/src/main/java/com/bartlomiejpluta/base/game/animation/AnimatedSprite.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/AnimatedSprite.java
index 8c8c8ae7..f928bce1 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/animation/AnimatedSprite.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/AnimatedSprite.java
@@ -1,11 +1,11 @@
-package com.bartlomiejpluta.base.game.animation;
+package com.bartlomiejpluta.base.engine.world.animation;
 
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.core.world.object.Sprite;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.object.Sprite;
 import lombok.EqualsAndHashCode;
 import org.joml.Vector2f;
 
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/Camera.java
similarity index 69%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/Camera.java
index 7549ce92..5a65c393 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/Camera.java
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.core.world.camera;
+package com.bartlomiejpluta.base.engine.world.camera;
 
-import com.bartlomiejpluta.base.core.gl.shader.constant.UniformName;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.object.Model;
+import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.object.Model;
 import org.joml.Matrix4f;
 
 public class Camera extends Model {
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/asset/EntitySetAsset.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/asset/EntitySetAsset.java
similarity index 74%
rename from game/src/main/java/com/bartlomiejpluta/base/game/entity/asset/EntitySetAsset.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/asset/EntitySetAsset.java
index 7179850f..cba80fdf 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/asset/EntitySetAsset.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/asset/EntitySetAsset.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.entity.asset;
+package com.bartlomiejpluta.base.engine.world.entity.asset;
 
-import com.bartlomiejpluta.base.game.common.asset.Asset;
+import com.bartlomiejpluta.base.engine.common.asset.Asset;
 import lombok.Getter;
 import lombok.NonNull;
 
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/config/EntitySpriteConfiguration.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java
similarity index 92%
rename from game/src/main/java/com/bartlomiejpluta/base/game/entity/config/EntitySpriteConfiguration.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java
index a02b5326..678c89a7 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/config/EntitySpriteConfiguration.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.entity.config;
+package com.bartlomiejpluta.base.engine.world.entity.config;
 
 import com.bartlomiejpluta.base.api.entity.Direction;
 import lombok.Data;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java
similarity index 73%
rename from game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java
index b8037f52..7aef1ff5 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.game.entity.manager;
+package com.bartlomiejpluta.base.engine.world.entity.manager;
 
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.game.entity.config.EntitySpriteConfiguration;
-import com.bartlomiejpluta.base.game.entity.model.DefaultEntity;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.entity.config.EntitySpriteConfiguration;
+import com.bartlomiejpluta.base.engine.world.entity.model.DefaultEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntitySetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntitySetManager.java
similarity index 74%
rename from game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntitySetManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntitySetManager.java
index 2daa5027..0f0e812b 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntitySetManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntitySetManager.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.game.entity.manager;
+package com.bartlomiejpluta.base.engine.world.entity.manager;
 
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
-import com.bartlomiejpluta.base.game.entity.asset.EntitySetAsset;
-import com.bartlomiejpluta.base.game.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.world.entity.asset.EntitySetAsset;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java
new file mode 100644
index 00000000..fe40bac5
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java
@@ -0,0 +1,8 @@
+package com.bartlomiejpluta.base.engine.world.entity.manager;
+
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.world.entity.model.DefaultEntity;
+
+public interface EntityManager extends Cleanable {
+   DefaultEntity createEntity(String entitySetUid);
+}
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntitySetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntitySetManager.java
new file mode 100644
index 00000000..8a898b28
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntitySetManager.java
@@ -0,0 +1,8 @@
+package com.bartlomiejpluta.base.engine.world.entity.manager;
+
+import com.bartlomiejpluta.base.engine.common.manager.AssetManager;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.world.entity.asset.EntitySetAsset;
+
+public interface EntitySetManager extends AssetManager<EntitySetAsset, Material> {
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java
similarity index 83%
rename from game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java
index 519d6e80..9551b0f0 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.game.entity.model;
+package com.bartlomiejpluta.base.engine.world.entity.model;
 
 import com.bartlomiejpluta.base.api.entity.Direction;
 import com.bartlomiejpluta.base.api.entity.Entity;
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.util.math.MathUtil;
-import com.bartlomiejpluta.base.game.entity.config.EntitySpriteConfiguration;
-import com.bartlomiejpluta.base.game.movement.MovableSprite;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.util.math.MathUtil;
+import com.bartlomiejpluta.base.engine.world.entity.config.EntitySpriteConfiguration;
+import com.bartlomiejpluta.base.engine.world.movement.MovableSprite;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/image/asset/ImageAsset.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/asset/ImageAsset.java
similarity index 58%
rename from game/src/main/java/com/bartlomiejpluta/base/game/image/asset/ImageAsset.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/asset/ImageAsset.java
index 70957030..accb3f79 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/image/asset/ImageAsset.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/asset/ImageAsset.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.image.asset;
+package com.bartlomiejpluta.base.engine.world.image.asset;
 
-import com.bartlomiejpluta.base.game.common.asset.Asset;
+import com.bartlomiejpluta.base.engine.common.asset.Asset;
 import lombok.NonNull;
 
 public class ImageAsset extends Asset {
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/image/manager/DefaultImageManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java
similarity index 74%
rename from game/src/main/java/com/bartlomiejpluta/base/game/image/manager/DefaultImageManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java
index e1827d48..75ff4689 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/image/manager/DefaultImageManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java
@@ -1,13 +1,13 @@
-package com.bartlomiejpluta.base.game.image.manager;
+package com.bartlomiejpluta.base.engine.world.image.manager;
 
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
-import com.bartlomiejpluta.base.core.util.math.MathUtil;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.game.image.asset.ImageAsset;
-import com.bartlomiejpluta.base.game.image.model.Image;
-import com.bartlomiejpluta.base.game.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.util.math.MathUtil;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.image.asset.ImageAsset;
+import com.bartlomiejpluta.base.engine.world.image.model.Image;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java
new file mode 100644
index 00000000..28041047
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java
@@ -0,0 +1,9 @@
+package com.bartlomiejpluta.base.engine.world.image.manager;
+
+import com.bartlomiejpluta.base.engine.common.manager.AssetManager;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.world.image.asset.ImageAsset;
+import com.bartlomiejpluta.base.engine.world.image.model.Image;
+
+public interface ImageManager extends AssetManager<ImageAsset, Image>, Cleanable {
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/image/model/Image.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/Image.java
similarity index 60%
rename from game/src/main/java/com/bartlomiejpluta/base/game/image/model/Image.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/Image.java
index 50c11f32..b03e0f45 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/image/model/Image.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/Image.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.game.image.model;
+package com.bartlomiejpluta.base.engine.world.image.model;
 
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.world.object.Sprite;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.world.object.Sprite;
 import lombok.Getter;
 
 @Getter
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/asset/GameMapAsset.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/asset/GameMapAsset.java
similarity index 59%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/asset/GameMapAsset.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/asset/GameMapAsset.java
index a14c0063..7ffe40e0 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/asset/GameMapAsset.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/asset/GameMapAsset.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.map.asset;
+package com.bartlomiejpluta.base.engine.world.map.asset;
 
-import com.bartlomiejpluta.base.game.common.asset.Asset;
+import com.bartlomiejpluta.base.engine.common.asset.Asset;
 import lombok.NonNull;
 
 public class GameMapAsset extends Asset {
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/Layer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/Layer.java
new file mode 100644
index 00000000..9097d4c7
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/Layer.java
@@ -0,0 +1,8 @@
+package com.bartlomiejpluta.base.engine.world.map.layer.base;
+
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderable;
+import com.bartlomiejpluta.base.engine.logic.Updatable;
+
+public interface Layer extends Renderable, Updatable {
+
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/color/ColorLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/ColorLayer.java
similarity index 57%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/layer/color/ColorLayer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/ColorLayer.java
index 7f1b9a36..f3fd23d5 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/color/ColorLayer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/ColorLayer.java
@@ -1,13 +1,13 @@
-package com.bartlomiejpluta.base.game.map.layer.color;
+package com.bartlomiejpluta.base.engine.world.map.layer.color;
 
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.core.world.object.Sprite;
-import com.bartlomiejpluta.base.game.map.layer.base.Layer;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.map.layer.base.Layer;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
+import com.bartlomiejpluta.base.engine.world.object.Sprite;
 import lombok.NonNull;
 
 public class ColorLayer extends Sprite implements Layer {
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/image/ImageLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/ImageLayer.java
similarity index 81%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/layer/image/ImageLayer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/ImageLayer.java
index e25d3ecc..d0367a7b 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/image/ImageLayer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/ImageLayer.java
@@ -1,11 +1,11 @@
-package com.bartlomiejpluta.base.game.map.layer.image;
+package com.bartlomiejpluta.base.engine.world.map.layer.image;
 
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.game.image.model.Image;
-import com.bartlomiejpluta.base.game.map.layer.base.Layer;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.image.model.Image;
+import com.bartlomiejpluta.base.engine.world.map.layer.base.Layer;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
 import lombok.NonNull;
 
 public class ImageLayer implements Layer {
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/image/ImageLayerMode.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/ImageLayerMode.java
similarity index 52%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/layer/image/ImageLayerMode.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/ImageLayerMode.java
index 7ce77b42..5a2a52ae 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/image/ImageLayerMode.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/ImageLayerMode.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.map.layer.image;
+package com.bartlomiejpluta.base.engine.world.map.layer.image;
 
 public enum ImageLayerMode {
    NORMAL,
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/object/ObjectLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/ObjectLayer.java
similarity index 84%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/layer/object/ObjectLayer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/ObjectLayer.java
index 760b1eb1..ced30d32 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/object/ObjectLayer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/ObjectLayer.java
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.game.map.layer.object;
+package com.bartlomiejpluta.base.engine.world.map.layer.object;
 
 import com.bartlomiejpluta.base.api.entity.Direction;
 import com.bartlomiejpluta.base.api.map.PassageAbility;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.game.map.layer.base.Layer;
-import com.bartlomiejpluta.base.game.movement.MovableSprite;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.map.layer.base.Layer;
+import com.bartlomiejpluta.base.engine.world.movement.MovableSprite;
 import org.joml.Vector2i;
 
 import java.util.List;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/tile/TileLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/TileLayer.java
similarity index 70%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/layer/tile/TileLayer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/TileLayer.java
index b8f477d7..8e75aad3 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/tile/TileLayer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/TileLayer.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.game.map.layer.tile;
+package com.bartlomiejpluta.base.engine.world.map.layer.tile;
 
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.game.map.layer.base.Layer;
-import com.bartlomiejpluta.base.game.tileset.model.Tile;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.map.layer.base.Layer;
+import com.bartlomiejpluta.base.engine.world.tileset.model.Tile;
 
 import java.util.Arrays;
 
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/manager/DefaultMapManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java
similarity index 78%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/manager/DefaultMapManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java
index 8566b3a1..41833eeb 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/manager/DefaultMapManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.game.map.manager;
+package com.bartlomiejpluta.base.engine.world.map.manager;
 
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.game.map.asset.GameMapAsset;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
-import com.bartlomiejpluta.base.game.map.serial.MapDeserializer;
-import com.bartlomiejpluta.base.game.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.world.map.asset.GameMapAsset;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
+import com.bartlomiejpluta.base.engine.world.map.serial.MapDeserializer;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java
new file mode 100644
index 00000000..3be55156
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java
@@ -0,0 +1,9 @@
+package com.bartlomiejpluta.base.engine.world.map.manager;
+
+import com.bartlomiejpluta.base.engine.common.manager.AssetManager;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.world.map.asset.GameMapAsset;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
+
+public interface MapManager extends AssetManager<GameMapAsset, DefaultGameMap>, Cleanable {
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/model/DefaultGameMap.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java
similarity index 80%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/model/DefaultGameMap.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java
index 30c25e7c..84a07a50 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/model/DefaultGameMap.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java
@@ -1,24 +1,24 @@
-package com.bartlomiejpluta.base.game.map.model;
+package com.bartlomiejpluta.base.engine.world.map.model;
 
 import com.bartlomiejpluta.base.api.entity.Entity;
 import com.bartlomiejpluta.base.api.entity.Movement;
 import com.bartlomiejpluta.base.api.map.GameMap;
 import com.bartlomiejpluta.base.api.map.PassageAbility;
-import com.bartlomiejpluta.base.core.gl.render.Renderable;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.logic.Updatable;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
-import com.bartlomiejpluta.base.game.entity.model.DefaultEntity;
-import com.bartlomiejpluta.base.game.image.model.Image;
-import com.bartlomiejpluta.base.game.map.layer.base.Layer;
-import com.bartlomiejpluta.base.game.map.layer.color.ColorLayer;
-import com.bartlomiejpluta.base.game.map.layer.image.ImageLayer;
-import com.bartlomiejpluta.base.game.map.layer.image.ImageLayerMode;
-import com.bartlomiejpluta.base.game.map.layer.object.ObjectLayer;
-import com.bartlomiejpluta.base.game.map.layer.tile.TileLayer;
-import com.bartlomiejpluta.base.game.tileset.model.TileSet;
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderable;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.logic.Updatable;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.world.entity.model.DefaultEntity;
+import com.bartlomiejpluta.base.engine.world.image.model.Image;
+import com.bartlomiejpluta.base.engine.world.map.layer.base.Layer;
+import com.bartlomiejpluta.base.engine.world.map.layer.color.ColorLayer;
+import com.bartlomiejpluta.base.engine.world.map.layer.image.ImageLayer;
+import com.bartlomiejpluta.base.engine.world.map.layer.image.ImageLayerMode;
+import com.bartlomiejpluta.base.engine.world.map.layer.object.ObjectLayer;
+import com.bartlomiejpluta.base.engine.world.map.layer.tile.TileLayer;
+import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet;
 import lombok.Getter;
 import lombok.NonNull;
 import org.joml.Vector2f;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/MapDeserializer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/MapDeserializer.java
new file mode 100644
index 00000000..f5dfe3bd
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/MapDeserializer.java
@@ -0,0 +1,7 @@
+package com.bartlomiejpluta.base.engine.world.map.serial;
+
+import com.bartlomiejpluta.base.engine.common.serial.Deserializer;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
+
+public abstract class MapDeserializer extends Deserializer<DefaultGameMap> {
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/serial/ProtobufMapDeserializer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java
similarity index 89%
rename from game/src/main/java/com/bartlomiejpluta/base/game/map/serial/ProtobufMapDeserializer.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java
index adf93b02..728ec993 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/serial/ProtobufMapDeserializer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.game.map.serial;
+package com.bartlomiejpluta.base.engine.world.map.serial;
 
 import com.bartlomiejpluta.base.api.map.PassageAbility;
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.game.image.manager.ImageManager;
-import com.bartlomiejpluta.base.game.map.layer.image.ImageLayerMode;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
-import com.bartlomiejpluta.base.game.tileset.manager.TileSetManager;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager;
+import com.bartlomiejpluta.base.engine.world.map.layer.image.ImageLayerMode;
+import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap;
+import com.bartlomiejpluta.base.engine.world.tileset.manager.TileSetManager;
 import com.bartlomiejpluta.base.proto.GameMapProto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/movement/DefaultMovement.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java
similarity index 93%
rename from game/src/main/java/com/bartlomiejpluta/base/game/movement/DefaultMovement.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java
index 4ec8e2f0..3db9aadc 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/movement/DefaultMovement.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.movement;
+package com.bartlomiejpluta.base.engine.world.movement;
 
 import com.bartlomiejpluta.base.api.entity.Direction;
 import com.bartlomiejpluta.base.api.entity.Movement;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java
similarity index 87%
rename from game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java
index 0c190963..388221c2 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java
@@ -1,11 +1,11 @@
-package com.bartlomiejpluta.base.game.movement;
+package com.bartlomiejpluta.base.engine.world.movement;
 
 import com.bartlomiejpluta.base.api.entity.Direction;
 import com.bartlomiejpluta.base.api.entity.Movement;
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.logic.Updatable;
-import com.bartlomiejpluta.base.game.animation.AnimatedSprite;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.logic.Updatable;
+import com.bartlomiejpluta.base.engine.world.animation.AnimatedSprite;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.joml.Vector2f;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Model.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java
similarity index 96%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Model.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java
index f90ca27b..9acb9f80 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Model.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.core.world.object;
+package com.bartlomiejpluta.base.engine.world.object;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Sprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java
similarity index 52%
rename from engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Sprite.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java
index 5dbdfcb8..7d9dc001 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Sprite.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java
@@ -1,12 +1,12 @@
-package com.bartlomiejpluta.base.core.world.object;
+package com.bartlomiejpluta.base.engine.world.object;
 
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.gl.render.Renderable;
-import com.bartlomiejpluta.base.core.gl.shader.constant.UniformName;
-import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
-import com.bartlomiejpluta.base.core.ui.Window;
-import com.bartlomiejpluta.base.core.world.camera.Camera;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.core.gl.render.Renderable;
+import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName;
+import com.bartlomiejpluta.base.engine.core.gl.shader.manager.ShaderManager;
+import com.bartlomiejpluta.base.engine.ui.Window;
+import com.bartlomiejpluta.base.engine.world.camera.Camera;
 import lombok.*;
 
 @RequiredArgsConstructor
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/asset/TileSetAsset.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/asset/TileSetAsset.java
similarity index 73%
rename from game/src/main/java/com/bartlomiejpluta/base/game/tileset/asset/TileSetAsset.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/asset/TileSetAsset.java
index 3ee94079..a5f21ce1 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/asset/TileSetAsset.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/asset/TileSetAsset.java
@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.tileset.asset;
+package com.bartlomiejpluta.base.engine.world.tileset.asset;
 
-import com.bartlomiejpluta.base.game.common.asset.Asset;
+import com.bartlomiejpluta.base.engine.common.asset.Asset;
 import lombok.Getter;
 import lombok.NonNull;
 
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/DefaultTileSetManager.java
similarity index 78%
rename from game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/DefaultTileSetManager.java
index 1c583083..230db704 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/DefaultTileSetManager.java
@@ -1,11 +1,11 @@
-package com.bartlomiejpluta.base.game.tileset.manager;
+package com.bartlomiejpluta.base.engine.world.tileset.manager;
 
-import com.bartlomiejpluta.base.core.error.AppException;
-import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
-import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
-import com.bartlomiejpluta.base.game.project.config.ProjectConfiguration;
-import com.bartlomiejpluta.base.game.tileset.asset.TileSetAsset;
-import com.bartlomiejpluta.base.game.tileset.model.TileSet;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager;
+import com.bartlomiejpluta.base.engine.error.AppException;
+import com.bartlomiejpluta.base.engine.project.config.ProjectConfiguration;
+import com.bartlomiejpluta.base.engine.util.mesh.MeshManager;
+import com.bartlomiejpluta.base.engine.world.tileset.asset.TileSetAsset;
+import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java
new file mode 100644
index 00000000..c6be7192
--- /dev/null
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java
@@ -0,0 +1,9 @@
+package com.bartlomiejpluta.base.engine.world.tileset.manager;
+
+import com.bartlomiejpluta.base.engine.common.manager.AssetManager;
+import com.bartlomiejpluta.base.engine.gc.Cleanable;
+import com.bartlomiejpluta.base.engine.world.tileset.asset.TileSetAsset;
+import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet;
+
+public interface TileSetManager extends AssetManager<TileSetAsset, TileSet>, Cleanable {
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/model/Tile.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/model/Tile.java
similarity index 74%
rename from game/src/main/java/com/bartlomiejpluta/base/game/tileset/model/Tile.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/model/Tile.java
index 6daa2c5a..a0aa8206 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/model/Tile.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/model/Tile.java
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.game.tileset.model;
+package com.bartlomiejpluta.base.engine.world.tileset.model;
 
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.gl.object.texture.Texture;
-import com.bartlomiejpluta.base.core.world.object.Sprite;
+import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.Texture;
+import com.bartlomiejpluta.base.engine.world.object.Sprite;
 import lombok.Getter;
 
 @Getter
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/model/TileSet.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/model/TileSet.java
similarity index 65%
rename from game/src/main/java/com/bartlomiejpluta/base/game/tileset/model/TileSet.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/model/TileSet.java
index d442a665..abe0a16b 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/model/TileSet.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/model/TileSet.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.game.tileset.model;
+package com.bartlomiejpluta.base.engine.world.tileset.model;
 
-import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
-import com.bartlomiejpluta.base.core.gl.object.texture.Texture;
+import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
+import com.bartlomiejpluta.base.engine.core.gl.object.texture.Texture;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
diff --git a/game/src/main/resources/application.yml b/engine/src/main/resources/application.yml
similarity index 100%
rename from game/src/main/resources/application.yml
rename to engine/src/main/resources/application.yml
diff --git a/game/build.gradle b/game/build.gradle
deleted file mode 100644
index 997cb6b2..00000000
--- a/game/build.gradle
+++ /dev/null
@@ -1,56 +0,0 @@
-plugins {
-    id 'org.springframework.boot' version "$springBootVersion"
-    id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
-    id 'java'
-    id 'application'
-}
-
-group 'com.bartlomiejpluta.base'
-version 'unspecified'
-
-import org.gradle.internal.os.OperatingSystem
-
-switch (OperatingSystem.current()) {
-    case OperatingSystem.LINUX:
-        def osArch = System.getProperty("os.arch")
-        project.ext.lwjglNatives = osArch.startsWith("arm") || osArch.startsWith("aarch64")
-                ? "natives-linux-${osArch.contains("64") || osArch.startsWith("armv8") ? "arm64" : "arm32"}"
-                : "natives-linux"
-        break
-    case OperatingSystem.MAC_OS:
-        project.ext.lwjglNatives = "natives-macos"
-        break
-    case OperatingSystem.WINDOWS:
-        project.ext.lwjglNatives = System.getProperty("os.arch").contains("64") ? "natives-windows" : "natives-windows-x86"
-        break
-}
-
-configurations {
-    compileOnly {
-        extendsFrom annotationProcessor
-    }
-}
-
-repositories {
-    mavenCentral()
-    jcenter()
-}
-
-dependencies {
-    implementation project(":engine")
-    implementation project(":proto")
-    implementation project(":api")
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-}
-
-application {
-    // Define the main class for the application.
-    mainClass = 'com.bartlomiejpluta.base.game.App'
-}
-
-build {
-    dependsOn(":engine:build")
-    dependsOn(":proto:build")
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java
deleted file mode 100644
index 1624a5da..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.bartlomiejpluta.base.game.entity.manager;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.game.entity.model.DefaultEntity;
-
-public interface EntityManager extends Cleanable {
-   DefaultEntity createEntity(String entitySetUid);
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntitySetManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntitySetManager.java
deleted file mode 100644
index 27c3c02e..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntitySetManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.bartlomiejpluta.base.game.entity.manager;
-
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.game.common.manager.AssetManager;
-import com.bartlomiejpluta.base.game.entity.asset.EntitySetAsset;
-
-public interface EntitySetManager extends AssetManager<EntitySetAsset, Material> {
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/image/manager/ImageManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/image/manager/ImageManager.java
deleted file mode 100644
index ea50c284..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/image/manager/ImageManager.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.bartlomiejpluta.base.game.image.manager;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.game.common.manager.AssetManager;
-import com.bartlomiejpluta.base.game.image.asset.ImageAsset;
-import com.bartlomiejpluta.base.game.image.model.Image;
-
-public interface ImageManager extends AssetManager<ImageAsset, Image>, Cleanable {
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/base/Layer.java b/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/base/Layer.java
deleted file mode 100644
index 5c604534..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/layer/base/Layer.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.bartlomiejpluta.base.game.map.layer.base;
-
-import com.bartlomiejpluta.base.core.gl.render.Renderable;
-import com.bartlomiejpluta.base.core.logic.Updatable;
-
-public interface Layer extends Renderable, Updatable {
-
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/manager/MapManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/map/manager/MapManager.java
deleted file mode 100644
index 18baec66..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/manager/MapManager.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.bartlomiejpluta.base.game.map.manager;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.game.common.manager.AssetManager;
-import com.bartlomiejpluta.base.game.map.asset.GameMapAsset;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
-
-public interface MapManager extends AssetManager<GameMapAsset, DefaultGameMap>, Cleanable {
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/map/serial/MapDeserializer.java b/game/src/main/java/com/bartlomiejpluta/base/game/map/serial/MapDeserializer.java
deleted file mode 100644
index d855f891..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/map/serial/MapDeserializer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.bartlomiejpluta.base.game.map.serial;
-
-import com.bartlomiejpluta.base.game.common.serial.Deserializer;
-import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
-
-public abstract class MapDeserializer extends Deserializer<DefaultGameMap> {
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/ProjectLoader.java b/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/ProjectLoader.java
deleted file mode 100644
index 5270a7ea..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/loader/ProjectLoader.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.bartlomiejpluta.base.game.project.loader;
-
-import com.bartlomiejpluta.base.game.project.model.Project;
-
-public interface ProjectLoader {
-   Project loadProject();
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/serial/ProjectDeserializer.java b/game/src/main/java/com/bartlomiejpluta/base/game/project/serial/ProjectDeserializer.java
deleted file mode 100644
index abae5832..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/serial/ProjectDeserializer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.bartlomiejpluta.base.game.project.serial;
-
-import com.bartlomiejpluta.base.game.common.serial.Deserializer;
-import com.bartlomiejpluta.base.game.project.model.Project;
-
-public abstract class ProjectDeserializer extends Deserializer<Project> {
-}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/TileSetManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/TileSetManager.java
deleted file mode 100644
index 8851bbe9..00000000
--- a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/TileSetManager.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.bartlomiejpluta.base.game.tileset.manager;
-
-import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.game.common.manager.AssetManager;
-import com.bartlomiejpluta.base.game.tileset.asset.TileSetAsset;
-import com.bartlomiejpluta.base.game.tileset.model.TileSet;
-
-public interface TileSetManager extends AssetManager<TileSetAsset, TileSet>, Cleanable {
-}
diff --git a/settings.gradle b/settings.gradle
index 815af424..450ecab0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,6 @@
 
 rootProject.name = 'BASE'
 include('engine')
-include('game')
 include('editor')
 include('proto')
 include('api')