Refactor odx structure

Make structure simpler