diff --git a/app/templates/new/layouts/org_template.html b/app/templates/new/layouts/org_template.html
new file mode 100644
index 000000000..5e04003fd
--- /dev/null
+++ b/app/templates/new/layouts/org_template.html
@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+
+{% block per_page_title %}
+  {% block org_page_title %}{% endblock %} – {{ current_org.name }}
+{% endblock %}
+
+{% block main %}
+  <div class="grid-container">
+    <div class="navigation-service usa-breadcrumb">
+      {% if current_user.platform_admin %}
+        <a href="{{ url_for('.organizations') }}" class="usa-link navigation-organization-link">Organizations</a>
+      {% endif %}
+      <div class="navigation-service">
+        {{ current_org.name }}
+      </div>
+      <a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service">Switch service</a>
+    </div>
+    <div class="grid-row">
+      <div class="grid-col-3">
+        {% include "org_nav.html" %}
+      </div>
+      <div class="grid-col-9">
+        {% block beforeContent %}
+          {% block backLink %}{% endblock %}
+        {% endblock %}
+        <main class="main" id="main-content" role="main" >
+          {% block content %}
+            {% include 'flash_messages.html' %}
+            {% block maincolumn_content %}{% endblock %}
+          {% endblock %}
+        </main>
+      </div>
+    </div>
+  </div>
+{% endblock %}
diff --git a/app/templates/new/layouts/withnav_template.html b/app/templates/new/layouts/withnav_template.html
index 78cd85e6a..412a004d0 100644
--- a/app/templates/new/layouts/withnav_template.html
+++ b/app/templates/new/layouts/withnav_template.html
@@ -9,7 +9,7 @@
     {% block serviceNavigation %}
       {% include "service_navigation.html" %}
     {% endblock %}
-    <!-- when it comes to setting_template and withnav_template, this service_navigation.html is only used in withnav_template and in settings_template, it was not used. That is one out of the two differences between settings template and withnav template. on child templates that extends settings_template, include the block serviceNavigation but leave it empty. Only pages settings_template.html is used: manage-users.html, service-settings.html, and user-profile.html  -->
+    <!-- The withnav_template can be used to replace the settings_template. when it comes to setting_template and withnav_template, this service_navigation.html is only used in withnav_template and in settings_template, it was not used. That is one out of the two differences between settings template and withnav template. Child templates that extends settings_template, include the block serviceNavigation but leave it empty. Within the app, the only pages settings_template.html is used: manage-users.html, service-settings.html, and user-profile.html  -->
     <div class="grid-row margin-top-5">
       {% if help %}
         <div class="grid-col-3">
diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md
index 894628d89..81325e26c 100644
--- a/app/templates/new/templates_glossary.md
+++ b/app/templates/new/templates_glossary.md
@@ -6,10 +6,10 @@ This document serves as a glossary for the templates directory structure of the
 ## Directory Structure
 
 - `/templates`
-  - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `settings_template`, and `content_template`.
+  - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `withoutnav_template` and `content_template`.
   - **/layouts**: Contains base templates and shared layouts used across the site. Simply put, it defines the overall structure or skeleton of the application (less frequently revised).
     - `withnav_template.html`: A variation of the base layout that includes a sidebar.
-    - `/error`: Templates for handling HTTP errors
+    - `org_template.html`: A variaton of the withnav_template
   - **/components**: Houses reusable UI components that can be included in multiple templates and can be tailored with different content or links depending on the context.(more frequently revised or customized)
     - `header.html`: Template for the site's header, included in `base.html`.
     - `footer.html`: Template for the site's footer, included in `base.html`.
@@ -28,10 +28,10 @@ This document serves as a glossary for the templates directory structure of the
 ### Old Layout Templates We Don't Need
 - withoutnav_template.html Delete
 - main_template.html Delete
-- settings_templates.html Delete
+- settings_templates.html `withnav_template` can be used to replace `settings_template`.
 - settings_nav.html (move to /new/navigation directory)
 - main_nav.html (move to /new/navigation directory)
 - service_navigation.html (move to /new/navigation directory)
-- org_template, could be under it's own directory called /organization
+- org_template, could be under it's own directory called /layout/organization
 - org_nav.html (move to /new/navigation directory)
-- -content_template.html Delete and consolidate to base template
+- content_template.html Delete