Class changing

Put everything into one class: The buttons are now in one, the state of
the game now is more clear.