Replace solid files with functions

Merged Miroslava Chirkova requested to merge dev3 into master

Merge request reports