diff --git a/ATA.cs b/ATA/ATA.cs
similarity index 100%
rename from ATA.cs
rename to ATA/ATA.cs
diff --git a/BD.cs b/Blu-ray/BD.cs
similarity index 100%
rename from BD.cs
rename to Blu-ray/BD.cs
diff --git a/CD.cs b/CD/CD.cs
similarity index 100%
rename from CD.cs
rename to CD/CD.cs
diff --git a/ChangeLog b/ChangeLog
index a6b6bb2..8101aee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2015-10-19  Natalia Portillo  <claunia@claunia.com>
+
+	* BD.cs:
+	* CD.cs:
+	* ATA.cs:
+	* MMC.cs:
+	* DVD.cs:
+	* SCSI.cs:
+	* CD/CD.cs:
+	* Floppy.cs:
+	* ATA/ATA.cs:
+	* DVD/DVD.cs:
+	* Blu-ray/BD.cs:
+	* SCSI/Inquiry.cs:
+	* SCSI/MMC/MMC.cs:
+	* Floppy/Floppy.cs:
+	* DiscImageChef.Decoders.csproj:
+	  Organize decoders files&folders
+
 2015-10-19  Natalia Portillo  <claunia@claunia.com>
 
 	* ATA.cs:
diff --git a/DVD.cs b/DVD/DVD.cs
similarity index 100%
rename from DVD.cs
rename to DVD/DVD.cs
diff --git a/DiscImageChef.Decoders.csproj b/DiscImageChef.Decoders.csproj
index 9f886eb..8f82b3b 100644
--- a/DiscImageChef.Decoders.csproj
+++ b/DiscImageChef.Decoders.csproj
@@ -34,13 +34,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BD.cs" />
-    <Compile Include="CD.cs" />
-    <Compile Include="DVD.cs" />
-    <Compile Include="Floppy.cs" />
-    <Compile Include="MMC.cs" />
-    <Compile Include="SCSI.cs" />
-    <Compile Include="ATA.cs" />
+    <Compile Include="SCSI\Inquiry.cs" />
+    <Compile Include="ATA\ATA.cs" />
+    <Compile Include="SCSI\MMC\MMC.cs" />
+    <Compile Include="Blu-ray\BD.cs" />
+    <Compile Include="Floppy\Floppy.cs" />
+    <Compile Include="CD\CD.cs" />
+    <Compile Include="DVD\DVD.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -53,4 +53,13 @@
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="SCSI\" />
+    <Folder Include="ATA\" />
+    <Folder Include="Blu-ray\" />
+    <Folder Include="DVD\" />
+    <Folder Include="SCSI\MMC\" />
+    <Folder Include="CD\" />
+    <Folder Include="Floppy\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Floppy.cs b/Floppy/Floppy.cs
similarity index 100%
rename from Floppy.cs
rename to Floppy/Floppy.cs
diff --git a/SCSI.cs b/SCSI/Inquiry.cs
similarity index 100%
rename from SCSI.cs
rename to SCSI/Inquiry.cs
diff --git a/MMC.cs b/SCSI/MMC/MMC.cs
similarity index 100%
rename from MMC.cs
rename to SCSI/MMC/MMC.cs