Refactoring resetEntities and renaming Mover to Entity