namespace refactoring - part 1
namespace still working
namespace complete