kconfig included in tree, reorganization