working on a module based loading scheme and cleaning up more namespacing