adapted to git sources, new delivery structure