Moved things around to get a proper folder structure
Merge pull request #22 from kastnerkyle/modularization

REF Moved things around to get a proper folder structure