Add Bundle configuration.
Add service definitions.
Fix indentation.
Create wrapper messaging service.