Re-organization of files, templates