Move UI code into package ui, and add one more package data