No major changes
Reorg templates
Moved all testing
Minor refactor