Moved all non-component dependencies.