Moved GUI stuff to client package