diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog
index 083974a2..67a30b32 100644
--- a/DiscImageChef.Core/ChangeLog
+++ b/DiscImageChef.Core/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* DiscImageChef.Core.csproj: Refactor: Move filesystem
+	  identification code to Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* DataFile.cs:
diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj
index 73a1466c..fba1074f 100644
--- a/DiscImageChef.Core/DiscImageChef.Core.csproj
+++ b/DiscImageChef.Core/DiscImageChef.Core.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Devices\Dumping\SCSI.cs" />
     <Compile Include="Devices\Dumping\SecureDigital.cs" />
     <Compile Include="DataFile.cs" />
+    <Compile Include="Filesystems.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 1aee8c67..32de57b0 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,10 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* Commands/Ls.cs:
+	* Commands/Analyze.cs:
+	* Commands/ExtractFiles.cs:
+	  Refactor: Move filesystem identification code to Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* Commands/DumpMedia.cs:
diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs
index 75036f5f..7d2b98a8 100644
--- a/DiscImageChef/Commands/Analyze.cs
+++ b/DiscImageChef/Commands/Analyze.cs
@@ -164,7 +164,7 @@ namespace DiscImageChef.Commands
                             {
                                 DicConsole.WriteLine("Identifying filesystem on partition");
 
-                                IdentifyFilesystems(_imageFormat, out id_plugins, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors);
+                                Core.Filesystems.Identify(_imageFormat, out id_plugins, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors);
                                 if(id_plugins.Count == 0)
                                     DicConsole.WriteLine("Filesystem not identified");
                                 else if(id_plugins.Count > 1)
@@ -197,7 +197,7 @@ namespace DiscImageChef.Commands
 
                 if(checkraw)
                 {
-                    IdentifyFilesystems(_imageFormat, out id_plugins, 0, _imageFormat.GetSectors() - 1);
+                    Core.Filesystems.Identify(_imageFormat, out id_plugins, 0, _imageFormat.GetSectors() - 1);
                     if(id_plugins.Count == 0)
                         DicConsole.WriteLine("Filesystem not identified");
                     else if(id_plugins.Count > 1)
@@ -233,19 +233,6 @@ namespace DiscImageChef.Commands
 
             Core.Statistics.AddCommand("analyze");
         }
-
-        static void IdentifyFilesystems(ImagePlugin imagePlugin, out List<string> id_plugins, ulong partitionStart, ulong partitionEnd)
-        {
-            id_plugins = new List<string>();
-            PluginBase plugins = new PluginBase();
-            plugins.RegisterAllPlugins();
-
-            foreach(Filesystem _plugin in plugins.PluginsList.Values)
-            {
-                if(_plugin.Identify(imagePlugin, partitionStart, partitionEnd))
-                    id_plugins.Add(_plugin.Name.ToLower());
-            }
-        }
     }
 }
 
diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs
index 003fe5ad..dfaf5cf3 100644
--- a/DiscImageChef/Commands/ExtractFiles.cs
+++ b/DiscImageChef/Commands/ExtractFiles.cs
@@ -154,7 +154,7 @@ namespace DiscImageChef.Commands
 
                         DicConsole.WriteLine("Identifying filesystem on partition");
 
-                        IdentifyFilesystems(_imageFormat, out id_plugins, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors);
+                        Core.Filesystems.Identify(_imageFormat, out id_plugins, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors);
                         if(id_plugins.Count == 0)
                             DicConsole.WriteLine("Filesystem not identified");
                         else if(id_plugins.Count > 1)
@@ -214,7 +214,7 @@ namespace DiscImageChef.Commands
                     }
                 }
 
-                IdentifyFilesystems(_imageFormat, out id_plugins, 0, _imageFormat.GetSectors() - 1);
+                Core.Filesystems.Identify(_imageFormat, out id_plugins, 0, _imageFormat.GetSectors() - 1);
                 if(id_plugins.Count == 0)
                     DicConsole.WriteLine("Filesystem not identified");
                 else if(id_plugins.Count > 1)
@@ -381,19 +381,6 @@ namespace DiscImageChef.Commands
 
             Core.Statistics.AddCommand("ls");
         }
-
-        static void IdentifyFilesystems(ImagePlugin imagePlugin, out List<string> id_plugins, ulong partitionStart, ulong partitionEnd)
-        {
-            id_plugins = new List<string>();
-            PluginBase plugins = new PluginBase();
-            plugins.RegisterAllPlugins();
-
-            foreach(Filesystem _plugin in plugins.PluginsList.Values)
-            {
-                if(_plugin.Identify(imagePlugin, partitionStart, partitionEnd))
-                    id_plugins.Add(_plugin.Name.ToLower());
-            }
-        }
     }
 }
 
diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs
index 7fe113e0..b7d431ca 100644
--- a/DiscImageChef/Commands/Ls.cs
+++ b/DiscImageChef/Commands/Ls.cs
@@ -143,7 +143,7 @@ namespace DiscImageChef.Commands
 
                         DicConsole.WriteLine("Identifying filesystem on partition");
 
-                        IdentifyFilesystems(_imageFormat, out id_plugins, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors);
+                        Core.Filesystems.Identify(_imageFormat, out id_plugins, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors);
                         if(id_plugins.Count == 0)
                             DicConsole.WriteLine("Filesystem not identified");
                         else if(id_plugins.Count > 1)
@@ -203,7 +203,7 @@ namespace DiscImageChef.Commands
                     }
                 }
 
-                IdentifyFilesystems(_imageFormat, out id_plugins, 0, _imageFormat.GetSectors() - 1);
+                Core.Filesystems.Identify(_imageFormat, out id_plugins, 0, _imageFormat.GetSectors() - 1);
                 if(id_plugins.Count == 0)
                     DicConsole.WriteLine("Filesystem not identified");
                 else if(id_plugins.Count > 1)
@@ -303,19 +303,6 @@ namespace DiscImageChef.Commands
 
             Core.Statistics.AddCommand("ls");
         }
-
-        static void IdentifyFilesystems(ImagePlugin imagePlugin, out List<string> id_plugins, ulong partitionStart, ulong partitionEnd)
-        {
-            id_plugins = new List<string>();
-            PluginBase plugins = new PluginBase();
-            plugins.RegisterAllPlugins();
-
-            foreach(Filesystem _plugin in plugins.PluginsList.Values)
-            {
-                if(_plugin.Identify(imagePlugin, partitionStart, partitionEnd))
-                    id_plugins.Add(_plugin.Name.ToLower());
-            }
-        }
     }
 }