More template organizing
More file organizing
Merge branch 'master' into kingman