Remove dependency on ng.
Refactor namespace.