Cleanup
Clean up root directory by using subdirs
Merge pull request #89 from mrjoelkemp/subdirs

Cleanup: Utilize subdirs