Moved all UI code to UI package