Restructure file hierarchy

Using correct file extensions instead of .tmpl.
Merge branch 'foundation'