GUI adaptation and package reorganization