PACK-22: Fixing storage dirs