Reorganize the services