move some files, fix winelib build