reorganized classes into directories. Added service method to system.
Merge branch '3x-service-cleanup' into 3.x-dev