Reorganize service modules