Restructure data paths for my use