More refactoring/reorganizing, particularly of movement code. Ghosts come out of the house