Moved GUI elements into better fitting packages.