Set up folders for merge