Changed namespaces and refactored namespacing.