restructured git modules