Refactored vbox-tray-icon source tree