Cleanup readme's to reflect repo restructuring

Change-Id: Ic75a6dd3ae02dcab1b9e4787eaa3049f5c70de42
Merge "Cleanup readme's to reflect repo restructuring"