Backend refactor

Merged Ian Foster requested to merge backend-refactor into develop

Merge request reports