NUM-115 Organized imports
NUM-115 MessageConsumer moved to top level package