gui packages refactoring