Ns refactor

upgrade to Namespaces. may have uninstall original before using this.