Revert "single-service Implementation"
64 files changed