Moved some gui code into other directories