Re-organize for different namespacing