diff --git a/aio/tools/transforms/templates/api/class.template.html b/aio/tools/transforms/templates/api/class.template.html
index 60445b3372..175144103f 100644
--- a/aio/tools/transforms/templates/api/class.template.html
+++ b/aio/tools/transforms/templates/api/class.template.html
@@ -1,29 +1,23 @@
 {% import "lib/memberHelpers.html" as memberHelpers -%}
 {% import "lib/descendants.html" as descendants -%}
 {% import "lib/paramList.html" as params -%}
-{% extends 'base.template.html' -%}
+{% extends 'export-base.template.html' -%}
 
-{% block body %}
-  <p class="short-description">{$ doc.shortDescription | marked $}</p>
-  {% include "includes/security-notes.html" %}
-  {% include "includes/deprecation.html" %}
-  {% block overview %}
+{% block overview %}
   {% include "includes/class-overview.html" %}
-  {% endblock %}
-  {% block details %}
-    {% block additional %}{% endblock %}
-    {% include "includes/description.html" %}
-    {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static Properties') $}
-    {$ memberHelpers.renderMethodDetails(doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $}
-    {% if doc.constructorDoc %}
-    <h2>Constructor</h2>
-    {$ memberHelpers.renderMethodDetail(doc.constructorDoc, 'constructor') $}{% endif %}
-
-    {$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $}
-
-    {$ memberHelpers.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
-
-    {% block annotations %}{% include "includes/annotations.html" %}{% endblock %}
-  {% endblock %}
-  {% include "includes/usageNotes.html" %}
+{% endblock %}
+{% block details %}
+  {% block additional %}{% endblock %}
+  {% include "includes/description.html" %}
+  {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static Properties') $}
+  {$ memberHelpers.renderMethodDetails(doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $}
+  {% if doc.constructorDoc %}
+  <h2>Constructor</h2>
+  {$ memberHelpers.renderMethodDetail(doc.constructorDoc, 'constructor') $}{% endif %}
+
+  {$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $}
+
+  {$ memberHelpers.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
+
+  {% block annotations %}{% include "includes/annotations.html" %}{% endblock %}
 {% endblock %}
diff --git a/aio/tools/transforms/templates/api/export-base.template.html b/aio/tools/transforms/templates/api/export-base.template.html
index b2e24aa799..df5e0293fa 100644
--- a/aio/tools/transforms/templates/api/export-base.template.html
+++ b/aio/tools/transforms/templates/api/export-base.template.html
@@ -5,6 +5,6 @@
   {% include "includes/security-notes.html" %}
   {% include "includes/deprecation.html" %}
   {% block overview %}{% endblock %}
-  {% include "includes/usageNotes.html" %}
   {% block details %}{% endblock %}
+  {% include "includes/usageNotes.html" %}
 {% endblock %}