Merged menu and game together under one window

Some restructuring among the classes in the graphix-package