refactor: move converter inner builders to outer classes