Reorganizing folders and removing time window constraint on historic data