Cleanup

Removed old folder, fixed weirdo merge issue - I should learn how to use
git better