Lots more reorganization and seperation of docs