Move more methods to their eventual home.