MM added
Merge branch 'templates'
Improve directory structure
Fix relative paths
Restructured templates
Path fixes, etc
Fix remaining links