Reorganization

Lefebvre, Robert Alexanderrequested to merge
reorganization into development

Merge reorganization into the development branch.

Merge request reports