Refactoring: split handler + move classes