cleaned jodli's cleanup and repaired the class diagrams...

also moved workbook control to new folder