Refactoring imaging service codes
  -- latest merge from Chris's import-volume implementation
  -- packaging changes