Move more things under Kconfig