Consolidating CharacterMover and CharacterController into a single class