Restructure branch
Merge branch 'master' into sandbox-templates
added new files