-scripts/kconfig/conf.c --> frontends/conf/conf.c
-scripts/kconfig/gconf.c --> frontends/gconf/gconf.c
-scripts/kconfig/gconf.glade --> frontends/gconf/gconf.glade
-scripts/kconfig/mconf.c --> frontends/mconf/mconf.c
-scripts/kconfig/nconf.c --> frontends/nconf/nconf.c
-scripts/kconfig/nconf.gui.c --> frontends/nconf/nconf.gui.c
-scripts/kconfig/nconf.h --> frontends/nconf/nconf.h
-scripts/kconfig/qconf.cc --> frontends/qconf/qconf.cc
-scripts/kconfig/qconf.h --> frontends/qconf/qconf.h
-scripts/kconfig/images.c --> libs/images/images.c_orig
-scripts/kconfig/lxdialog/BIG.FAT.WARNING --> libs/lxdialog/BIG.FAT.WARNING
-scripts/kconfig/lxdialog/checklist.c --> libs/lxdialog/checklist.c
-scripts/kconfig/lxdialog/dialog.h --> libs/lxdialog/dialog.h
-scripts/kconfig/lxdialog/inputbox.c --> libs/lxdialog/inputbox.c
-scripts/kconfig/lxdialog/menubox.c --> libs/lxdialog/menubox.c
-scripts/kconfig/lxdialog/textbox.c --> libs/lxdialog/textbox.c
-scripts/kconfig/lxdialog/util.c --> libs/lxdialog/util.c
-scripts/kconfig/lxdialog/yesno.c --> libs/lxdialog/yesno.c
-scripts/kconfig/confdata.c --> libs/parser/confdata.c
-scripts/kconfig/expr.c --> libs/parser/expr.c
-scripts/kconfig/expr.h --> libs/parser/expr.h
-scripts/kconfig/zconf.gperf --> libs/parser/hconf.gperf
-scripts/kconfig/zconf.l --> libs/parser/lconf.l
-scripts/kconfig/lkc.h --> libs/parser/lkc.h
-scripts/kconfig/lkc_proto.h --> libs/parser/lkc_proto.h
-scripts/kconfig/menu.c --> libs/parser/menu.c
-scripts/kconfig/symbol.c --> libs/parser/symbol.c
-scripts/kconfig/util.c --> libs/parser/util.c
-scripts/kconfig/zconf.y --> libs/parser/yconf.y
-scripts/config --> utils/tweak
-scripts/diffconfig --> utils/diff
-scripts/kconfig/merge_config.sh --> utils/merge
-scripts/kconfig/streamline_config.pl --> utils/streamline
-scripts/kconfig/kxgettext.c --> utils/gettext.c
-Documentation/kbuild/kconfig-language.txt --> docs/kconfig-language.txt
-Documentation/kbuild/kconfig.txt --> docs/kconfig.txt