reestructuration of git project (cont)