Moved dependencies to correct place.