fix KCONFIG in packages: move back all KCONFIG from package variants to the main...