Added block functions to Figure.hs, changed naming convention of Draw.hs