rough draft v2, structural changes
removed sets, adding in remote include, editorial changes from diane

Change-Id: I557303b68c4ca5b5d9f9664e200db3ab6286794e
Merge "rough draft v2, structural changes removed sets, adding in remote include, editorial changes from diane"