(VBAT-2) improvements to data model (reordered columns) and install scripts