Restructuring GUI code - first pass - WIP.
10 files changed