Refactor storage into separate vhd/vhdx classes