clean-up - next time use git itself to move stuff around