Add carnegie chart and update it
Restructure files