Move bits around so we can have easier per distro options