GUI: Move Obsolete Classes, Make Menus Work
Master: Fix Merge Conflicts