Classes refactored, 'util' package renamed to 'message'