rework!
new server config file paths
templates folders!
_basic* moved to folder ./views/basic/
Merge remote-tracking branch 'origin/master'