[master 2/12] Rearrange and group some of the StorageDevice's methods/properties