Reorganized blockstorage v1 test packages.

Change-Id: Ied9c2bf7469f01281adc0e10410ae899cca5b822
Merge "Reorganized blockstorage v1 test packages."