(TK-27) Move schemas into common

Combine the schemas and common namespaces.