Revert "Move some more files to shared project"

This reverts commit ad37e32315e955643c33b7dd35c5b0bb26747525.
Revert "Shared Projects"

This reverts commit 08d6714863680b2b851e11af47c568f5e66c871f.