diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 152c7fc..0463039 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -52,8 +52,6 @@ final class MainController extends AbstractController
         // Convert flat list into a nested tree
         $tree = [];
         foreach ($finder as $file) {
-            /** @var SplFileInfo $file */
-
             $current = &$tree;
 
             // Dunno why it is undefined, it works
@@ -66,9 +64,7 @@ final class MainController extends AbstractController
                 $current = &$current[$part];
             }
 
-            $current[] = $file;
-
-            //usort($current, fn($a, $b) => strcmp(implode('/', $a), implode('/', $b)));
+            $current[$file->getFilenameWithoutExtension()] = [];
         }
 
         return $this->render('main/index.html.twig', [
diff --git a/templates/main/index.html.twig b/templates/main/index.html.twig
index 53ee70f..f96d3b7 100644
--- a/templates/main/index.html.twig
+++ b/templates/main/index.html.twig
@@ -2,22 +2,18 @@
 
 {% block title %}{{ path }} | Gaisen{% endblock %}
 
-{% macro render_tree(tree) %}
+{% macro render_tree(tree, prefix = '') %}
     <ul>
-        {% for key, value in tree %}
-            <li>
-                {% if value is iterable and value|length > 0 %}
-                    {{ key }}
-                    {{ _self.render_tree(value) }} {# Recursive call #}
-                {% else %}
-                    <a href="{{ path('app_index', {
-                        path: value.relativePathname
-                    }) }}">
-                        {{ value.filename }}
-                    </a>
-                {% endif %}
-            </li>
-        {% endfor %}
+    {% for name, subtree in tree %}
+        <li>
+            <a href="{{ path('app_index', {
+                path: prefix ~ name
+            }) }}">
+                {{ name }}
+            </a>
+            {{ _self.render_tree(subtree, name ~ '/') }}
+        </li>
+    {% endfor %}
     </ul>
 {% endmacro %}