Reorganize GUI/Model subdirectories; remove unused includes; mv some fcts

Merge request reports

Loading