diff --git a/system/Debug/Toolbar/Views/_config.tpl b/system/Debug/Toolbar/Views/_config.tpl
new file mode 100644
index 0000000..4247e81
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_config.tpl
@@ -0,0 +1,48 @@
+<p class="debug-bar-alignRight">
+	<a href="https://codeigniter4.github.io/CodeIgniter4/index.html" target="_blank" >Read the CodeIgniter docs...</a>
+</p>
+
+<table>
+	<tbody>
+		<tr>
+			<td>CodeIgniter Version:</td>
+			<td>{ ciVersion }</td>
+		</tr>
+		<tr>
+			<td>PHP Version:</td>
+			<td>{ phpVersion }</td>
+		</tr>
+		<tr>
+			<td>PHP SAPI:</td>
+			<td>{ phpSAPI }</td>
+		</tr>
+		<tr>
+			<td>Environment:</td>
+			<td>{ environment }</td>
+		</tr>
+		<tr>
+			<td>Base URL:</td>
+			<td>
+				{ if $baseURL == '' }
+					<div class="warning">
+						The $baseURL should always be set manually to prevent possible URL personification from external parties.
+					</div>
+				{ else }
+					{ baseURL }
+				{ endif }
+			</td>
+		</tr>
+		<tr>
+			<td>TimeZone:</td>
+			<td>{ timezone }</td>
+		</tr>
+		<tr>
+			<td>Locale:</td>
+			<td>{ locale }</td>
+		</tr>
+		<tr>
+			<td>Content Security Policy Enabled:</td>
+			<td>{ if $cspEnabled } Yes { else } No { endif }</td>
+		</tr>
+	</tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_config.tpl.php b/system/Debug/Toolbar/Views/_config.tpl.php
deleted file mode 100644
index 4247e81..0000000
--- a/system/Debug/Toolbar/Views/_config.tpl.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<p class="debug-bar-alignRight">
-	<a href="https://codeigniter4.github.io/CodeIgniter4/index.html" target="_blank" >Read the CodeIgniter docs...</a>
-</p>
-
-<table>
-	<tbody>
-		<tr>
-			<td>CodeIgniter Version:</td>
-			<td>{ ciVersion }</td>
-		</tr>
-		<tr>
-			<td>PHP Version:</td>
-			<td>{ phpVersion }</td>
-		</tr>
-		<tr>
-			<td>PHP SAPI:</td>
-			<td>{ phpSAPI }</td>
-		</tr>
-		<tr>
-			<td>Environment:</td>
-			<td>{ environment }</td>
-		</tr>
-		<tr>
-			<td>Base URL:</td>
-			<td>
-				{ if $baseURL == '' }
-					<div class="warning">
-						The $baseURL should always be set manually to prevent possible URL personification from external parties.
-					</div>
-				{ else }
-					{ baseURL }
-				{ endif }
-			</td>
-		</tr>
-		<tr>
-			<td>TimeZone:</td>
-			<td>{ timezone }</td>
-		</tr>
-		<tr>
-			<td>Locale:</td>
-			<td>{ locale }</td>
-		</tr>
-		<tr>
-			<td>Content Security Policy Enabled:</td>
-			<td>{ if $cspEnabled } Yes { else } No { endif }</td>
-		</tr>
-	</tbody>
-</table>
diff --git a/system/Debug/Toolbar/Views/_database.tpl b/system/Debug/Toolbar/Views/_database.tpl
new file mode 100644
index 0000000..b5cf1a4
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_database.tpl
@@ -0,0 +1,16 @@
+<table>
+    <thead>
+        <tr>
+            <th class="debug-bar-width6r">Time</th>
+            <th>Query String</th>
+        </tr>
+    </thead>
+    <tbody>
+    {queries}
+        <tr>
+            <td class="narrow">{duration}</td>
+            <td>{! sql !}</td>
+        </tr>
+    {/queries}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_database.tpl.php b/system/Debug/Toolbar/Views/_database.tpl.php
deleted file mode 100644
index b5cf1a4..0000000
--- a/system/Debug/Toolbar/Views/_database.tpl.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<table>
-    <thead>
-        <tr>
-            <th class="debug-bar-width6r">Time</th>
-            <th>Query String</th>
-        </tr>
-    </thead>
-    <tbody>
-    {queries}
-        <tr>
-            <td class="narrow">{duration}</td>
-            <td>{! sql !}</td>
-        </tr>
-    {/queries}
-    </tbody>
-</table>
diff --git a/system/Debug/Toolbar/Views/_events.tpl b/system/Debug/Toolbar/Views/_events.tpl
new file mode 100644
index 0000000..88d732f
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_events.tpl
@@ -0,0 +1,18 @@
+<table>
+    <thead>
+        <tr>
+            <th class="debug-bar-width6r">Time</th>
+            <th>Event Name</th>
+            <th>Times Called</th>
+        </tr>
+    </thead>
+    <tbody>
+    {events}
+        <tr>
+            <td class="narrow">{ duration } ms</td>
+            <td>{event}</td>
+            <td>{count}</td>
+        </tr>
+    {/events}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_events.tpl.php b/system/Debug/Toolbar/Views/_events.tpl.php
deleted file mode 100644
index 88d732f..0000000
--- a/system/Debug/Toolbar/Views/_events.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<table>
-    <thead>
-        <tr>
-            <th class="debug-bar-width6r">Time</th>
-            <th>Event Name</th>
-            <th>Times Called</th>
-        </tr>
-    </thead>
-    <tbody>
-    {events}
-        <tr>
-            <td class="narrow">{ duration } ms</td>
-            <td>{event}</td>
-            <td>{count}</td>
-        </tr>
-    {/events}
-    </tbody>
-</table>
diff --git a/system/Debug/Toolbar/Views/_files.tpl b/system/Debug/Toolbar/Views/_files.tpl
new file mode 100644
index 0000000..9c992ab
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_files.tpl
@@ -0,0 +1,16 @@
+<table>
+    <tbody>
+    {userFiles}
+        <tr>
+            <td>{name}</td>
+            <td>{path}</td>
+        </tr>
+    {/userFiles}
+    {coreFiles}
+        <tr class="muted">
+            <td class="debug-bar-width20e">{name}</td>
+            <td>{path}</td>
+        </tr>
+    {/coreFiles}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_files.tpl.php b/system/Debug/Toolbar/Views/_files.tpl.php
deleted file mode 100644
index 9c992ab..0000000
--- a/system/Debug/Toolbar/Views/_files.tpl.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<table>
-    <tbody>
-    {userFiles}
-        <tr>
-            <td>{name}</td>
-            <td>{path}</td>
-        </tr>
-    {/userFiles}
-    {coreFiles}
-        <tr class="muted">
-            <td class="debug-bar-width20e">{name}</td>
-            <td>{path}</td>
-        </tr>
-    {/coreFiles}
-    </tbody>
-</table>
diff --git a/system/Debug/Toolbar/Views/_history.tpl b/system/Debug/Toolbar/Views/_history.tpl
new file mode 100644
index 0000000..9db00ec
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_history.tpl
@@ -0,0 +1,28 @@
+<table>
+    <thead>
+        <tr>
+            <th>Action</th>
+            <th>Datetime</th>
+            <th>Status</th>
+            <th>Method</th>
+            <th>URL</th>
+            <th>Content-Type</th>
+            <th>Is AJAX?</th>
+        </tr>
+    </thead>
+    <tbody>
+    {files}
+        <tr data-active="{active}">
+        	<td class="debug-bar-width70p">
+            	<button class="ci-history-load" data-time="{time}">Load</button>
+            </td>
+            <td class="debug-bar-width140p">{datetime}</td>
+            <td>{status}</td>
+            <td>{method}</td>
+            <td>{url}</td>
+            <td>{contentType}</td>
+            <td>{isAJAX}</td>
+        </tr>
+    {/files}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_history.tpl.php b/system/Debug/Toolbar/Views/_history.tpl.php
deleted file mode 100644
index 9db00ec..0000000
--- a/system/Debug/Toolbar/Views/_history.tpl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<table>
-    <thead>
-        <tr>
-            <th>Action</th>
-            <th>Datetime</th>
-            <th>Status</th>
-            <th>Method</th>
-            <th>URL</th>
-            <th>Content-Type</th>
-            <th>Is AJAX?</th>
-        </tr>
-    </thead>
-    <tbody>
-    {files}
-        <tr data-active="{active}">
-        	<td class="debug-bar-width70p">
-            	<button class="ci-history-load" data-time="{time}">Load</button>
-            </td>
-            <td class="debug-bar-width140p">{datetime}</td>
-            <td>{status}</td>
-            <td>{method}</td>
-            <td>{url}</td>
-            <td>{contentType}</td>
-            <td>{isAJAX}</td>
-        </tr>
-    {/files}
-    </tbody>
-</table>
diff --git a/system/Debug/Toolbar/Views/_logs.tpl b/system/Debug/Toolbar/Views/_logs.tpl
new file mode 100644
index 0000000..7c80d84
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_logs.tpl
@@ -0,0 +1,20 @@
+{ if $logs == [] }
+<p>Nothing was logged. If you were expecting logged items, ensure that LoggerConfig file has the correct threshold set.</p>
+{ else }
+<table>
+    <thead>
+        <tr>
+            <th>Severity</th>
+            <th>Message</th>
+        </tr>
+    </thead>
+    <tbody>
+    {logs}
+        <tr>
+            <td>{level}</td>
+            <td>{msg}</td>
+        </tr>
+    {/logs}
+    </tbody>
+</table>
+{ endif }
diff --git a/system/Debug/Toolbar/Views/_logs.tpl.php b/system/Debug/Toolbar/Views/_logs.tpl.php
deleted file mode 100644
index 7c80d84..0000000
--- a/system/Debug/Toolbar/Views/_logs.tpl.php
+++ /dev/null
@@ -1,20 +0,0 @@
-{ if $logs == [] }
-<p>Nothing was logged. If you were expecting logged items, ensure that LoggerConfig file has the correct threshold set.</p>
-{ else }
-<table>
-    <thead>
-        <tr>
-            <th>Severity</th>
-            <th>Message</th>
-        </tr>
-    </thead>
-    <tbody>
-    {logs}
-        <tr>
-            <td>{level}</td>
-            <td>{msg}</td>
-        </tr>
-    {/logs}
-    </tbody>
-</table>
-{ endif }
diff --git a/system/Debug/Toolbar/Views/_routes.tpl b/system/Debug/Toolbar/Views/_routes.tpl
new file mode 100644
index 0000000..0988049
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_routes.tpl
@@ -0,0 +1,44 @@
+<h3>Matched Route</h3>
+
+<table>
+    <tbody>
+    {matchedRoute}
+        <tr>
+            <td>Directory:</td>
+            <td>{directory}</td>
+        </tr>
+        <tr>
+            <td>Controller:</td>
+            <td>{controller}</td>
+        </tr>
+        <tr>
+            <td>Method:</td>
+            <td>{method}</td>
+        </tr>
+        <tr>
+            <td>Params:</td>
+            <td>{paramCount} / {truePCount}</td>
+        </tr>
+        {params}
+            <tr class="route-params-item">
+                <td>{name}</td>
+                <td>{value}</td>
+            </tr>
+        {/params}
+    {/matchedRoute}
+    </tbody>
+</table>
+
+
+<h3>Defined Routes</h3>
+
+<table>
+    <tbody>
+    {routes}
+        <tr>
+            <td>{from}</td>
+            <td>{to}</td>
+        </tr>
+    {/routes}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_routes.tpl.php b/system/Debug/Toolbar/Views/_routes.tpl.php
deleted file mode 100644
index 0988049..0000000
--- a/system/Debug/Toolbar/Views/_routes.tpl.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<h3>Matched Route</h3>
-
-<table>
-    <tbody>
-    {matchedRoute}
-        <tr>
-            <td>Directory:</td>
-            <td>{directory}</td>
-        </tr>
-        <tr>
-            <td>Controller:</td>
-            <td>{controller}</td>
-        </tr>
-        <tr>
-            <td>Method:</td>
-            <td>{method}</td>
-        </tr>
-        <tr>
-            <td>Params:</td>
-            <td>{paramCount} / {truePCount}</td>
-        </tr>
-        {params}
-            <tr class="route-params-item">
-                <td>{name}</td>
-                <td>{value}</td>
-            </tr>
-        {/params}
-    {/matchedRoute}
-    </tbody>
-</table>
-
-
-<h3>Defined Routes</h3>
-
-<table>
-    <tbody>
-    {routes}
-        <tr>
-            <td>{from}</td>
-            <td>{to}</td>
-        </tr>
-    {/routes}
-    </tbody>
-</table>