Add service module, change naming