Updated for file hierarchy
Merge pull request #39 from caliban19/master

Updated for file hierarchy