Refactored movement into velocity vectors

Collision detection has been mostly removed and needs refactored