Code Cleanup

Added a couple new classes. Rearranged methods in MainWindow.