Finished restructure, of column storage