Reorganisation git + debug integration