reorganization and fix document type"