Move around dependencies
Improve repo support