Refactor and cleanup

Refactor code into multiple classes. Add org name to folder name. Fix files with spaces, and other strange chars messing things up.