Point to proper locations and add missing projects

Change-Id: Idf2a7f33794a9287f74d3529e440cf3d9f4079f0