Move more things to partials and yamls