Reorganize namespaces to include `kitchensink`