refactored UI packages