diff --git a/src/Controller/ToolsController.php b/src/Controller/ToolsController.php
index 542b5722..ae01ec20 100644
--- a/src/Controller/ToolsController.php
+++ b/src/Controller/ToolsController.php
@@ -43,7 +43,7 @@ class ToolsController extends AbstractController
     {
         $this->denyAccessUnlessGranted('@tools.reel_calculator');
 
-        return $this->render('Tools/ReelCalculator/main.html.twig');
+        return $this->render('tools/reel_calculator/reel_calculator.html.twig');
     }
 
     /**
@@ -53,7 +53,7 @@ class ToolsController extends AbstractController
     {
         $this->denyAccessUnlessGranted('@system.server_infos');
 
-        return $this->render('Tools/ServerInfos/main.html.twig', [
+        return $this->render('tools/server_infos/server_infos.html.twig ', [
             //Part-DB section
             'git_branch' => $versionInfo->getGitBranchName(),
             'git_commit' => $versionInfo->getGitCommitHash(),
@@ -110,7 +110,7 @@ class ToolsController extends AbstractController
             }, $group);
         }, $grouped_footprints);
 
-        return $this->render('Tools/BuiltInFootprintsViewer/main.html.twig', [
+        return $this->render('tools/builtin_footprints_viewer/builtin_footprints_viewer.html.twig', [
             'grouped_footprints' => $grouped_footprints,
         ]);
     }
@@ -123,6 +123,6 @@ class ToolsController extends AbstractController
     {
         $this->denyAccessUnlessGranted('@tools.ic_logos');
 
-        return $this->render('Tools/ICLogos/ic_logos.html.twig');
+        return $this->render('tools/ic_logos/ic_logos.html.twig');
     }
 }
diff --git a/templates/Tools/BuiltInFootprintsViewer/main.html.twig b/templates/tools/builtin_footprints_viewer/builtin_footprints_viewer.html.twig
similarity index 100%
rename from templates/Tools/BuiltInFootprintsViewer/main.html.twig
rename to templates/tools/builtin_footprints_viewer/builtin_footprints_viewer.html.twig
diff --git a/templates/Tools/ICLogos/ic_logos.html.twig b/templates/tools/ic_logos/ic_logos.html.twig
similarity index 100%
rename from templates/Tools/ICLogos/ic_logos.html.twig
rename to templates/tools/ic_logos/ic_logos.html.twig
diff --git a/templates/Tools/ReelCalculator/main.html.twig b/templates/tools/reel_calculator/reel_calculator.html.twig
similarity index 100%
rename from templates/Tools/ReelCalculator/main.html.twig
rename to templates/tools/reel_calculator/reel_calculator.html.twig
diff --git a/templates/Tools/ServerInfos/_db.html.twig b/templates/tools/server_infos/_db.html.twig
similarity index 100%
rename from templates/Tools/ServerInfos/_db.html.twig
rename to templates/tools/server_infos/_db.html.twig
diff --git a/templates/Tools/ServerInfos/_partdb.html.twig b/templates/tools/server_infos/_partdb.html.twig
similarity index 100%
rename from templates/Tools/ServerInfos/_partdb.html.twig
rename to templates/tools/server_infos/_partdb.html.twig
diff --git a/templates/Tools/ServerInfos/_php.html.twig b/templates/tools/server_infos/_php.html.twig
similarity index 100%
rename from templates/Tools/ServerInfos/_php.html.twig
rename to templates/tools/server_infos/_php.html.twig
diff --git a/templates/Tools/ServerInfos/main.html.twig b/templates/tools/server_infos/server_infos.html.twig
similarity index 90%
rename from templates/Tools/ServerInfos/main.html.twig
rename to templates/tools/server_infos/server_infos.html.twig
index 02fcbad7..fd3d2759 100644
--- a/templates/Tools/ServerInfos/main.html.twig
+++ b/templates/tools/server_infos/server_infos.html.twig
@@ -16,13 +16,13 @@
     </nav>
     <div class="tab-content" id="nav-tabContent">
         <div class="tab-pane fade show active" id="server_infos-partdb" role="tabpanel" aria-labelledby="server_infos-partdb-tab">
-            {% include "Tools/ServerInfos/_partdb.html.twig" %}
+            {% include "tools/server_infos/_partdb.html.twig" %}
         </div>
         <div class="tab-pane fade" id="server_infos-php" role="tabpanel" aria-labelledby="server_infos-php-tab">
-            {% include "Tools/ServerInfos/_php.html.twig" %}
+            {% include "tools/server_infos/_php.html.twig" %}
         </div>
         <div class="tab-pane fade" id="server_infos-db" role="tabpanel" aria-labelledby="server_infos-database-tab">
-            {% include "Tools/ServerInfos/_db.html.twig" %}
+            {% include "tools/server_infos/_db.html.twig" %}
         </div>
     </div>