Reorganise Storage component
Shift methods to commons, delete unuse class