Reshuffle the gui class structure a bit more.