Refactor and clean-up Druid data ingestion Part 2

Make v9 segments directly