Remove template 2 and move cms templates into new folder