restructured ui package