Moved around some dependencies.