Reorginised UI package