New in-houser sparks adviser rejig at Waters