Change to Voxset structure to prep for advanced optimization