Split storage into storage/storagetype