more template organization and hybrid integration