moving folders back after that horrendous merge