file restructuring, removed highcharts references