Switched to areac chart
Moved classes to separate files