refactored avro structure, split execution service threads, cleanup of discovery task