Cleanup

Moved movement stuff into its own header.