Move desktop- and laptop-specific packages to separate commands