Started working on core/deploy. Removed core from template namespaces.