Changed dependencies

Changed the dependencies between the different components.