Reorganized service controllers + unit tests