Revert "Refactoring now working for services + started for BPM services"

This reverts commit f2a13016e42dcb99ad7e896fc0c36f5e030017ac.