Update Terminal/Figure.hs to use Terminal/Draw.hs