Moved around some GUI classes.