File layout changes and README edits