Dev refactor

Merged Matthieu Boileau requested to merge dev-refactor into master

Code reorganization and cleaning

Edited by Matthieu Boileau

Merge request reports