Rethinking the services config
Fixing structure