Refactor directory structure
Merge branch 'frontEndTemplate' into develop