reorganized template hierarchy files