Reverting back to old file structure