Refactored gui-packages