Dongle integration and package restructuring