reorganize files
Merge pull request #20 from WhosOutThere/josh-cleanup

reorganize files