second phase of alignment of documentation, schema and source