Version 3

Calculation of package_name and service_name need patricular attention.
Just need to remove the solr references.