Revert "Merged and moved projects"

This reverts commit 3bfdd30690367232d21c7ec1a9737ee568ebf670.
Fixup