Batch VS builds, consolidate shared props, update imports