diff --git a/reference/domxml/functions/DomAttribute-name.xml b/reference/domxml/DomAttribute/name.xml
similarity index 100%
rename from reference/domxml/functions/DomAttribute-name.xml
rename to reference/domxml/DomAttribute/name.xml
diff --git a/reference/domxml/functions/DomAttribute-set-value.xml b/reference/domxml/DomAttribute/set-value.xml
similarity index 100%
rename from reference/domxml/functions/DomAttribute-set-value.xml
rename to reference/domxml/DomAttribute/set-value.xml
diff --git a/reference/domxml/functions/DomAttribute-specified.xml b/reference/domxml/DomAttribute/specified.xml
similarity index 100%
rename from reference/domxml/functions/DomAttribute-specified.xml
rename to reference/domxml/DomAttribute/specified.xml
diff --git a/reference/domxml/functions/DomAttribute-value.xml b/reference/domxml/DomAttribute/value.xml
similarity index 100%
rename from reference/domxml/functions/DomAttribute-value.xml
rename to reference/domxml/DomAttribute/value.xml
diff --git a/reference/domxml/functions/DomDocument-add-root.xml b/reference/domxml/DomDocument/add-root.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-add-root.xml
rename to reference/domxml/DomDocument/add-root.xml
diff --git a/reference/domxml/functions/DomDocument-create-attribute.xml b/reference/domxml/DomDocument/create-attribute.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-attribute.xml
rename to reference/domxml/DomDocument/create-attribute.xml
diff --git a/reference/domxml/functions/DomDocument-create-cdata-section.xml b/reference/domxml/DomDocument/create-cdata-section.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-cdata-section.xml
rename to reference/domxml/DomDocument/create-cdata-section.xml
diff --git a/reference/domxml/functions/DomDocument-create-comment.xml b/reference/domxml/DomDocument/create-comment.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-comment.xml
rename to reference/domxml/DomDocument/create-comment.xml
diff --git a/reference/domxml/functions/DomDocument-create-element-ns.xml b/reference/domxml/DomDocument/create-element-ns.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-element-ns.xml
rename to reference/domxml/DomDocument/create-element-ns.xml
diff --git a/reference/domxml/functions/DomDocument-create-element.xml b/reference/domxml/DomDocument/create-element.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-element.xml
rename to reference/domxml/DomDocument/create-element.xml
diff --git a/reference/domxml/functions/DomDocument-create-entity-reference.xml b/reference/domxml/DomDocument/create-entity-reference.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-entity-reference.xml
rename to reference/domxml/DomDocument/create-entity-reference.xml
diff --git a/reference/domxml/functions/DomDocument-create-processing-instruction.xml b/reference/domxml/DomDocument/create-processing-instruction.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-processing-instruction.xml
rename to reference/domxml/DomDocument/create-processing-instruction.xml
diff --git a/reference/domxml/functions/DomDocument-create-text-node.xml b/reference/domxml/DomDocument/create-text-node.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-create-text-node.xml
rename to reference/domxml/DomDocument/create-text-node.xml
diff --git a/reference/domxml/functions/DomDocument-doctype.xml b/reference/domxml/DomDocument/doctype.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-doctype.xml
rename to reference/domxml/DomDocument/doctype.xml
diff --git a/reference/domxml/functions/DomDocument-document-element.xml b/reference/domxml/DomDocument/document-element.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-document-element.xml
rename to reference/domxml/DomDocument/document-element.xml
diff --git a/reference/domxml/functions/DomDocument-dump-file.xml b/reference/domxml/DomDocument/dump-file.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-dump-file.xml
rename to reference/domxml/DomDocument/dump-file.xml
diff --git a/reference/domxml/functions/DomDocument-dump-mem.xml b/reference/domxml/DomDocument/dump-mem.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-dump-mem.xml
rename to reference/domxml/DomDocument/dump-mem.xml
diff --git a/reference/domxml/functions/DomDocument-get-element-by-id.xml b/reference/domxml/DomDocument/get-element-by-id.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-get-element-by-id.xml
rename to reference/domxml/DomDocument/get-element-by-id.xml
diff --git a/reference/domxml/functions/DomDocument-get-elements-by-tagname.xml b/reference/domxml/DomDocument/get-elements-by-tagname.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-get-elements-by-tagname.xml
rename to reference/domxml/DomDocument/get-elements-by-tagname.xml
diff --git a/reference/domxml/functions/DomDocument-html-dump-mem.xml b/reference/domxml/DomDocument/html-dump-mem.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-html-dump-mem.xml
rename to reference/domxml/DomDocument/html-dump-mem.xml
diff --git a/reference/domxml/functions/DomDocument-xinclude.xml b/reference/domxml/DomDocument/xinclude.xml
similarity index 100%
rename from reference/domxml/functions/DomDocument-xinclude.xml
rename to reference/domxml/DomDocument/xinclude.xml
diff --git a/reference/domxml/functions/DomDocumentType-entities.xml b/reference/domxml/DomDocumentType/entities.xml
similarity index 100%
rename from reference/domxml/functions/DomDocumentType-entities.xml
rename to reference/domxml/DomDocumentType/entities.xml
diff --git a/reference/domxml/functions/DomDocumentType-internal-subset.xml b/reference/domxml/DomDocumentType/internal-subset.xml
similarity index 100%
rename from reference/domxml/functions/DomDocumentType-internal-subset.xml
rename to reference/domxml/DomDocumentType/internal-subset.xml
diff --git a/reference/domxml/functions/DomDocumentType-name.xml b/reference/domxml/DomDocumentType/name.xml
similarity index 100%
rename from reference/domxml/functions/DomDocumentType-name.xml
rename to reference/domxml/DomDocumentType/name.xml
diff --git a/reference/domxml/functions/DomDocumentType-notations.xml b/reference/domxml/DomDocumentType/notations.xml
similarity index 100%
rename from reference/domxml/functions/DomDocumentType-notations.xml
rename to reference/domxml/DomDocumentType/notations.xml
diff --git a/reference/domxml/functions/DomDocumentType-public-id.xml b/reference/domxml/DomDocumentType/public-id.xml
similarity index 100%
rename from reference/domxml/functions/DomDocumentType-public-id.xml
rename to reference/domxml/DomDocumentType/public-id.xml
diff --git a/reference/domxml/functions/DomDocumentType-system-id.xml b/reference/domxml/DomDocumentType/system-id.xml
similarity index 100%
rename from reference/domxml/functions/DomDocumentType-system-id.xml
rename to reference/domxml/DomDocumentType/system-id.xml
diff --git a/reference/domxml/functions/DomElement-get-attribute-node.xml b/reference/domxml/DomElement/get-attribute-node.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-get-attribute-node.xml
rename to reference/domxml/DomElement/get-attribute-node.xml
diff --git a/reference/domxml/functions/DomElement-get-attribute.xml b/reference/domxml/DomElement/get-attribute.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-get-attribute.xml
rename to reference/domxml/DomElement/get-attribute.xml
diff --git a/reference/domxml/functions/DomElement-get-elements-by-tagname.xml b/reference/domxml/DomElement/get-elements-by-tagname.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-get-elements-by-tagname.xml
rename to reference/domxml/DomElement/get-elements-by-tagname.xml
diff --git a/reference/domxml/functions/DomElement-has-attribute.xml b/reference/domxml/DomElement/has-attribute.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-has-attribute.xml
rename to reference/domxml/DomElement/has-attribute.xml
diff --git a/reference/domxml/functions/DomElement-remove-attribute.xml b/reference/domxml/DomElement/remove-attribute.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-remove-attribute.xml
rename to reference/domxml/DomElement/remove-attribute.xml
diff --git a/reference/domxml/functions/DomElement-set-attribute-node.xml b/reference/domxml/DomElement/set-attribute-node.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-set-attribute-node.xml
rename to reference/domxml/DomElement/set-attribute-node.xml
diff --git a/reference/domxml/functions/DomElement-set-attribute.xml b/reference/domxml/DomElement/set-attribute.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-set-attribute.xml
rename to reference/domxml/DomElement/set-attribute.xml
diff --git a/reference/domxml/functions/DomElement-tagname.xml b/reference/domxml/DomElement/tagname.xml
similarity index 100%
rename from reference/domxml/functions/DomElement-tagname.xml
rename to reference/domxml/DomElement/tagname.xml
diff --git a/reference/domxml/functions/DomNode-add-namespace.xml b/reference/domxml/DomNode/add-namespace.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-add-namespace.xml
rename to reference/domxml/DomNode/add-namespace.xml
diff --git a/reference/domxml/functions/DomNode-append-child.xml b/reference/domxml/DomNode/append-child.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-append-child.xml
rename to reference/domxml/DomNode/append-child.xml
diff --git a/reference/domxml/functions/DomNode-append-sibling.xml b/reference/domxml/DomNode/append-sibling.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-append-sibling.xml
rename to reference/domxml/DomNode/append-sibling.xml
diff --git a/reference/domxml/functions/DomNode-attributes.xml b/reference/domxml/DomNode/attributes.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-attributes.xml
rename to reference/domxml/DomNode/attributes.xml
diff --git a/reference/domxml/functions/DomNode-child-nodes.xml b/reference/domxml/DomNode/child-nodes.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-child-nodes.xml
rename to reference/domxml/DomNode/child-nodes.xml
diff --git a/reference/domxml/functions/DomNode-clone-node.xml b/reference/domxml/DomNode/clone-node.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-clone-node.xml
rename to reference/domxml/DomNode/clone-node.xml
diff --git a/reference/domxml/functions/DomNode-dump-node.xml b/reference/domxml/DomNode/dump-node.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-dump-node.xml
rename to reference/domxml/DomNode/dump-node.xml
diff --git a/reference/domxml/functions/DomNode-first-child.xml b/reference/domxml/DomNode/first-child.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-first-child.xml
rename to reference/domxml/DomNode/first-child.xml
diff --git a/reference/domxml/functions/DomNode-get-content.xml b/reference/domxml/DomNode/get-content.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-get-content.xml
rename to reference/domxml/DomNode/get-content.xml
diff --git a/reference/domxml/functions/DomNode-has-attributes.xml b/reference/domxml/DomNode/has-attributes.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-has-attributes.xml
rename to reference/domxml/DomNode/has-attributes.xml
diff --git a/reference/domxml/functions/DomNode-has-child-nodes.xml b/reference/domxml/DomNode/has-child-nodes.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-has-child-nodes.xml
rename to reference/domxml/DomNode/has-child-nodes.xml
diff --git a/reference/domxml/functions/DomNode-insert-before.xml b/reference/domxml/DomNode/insert-before.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-insert-before.xml
rename to reference/domxml/DomNode/insert-before.xml
diff --git a/reference/domxml/functions/DomNode-is-blank-node.xml b/reference/domxml/DomNode/is-blank-node.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-is-blank-node.xml
rename to reference/domxml/DomNode/is-blank-node.xml
diff --git a/reference/domxml/functions/DomNode-last-child.xml b/reference/domxml/DomNode/last-child.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-last-child.xml
rename to reference/domxml/DomNode/last-child.xml
diff --git a/reference/domxml/functions/DomNode-next-sibling.xml b/reference/domxml/DomNode/next-sibling.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-next-sibling.xml
rename to reference/domxml/DomNode/next-sibling.xml
diff --git a/reference/domxml/functions/DomNode-node-name.xml b/reference/domxml/DomNode/node-name.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-node-name.xml
rename to reference/domxml/DomNode/node-name.xml
diff --git a/reference/domxml/functions/DomNode-node-type.xml b/reference/domxml/DomNode/node-type.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-node-type.xml
rename to reference/domxml/DomNode/node-type.xml
diff --git a/reference/domxml/functions/DomNode-node-value.xml b/reference/domxml/DomNode/node-value.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-node-value.xml
rename to reference/domxml/DomNode/node-value.xml
diff --git a/reference/domxml/functions/DomNode-owner-document.xml b/reference/domxml/DomNode/owner-document.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-owner-document.xml
rename to reference/domxml/DomNode/owner-document.xml
diff --git a/reference/domxml/functions/DomNode-parent-node.xml b/reference/domxml/DomNode/parent-node.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-parent-node.xml
rename to reference/domxml/DomNode/parent-node.xml
diff --git a/reference/domxml/functions/DomNode-prefix.xml b/reference/domxml/DomNode/prefix.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-prefix.xml
rename to reference/domxml/DomNode/prefix.xml
diff --git a/reference/domxml/functions/DomNode-previous-sibling.xml b/reference/domxml/DomNode/previous-sibling.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-previous-sibling.xml
rename to reference/domxml/DomNode/previous-sibling.xml
diff --git a/reference/domxml/functions/DomNode-remove-child.xml b/reference/domxml/DomNode/remove-child.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-remove-child.xml
rename to reference/domxml/DomNode/remove-child.xml
diff --git a/reference/domxml/functions/DomNode-replace-child.xml b/reference/domxml/DomNode/replace-child.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-replace-child.xml
rename to reference/domxml/DomNode/replace-child.xml
diff --git a/reference/domxml/functions/DomNode-replace-node.xml b/reference/domxml/DomNode/replace-node.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-replace-node.xml
rename to reference/domxml/DomNode/replace-node.xml
diff --git a/reference/domxml/functions/DomNode-set-content.xml b/reference/domxml/DomNode/set-content.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-set-content.xml
rename to reference/domxml/DomNode/set-content.xml
diff --git a/reference/domxml/functions/DomNode-set-name.xml b/reference/domxml/DomNode/set-name.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-set-name.xml
rename to reference/domxml/DomNode/set-name.xml
diff --git a/reference/domxml/functions/DomNode-set-namespace.xml b/reference/domxml/DomNode/set-namespace.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-set-namespace.xml
rename to reference/domxml/DomNode/set-namespace.xml
diff --git a/reference/domxml/functions/DomNode-unlink-node.xml b/reference/domxml/DomNode/unlink-node.xml
similarity index 100%
rename from reference/domxml/functions/DomNode-unlink-node.xml
rename to reference/domxml/DomNode/unlink-node.xml
diff --git a/reference/domxml/functions/DomProcessingInstruction-data.xml b/reference/domxml/DomProcessingInstruction/data.xml
similarity index 100%
rename from reference/domxml/functions/DomProcessingInstruction-data.xml
rename to reference/domxml/DomProcessingInstruction/data.xml
diff --git a/reference/domxml/functions/DomProcessingInstruction-target.xml b/reference/domxml/DomProcessingInstruction/target.xml
similarity index 100%
rename from reference/domxml/functions/DomProcessingInstruction-target.xml
rename to reference/domxml/DomProcessingInstruction/target.xml
diff --git a/reference/domxml/functions/DomXsltStylesheet-process.xml b/reference/domxml/DomXsltStylesheet/process.xml
similarity index 100%
rename from reference/domxml/functions/DomXsltStylesheet-process.xml
rename to reference/domxml/DomXsltStylesheet/process.xml
diff --git a/reference/domxml/functions/DomXsltStylesheet-result-dump-file.xml b/reference/domxml/DomXsltStylesheet/result-dump-file.xml
similarity index 100%
rename from reference/domxml/functions/DomXsltStylesheet-result-dump-file.xml
rename to reference/domxml/DomXsltStylesheet/result-dump-file.xml
diff --git a/reference/domxml/functions/DomXsltStylesheet-result-dump-mem.xml b/reference/domxml/DomXsltStylesheet/result-dump-mem.xml
similarity index 100%
rename from reference/domxml/functions/DomXsltStylesheet-result-dump-mem.xml
rename to reference/domxml/DomXsltStylesheet/result-dump-mem.xml
diff --git a/reference/domxml/reference.xml b/reference/domxml/reference.xml
index bcb67522c1..2597681177 100644
--- a/reference/domxml/reference.xml
+++ b/reference/domxml/reference.xml
@@ -701,6 +701,13 @@ morerows='1'>b1c1
+&reference.domxml.entities.DomAttribute;
+&reference.domxml.entities.DomDocument;
+&reference.domxml.entities.DomDocumentType;
+&reference.domxml.entities.DomElement;
+&reference.domxml.entities.DomNode;
+&reference.domxml.entities.DomProcessingInstruction;
+&reference.domxml.entities.DomXsltStylesheet;
&reference.domxml.entities.functions;
diff --git a/reference/hwapi/functions/hwapi-checkin.xml b/reference/hwapi/hw_api/checkin.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-checkin.xml
rename to reference/hwapi/hw_api/checkin.xml
diff --git a/reference/hwapi/functions/hwapi-checkout.xml b/reference/hwapi/hw_api/checkout.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-checkout.xml
rename to reference/hwapi/hw_api/checkout.xml
diff --git a/reference/hwapi/functions/hwapi-children.xml b/reference/hwapi/hw_api/children.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-children.xml
rename to reference/hwapi/hw_api/children.xml
diff --git a/reference/hwapi/functions/hwapi-content.xml b/reference/hwapi/hw_api/content.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-content.xml
rename to reference/hwapi/hw_api/content.xml
diff --git a/reference/hwapi/functions/hwapi-copy.xml b/reference/hwapi/hw_api/copy.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-copy.xml
rename to reference/hwapi/hw_api/copy.xml
diff --git a/reference/hwapi/functions/hwapi-dbstat.xml b/reference/hwapi/hw_api/dbstat.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-dbstat.xml
rename to reference/hwapi/hw_api/dbstat.xml
diff --git a/reference/hwapi/functions/hwapi-dcstat.xml b/reference/hwapi/hw_api/dcstat.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-dcstat.xml
rename to reference/hwapi/hw_api/dcstat.xml
diff --git a/reference/hwapi/functions/hwapi-dstanchors.xml b/reference/hwapi/hw_api/dstanchors.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-dstanchors.xml
rename to reference/hwapi/hw_api/dstanchors.xml
diff --git a/reference/hwapi/functions/hwapi-dstofsrcanchor.xml b/reference/hwapi/hw_api/dstofsrcanchor.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-dstofsrcanchor.xml
rename to reference/hwapi/hw_api/dstofsrcanchor.xml
diff --git a/reference/hwapi/functions/hwapi-find.xml b/reference/hwapi/hw_api/find.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-find.xml
rename to reference/hwapi/hw_api/find.xml
diff --git a/reference/hwapi/functions/hwapi-ftstat.xml b/reference/hwapi/hw_api/ftstat.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-ftstat.xml
rename to reference/hwapi/hw_api/ftstat.xml
diff --git a/reference/hwapi/functions/hwapi-hwstat.xml b/reference/hwapi/hw_api/hwstat.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-hwstat.xml
rename to reference/hwapi/hw_api/hwstat.xml
diff --git a/reference/hwapi/functions/hwapi-identify.xml b/reference/hwapi/hw_api/identify.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-identify.xml
rename to reference/hwapi/hw_api/identify.xml
diff --git a/reference/hwapi/functions/hwapi-info.xml b/reference/hwapi/hw_api/info.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-info.xml
rename to reference/hwapi/hw_api/info.xml
diff --git a/reference/hwapi/functions/hwapi-insert.xml b/reference/hwapi/hw_api/insert.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-insert.xml
rename to reference/hwapi/hw_api/insert.xml
diff --git a/reference/hwapi/functions/hwapi-insertanchor.xml b/reference/hwapi/hw_api/insertanchor.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-insertanchor.xml
rename to reference/hwapi/hw_api/insertanchor.xml
diff --git a/reference/hwapi/functions/hwapi-insertcollection.xml b/reference/hwapi/hw_api/insertcollection.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-insertcollection.xml
rename to reference/hwapi/hw_api/insertcollection.xml
diff --git a/reference/hwapi/functions/hwapi-insertdocument.xml b/reference/hwapi/hw_api/insertdocument.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-insertdocument.xml
rename to reference/hwapi/hw_api/insertdocument.xml
diff --git a/reference/hwapi/functions/hwapi-link.xml b/reference/hwapi/hw_api/link.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-link.xml
rename to reference/hwapi/hw_api/link.xml
diff --git a/reference/hwapi/functions/hwapi-lock.xml b/reference/hwapi/hw_api/lock.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-lock.xml
rename to reference/hwapi/hw_api/lock.xml
diff --git a/reference/hwapi/functions/hwapi-move.xml b/reference/hwapi/hw_api/move.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-move.xml
rename to reference/hwapi/hw_api/move.xml
diff --git a/reference/hwapi/functions/hwapi-object.xml b/reference/hwapi/hw_api/object.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object.xml
rename to reference/hwapi/hw_api/object.xml
diff --git a/reference/hwapi/functions/hwapi-objectbyanchor.xml b/reference/hwapi/hw_api/objectbyanchor.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-objectbyanchor.xml
rename to reference/hwapi/hw_api/objectbyanchor.xml
diff --git a/reference/hwapi/functions/hwapi-parents.xml b/reference/hwapi/hw_api/parents.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-parents.xml
rename to reference/hwapi/hw_api/parents.xml
diff --git a/reference/hwapi/functions/hwapi-remove.xml b/reference/hwapi/hw_api/remove.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-remove.xml
rename to reference/hwapi/hw_api/remove.xml
diff --git a/reference/hwapi/functions/hwapi-replace.xml b/reference/hwapi/hw_api/replace.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-replace.xml
rename to reference/hwapi/hw_api/replace.xml
diff --git a/reference/hwapi/functions/hwapi-setcommittedversion.xml b/reference/hwapi/hw_api/setcommittedversion.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-setcommittedversion.xml
rename to reference/hwapi/hw_api/setcommittedversion.xml
diff --git a/reference/hwapi/functions/hwapi-srcanchors.xml b/reference/hwapi/hw_api/srcanchors.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-srcanchors.xml
rename to reference/hwapi/hw_api/srcanchors.xml
diff --git a/reference/hwapi/functions/hwapi-srcsofdst.xml b/reference/hwapi/hw_api/srcsofdst.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-srcsofdst.xml
rename to reference/hwapi/hw_api/srcsofdst.xml
diff --git a/reference/hwapi/functions/hwapi-unlock.xml b/reference/hwapi/hw_api/unlock.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-unlock.xml
rename to reference/hwapi/hw_api/unlock.xml
diff --git a/reference/hwapi/functions/hwapi-user.xml b/reference/hwapi/hw_api/user.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-user.xml
rename to reference/hwapi/hw_api/user.xml
diff --git a/reference/hwapi/functions/hwapi-userlist.xml b/reference/hwapi/hw_api/userlist.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-userlist.xml
rename to reference/hwapi/hw_api/userlist.xml
diff --git a/reference/hwapi/functions/hwapi-attribute-key.xml b/reference/hwapi/hw_api_attribute/key.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-attribute-key.xml
rename to reference/hwapi/hw_api_attribute/key.xml
diff --git a/reference/hwapi/functions/hwapi-attribute-langdepvalue.xml b/reference/hwapi/hw_api_attribute/langdepvalue.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-attribute-langdepvalue.xml
rename to reference/hwapi/hw_api_attribute/langdepvalue.xml
diff --git a/reference/hwapi/functions/hwapi-attribute-value.xml b/reference/hwapi/hw_api_attribute/value.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-attribute-value.xml
rename to reference/hwapi/hw_api_attribute/value.xml
diff --git a/reference/hwapi/functions/hwapi-attribute-values.xml b/reference/hwapi/hw_api_attribute/values.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-attribute-values.xml
rename to reference/hwapi/hw_api_attribute/values.xml
diff --git a/reference/hwapi/functions/hwapi-content-mimetype.xml b/reference/hwapi/hw_api_content/mimetype.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-content-mimetype.xml
rename to reference/hwapi/hw_api_content/mimetype.xml
diff --git a/reference/hwapi/functions/hwapi-content-read.xml b/reference/hwapi/hw_api_content/read.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-content-read.xml
rename to reference/hwapi/hw_api_content/read.xml
diff --git a/reference/hwapi/functions/hwapi-error-count.xml b/reference/hwapi/hw_api_error/count.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-error-count.xml
rename to reference/hwapi/hw_api_error/count.xml
diff --git a/reference/hwapi/functions/hwapi-error-reason.xml b/reference/hwapi/hw_api_error/reason.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-error-reason.xml
rename to reference/hwapi/hw_api_error/reason.xml
diff --git a/reference/hwapi/functions/hwapi-object-assign.xml b/reference/hwapi/hw_api_object/assign.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-assign.xml
rename to reference/hwapi/hw_api_object/assign.xml
diff --git a/reference/hwapi/functions/hwapi-object-attreditable.xml b/reference/hwapi/hw_api_object/attreditable.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-attreditable.xml
rename to reference/hwapi/hw_api_object/attreditable.xml
diff --git a/reference/hwapi/functions/hwapi-object-count.xml b/reference/hwapi/hw_api_object/count.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-count.xml
rename to reference/hwapi/hw_api_object/count.xml
diff --git a/reference/hwapi/functions/hwapi-object-insert.xml b/reference/hwapi/hw_api_object/insert.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-insert.xml
rename to reference/hwapi/hw_api_object/insert.xml
diff --git a/reference/hwapi/functions/hwapi-object-remove.xml b/reference/hwapi/hw_api_object/remove.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-remove.xml
rename to reference/hwapi/hw_api_object/remove.xml
diff --git a/reference/hwapi/functions/hwapi-object-title.xml b/reference/hwapi/hw_api_object/title.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-title.xml
rename to reference/hwapi/hw_api_object/title.xml
diff --git a/reference/hwapi/functions/hwapi-object-value.xml b/reference/hwapi/hw_api_object/value.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-object-value.xml
rename to reference/hwapi/hw_api_object/value.xml
diff --git a/reference/hwapi/functions/hwapi-reason-description.xml b/reference/hwapi/hw_api_reason/description.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-reason-description.xml
rename to reference/hwapi/hw_api_reason/description.xml
diff --git a/reference/hwapi/functions/hwapi-reason-type.xml b/reference/hwapi/hw_api_reason/type.xml
similarity index 100%
rename from reference/hwapi/functions/hwapi-reason-type.xml
rename to reference/hwapi/hw_api_reason/type.xml
diff --git a/reference/hwapi/reference.xml b/reference/hwapi/reference.xml
index 37d882b5d4..84fb5719d6 100644
--- a/reference/hwapi/reference.xml
+++ b/reference/hwapi/reference.xml
@@ -127,6 +127,12 @@
+&reference.hwapi.entities.hw-api-attribute;
+&reference.hwapi.entities.hw-api;
+&reference.hwapi.entities.hw-api-content;
+&reference.hwapi.entities.hw-api-error;
+&reference.hwapi.entities.hw-api-object;
+&reference.hwapi.entities.hw-api-reason;
&reference.hwapi.entities.functions;
diff --git a/reference/oci8/functions/oci-collection-append.xml b/reference/oci8/OCI-Collection/append.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-append.xml
rename to reference/oci8/OCI-Collection/append.xml
diff --git a/reference/oci8/functions/oci-collection-assign.xml b/reference/oci8/OCI-Collection/assign.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-assign.xml
rename to reference/oci8/OCI-Collection/assign.xml
diff --git a/reference/oci8/functions/oci-collection-assignelem.xml b/reference/oci8/OCI-Collection/assignElem.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-assignelem.xml
rename to reference/oci8/OCI-Collection/assignElem.xml
diff --git a/reference/oci8/functions/oci-collection-free.xml b/reference/oci8/OCI-Collection/free.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-free.xml
rename to reference/oci8/OCI-Collection/free.xml
diff --git a/reference/oci8/functions/oci-collection-getelem.xml b/reference/oci8/OCI-Collection/getElem.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-getelem.xml
rename to reference/oci8/OCI-Collection/getElem.xml
diff --git a/reference/oci8/functions/oci-collection-max.xml b/reference/oci8/OCI-Collection/max.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-max.xml
rename to reference/oci8/OCI-Collection/max.xml
diff --git a/reference/oci8/functions/oci-collection-size.xml b/reference/oci8/OCI-Collection/size.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-size.xml
rename to reference/oci8/OCI-Collection/size.xml
diff --git a/reference/oci8/functions/oci-collection-trim.xml b/reference/oci8/OCI-Collection/trim.xml
similarity index 100%
rename from reference/oci8/functions/oci-collection-trim.xml
rename to reference/oci8/OCI-Collection/trim.xml
diff --git a/reference/oci8/functions/oci-lob-append.xml b/reference/oci8/OCI-Lob/append.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-append.xml
rename to reference/oci8/OCI-Lob/append.xml
diff --git a/reference/oci8/functions/oci-lob-close.xml b/reference/oci8/OCI-Lob/close.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-close.xml
rename to reference/oci8/OCI-Lob/close.xml
diff --git a/reference/oci8/functions/oci-lob-eof.xml b/reference/oci8/OCI-Lob/eof.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-eof.xml
rename to reference/oci8/OCI-Lob/eof.xml
diff --git a/reference/oci8/functions/oci-lob-erase.xml b/reference/oci8/OCI-Lob/erase.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-erase.xml
rename to reference/oci8/OCI-Lob/erase.xml
diff --git a/reference/oci8/functions/oci-lob-export.xml b/reference/oci8/OCI-Lob/export.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-export.xml
rename to reference/oci8/OCI-Lob/export.xml
diff --git a/reference/oci8/functions/oci-lob-flush.xml b/reference/oci8/OCI-Lob/flush.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-flush.xml
rename to reference/oci8/OCI-Lob/flush.xml
diff --git a/reference/oci8/functions/oci-lob-free.xml b/reference/oci8/OCI-Lob/free.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-free.xml
rename to reference/oci8/OCI-Lob/free.xml
diff --git a/reference/oci8/functions/oci-lob-getbuffering.xml b/reference/oci8/OCI-Lob/getBuffering.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-getbuffering.xml
rename to reference/oci8/OCI-Lob/getBuffering.xml
diff --git a/reference/oci8/functions/oci-lob-import.xml b/reference/oci8/OCI-Lob/import.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-import.xml
rename to reference/oci8/OCI-Lob/import.xml
diff --git a/reference/oci8/functions/oci-lob-load.xml b/reference/oci8/OCI-Lob/load.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-load.xml
rename to reference/oci8/OCI-Lob/load.xml
diff --git a/reference/oci8/functions/oci-lob-read.xml b/reference/oci8/OCI-Lob/read.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-read.xml
rename to reference/oci8/OCI-Lob/read.xml
diff --git a/reference/oci8/functions/oci-lob-rewind.xml b/reference/oci8/OCI-Lob/rewind.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-rewind.xml
rename to reference/oci8/OCI-Lob/rewind.xml
diff --git a/reference/oci8/functions/oci-lob-save.xml b/reference/oci8/OCI-Lob/save.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-save.xml
rename to reference/oci8/OCI-Lob/save.xml
diff --git a/reference/oci8/functions/oci-lob-savefile.xml b/reference/oci8/OCI-Lob/saveFile.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-savefile.xml
rename to reference/oci8/OCI-Lob/saveFile.xml
diff --git a/reference/oci8/functions/oci-lob-seek.xml b/reference/oci8/OCI-Lob/seek.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-seek.xml
rename to reference/oci8/OCI-Lob/seek.xml
diff --git a/reference/oci8/functions/oci-lob-setbuffering.xml b/reference/oci8/OCI-Lob/setBuffering.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-setbuffering.xml
rename to reference/oci8/OCI-Lob/setBuffering.xml
diff --git a/reference/oci8/functions/oci-lob-size.xml b/reference/oci8/OCI-Lob/size.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-size.xml
rename to reference/oci8/OCI-Lob/size.xml
diff --git a/reference/oci8/functions/oci-lob-tell.xml b/reference/oci8/OCI-Lob/tell.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-tell.xml
rename to reference/oci8/OCI-Lob/tell.xml
diff --git a/reference/oci8/functions/oci-lob-truncate.xml b/reference/oci8/OCI-Lob/truncate.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-truncate.xml
rename to reference/oci8/OCI-Lob/truncate.xml
diff --git a/reference/oci8/functions/oci-lob-write.xml b/reference/oci8/OCI-Lob/write.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-write.xml
rename to reference/oci8/OCI-Lob/write.xml
diff --git a/reference/oci8/functions/oci-lob-writetemporary.xml b/reference/oci8/OCI-Lob/writeTemporary.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-writetemporary.xml
rename to reference/oci8/OCI-Lob/writeTemporary.xml
diff --git a/reference/oci8/functions/oci-lob-writetofile.xml b/reference/oci8/OCI-Lob/writeToFile.xml
similarity index 100%
rename from reference/oci8/functions/oci-lob-writetofile.xml
rename to reference/oci8/OCI-Lob/writeToFile.xml
diff --git a/reference/oci8/reference.xml b/reference/oci8/reference.xml
index 383bd76ed9..ceca52ff3e 100644
--- a/reference/oci8/reference.xml
+++ b/reference/oci8/reference.xml
@@ -3,6 +3,8 @@
OCI8 &Functions;
+ &reference.oci8.entities.OCI-Collection;
+ &reference.oci8.entities.OCI-Lob;
&reference.oci8.entities.functions;
diff --git a/reference/pdo_cubrid/functions/PDO-cubrid-schema.xml b/reference/pdo_cubrid/PDO/cubrid-schema.xml
similarity index 100%
rename from reference/pdo_cubrid/functions/PDO-cubrid-schema.xml
rename to reference/pdo_cubrid/PDO/cubrid-schema.xml
diff --git a/reference/pdo_cubrid/reference.xml b/reference/pdo_cubrid/reference.xml
index 3d2aa223fc..3a19866d27 100644
--- a/reference/pdo_cubrid/reference.xml
+++ b/reference/pdo_cubrid/reference.xml
@@ -215,7 +215,7 @@ cubrid:host=localhost;port=33000;dbname=demodb
- &reference.pdo-cubrid.entities.functions;
+ &reference.pdo-cubrid.entities.PDO;
diff --git a/reference/pdo_pgsql/functions/PDO-pgsqlLOBCreate.xml b/reference/pdo_pgsql/PDO/pgsqlLOBCreate.xml
similarity index 100%
rename from reference/pdo_pgsql/functions/PDO-pgsqlLOBCreate.xml
rename to reference/pdo_pgsql/PDO/pgsqlLOBCreate.xml
diff --git a/reference/pdo_pgsql/functions/PDO-pgsqlLOBOpen.xml b/reference/pdo_pgsql/PDO/pgsqlLOBOpen.xml
similarity index 100%
rename from reference/pdo_pgsql/functions/PDO-pgsqlLOBOpen.xml
rename to reference/pdo_pgsql/PDO/pgsqlLOBOpen.xml
diff --git a/reference/pdo_pgsql/functions/PDO-pgsqlLOBUnlink.xml b/reference/pdo_pgsql/PDO/pgsqlLOBUnlink.xml
similarity index 100%
rename from reference/pdo_pgsql/functions/PDO-pgsqlLOBUnlink.xml
rename to reference/pdo_pgsql/PDO/pgsqlLOBUnlink.xml
diff --git a/reference/pdo_pgsql/reference.xml b/reference/pdo_pgsql/reference.xml
index 03db44b028..66a30f533f 100644
--- a/reference/pdo_pgsql/reference.xml
+++ b/reference/pdo_pgsql/reference.xml
@@ -118,7 +118,7 @@ pgsql:host=localhost;port=5432;dbname=testdb;user=bruce;password=mypass
- &reference.pdo-pgsql.entities.functions;
+ &reference.pdo-pgsql.entities.PDO;
diff --git a/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml b/reference/pdo_sqlite/PDO/sqliteCreateAggregate.xml
similarity index 100%
rename from reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml
rename to reference/pdo_sqlite/PDO/sqliteCreateAggregate.xml
diff --git a/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml b/reference/pdo_sqlite/PDO/sqliteCreateFunction.xml
similarity index 100%
rename from reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml
rename to reference/pdo_sqlite/PDO/sqliteCreateFunction.xml
diff --git a/reference/pdo_sqlite/reference.xml b/reference/pdo_sqlite/reference.xml
index 14e7a9ea5c..a7e0c9b1c7 100644
--- a/reference/pdo_sqlite/reference.xml
+++ b/reference/pdo_sqlite/reference.xml
@@ -130,7 +130,7 @@ sqlite2::memory:
- &reference.pdo-sqlite.entities.functions;
+ &reference.pdo-sqlite.entities.PDO;
- &reference.sam.entities.functions;
+ &reference.sam.entities.SAMConnection;
+ &reference.sam.entities.SAMMessage;