Revert "NX-485: clean up last non-client-facing split packages"

This reverts commit f232c0b044a4f31cb799b7c731b0504d8cca72a1.
Revert "NX-485: remove last few embedded plugin dependencies"

This reverts commit 481fc758b71f0924198323f3da44d2b52936f9ba.