Revert "Create new service and package"

This reverts commit a5a01cafbc9ab17764f93ea58ee9d0fa4ce8adcb.