split infrastructure further