restructure directories
Merge pull request #2 from hunterritchie/dir_restructure

restructure directories