diff --git a/aio/tools/transforms/templates/api/base.template.html b/aio/tools/transforms/templates/api/base.template.html
new file mode 100644
index 0000000000..bc910dd555
--- /dev/null
+++ b/aio/tools/transforms/templates/api/base.template.html
@@ -0,0 +1,13 @@
+<article>
+  <header class="api-header">
+    <h1>{$ doc.name $}</h1>
+    <label class="api-type-label {$ doc.docType $}">{$ doc.docType $}</label>
+    {% if doc.deprecated %}<label class="api-status-label deprecated">deprecated</label>{% endif %}
+    {% if doc.experimental %}<label class="api-status-label experimental">experimental</label>{% endif %}
+    {% if doc.stable %}<label class="api-status-label stable">stable</label>{% endif %}
+    <span class="version">{$ version $}</span>
+  </header>
+
+  {% block body %}{% endblock %}
+
+</article>
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/class.template.html b/aio/tools/transforms/templates/api/class.template.html
new file mode 100644
index 0000000000..d78fefe0c8
--- /dev/null
+++ b/aio/tools/transforms/templates/api/class.template.html
@@ -0,0 +1,14 @@
+{% import "lib/paramList.html" as params -%}
+{% extends 'export-base.template.html' -%}
+
+{% block details %}
+
+{% include "includes/class-overview.html" %}
+{% block additional %}{% endblock %}
+{% include "includes/description.html" %}
+{% include "includes/annotations.html" %}
+{% include "includes/statics.html" %}
+{% include "includes/constructor.html" %}
+{% include "includes/members.html" %}
+
+{% endblock %}
diff --git a/aio/tools/transforms/templates/const.template.html b/aio/tools/transforms/templates/api/const.template.html
similarity index 100%
rename from aio/tools/transforms/templates/const.template.html
rename to aio/tools/transforms/templates/api/const.template.html
diff --git a/aio/tools/transforms/templates/api/decorator.template.html b/aio/tools/transforms/templates/api/decorator.template.html
new file mode 100644
index 0000000000..f5e9ac0b39
--- /dev/null
+++ b/aio/tools/transforms/templates/api/decorator.template.html
@@ -0,0 +1,7 @@
+{% import "lib/paramList.html" as params -%}
+{% extends 'export-base.template.html' %}
+
+{% block details %}
+  {% include "includes/description.html" %}
+  {% include "includes/metadata.html" %}
+{% endblock %}
diff --git a/aio/tools/transforms/templates/api/directive.template.html b/aio/tools/transforms/templates/api/directive.template.html
new file mode 100644
index 0000000000..8405fc6a9e
--- /dev/null
+++ b/aio/tools/transforms/templates/api/directive.template.html
@@ -0,0 +1,9 @@
+{% import "lib/paramList.html" as params -%}
+{% extends 'class.template.html' -%}
+
+{% block additional -%}
+  {% include "includes/selectors.html" %}
+  {% include "includes/outputs.html" %}
+  {% include "includes/inputs.html" %}
+  {% include "includes/export-as.html" %}
+{% endblock %}
diff --git a/aio/tools/transforms/templates/enum.template.html b/aio/tools/transforms/templates/api/enum.template.html
similarity index 100%
rename from aio/tools/transforms/templates/enum.template.html
rename to aio/tools/transforms/templates/api/enum.template.html
diff --git a/aio/tools/transforms/templates/api/export-base.template.html b/aio/tools/transforms/templates/api/export-base.template.html
new file mode 100644
index 0000000000..3677198a98
--- /dev/null
+++ b/aio/tools/transforms/templates/api/export-base.template.html
@@ -0,0 +1,10 @@
+{% extends 'base.template.html' -%}
+
+{% block body %}
+  {% include "includes/what-it-does.html" %}
+  {% include "includes/info-bar.html" %}
+  {% include "includes/security-notes.html" %}
+  {% include "includes/deprecation.html" %}
+  {% include "includes/how-to-use.html" %}
+  {% block details %}{% endblock %}
+{% endblock %}
diff --git a/aio/tools/transforms/templates/api/function.template.html b/aio/tools/transforms/templates/api/function.template.html
new file mode 100644
index 0000000000..85a7b71e09
--- /dev/null
+++ b/aio/tools/transforms/templates/api/function.template.html
@@ -0,0 +1,9 @@
+{% import "lib/paramList.html" as params -%}
+{% extends 'export-base.template.html' -%}
+
+{% block details %}
+  <code-example language="ts" hideCopy="true">
+  function {$ doc.name $}{$ params.paramList(doc.parameters) $}: {$ doc.returnType or 'any' $};
+  </code-example>
+  {% include "includes/description.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/annotations.html b/aio/tools/transforms/templates/api/includes/annotations.html
new file mode 100644
index 0000000000..478d520fd1
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/annotations.html
@@ -0,0 +1,9 @@
+{%- if doc.decorators.length %}
+<section class="annotations">
+  <h2>Annotations</h2>
+  {%- for decorator in doc.decorators %}
+    <code-example hideCopy="true">@{$ decorator.name $}{$ params.paramList(decorator.arguments) $}</code-example>
+    {% if not decorator.notYetDocumented %}{$ decorator.description | marked $}{% endif %}
+  {% endfor %}
+</section>
+{% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/class-overview.html b/aio/tools/transforms/templates/api/includes/class-overview.html
new file mode 100644
index 0000000000..be7a596083
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/class-overview.html
@@ -0,0 +1,17 @@
+{% macro renderMember(member) %}{% if not member.internal -%}
+<a class="code-anchor" href="#{$ member.name $}">{$ member.name $}</a> {$ params.paramList(member.parameters) | indent(4, false) | trim() $}{$ params.returnType(member.returnType) $}
+{%- endif %}{% endmacro -%}
+
+<section class="class-overview">
+  <h2>Overview</h2>
+  <code-example language="ts" hideCopy="true">
+  {$ doc.docType $} {$ doc.name $} {$ doc.heritage $} {
+  {%- if doc.statics.length %}{% for member in doc.statics %}
+    static {$ renderMember(member) $}{% endfor %}{% endif %}
+  {%- if doc.constructorDoc %}
+    {$ renderMember(doc.constructorDoc) $}{% endif %}
+  {%- if doc.members.length %}{% for member in doc.members %}
+    {$ renderMember(member) $}{% endfor %}{% endif %}
+  }
+  </code-example>
+</section>
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/constructor.html b/aio/tools/transforms/templates/api/includes/constructor.html
new file mode 100644
index 0000000000..c291786b48
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/constructor.html
@@ -0,0 +1,8 @@
+{%- if doc.constructorDoc and not doc.constructorDoc.internal %}
+<section class="constructor">
+  <a id="{$ doc.constructorDoc.name $}"></a>
+  <h2>Constructor</h2>
+  <code-example hideCopy="true">{$ doc.constructorDoc.name $}{$ params.paramList(doc.constructorDoc.parameters) $}</code-example>
+  {% if not doc.constructorDoc.notYetDocumented %}{$ doc.constructorDoc.description | marked $}{% endif %}
+</section>
+{% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/deprecation.html b/aio/tools/transforms/templates/api/includes/deprecation.html
new file mode 100644
index 0000000000..7aa4f0db54
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/deprecation.html
@@ -0,0 +1,6 @@
+{% if doc.deprecated %}
+<section class="deprecated">
+  <h2>Deprecation Notes</h2>
+  {$ doc.deprecated | marked $}
+</section>
+{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/description.html b/aio/tools/transforms/templates/api/includes/description.html
new file mode 100644
index 0000000000..d5545c06e7
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/description.html
@@ -0,0 +1,6 @@
+{% if doc.description %}
+<section class="description">
+  <h2>Description</h2>
+  {$ doc.description | trimBlankLines | marked $}
+</section>
+{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_export-as.html b/aio/tools/transforms/templates/api/includes/export-as.html
similarity index 69%
rename from aio/tools/transforms/templates/includes/_export-as.html
rename to aio/tools/transforms/templates/api/includes/export-as.html
index 23c0cf79fb..995383619e 100644
--- a/aio/tools/transforms/templates/includes/_export-as.html
+++ b/aio/tools/transforms/templates/api/includes/export-as.html
@@ -1,8 +1,8 @@
 {%- if doc.directiveOptions.exportAs %}
-<div class="export-as api-section">
+<section class="export-as">
   <h2>Exported as</h2>
-  <p>
+  <div>
     <code>{$ doc.directiveOptions.exportAs $}</code>
-  </p>
-</div>
+  </div>
+</section>
 {% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/how-to-use.html b/aio/tools/transforms/templates/api/includes/how-to-use.html
new file mode 100644
index 0000000000..13156b0b7a
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/how-to-use.html
@@ -0,0 +1,6 @@
+{% if doc.howToUse %}
+<section class="how-to-use">
+  <h2>How To Use</h2>
+  {$ doc.howToUse | marked $}
+</section>
+{% endif %}
diff --git a/aio/tools/transforms/templates/includes/_info-bar.html b/aio/tools/transforms/templates/api/includes/info-bar.html
similarity index 100%
rename from aio/tools/transforms/templates/includes/_info-bar.html
rename to aio/tools/transforms/templates/api/includes/info-bar.html
diff --git a/aio/tools/transforms/templates/includes/_inputs.html b/aio/tools/transforms/templates/api/includes/inputs.html
similarity index 89%
rename from aio/tools/transforms/templates/includes/_inputs.html
rename to aio/tools/transforms/templates/api/includes/inputs.html
index 85f9aef3ea..e1c956fbb0 100644
--- a/aio/tools/transforms/templates/includes/_inputs.html
+++ b/aio/tools/transforms/templates/api/includes/inputs.html
@@ -1,5 +1,5 @@
 {% if doc.inputs %}
-<div class="inputs api-section">
+<section class="inputs">
   <h2>Inputs</h2>
   {% for binding, property in doc.inputs %}
   <div class="input">
@@ -7,5 +7,5 @@
     {$ property.memberDoc.description | trimBlankLines | marked $}
   </div>
   {% endfor %}
-</div>
+</section>
 {% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/interface-overview.html b/aio/tools/transforms/templates/api/includes/interface-overview.html
new file mode 100644
index 0000000000..895b4b5fa3
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/interface-overview.html
@@ -0,0 +1,8 @@
+<section class="interface-overview">
+  <h2>Interface Overview</h2>
+  <code-example language="ts" hideCopy="true">
+  interface {$ doc.name $} {$ doc.heritage $} { {% if doc.members.length %}{% for member in doc.members %}{% if not member.internal %}
+    <a class="code-anchor" href="#{$ member.name $}">{$ member.name | indent(6, false) | trim $}</a> {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}{% endif %}{% endfor %}{% endif %}
+  }
+  </code-example>
+</section>
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/members.html b/aio/tools/transforms/templates/api/includes/members.html
new file mode 100644
index 0000000000..f3774ab1e1
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/members.html
@@ -0,0 +1,19 @@
+{% if doc.members.length %}
+<section class="member-members">
+  <h2>Members</h2>
+  {% for member in doc.members %}{% if not member.internal %}
+    <div class="instance-member">
+      <a id="{$ member.name $}"></a>
+      <code-example hideCopy="true">{$ member.name $}{$ params.paramList(member.parameters) | trim $}{$ params.returnType(member.returnType) $}</code-example>
+      {%- if not member.notYetDocumented %}
+      {$ member.description | marked $}
+      {% endif %}
+    </div>
+
+    {% if not loop.last %}
+    <hr>
+    {% endif %}
+
+  {% endif %}{% endfor %}
+</section>
+{% endif %}
diff --git a/aio/tools/transforms/templates/includes/_metadata.html b/aio/tools/transforms/templates/api/includes/metadata.html
similarity index 51%
rename from aio/tools/transforms/templates/includes/_metadata.html
rename to aio/tools/transforms/templates/api/includes/metadata.html
index de2b99485e..e632ac5abf 100644
--- a/aio/tools/transforms/templates/includes/_metadata.html
+++ b/aio/tools/transforms/templates/api/includes/metadata.html
@@ -1,15 +1,13 @@
 {% if doc.members.length %}
-<div class="meta-data api-section">
+<section class="meta-data">
   <h2>Metadata Properties</h2>
     {% for metadata in doc.members %}{% if not metadata.internal %}
     <div class="metadata-member">
-      <a name="{$ metadata.name $}-anchor" class="anchor-offset"></a>
-      <pre>
-        <code>{$ metadata.name $}{$ params.paramList(metadata.parameters) | trim $}{$ params.returnType(metadata.returnType) $}</code>
-      </pre>
-      {%- if not metadata.notYetDocumented %}{$ metadata.description | trimBlankLines | marked $}{% endif -%}
+      <a name="{$ metadata.name $}" class="anchor-offset"></a>
+      <code-example hideCopy="true">{$ metadata.name $}{$ params.paramList(metadata.parameters) | trim $}{$ params.returnType(metadata.returnType) $}</code-example>
+      {%- if not metadata.notYetDocumented %}{$ metadata.description | marked $}{% endif -%}
     </div>
     {% if not loop.last %}<hr class="hr-margin">{% endif %}
   {% endif %}{% endfor %}
-</div>
+</section>
 {% endif %}
diff --git a/aio/tools/transforms/templates/includes/_outputs.html b/aio/tools/transforms/templates/api/includes/outputs.html
similarity index 90%
rename from aio/tools/transforms/templates/includes/_outputs.html
rename to aio/tools/transforms/templates/api/includes/outputs.html
index 74aa43a23f..46a46e532f 100644
--- a/aio/tools/transforms/templates/includes/_outputs.html
+++ b/aio/tools/transforms/templates/api/includes/outputs.html
@@ -1,5 +1,5 @@
 {% if doc.outputs %}
-<div class="outputs">
+<section class="outputs">
   <h2>Outputs</h2>
   {% for binding, property in doc.outputs %}
   <div class="output">
@@ -7,5 +7,5 @@
     {$ property.memberDoc.description | trimBlankLines | marked $}
   </div>
   {% endfor %}
-</div>
+</section>
 {% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/security-notes.html b/aio/tools/transforms/templates/api/includes/security-notes.html
new file mode 100644
index 0000000000..4f0f815b30
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/security-notes.html
@@ -0,0 +1,6 @@
+{% if doc.security %}
+<section "security">
+  <h2>Security Risk</h2>
+  {$ doc.security | marked $}
+</section>
+{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_selectors.html b/aio/tools/transforms/templates/api/includes/selectors.html
similarity index 73%
rename from aio/tools/transforms/templates/includes/_selectors.html
rename to aio/tools/transforms/templates/api/includes/selectors.html
index 9c82dbdd2a..393359a6c3 100644
--- a/aio/tools/transforms/templates/includes/_selectors.html
+++ b/aio/tools/transforms/templates/api/includes/selectors.html
@@ -1,10 +1,10 @@
 {%- if doc.directiveOptions.selector.split(',').length %}
-<div class="selectors api-section">
+<section class="selectors">
   <h2>Selectors</h2>
   {% for selector in doc.directiveOptions.selector.split(',') %}
-  <p class="selector">
+  <div class="selector">
     <code>{$ selector $}</code>
-  </p>
+  </div>
   {% endfor %}
-</div>
+</section>
 {% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/statics.html b/aio/tools/transforms/templates/api/includes/statics.html
new file mode 100644
index 0000000000..7bdc4576f7
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/statics.html
@@ -0,0 +1,19 @@
+{% if doc.statics.length %}
+<section class="static-members">
+  <h2>Static Members</h2>
+  {% for member in doc.statics %}{% if not member.internal %}
+    <div class="static-member">
+      <a id="{$ member.name $}"></a>
+      <code-example hideCopy="true">{$ member.name $}{$ params.paramList(member.parameters) | trim $}{$ params.returnType(member.returnType) $}</code-example>
+      {%- if not member.notYetDocumented %}
+      {$ member.description | marked $}
+      {% endif %}
+    </div>
+
+    {% if not loop.last %}
+    <hr>
+    {% endif %}
+
+  {% endif %}{% endfor %}
+</section>
+{% endif %}
diff --git a/aio/tools/transforms/templates/api/includes/what-it-does.html b/aio/tools/transforms/templates/api/includes/what-it-does.html
new file mode 100644
index 0000000000..faf96fa59a
--- /dev/null
+++ b/aio/tools/transforms/templates/api/includes/what-it-does.html
@@ -0,0 +1,5 @@
+{%- if doc.whatItDoes %}
+<div class="what-it-does">
+  {$ doc.whatItDoes | marked $}
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/interface.template.html b/aio/tools/transforms/templates/api/interface.template.html
new file mode 100644
index 0000000000..486862f885
--- /dev/null
+++ b/aio/tools/transforms/templates/api/interface.template.html
@@ -0,0 +1,9 @@
+{% import "lib/paramList.html" as params -%}
+{% extends 'export-base.template.html' -%}
+
+{% block details %}
+  {% include "includes/interface-overview.html" %}
+  {% include "includes/description.html" %}
+  <!-- TODO include callMember and newMember -->
+  {% include "includes/members.html" %}
+{% endblock %}
diff --git a/aio/tools/transforms/templates/let.template.html b/aio/tools/transforms/templates/api/let.template.html
similarity index 100%
rename from aio/tools/transforms/templates/let.template.html
rename to aio/tools/transforms/templates/api/let.template.html
diff --git a/aio/tools/transforms/templates/lib/githubLinks.html b/aio/tools/transforms/templates/api/lib/githubLinks.html
similarity index 100%
rename from aio/tools/transforms/templates/lib/githubLinks.html
rename to aio/tools/transforms/templates/api/lib/githubLinks.html
diff --git a/aio/tools/transforms/templates/lib/paramList.html b/aio/tools/transforms/templates/api/lib/paramList.html
similarity index 100%
rename from aio/tools/transforms/templates/lib/paramList.html
rename to aio/tools/transforms/templates/api/lib/paramList.html
diff --git a/aio/tools/transforms/templates/api/module.template.html b/aio/tools/transforms/templates/api/module.template.html
new file mode 100644
index 0000000000..0704998b13
--- /dev/null
+++ b/aio/tools/transforms/templates/api/module.template.html
@@ -0,0 +1,16 @@
+{% extends 'base.template.html' -%}
+
+{% block body -%}
+
+{% include "includes/deprecation.html" %}
+{% include "includes/description.html" %}
+
+<section class="export-list">
+  <ul>
+    {% for export in doc.exports -%}
+    <li><a href="{$ export.path $}">{$ export.name $}</a></li>
+    {%- endfor %}
+  </ul>
+</section>
+
+{%- endblock %}
diff --git a/aio/tools/transforms/templates/api/pipe.template.html b/aio/tools/transforms/templates/api/pipe.template.html
new file mode 100644
index 0000000000..2fbb67f4ce
--- /dev/null
+++ b/aio/tools/transforms/templates/api/pipe.template.html
@@ -0,0 +1,8 @@
+{% extends 'export-base.template.html' -%}
+
+{% block details %}
+{% include "includes/description.html" %}
+<div class="pipe-properties">
+  {% if doc.pipeOptions.pure == "true" %}<label class="pipe-type-label pure">pure</label>{% endif %}
+</div>
+{% endblock %}
diff --git a/aio/tools/transforms/templates/api/type-alias.template.html b/aio/tools/transforms/templates/api/type-alias.template.html
new file mode 100644
index 0000000000..d2766eb6d3
--- /dev/null
+++ b/aio/tools/transforms/templates/api/type-alias.template.html
@@ -0,0 +1,8 @@
+{% extends 'export-base.template.html' %}
+
+{% block details %}
+  <code-example language="ts" hideCopy="true">
+  type {$ doc.name $} = {$ doc.typeDefinition $};
+  </code-example>
+  {% include "includes/description.html" %}
+{% endblock %}
diff --git a/aio/tools/transforms/templates/value-module.template.html b/aio/tools/transforms/templates/api/value-module.template.html
similarity index 100%
rename from aio/tools/transforms/templates/value-module.template.html
rename to aio/tools/transforms/templates/api/value-module.template.html
diff --git a/aio/tools/transforms/templates/api/var.template.html b/aio/tools/transforms/templates/api/var.template.html
new file mode 100644
index 0000000000..c543567d24
--- /dev/null
+++ b/aio/tools/transforms/templates/api/var.template.html
@@ -0,0 +1,8 @@
+{% extends 'export-base.template.html' %}
+
+{% block details %}
+  <code-example language="ts" hideCopy="true">
+  const {$ doc.name $}: {$ doc.symbolTypeName or 'any' $};
+  </code-example>
+  {% include "includes/description.html" %}
+{% endblock %}
diff --git a/aio/tools/transforms/templates/class.template.html b/aio/tools/transforms/templates/class.template.html
deleted file mode 100644
index 6129e97692..0000000000
--- a/aio/tools/transforms/templates/class.template.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% import "lib/paramList.html" as params -%}
-{% extends 'layout/api-base.template.html' -%}
-
-{% block details %}
-<div class="api-container">
-  {% include "includes/_class-overview.html" %}
-  {% block additional %}{% endblock %}
-  {% include "includes/_description.html" %}
-  {% include "includes/_annotations.html" %}
-  {% include "includes/_constructor.html" %}
-  {% include "includes/_statics.html" %}
-  {% include "includes/_members.html" %}
-</div>
-{% endblock %}
diff --git a/aio/tools/transforms/templates/decorator.template.html b/aio/tools/transforms/templates/decorator.template.html
deleted file mode 100644
index 12586023d5..0000000000
--- a/aio/tools/transforms/templates/decorator.template.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% import "lib/paramList.html" as params -%}
-{% extends 'layout/api-base.template.html' %}
-
-{% block details %}
-  {% include "includes/_description.html" %}
-  {% include "includes/_metadata.html" %}
-{% endblock %}
diff --git a/aio/tools/transforms/templates/directive.template.html b/aio/tools/transforms/templates/directive.template.html
deleted file mode 100644
index 9eda197279..0000000000
--- a/aio/tools/transforms/templates/directive.template.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% import "lib/paramList.html" as params -%}
-{% extends 'class.template.html' -%}
-
-{% block additional -%}
-  {% include "includes/_selectors.html" %}
-  {% include "includes/_outputs.html" %}
-  {% include "includes/_inputs.html" %}
-  {% include "includes/_export-as.html" %}
-{% endblock %}
diff --git a/aio/tools/transforms/templates/function.template.html b/aio/tools/transforms/templates/function.template.html
deleted file mode 100644
index bde4ecf1f3..0000000000
--- a/aio/tools/transforms/templates/function.template.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% import "lib/paramList.html" as params -%}
-{% extends 'layout/api-base.template.html' -%}
-
-{% block details %}
-  {% include "includes/_description.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_annotations.html b/aio/tools/transforms/templates/includes/_annotations.html
deleted file mode 100644
index 8f9b4c6317..0000000000
--- a/aio/tools/transforms/templates/includes/_annotations.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- if doc.decorators.length %}
-<div class="annotations api-section">
-    <h2>Annotations</h2>
-    {%- for decorator in doc.decorators %}
-      <pre class="prettyprint no-bg">
-        <code>@{$ decorator.name $}{$ params.paramList(decorator.arguments) | indent(10, false) $}</code>
-      </pre>
-      {%- if not decorator.notYetDocumented %}{$ decorator.description | marked $}{% endif %}
-    {% endfor %}
-</div>
-{% endif %}
diff --git a/aio/tools/transforms/templates/includes/_constructor.html b/aio/tools/transforms/templates/includes/_constructor.html
deleted file mode 100644
index 012dcdcb6f..0000000000
--- a/aio/tools/transforms/templates/includes/_constructor.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{%- if doc.constructorDoc and not doc.constructorDoc.internal %}
-<div class="constructor api-section">
-  <h2>Constructor</h2>
-  <a name="constructor" class="anchor-offset"></a>
-  <pre class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ doc.constructorDoc.name $}') }">
-    <code>
-      {$ doc.constructorDoc.name $}{$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
-    </code>
-  </pre>
-  {%- if not doc.constructorDoc.notYetDocumented %}
-  {$ doc.constructorDoc.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
-  {% endif %}
-</div>
-{% endif %}
diff --git a/aio/tools/transforms/templates/includes/_deprecated-notes.html b/aio/tools/transforms/templates/includes/_deprecated-notes.html
deleted file mode 100644
index eb196f37c4..0000000000
--- a/aio/tools/transforms/templates/includes/_deprecated-notes.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if doc.showDeprecatedNotes %}
-<div layout="row" layout-xs="column" class="row-margin ng-cloak">
-  <div flex="20" flex-xs="100">
-    <h2 class="h2-api-docs">Deprecation Notes</h2>
-  </div>
-  <div flex="80" flex-xs="100">
-    {%- if doc.deprecated %}{$ doc.deprecated | marked $}
-    {% else %}<em>Not yet documented</em>{% endif %}
-  </div>
-</div>
-{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_description.html b/aio/tools/transforms/templates/includes/_description.html
deleted file mode 100644
index 31cfd9eef4..0000000000
--- a/aio/tools/transforms/templates/includes/_description.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="description api-section">
-  <h2 class="text-display-1" id="api-description">Description<a href="#api-description" class="header-link"><i class="material-icons">link</i></a></h2>
-  {%- if doc.description.length > 2 %}
-  {$ doc.description | trimBlankLines | marked $}
-  {% endif %}
-</div>
diff --git a/aio/tools/transforms/templates/includes/_how-to-use.html b/aio/tools/transforms/templates/includes/_how-to-use.html
deleted file mode 100644
index a861e27a49..0000000000
--- a/aio/tools/transforms/templates/includes/_how-to-use.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{%- if doc.howToUse %}
-  <!-- QUICK REFERENCE CODE EXAMPLE -->
-  <div class="how-to-use api-section">
-    <h2>How To Use</h2>
-    {$ doc.howToUse | marked $}
-  </div>
-{% endif %}
diff --git a/aio/tools/transforms/templates/includes/_interface-overview.html b/aio/tools/transforms/templates/includes/_interface-overview.html
deleted file mode 100644
index 27866ffad3..0000000000
--- a/aio/tools/transforms/templates/includes/_interface-overview.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="class-overview">
-  <h2>Interface Overview</h2>
-  <div class="api-doc-code">
-
-    <code class="no-bg openParens">interface {$ doc.name $} {</code>
-
-    {% if doc.members.length %}
-    <div class="members">
-      {% for member in doc.members %}{% if not member.internal %}
-        <pre class="prettyprint no-bg-with-indent"><code>
-          <a class="code-anchor" href="#{$ member.name $}-anchor">{$ member.name | indent(6, false) | trim $}</a>
-          {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-        </code></pre>
-      {% endif %}{% endfor %}
-    {% endif %}
-
-    <code class="endParens api-doc-code no-bg">}</code>
-  </div>
-</div>
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_members.html b/aio/tools/transforms/templates/includes/_members.html
deleted file mode 100644
index e8481b0597..0000000000
--- a/aio/tools/transforms/templates/includes/_members.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- **** This is being duplicated - already in class overview content **** -->
-
-<!--{% if doc.members.length %}
-<div class="instance-members api-section">
-  <h2>Class Details</h2>
-  {% for member in doc.members %}{% if not member.internal %}
-  <div class="instance-member">
-    <a name="{$ member.name $}-anchor" class="anchor-offset"></a>
-    <pre class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }">
-    <code>{$ member.name $}{$ params.paramList(member.parameters) | trim $}{$ params.returnType(member.returnType) $}</code>
-    </pre>
-    {%- if not member.notYetDocumented %}
-    {$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
-    {% endif -%}
-  </div>
-  {% if not loop.last %}<hr class="hr-margin">{% endif %}
-  {% endif %}{% endfor %}
-</div>
-{% endif %}-->
diff --git a/aio/tools/transforms/templates/includes/_ng-module.html b/aio/tools/transforms/templates/includes/_ng-module.html
deleted file mode 100644
index 151c9d5a86..0000000000
--- a/aio/tools/transforms/templates/includes/_ng-module.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div layout="row" layout-xs="column" class="row-margin ng-cloak">
-  <div flex="20" flex-xs="100">
-    <h2 class="h2-api-docs">NgModule</h2>
-  </div>
-  <div class="code-links" flex="80" flex-xs="100">
-    {$ doc.ngModule $}
-  </div>
-</div>
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_security-notes.html b/aio/tools/transforms/templates/includes/_security-notes.html
deleted file mode 100644
index f66ce66cc4..0000000000
--- a/aio/tools/transforms/templates/includes/_security-notes.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% if doc.showSecurityNotes and doc.security %}
-<div layout="row" layout-xs="column" class="row-margin ng-cloak">
-  <div flex="20" flex-xs="100">
-    <h2 class="h2-api-docs">Security Risk</h2>
-  </div>
-  <div flex="80" flex-xs="100">
-    {$ doc.security | marked $}
-  </div>
-</div>
-{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/includes/_statics.html b/aio/tools/transforms/templates/includes/_statics.html
deleted file mode 100644
index 00929c4c30..0000000000
--- a/aio/tools/transforms/templates/includes/_statics.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% if doc.statics.length %}
-<div class="static-members api-section">
-    <h2>Static Members</h2>
-  {% for member in doc.statics %}{% if not member.internal %}
-    <div class="static-member">
-      <a name="{$ member.name $}-anchor" class="anchor-offset"></a>
-      <pre class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }">
-        <code>{$ member.name $}{$ params.paramList(member.parameters) | trim $}{$ params.returnType(member.returnType) $}</code>
-      </pre>
-      {%- if not member.notYetDocumented %}
-      {$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
-      {% endif %}
-    </div>
-
-    {% if not loop.last %}
-    <hr class="hr-margin">
-    {% endif %}
-
-  {% endif %}{% endfor %}
-</div>
-{% endif %}
diff --git a/aio/tools/transforms/templates/includes/_title.html b/aio/tools/transforms/templates/includes/_title.html
deleted file mode 100644
index b11e5c22b2..0000000000
--- a/aio/tools/transforms/templates/includes/_title.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- PAGE HERO -->
-<header class="api-header">
-  <h1>{$ doc.name $}</h1>
-  <div class="api-type-label {$ doc.docType $}">
-    <label>{$ doc.docType $}</label>
-  </div>
-  <span class="version">{$ angular.version $}</span>
-</header>
diff --git a/aio/tools/transforms/templates/includes/_what-it-does.html b/aio/tools/transforms/templates/includes/_what-it-does.html
deleted file mode 100644
index 9ed426f6fe..0000000000
--- a/aio/tools/transforms/templates/includes/_what-it-does.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- if doc.whatItDoes %}
-<div class="what-it-does">{$ doc.whatItDoes | marked $}</div>
-{% endif %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/interface.template.html b/aio/tools/transforms/templates/interface.template.html
deleted file mode 100644
index 1ed21de37f..0000000000
--- a/aio/tools/transforms/templates/interface.template.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% import "lib/paramList.html" as params -%}
-{% extends 'layout/api-base.template.html' -%}
-
-{% block details %}
-  {% include "includes/_interface-overview.html" %}
-  {% include "includes/_description.html" %}
-  {% include "includes/_members.html" %}
-{% endblock %}
diff --git a/aio/tools/transforms/templates/layout/api-base.template.html b/aio/tools/transforms/templates/layout/api-base.template.html
deleted file mode 100644
index db5146a987..0000000000
--- a/aio/tools/transforms/templates/layout/api-base.template.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'layout/base.template.html' -%}
-
-{% block body %}
-  <aio-jump-nav></aio-jump-nav>
-  {% include "includes/_what-it-does.html" %}
-  {% include "includes/_info-bar.html" %}
-  {% include "includes/_security-notes.html" %}
-  {% include "includes/_deprecated-notes.html" %}
-  {% include "includes/_how-to-use.html" %}
-  {% block details %}{% endblock %}
-{% endblock %}
diff --git a/aio/tools/transforms/templates/layout/base.template.html b/aio/tools/transforms/templates/layout/base.template.html
deleted file mode 100644
index 6ceff4e61c..0000000000
--- a/aio/tools/transforms/templates/layout/base.template.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<article>
-  {% include "includes/_title.html" %}
-  {% block body %}{% endblock %}
-</article>
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/module.template.html b/aio/tools/transforms/templates/module.template.html
deleted file mode 100644
index df154e3b71..0000000000
--- a/aio/tools/transforms/templates/module.template.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends 'layout/base.template.html' -%}
-
-{% block body -%}
-<ul>
-  {% for page in doc.childPages -%}
-  <li>
-    <!-- TODO: convert to hovercard -->
-    <a href="{$ relativePath(doc.moduleFolder, page.exportDoc.path) $}">{$ page.title $}</a>
-  </li>
-  {% endfor %}
-</ul>
-{% endblock %}
diff --git a/aio/tools/transforms/templates/pipe.template.html b/aio/tools/transforms/templates/pipe.template.html
deleted file mode 100644
index bd6d7e0e0c..0000000000
--- a/aio/tools/transforms/templates/pipe.template.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'layout/api-base.template.html' -%}
-
-{% block details %}
-  {% include "includes/_description.html" %}
-{% endblock %}
diff --git a/aio/tools/transforms/templates/type-alias.template.html b/aio/tools/transforms/templates/type-alias.template.html
deleted file mode 100644
index 8f4b225223..0000000000
--- a/aio/tools/transforms/templates/type-alias.template.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends 'interface.template.html' %}
diff --git a/aio/tools/transforms/templates/var.template.html b/aio/tools/transforms/templates/var.template.html
deleted file mode 100644
index 56149893e8..0000000000
--- a/aio/tools/transforms/templates/var.template.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'layout/api-base.template.html' %}
-
-{% block details %}
-  {% include "includes/_description.html" %}
-{% endblock %}