Revert "Point to proper locations and add missing projects"

This reverts commit 31e326ae2a3baeeb4ae41651f3a5425401ac6bd3.