moving templates to structure defined by finlay