Refactored to full t4 and single project