Merge pull request #5 from seanjohnson08/master

Reorganization of file structure
typo