UI Package Structure refactoring