restructured classes
restructured classes
converted Annulus class to static
relocated methods to classes that make sense
added part 2, not working - need to figure out how to expand 2d array