Moved classes around in ui-package