Refactored file structure
Made additional changes to file structure
Merge pull request #169 from jasonerpenbeck/new-fs

Re-organized file structure, re-mapped file paths in code closes #90