Reorganize files
Merge pull request #7 from MikeDelaney/reorg

Reorganize files