Rahul - Refactoring namespaces around.