HSEARCH-1459 Rename exising Services to better match their new role
HSEARCH-1365 Reorganize distribution assembly