Removing ChartTypes class in favor of a more modular Graph and Table class