Use new dir layout and merge mock into templates
Use new path/script and add load-mock.sh to dummy start