Massive refactor around Pie Chart code/files.