Moved some responsibilities around