Moving ui to a ui package