Base pass at new template pages

Includes slight re-org of the files route
Correcting files spec for new data model