Move scheme drowing to a separate module