#SB-256: Refactor all *.foo.services.* packages into *.service.foo.*

Fixed.