huge data refactor changes

14 jobs from new-bench-cassandra in 26 minutes and 57 seconds (queued for 2 minutes and 54 seconds)
Status Job ID Name Coverage
  Test
passed #25311
avrora

00:23

passed #25312
batik

04:16

passed #25313
eclipse

00:44

passed #25314
fop

00:33

passed #25315
h2

01:13

passed #25316
jython

00:56

passed #25317
luindex

00:33

passed #25318
lusearch

00:35

passed #25319
pmd

03:06

passed #25320
sunflow

00:22

passed #25321
tomcat

01:08

passed #25322
tradebeans

06:23

passed #25323
tradesoap

06:18

passed #25324
xalan

00:24