Better projects parser (in progress)

Change-Id: I96873f489c7329ce4b19f94a1880067adda178d6