Refactoring: added several classes (tool working ok, reporter broken)