Remove old files
Update service registry
Update configuration
Update report spec
Merge remote-tracking branch 'origin/remove_service_classes' into develop