Merge Austin to master

- Refactored Project folder structure.