Changed structure of services to reflect general functionality