TK-20278 Moved classes that can be serialized to separate unit to avoid coupling