CHanged the structure by moving all UI code into a separate package.