Move some responsiblities around.