Restructuring, adding templating, and adding start of next project