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