Revert "Refactoring now working for services + started for BPM services" because of erroneous push

This reverts commit bdc0f9948f26196eb6f7f6c253d7dc2c6bcb3436.