Begin to restructure into more general charts package