Fixed data folder issues

Fixed data folder issues