diff --git a/netbox_access_lists/template_content.py b/netbox_access_lists/template_content.py
index 3fb339c..1431bd4 100644
--- a/netbox_access_lists/template_content.py
+++ b/netbox_access_lists/template_content.py
@@ -17,7 +17,7 @@ class AccessLists(PluginTemplateExtension):
         #elif ctype.model == 'virtualmachine':
         #    access_lists = AccessList.objects.filter(device=obj.pk)
 
-        return self.render('inc/device_access_lists.html', extra_context={
+        return self.render('inc/device/access_lists.html', extra_context={
             'access_lists': access_lists,
             'type': ctype.model if ctype.model == 'device' else ctype.name.replace(' ', '_'),
         })
diff --git a/netbox_access_lists/templates/inc/device_access_lists.html b/netbox_access_lists/templates/inc/device/access_lists.html
similarity index 87%
rename from netbox_access_lists/templates/inc/device_access_lists.html
rename to netbox_access_lists/templates/inc/device/access_lists.html
index 074d028..7bdb9b9 100644
--- a/netbox_access_lists/templates/inc/device_access_lists.html
+++ b/netbox_access_lists/templates/inc/device/access_lists.html
@@ -3,7 +3,7 @@
             Access Lists
         </h5>
         <div class="card-body">
-            {% include 'inc/assigned_access_lists.html' %}
+            {% include 'inc/device/assigned_access_lists.html' %}
         </div>
         <div class="card-footer text-end noprint">
             <a href="{% url 'plugins:netbox_access_lists:accesslist_add' %}?{{ type }}={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
diff --git a/netbox_access_lists/templates/inc/assigned_access_lists.html b/netbox_access_lists/templates/inc/device/assigned_access_lists.html
similarity index 100%
rename from netbox_access_lists/templates/inc/assigned_access_lists.html
rename to netbox_access_lists/templates/inc/device/assigned_access_lists.html
diff --git a/netbox_access_lists/templates/netbox_access_lists/accesslistextendedrule.html b/netbox_access_lists/templates/netbox_access_lists/aclextendedrule.html
similarity index 100%
rename from netbox_access_lists/templates/netbox_access_lists/accesslistextendedrule.html
rename to netbox_access_lists/templates/netbox_access_lists/aclextendedrule.html
diff --git a/netbox_access_lists/templates/netbox_access_lists/accessliststandardrule.html b/netbox_access_lists/templates/netbox_access_lists/aclstandardrule.html
similarity index 72%
rename from netbox_access_lists/templates/netbox_access_lists/accessliststandardrule.html
rename to netbox_access_lists/templates/netbox_access_lists/aclstandardrule.html
index ea5e41e..f704727 100644
--- a/netbox_access_lists/templates/netbox_access_lists/accessliststandardrule.html
+++ b/netbox_access_lists/templates/netbox_access_lists/aclstandardrule.html
@@ -46,24 +46,6 @@
                 {% endif %}
               </td>
             </tr>
-            <tr>
-              <th scope="row">Source Ports</th>
-              <td>{{ object.source_ports|join:", "|placeholder }}</td>
-            </tr>
-            <tr>
-              <th scope="row">Destination Prefix</th>
-              <td>
-                {% if object.destination_prefix %}
-                  <a href="{{ object.destination_prefix.get_absolute_url }}">{{ object.destination_prefix }}</a>
-                {% else %}
-                  {{ ''|placeholder }}
-                {% endif %}
-              </td>
-            </tr>
-            <tr>
-              <th scope="row">Destination Ports</th>
-              <td>{{ object.destination_ports|join:", "|placeholder }}</td>
-            </tr>
             <tr>
               <th scope="row">Action</th>
               <td>{{ object.get_action_display }}</td>