Code reorganization #2153: reorg /ui