Moved GUI code around into packages.