Moved infrastructure template to public-infrastructure in preparation for private infrastructure
Split infrastructure into public and private templates