Namespace refactoring.

Subscribe bug fix