removed files, added new template hierarchy