Refactored motion of movables and moved the logic for moving into the World class
merge