diff --git a/doc/source/specs/stein/index.rst b/doc/source/specs/stein/index.rst
index eba392449..cb5ad773a 100644
--- a/doc/source/specs/stein/index.rst
+++ b/doc/source/specs/stein/index.rst
@@ -2,13 +2,6 @@
 Nova Stein Specifications
 =========================
 
-Template:
-
-.. toctree::
-   :maxdepth: 1
-
-   Specification Template (Stein release) <template>
-
 Stein implemented specs:
 
 .. toctree::
diff --git a/doc/source/specs/stein/template.rst b/doc/source/specs/stein/template.rst
deleted file mode 120000
index b666bfd41..000000000
--- a/doc/source/specs/stein/template.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../../specs/stein-template.rst
\ No newline at end of file
diff --git a/specs/stein/approved/alloc-candidates-in-tree.rst b/specs/stein/implemented/alloc-candidates-in-tree.rst
similarity index 100%
rename from specs/stein/approved/alloc-candidates-in-tree.rst
rename to specs/stein/implemented/alloc-candidates-in-tree.rst
diff --git a/specs/stein/approved/bandwidth-resource-provider.rst b/specs/stein/implemented/bandwidth-resource-provider.rst
similarity index 100%
rename from specs/stein/approved/bandwidth-resource-provider.rst
rename to specs/stein/implemented/bandwidth-resource-provider.rst
diff --git a/specs/stein/approved/boot-instance-specific-storage-backend.rst b/specs/stein/implemented/boot-instance-specific-storage-backend.rst
similarity index 100%
rename from specs/stein/approved/boot-instance-specific-storage-backend.rst
rename to specs/stein/implemented/boot-instance-specific-storage-backend.rst
diff --git a/specs/stein/approved/conf-max-attach-volumes.rst b/specs/stein/implemented/conf-max-attach-volumes.rst
similarity index 100%
rename from specs/stein/approved/conf-max-attach-volumes.rst
rename to specs/stein/implemented/conf-max-attach-volumes.rst
diff --git a/specs/stein/approved/expose-virtual-device-tags-in-rest-api.rst b/specs/stein/implemented/expose-virtual-device-tags-in-rest-api.rst
similarity index 100%
rename from specs/stein/approved/expose-virtual-device-tags-in-rest-api.rst
rename to specs/stein/implemented/expose-virtual-device-tags-in-rest-api.rst
diff --git a/specs/stein/approved/flavor-extra-spec-image-property-validation.rst b/specs/stein/implemented/flavor-extra-spec-image-property-validation.rst
similarity index 100%
rename from specs/stein/approved/flavor-extra-spec-image-property-validation.rst
rename to specs/stein/implemented/flavor-extra-spec-image-property-validation.rst
diff --git a/specs/stein/approved/generic-os-vif-offloads.rst b/specs/stein/implemented/generic-os-vif-offloads.rst
similarity index 100%
rename from specs/stein/approved/generic-os-vif-offloads.rst
rename to specs/stein/implemented/generic-os-vif-offloads.rst
diff --git a/specs/stein/approved/handling-down-cell_new.rst b/specs/stein/implemented/handling-down-cell.rst
similarity index 100%
rename from specs/stein/approved/handling-down-cell_new.rst
rename to specs/stein/implemented/handling-down-cell.rst
diff --git a/specs/stein/approved/initial-allocation-ratios.rst b/specs/stein/implemented/initial-allocation-ratios.rst
similarity index 100%
rename from specs/stein/approved/initial-allocation-ratios.rst
rename to specs/stein/implemented/initial-allocation-ratios.rst
diff --git a/specs/stein/approved/ironic-conductor-groups.rst b/specs/stein/implemented/ironic-conductor-groups.rst
similarity index 100%
rename from specs/stein/approved/ironic-conductor-groups.rst
rename to specs/stein/implemented/ironic-conductor-groups.rst
diff --git a/specs/stein/approved/live-migration-force-after-timeout.rst b/specs/stein/implemented/live-migration-force-after-timeout.rst
similarity index 100%
rename from specs/stein/approved/live-migration-force-after-timeout.rst
rename to specs/stein/implemented/live-migration-force-after-timeout.rst
diff --git a/specs/stein/approved/per-aggregate-scheduling-weight.rst b/specs/stein/implemented/per-aggregate-scheduling-weight.rst
similarity index 100%
rename from specs/stein/approved/per-aggregate-scheduling-weight.rst
rename to specs/stein/implemented/per-aggregate-scheduling-weight.rst
diff --git a/specs/stein/approved/per-instance-libvirt-sysinfo-serial.rst b/specs/stein/implemented/per-instance-libvirt-sysinfo-serial.rst
similarity index 100%
rename from specs/stein/approved/per-instance-libvirt-sysinfo-serial.rst
rename to specs/stein/implemented/per-instance-libvirt-sysinfo-serial.rst
diff --git a/specs/stein/approved/remove-force-flag-from-live-migrate-and-evacuate.rst b/specs/stein/implemented/remove-force-flag-from-live-migrate-and-evacuate.rst
similarity index 100%
rename from specs/stein/approved/remove-force-flag-from-live-migrate-and-evacuate.rst
rename to specs/stein/implemented/remove-force-flag-from-live-migrate-and-evacuate.rst
diff --git a/specs/stein/approved/show-server-group.rst b/specs/stein/implemented/show-server-group.rst
similarity index 100%
rename from specs/stein/approved/show-server-group.rst
rename to specs/stein/implemented/show-server-group.rst
diff --git a/specs/stein/implemented/stein-template.rst b/specs/stein/implemented/stein-template.rst
deleted file mode 120000
index fae36ee6e..000000000
--- a/specs/stein/implemented/stein-template.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../stein-template.rst
\ No newline at end of file
diff --git a/specs/stein/approved/support-hpet-on-guest.rst b/specs/stein/implemented/support-hpet-on-guest.rst
similarity index 100%
rename from specs/stein/approved/support-hpet-on-guest.rst
rename to specs/stein/implemented/support-hpet-on-guest.rst
diff --git a/specs/stein/approved/support-to-query-nova-resources-filter-by-changes-before.rst b/specs/stein/implemented/support-to-query-nova-resources-filter-by-changes-before.rst
similarity index 100%
rename from specs/stein/approved/support-to-query-nova-resources-filter-by-changes-before.rst
rename to specs/stein/implemented/support-to-query-nova-resources-filter-by-changes-before.rst
diff --git a/specs/stein/approved/vmware-live-migration.rst b/specs/stein/implemented/vmware-live-migration.rst
similarity index 100%
rename from specs/stein/approved/vmware-live-migration.rst
rename to specs/stein/implemented/vmware-live-migration.rst
diff --git a/specs/stein/approved/vrouter-hw-offloads.rst b/specs/stein/implemented/vrouter-hw-offloads.rst
similarity index 100%
rename from specs/stein/approved/vrouter-hw-offloads.rst
rename to specs/stein/implemented/vrouter-hw-offloads.rst
diff --git a/specs/stein/redirects b/specs/stein/redirects
index e69de29bb..04c25d990 100644
--- a/specs/stein/redirects
+++ b/specs/stein/redirects
@@ -0,0 +1,19 @@
+approved/alloc-candidates-in-tree.rst ../implemented/alloc-candidates-in-tree.rst
+approved/bandwidth-resource-provider.rst ../implemented/bandwidth-resource-provider.rst
+approved/boot-instance-specific-storage-backend.rst ../implemented/boot-instance-specific-storage-backend.rst
+approved/conf-max-attach-volumes.rst ../implemented/conf-max-attach-volumes.rst
+approved/expose-virtual-device-tags-in-rest-api.rst ../implemented/expose-virtual-device-tags-in-rest-api.rst
+approved/flavor-extra-spec-image-property-validation.rst ../implemented/flavor-extra-spec-image-property-validation.rst
+approved/generic-os-vif-offloads.rst ../implemented/generic-os-vif-offloads.rst
+approved/initial-allocation-ratios.rst ../implemented/initial-allocation-ratios.rst
+approved/ironic-conductor-groups.rst ../implemented/ironic-conductor-groups.rst
+approved/live-migration-force-after-timeout.rst ../implemented/live-migration-force-after-timeout.rst
+approved/per-aggregate-scheduling-weight.rst ../implemented/per-aggregate-scheduling-weight.rst
+approved/per-instance-libvirt-sysinfo-serial.rst ../implemented/per-instance-libvirt-sysinfo-serial.rst
+approved/remove-force-flag-from-live-migrate-and-evacuate.rst ../implemented/remove-force-flag-from-live-migrate-and-evacuate.rst
+approved/show-server-group.rst ../implemented/show-server-group.rst
+approved/support-hpet-on-guest.rst ../implemented/support-hpet-on-guest.rst
+approved/support-to-query-nova-resources-filter-by-changes-before.rst ../implemented/support-to-query-nova-resources-filter-by-changes-before.rst
+approved/vmware-live-migration.rst ../implemented/vmware-live-migration.rst
+approved/vrouter-hw-offloads.rst ../implemented/vrouter-hw-offloads.rst
+approved/handling-down-cell_new.rst ../implemented/handling-down-cell.rst