diff --git a/site/src/store/modules/projects.js b/site/src/store/modules/projects.js
index 9532fc6..486afa5 100644
--- a/site/src/store/modules/projects.js
+++ b/site/src/store/modules/projects.js
@@ -24,13 +24,9 @@ export default {
             // No current project
             else
             {
+                // Set first project as current
                 const projectKeys = Object.keys(state.all)
-
-                // If only one project, set has current
-                if(projectKeys.length === 1)
-                {
-                    state.current = state.all[projectKeys[0]]
-                }
+                state.current = state.all[projectKeys[0]]
             }
         },
 
diff --git a/test/demo-folder/folder-1/sub-folder/test-4.css b/test/demo-folder-1/folder-1/sub-folder/test-4.css
similarity index 100%
rename from test/demo-folder/folder-1/sub-folder/test-4.css
rename to test/demo-folder-1/folder-1/sub-folder/test-4.css
diff --git a/test/demo-folder/folder-1/test-4.css b/test/demo-folder-1/folder-1/test-4.css
similarity index 100%
rename from test/demo-folder/folder-1/test-4.css
rename to test/demo-folder-1/folder-1/test-4.css
diff --git a/test/demo-folder/folder-2/test-3-diff-1.js b/test/demo-folder-1/folder-2/test-3-diff-1.js
similarity index 100%
rename from test/demo-folder/folder-2/test-3-diff-1.js
rename to test/demo-folder-1/folder-2/test-3-diff-1.js
diff --git a/test/demo-folder/folder-2/test-3-diff-2.js b/test/demo-folder-1/folder-2/test-3-diff-2.js
similarity index 100%
rename from test/demo-folder/folder-2/test-3-diff-2.js
rename to test/demo-folder-1/folder-2/test-3-diff-2.js
diff --git a/test/demo-folder/folder-2/test-3-diff-3.js b/test/demo-folder-1/folder-2/test-3-diff-3.js
similarity index 100%
rename from test/demo-folder/folder-2/test-3-diff-3.js
rename to test/demo-folder-1/folder-2/test-3-diff-3.js
diff --git a/test/demo-folder/folder-2/test-3-diff-4.js b/test/demo-folder-1/folder-2/test-3-diff-4.js
similarity index 100%
rename from test/demo-folder/folder-2/test-3-diff-4.js
rename to test/demo-folder-1/folder-2/test-3-diff-4.js
diff --git a/test/demo-folder/folder-2/test-3.js b/test/demo-folder-1/folder-2/test-3.js
similarity index 100%
rename from test/demo-folder/folder-2/test-3.js
rename to test/demo-folder-1/folder-2/test-3.js
diff --git a/test/demo-folder/soidjf b/test/demo-folder-1/soidjf
similarity index 100%
rename from test/demo-folder/soidjf
rename to test/demo-folder-1/soidjf
diff --git a/test/demo-folder/sub/empty.txt b/test/demo-folder-1/sub/empty.txt
similarity index 100%
rename from test/demo-folder/sub/empty.txt
rename to test/demo-folder-1/sub/empty.txt
diff --git a/test/demo-folder/test-1.html b/test/demo-folder-1/test-1.html
similarity index 100%
rename from test/demo-folder/test-1.html
rename to test/demo-folder-1/test-1.html
diff --git a/test/demo-folder/test-2.php b/test/demo-folder-1/test-2.php
similarity index 100%
rename from test/demo-folder/test-2.php
rename to test/demo-folder-1/test-2.php
diff --git a/test/demo-folder/testouille b/test/demo-folder-1/testouille
similarity index 100%
rename from test/demo-folder/testouille
rename to test/demo-folder-1/testouille
diff --git a/test/demo-folder/vendor/.test/excluded-file.txt b/test/demo-folder-1/vendor/.test/excluded-file.txt
similarity index 100%
rename from test/demo-folder/vendor/.test/excluded-file.txt
rename to test/demo-folder-1/vendor/.test/excluded-file.txt
diff --git a/test/demo-folder/vendor/.test2 b/test/demo-folder-1/vendor/.test2
similarity index 100%
rename from test/demo-folder/vendor/.test2
rename to test/demo-folder-1/vendor/.test2
diff --git a/test/demo-folder/vendor/excluded-file.txt b/test/demo-folder-1/vendor/excluded-file.txt
similarity index 100%
rename from test/demo-folder/vendor/excluded-file.txt
rename to test/demo-folder-1/vendor/excluded-file.txt
diff --git a/test/demo-folder/video-2.jpg b/test/demo-folder-1/video-2.jpg
similarity index 100%
rename from test/demo-folder/video-2.jpg
rename to test/demo-folder-1/video-2.jpg
diff --git a/test/demo-folder/video.mp4 b/test/demo-folder-1/video.mp4
similarity index 100%
rename from test/demo-folder/video.mp4
rename to test/demo-folder-1/video.mp4
diff --git a/test/demo-folder-2/test.html b/test/demo-folder-2/test.html
new file mode 100644
index 0000000..8687d32
--- /dev/null
+++ b/test/demo-folder-2/test.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Mon super site</title>
+</head>
+<body>
+    <section>
+
+        <h1>Bonjour</h1>
+        <form action="#">
+            <input type="text">
+        </form>
+
+        <footer>
+            <a href="#">Contact</a>
+        </footer>
+
+    </section>
+</body>
+</html>
diff --git a/test/demo-folder-2/test.php b/test/demo-folder-2/test.php
new file mode 100644
index 0000000..dfeb90a
--- /dev/null
+++ b/test/demo-folder-2/test.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+* Test
+*/
+class ClassName extends AnotherClass
+{
+
+
+    function __construct( argument )
+    {
+        // code...
+    }
+
+    function test()
+    {
+
+    }
+}