Moved folders before merge