HCSVLAB-729 Refactor classes structure + method fixes