move some files to the view folder.  Remove references to Point2D