Folding paths into propLists

Change-Id: I7835be8ec70392e1bc5c596566a113c3da8f2012