Moving services to its own submodule