refactor locations of services and models, hookup dtos