Fixed namespaces and created an initil megration.  Smoke-test passed