Moved some dependencies