Fixed file and dir mix up in storage class