Add Domain Classifier module.

Cleanup in the config files.
More cleanup