diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animated.java b/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animated.java
index 80e1d8f9..57f07dd9 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animated.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animated.java
@@ -1,6 +1,6 @@
 package com.bartlomiejpluta.base.api.animation;
 
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 
 public interface Animated extends Updatable {
    boolean isAnimationEnabled();
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java b/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java
index 558c2ff4..4bbf1a5e 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java
@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.api.animation;
 
 import com.bartlomiejpluta.base.api.map.layer.base.Layer;
 import com.bartlomiejpluta.base.api.move.Movable;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 import com.bartlomiejpluta.base.util.path.Path;
 
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
index df88b3f0..ce0d1227 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
@@ -16,7 +16,7 @@ import com.bartlomiejpluta.base.api.map.model.GameMap;
 import com.bartlomiejpluta.base.api.runner.GameRunner;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import com.bartlomiejpluta.base.internal.gc.Disposable;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 import com.bartlomiejpluta.base.util.lambda.UncheckedConsumer;
 import com.bartlomiejpluta.base.util.lambda.UncheckedFunction;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java b/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
index ade88ec0..613ba40a 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
@@ -5,7 +5,7 @@ import com.bartlomiejpluta.base.api.event.EventType;
 import com.bartlomiejpluta.base.api.event.Reactive;
 import com.bartlomiejpluta.base.api.location.Locationable;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 
 import java.util.function.Consumer;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java
index 066725c1..6924b870 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java
@@ -1,7 +1,7 @@
 package com.bartlomiejpluta.base.api.gui;
 
 import com.bartlomiejpluta.base.internal.gc.Disposable;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 
 public interface GUI extends Renderable, Updatable, Disposable {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java
index 4b2039fd..11a41cc6 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java
@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.api.gui;
 
 import com.bartlomiejpluta.base.api.event.Reactive;
 import com.bartlomiejpluta.base.api.screen.Screen;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 
 public interface Widget extends Updatable, Reactive {
    Widget getParent();
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/light/Light.java b/api/src/main/java/com/bartlomiejpluta/base/api/light/Light.java
index a4d45d1a..022a0c4d 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/light/Light.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/light/Light.java
@@ -1,7 +1,7 @@
 package com.bartlomiejpluta.base.api.light;
 
 import com.bartlomiejpluta.base.api.location.Locationable;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 import org.joml.Vector3fc;
 
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java
index d33547e8..34957475 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java
@@ -4,7 +4,7 @@ import com.bartlomiejpluta.base.api.animation.Animation;
 import com.bartlomiejpluta.base.api.event.Reactive;
 import com.bartlomiejpluta.base.api.light.Light;
 import com.bartlomiejpluta.base.api.map.model.GameMap;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 
 import java.util.List;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/internal/logic/Updatable.java b/api/src/main/java/com/bartlomiejpluta/base/internal/program/Updatable.java
similarity index 53%
rename from api/src/main/java/com/bartlomiejpluta/base/internal/logic/Updatable.java
rename to api/src/main/java/com/bartlomiejpluta/base/internal/program/Updatable.java
index 0a74abcc..8153a016 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/internal/logic/Updatable.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/internal/program/Updatable.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.internal.logic;
+package com.bartlomiejpluta.base.internal.program;
 
 public interface Updatable {
    void update(float dt);
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java
index 8701f7f0..2abe8d16 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java
@@ -4,7 +4,7 @@ import com.bartlomiejpluta.base.api.context.Context;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import com.bartlomiejpluta.base.engine.common.init.Initializable;
 import com.bartlomiejpluta.base.engine.gc.OffHeapGarbageCollector;
-import com.bartlomiejpluta.base.engine.logic.GameLogic;
+import com.bartlomiejpluta.base.engine.program.GameProgram;
 import com.bartlomiejpluta.base.engine.thread.ThreadManager;
 import com.bartlomiejpluta.base.engine.time.ChronoMeter;
 import com.bartlomiejpluta.base.engine.ui.manager.ScreenManager;
@@ -24,7 +24,7 @@ public class DefaultGameEngine implements GameEngine {
 
    private final ScreenManager screenManager;
    private final ThreadManager threadManager;
-   private final GameLogic logic;
+   private final GameProgram program;
    private final OffHeapGarbageCollector garbageCollector;
    private final List<Initializable> initializables;
 
@@ -57,7 +57,7 @@ public class DefaultGameEngine implements GameEngine {
               .peek(i -> log.info("Initializing {}", i.getClass().getSimpleName()))
               .forEach(Initializable::init);
 
-      logic.init(screen, context);
+      program.init(screen, context);
    }
 
    private void loop() {
@@ -83,16 +83,16 @@ public class DefaultGameEngine implements GameEngine {
    }
 
    private void input() {
-      logic.input();
+      program.input();
    }
 
    private void update(float dt) {
-      logic.update(dt);
+      program.update(dt);
    }
 
    private void render() {
       screen.update();
-      logic.render(screen);
+      program.render(screen);
    }
 
    private void cleanUp() {
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/program/DefaultGameProgram.java
similarity index 90%
rename from engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/program/DefaultGameProgram.java
index f51cb870..f3d5853d 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/program/DefaultGameProgram.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.engine.logic;
+package com.bartlomiejpluta.base.engine.program;
 
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.context.Context;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
-public class DefaultGameLogic implements GameLogic {
+public class DefaultGameProgram implements GameProgram {
    private final Renderer renderer;
    private Camera camera;
    private Input input;
@@ -24,9 +24,10 @@ public class DefaultGameLogic implements GameLogic {
 
    @Override
    public void init(Screen screen, Context context) {
+      log.info("Initializing game program");
+
       this.context = context;
 
-      log.info("Initializing game logic");
       renderer.init();
 
       log.info("Creating camera model");
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/program/GameProgram.java
similarity index 74%
rename from engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java
rename to engine/src/main/java/com/bartlomiejpluta/base/engine/program/GameProgram.java
index 3a4eb42c..b6ae3f67 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/program/GameProgram.java
@@ -1,10 +1,10 @@
-package com.bartlomiejpluta.base.engine.logic;
+package com.bartlomiejpluta.base.engine.program;
 
 import com.bartlomiejpluta.base.api.context.Context;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import com.bartlomiejpluta.base.internal.gc.Cleanable;
 
-public interface GameLogic extends Cleanable {
+public interface GameProgram extends Cleanable {
    void init(Screen screen, Context context);
 
    void input();
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java
index e1041715..d767d6e7 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java
@@ -9,7 +9,7 @@ import com.bartlomiejpluta.base.api.map.model.GameMap;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import com.bartlomiejpluta.base.engine.core.gl.shader.constant.CounterName;
 import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.ShaderManager;
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java
index 1916678d..2a472d40 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java
@@ -21,7 +21,7 @@ import com.bartlomiejpluta.base.engine.world.map.layer.image.DefaultImageLayer;
 import com.bartlomiejpluta.base.engine.world.map.layer.object.DefaultObjectLayer;
 import com.bartlomiejpluta.base.engine.world.map.layer.tile.DefaultTileLayer;
 import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 import com.bartlomiejpluta.base.internal.render.ShaderManager;
 import lombok.Getter;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java
index 43e9123c..1ef11712 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java
@@ -6,15 +6,11 @@ import com.bartlomiejpluta.base.engine.core.engine.DefaultGameEngine;
 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.animation.model.AnimatedSprite;
-import com.bartlomiejpluta.base.internal.logic.Updatable;
-import com.bartlomiejpluta.base.util.math.Distance;
+import com.bartlomiejpluta.base.internal.program.Updatable;
 import com.bartlomiejpluta.base.util.math.MathUtil;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.joml.Vector2f;
-import org.joml.Vector2fc;
-import org.joml.Vector2i;
-import org.joml.Vector2ic;
 
 import static java.lang.Math.abs;
 import static java.lang.Math.max;