#13 bugtracker - move templates to namespacing folder