move back to a nested resource model

replace IDs with URIs

Change-Id: I6d126df4cae56db296b87711fabed7b2d2a56a79