Reverting to prior directory structure...