reorganised cache dir