new hierarchy for files and templates.

Build broken...