. . everything but end user desktop should be in the server package because that's for people who know what they're doing technically. Some specific embedded applications might call for desktop with modules brought over from server.

Ideally, they should be as compatible as they can be, but not to the detriment of desktop or server performance in their specific packages. Linux needs to be much more prominent on the desktop to protect its use on the server or it remains vulnerable to Microsoft in the long term.