re-structure storage components