KAZOO-725: move all the things...oops