Reflect move to themes structure

We've moved from a "templates" approach to a "themes" approach.