Updates to split projects and add generic templates