setup files and folders
Merge branch 'master' of github.com:NicoSa/Architect-test