Clean up code
Finish code cleanup
Merge pull request #2 from indiesquidge/organize-folder

Clean up code
Merge branch 'organize-folder'

* organize-folder:
  Finish code cleanup
  Clean up code