diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java
index 59d47bee..36539a54 100644
--- a/src/main/java/electrosphere/controls/ControlHandler.java
+++ b/src/main/java/electrosphere/controls/ControlHandler.java
@@ -93,7 +93,7 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
-import electrosphere.entity.state.movement.speed.ClientWalkTree;
+import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.logger.LoggerInterface;
diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
index 18a69432..ab4d0808 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
@@ -21,7 +21,7 @@ import electrosphere.entity.state.movement.FallTree;
 import electrosphere.entity.state.movement.SprintTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState;
-import electrosphere.entity.state.movement.speed.ClientWalkTree;
+import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
index 91f736b7..382a1bf4 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
@@ -20,7 +20,7 @@ import electrosphere.entity.state.movement.ServerSprintTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
-import electrosphere.entity.state.movement.speed.ServerWalkTree;
+import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.entity.state.server.ServerPlayerViewDirTree;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
diff --git a/src/main/java/electrosphere/entity/state/movement/speed/ClientWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java
similarity index 99%
rename from src/main/java/electrosphere/entity/state/movement/speed/ClientWalkTree.java
rename to src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java
index 46a45ad0..1f562748 100644
--- a/src/main/java/electrosphere/entity/state/movement/speed/ClientWalkTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java
@@ -1,4 +1,4 @@
-package electrosphere.entity.state.movement.speed;
+package electrosphere.entity.state.movement.walk;
 
 
 import electrosphere.net.synchronization.server.ServerSynchronizationManager;
diff --git a/src/main/java/electrosphere/entity/state/movement/speed/ServerWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java
similarity index 97%
rename from src/main/java/electrosphere/entity/state/movement/speed/ServerWalkTree.java
rename to src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java
index 77f0fc0f..38879d24 100644
--- a/src/main/java/electrosphere/entity/state/movement/speed/ServerWalkTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java
@@ -1,4 +1,4 @@
-package electrosphere.entity.state.movement.speed;
+package electrosphere.entity.state.movement.walk;
 
 
 import electrosphere.engine.Globals;
@@ -10,7 +10,7 @@ import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.btree.BehaviorTree;
-import electrosphere.entity.state.movement.speed.ClientWalkTree.WalkState;
+import electrosphere.entity.state.movement.walk.ClientWalkTree.WalkState;
 import electrosphere.game.data.creature.type.movement.WalkMovementSystem;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
index 28c0b719..45d6401f 100644
--- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
+++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
@@ -42,8 +42,8 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
-import electrosphere.entity.state.movement.speed.ClientWalkTree;
-import electrosphere.entity.state.movement.speed.ServerWalkTree;
+import electrosphere.entity.state.movement.walk.ClientWalkTree;
+import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.entity.state.physicssync.upright.ClientAlwaysUprightTree;
 import electrosphere.entity.state.physicssync.upright.ServerAlwaysUprightTree;
 import electrosphere.entity.state.rotator.RotatorHierarchyNode;
diff --git a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java
index 5ceff66d..57ecc84b 100644
--- a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java
+++ b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java
@@ -1,9 +1,9 @@
 package electrosphere.net.synchronization.client;
 
 
-import electrosphere.entity.state.movement.speed.ClientWalkTree;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
+import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.entity.state.life.ClientLifeTree;
 import electrosphere.entity.state.block.ClientBlockTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
diff --git a/src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java
index 1e7703ce..c5ba5782 100644
--- a/src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java
+++ b/src/main/java/electrosphere/net/synchronization/server/ServerSynchronizationManager.java
@@ -1,7 +1,6 @@
 package electrosphere.net.synchronization.server;
 
 
-import electrosphere.entity.state.movement.speed.ServerWalkTree;
 import electrosphere.logger.LoggerInterface;
 
 import java.util.LinkedList;
@@ -10,6 +9,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
+import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
 import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.server.datacell.utils.EntityLookupUtils;
diff --git a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java
index fcbf6601..ac032f97 100644
--- a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java
+++ b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java
@@ -1,8 +1,6 @@
 package electrosphere.net.synchronization.transport;
 
 
-import electrosphere.entity.state.movement.speed.ServerWalkTree;
-import electrosphere.entity.state.movement.speed.ClientWalkTree;
 import electrosphere.entity.state.equip.ClientEquipState;
 import java.util.LinkedList;
 import java.util.List;
@@ -24,6 +22,8 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
+import electrosphere.entity.state.movement.walk.ClientWalkTree;
+import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.net.synchronization.enums.FieldIdEnums;
 
diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java
index 25d788c5..b98063c8 100644
--- a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java
+++ b/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java
@@ -1,7 +1,7 @@
 package electrosphere.server.ai.nodes.actions.move;
 
 import electrosphere.entity.Entity;
-import electrosphere.entity.state.movement.speed.ServerWalkTree;
+import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.server.ai.blackboard.Blackboard;
 import electrosphere.server.ai.nodes.AITreeNode;
 
diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java
index ae0fc2d5..10e5340b 100644
--- a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java
+++ b/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java
@@ -1,7 +1,7 @@
 package electrosphere.server.ai.nodes.actions.move;
 
 import electrosphere.entity.Entity;
-import electrosphere.entity.state.movement.speed.ServerWalkTree;
+import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.server.ai.blackboard.Blackboard;
 import electrosphere.server.ai.nodes.AITreeNode;