MovementManager and Optimization of various other classes