Consolidate data folder