restructured code, fixing movement/rotation