Split goDecorator service into two services

As discussed.