Clean up and moved UI pieces to .ui package