Reorganize Service Layer