diff --git a/LibMpc/Commands/Commands.Database.cs b/LibMpc/Commands/Commands.Database.cs
index 20d78d0..9f9844e 100644
--- a/LibMpc/Commands/Commands.Database.cs
+++ b/LibMpc/Commands/Commands.Database.cs
@@ -67,20 +67,39 @@ namespace LibMpc
 
             // TODO: findadd
 
-            public class ListAll : IMpcCommand<IList<KeyValuePair<string, string>>>
+            public class ListAll : IMpcCommand<IList<IDictionary<string, IList<string>>>>
             {
                 public string Value => "listall";
 
-                public IDictionary<string, IList<KeyValuePair<string, string>>> FormatResponse(IList<KeyValuePair<string, string>> response)
+                public IDictionary<string, IList<IDictionary<string, IList<string>>>> FormatResponse(IList<KeyValuePair<string, string>> response)
                 {
-                    var results = new Dictionary<string, IList<KeyValuePair<string, string>>>
+                    var results = new Dictionary<string, IList<IDictionary<string, IList<string>>>>
                     {
-                        { "result", new List<KeyValuePair<string, string>>() }
+                        { "directories", new List<IDictionary<string, IList<string>>>() }
                     };
-
-                    foreach (var keyValuePair in response)
+                    
+                    // Add by default the root directory
+                    results["directories"].Add(new Dictionary<string, IList<string>>
                     {
-                        results["result"].Add(keyValuePair);
+                        { "path", new List<string>() },
+                        { "files", new List<string>() }
+                    });
+
+                    foreach (var line in response)
+                    {
+                        if (line.Key.Equals("file"))
+                        {
+                            results["directories"].Last()["files"].Add(line.Value);
+                        }
+
+                        if (line.Key.Equals("directory"))
+                        {
+                            results["directories"].Add(new Dictionary<string, IList<string>>
+                            {
+                                { "path", new []{ line.Value } },
+                                { "files", new List<string>() }
+                            });
+                        }
                     }
 
                     return results;
diff --git a/LibMpcTest/LibMpcTest.cs b/LibMpcTest/LibMpcTest.cs
index 868a680..ace1279 100644
--- a/LibMpcTest/LibMpcTest.cs
+++ b/LibMpcTest/LibMpcTest.cs
@@ -53,7 +53,8 @@ namespace LibMpcTest
             Console.Out.WriteLine("ListAllTest Result:");
             Console.Out.WriteLine(JsonConvert.SerializeObject(response, Formatting.Indented));
 
-            // TODO: Assert
+            Assert.True(response.Response.Body.Keys.Contains("directories"));
+            Assert.True(response.Response.Body["directories"].Count.Equals(5));
         }
 
         public void Dispose()