Restructure data directories