Point to proper locations and add missing projects

Change-Id: I0b6a85749c66c16dcb2810e66849bc65abd4cf79