Data simplification

Anton Akhmerovrequested to merge
data-simplification into master

Further simplification of the data structures to make the codebase easier to maintain and migrate.

Edited by Anton Akhmerov

Merge request reports