Remove extracted Highchats.
Cleaning up controllers.
Merge pull request #4 from james-dibble/refactor-controllers

Refactor controllers