Reorganised + added convenience methods to Polygon