Fixed imports

Merged Matej Michálek requested to merge refactor2 into milestone-3

Merge request reports