movement refactoring

not done yet (clean up in player and obstacle still needed)