Complete extraction of service into module. Add existing tests and make them work.
Complete extraction of service into module. Add existing tests and make them work.