Added Line Charts

And some refactoring in the hierarchy