Further refactored namespacing. All functions in namespaced object