Merge & move things in the right place again.