Re-org & clean up of service code. Conforming to standard service format.