Massive refactoring for simplification

Merged Jacek Lebioda requested to merge develop into master

Merge request reports