Organization of template files; editing views and tests to match