reorganize namespaces to allow for 'dropin' implementations in the future