Fixed test cases for change in serviceType on A-GOLE definition.
Cleaning up unused classes and restructuring packages.