wip
Cleanup before bringing in the template repo
Using the new all-in-one template repo