Move StorageUtils into main package