Major file clean up

Rea TODO.rm file for details, but in essence, I’m preparing for heroku