Move movement methods to Movement.cs