Make sure to move nested single folder, as in gvim case.