Everything that is a separate subproject should live in the subprojects directory. Progress on #2503 This reverts commit 451f8a8c19.
451f8a8c19