move everything into config
tweak packages for 23