reorganized modules. merged all services in a single service