refactored base template into project directory
Merge branch 'master' into HEAD