Refactored move functions to library Movement
Merged conflicts