Re-organize data sets, add correlation table