Refactoring UI packages