Add defintions field to container registry
Insert definitions to registry.
Bring related modules into single container module.