Update template submodule to fix namespaces
Clean up submodule I'm about to move, renders last commit totally pointless...
Add template submodule in correct place
Move framework classes to correct location - will change the namespaces shortly
Fix namespaces for all the classes that were just moved around