Restructured files
Merge pull request #41 from johnttan/restructureFolders#40

Restructured files