Reorganization of service-module