Renamed xml and adjusted repository scheme