[Village, Movement] Moved movement stuff from village to movement.