Move stuff around, hopefully for the last time.