Revert "Refactor odx structure"

upstream update