Restructure UI server code to prepare it for issue #238