Refactoring move and checkcollision into entity methods