[DF-2722] fix review issues: move new class to necessary folder