Restructure data folder