Refactor: extracted class to a new module