Cleanup storage definition, swap the order

Change-Id: I2ddf96e6d190ecde19d38cc352715c8fdd0bf005