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/kconfig-tweak
-scripts/diffconfig --> utils/kconfig-diff
-scripts/kconfig/merge_config.sh --> utils/kconfig-merge
-scripts/kconfig/streamline_config.pl --> utils/kconfig-streamline
-scripts/kconfig/kxgettext.c --> utils/kconfig-gettext.c
+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