Added manager class, moved files from canvaswidget to manager, began gutting canvas