Updating client code to API changes, remove dependencies to repository where possible, add some temporary dependencies to repository where necessary.
Changed paths: