Change repos to new location

Conflicts:

	default.xml