simplified templates. removed surround now only 2 folders
adjusted controller to reflect new templates structure
reflect changs to template folder
Merge branch 'feature/refactor-build'