Config structure updated. Cleaned up the services.