merged, changed folder names