diff --git a/tools/api-builder/angular.io-package/templates/const.template.html b/tools/api-builder/angular.io-package/templates/const.template.html
new file mode 100644
index 0000000000..a208c7ca4f
--- /dev/null
+++ b/tools/api-builder/angular.io-package/templates/const.template.html
@@ -0,0 +1 @@
+{% extends 'var.template.html' -%}
\ No newline at end of file
diff --git a/tools/api-builder/angular.io-package/templates/interface.template.html b/tools/api-builder/angular.io-package/templates/interface.template.html
new file mode 100644
index 0000000000..9c59159b29
--- /dev/null
+++ b/tools/api-builder/angular.io-package/templates/interface.template.html
@@ -0,0 +1 @@
+{% extends 'class.template.html' -%}
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/lib/githubLinks.html b/tools/api-builder/angular.io-package/templates/lib/githubLinks.html
similarity index 100%
rename from tools/api-builder/docs-package/templates/lib/githubLinks.html
rename to tools/api-builder/angular.io-package/templates/lib/githubLinks.html
diff --git a/tools/api-builder/docs-package/templates/overview-dump.template.html b/tools/api-builder/angular.io-package/templates/overview-dump.template.html
similarity index 100%
rename from tools/api-builder/docs-package/templates/overview-dump.template.html
rename to tools/api-builder/angular.io-package/templates/overview-dump.template.html
diff --git a/tools/api-builder/docs-package/templates/type-alias.template.html b/tools/api-builder/angular.io-package/templates/type-alias.template.html
similarity index 100%
rename from tools/api-builder/docs-package/templates/type-alias.template.html
rename to tools/api-builder/angular.io-package/templates/type-alias.template.html
diff --git a/tools/api-builder/docs-package/index.js b/tools/api-builder/docs-package/index.js
index f219f15647..63d3272cd8 100644
--- a/tools/api-builder/docs-package/index.js
+++ b/tools/api-builder/docs-package/index.js
@@ -85,9 +85,6 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
     variableEnd: '$}'
   };
 
-  templateFinder.templateFolders
-      .unshift(path.resolve(__dirname, 'templates'));
-
   templateFinder.templatePatterns = [
     '${ doc.template }',
     '${ doc.id }.${ doc.docType }.template.html',
diff --git a/tools/api-builder/docs-package/templates/class.template.html b/tools/api-builder/docs-package/templates/class.template.html
deleted file mode 100644
index f0fc6b2801..0000000000
--- a/tools/api-builder/docs-package/templates/class.template.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% include "lib/paramList.html" -%}
-{% include "lib/githubLinks.html" -%}
-{% extends 'layout/base.template.html' -%}
-
-{% block body %}
-<h1 class="class export">{$ doc.name $} <span class="type">{$ doc.docType $}</span></h1>
-<p class="module">exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }<br/>
-defined in {$ githubViewLink(doc) $}
-</p>
-<p>{$ doc.description | marked $}</p>
-
-{%- if doc.decorators %}
-<h2>Annotations</h2>
-{%- for decorator in doc.decorators %}
-  <h3 class="annotation">@{$ decorator.name $}{$ paramList(decorator.arguments) $}</h3>
-{% endfor %}
-{% endif -%}
-
-{%- if doc.constructorDoc or doc.members.length -%}
-<h2>Members</h2>
-
-{%- if doc.constructorDoc %}
-  <section class="member constructor">
-    <h1 id="constructor" class="name">{$ doc.constructorDoc.name $}{$ paramList(doc.constructorDoc.params) $}</h1>
-    {% marked %}
-      {$ doc.constructorDoc.description $}
-    {% endmarked %}
-  </section>
-{% endif -%}
-
-{%- for member in doc.members %}{% if not member.internal %}
-  <section class="member">
-    <h1 id="{$ member.name $}" class="name">
-      {$ member.name $}{% if member.optional %}?{% endif %}{$ paramList(member.params) $}
-    </h1>
-    {% marked %}
-      {$ member.description $}
-    {% endmarked %}
-  </section>
-
-{% endif %}{% endfor %}
-{%- endif -%}
-
-{% endblock %}
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/common.template.html b/tools/api-builder/docs-package/templates/common.template.html
deleted file mode 100644
index dc10750a80..0000000000
--- a/tools/api-builder/docs-package/templates/common.template.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'layout/base.template.html' %}
-
-{% block body %}
-<h1>{$ doc.id $}</h1>
-<h2>({$ doc.docType $})</h2>
-<div>
-{$ doc.description | marked $}
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/const.template.html b/tools/api-builder/docs-package/templates/const.template.html
deleted file mode 100644
index 8b813c7d8e..0000000000
--- a/tools/api-builder/docs-package/templates/const.template.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends 'var.template.html' -%}
diff --git a/tools/api-builder/docs-package/templates/data-module.template.js b/tools/api-builder/docs-package/templates/data-module.template.js
deleted file mode 100644
index 498cdad8cf..0000000000
--- a/tools/api-builder/docs-package/templates/data-module.template.js
+++ /dev/null
@@ -1,3 +0,0 @@
-angular.module('{$ doc.moduleName $}', [])
-
-.value('{$ doc.serviceName $}', {$ doc.value | json $});
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/function.template.html b/tools/api-builder/docs-package/templates/function.template.html
deleted file mode 100644
index 4e6d5441f6..0000000000
--- a/tools/api-builder/docs-package/templates/function.template.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% include "lib/paramList.html" -%}
-{% include "lib/githubLinks.html" -%}
-{% extends 'layout/base.template.html' -%}
-
-{% block body %}
-<h1 class="function export">{$ doc.name $}{$ paramList(doc.parameters) $}</h1>
-<p class="module">exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }<br/>
-defined in {$ githubViewLink(doc) $}</p>
-<p>{$ doc.description | marked $}</p>
-
-{% endblock %}
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/guide.template.html b/tools/api-builder/docs-package/templates/guide.template.html
deleted file mode 100644
index 3ee289dbc8..0000000000
--- a/tools/api-builder/docs-package/templates/guide.template.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'layout/base.template.html' %}
-
-{% block body %}
-{$ doc.description | marked $}
-{% endblock %}
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/interface.template.html b/tools/api-builder/docs-package/templates/interface.template.html
deleted file mode 100644
index 3bde456ceb..0000000000
--- a/tools/api-builder/docs-package/templates/interface.template.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends 'class.template.html' -%}
diff --git a/tools/api-builder/docs-package/templates/layout/base.template.html b/tools/api-builder/docs-package/templates/layout/base.template.html
deleted file mode 100644
index 16a0d9dc96..0000000000
--- a/tools/api-builder/docs-package/templates/layout/base.template.html
+++ /dev/null
@@ -1 +0,0 @@
-{% block body %}{% endblock %}
\ No newline at end of file
diff --git a/tools/api-builder/docs-package/templates/lib/paramList.html b/tools/api-builder/docs-package/templates/lib/paramList.html
deleted file mode 100644
index 85dccb212b..0000000000
--- a/tools/api-builder/docs-package/templates/lib/paramList.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% macro paramList(params) -%}
-  {%- if params -%}<span class="params">(
-    {%- for param in params -%}
-      <span class="param">{$ param | escape $}{% if not loop.last %}, {% endif %}</span>
-    {%- endfor %})</span>
-  {%- endif %}
-{%- endmacro -%}
diff --git a/tools/api-builder/docs-package/templates/var.template.html b/tools/api-builder/docs-package/templates/var.template.html
deleted file mode 100644
index 2d43873595..0000000000
--- a/tools/api-builder/docs-package/templates/var.template.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% include "lib/githubLinks.html" -%}
-{% extends 'layout/base.template.html' %}
-
-{% block body %}
-<h1>{$ doc.name $} <span class="type">variable</span></h1>
-<p class="module">exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }<br/>
-defined in {$ githubViewLink(doc) $}</p>
-<p>{$ doc.description | marked $}</p>
-
-{% endblock %}
\ No newline at end of file