Restructured folders
Merge pull request #75 from johnttan/restructureFolders#74

Restructured folders