adding added a drawing helper class, rearranged some classes, etc.