restructured software sources