reorganize and add the data dir