namespace changes

changed namespaces to hide internals