diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 7b3c95a36..fb2cf8b5b 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -226,12 +226,10 @@
             <e p="ATA.cs" t="Include" />
             <e p="DeviceReport.cs" t="Include" />
             <e p="FireWire.cs" t="Include" />
+            <e p="MMC.cs" t="Include" />
             <e p="PCMCIA.cs" t="Include" />
-            <e p="SCSI" t="Include">
-              <e p="General.cs" t="Include" />
-              <e p="MMC.cs" t="Include" />
-              <e p="SSC.cs" t="Include" />
-            </e>
+            <e p="SSC.cs" t="Include" />
+            <e p="Scsi.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
             <e p="USB.cs" t="Include" />
           </e>
diff --git a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs b/DiscImageChef.Core/Devices/Report/MMC.cs
similarity index 100%
rename from DiscImageChef.Core/Devices/Report/SCSI/MMC.cs
rename to DiscImageChef.Core/Devices/Report/MMC.cs
diff --git a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs b/DiscImageChef.Core/Devices/Report/SSC.cs
similarity index 100%
rename from DiscImageChef.Core/Devices/Report/SCSI/SSC.cs
rename to DiscImageChef.Core/Devices/Report/SSC.cs
diff --git a/DiscImageChef.Core/Devices/Report/SCSI/General.cs b/DiscImageChef.Core/Devices/Report/Scsi.cs
similarity index 100%
rename from DiscImageChef.Core/Devices/Report/SCSI/General.cs
rename to DiscImageChef.Core/Devices/Report/Scsi.cs
diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj
index f27cd4684..56081e801 100644
--- a/DiscImageChef.Core/DiscImageChef.Core.csproj
+++ b/DiscImageChef.Core/DiscImageChef.Core.csproj
@@ -50,6 +50,9 @@
     <Compile Include="Devices\Info\Plextor.cs" />
     <Compile Include="Devices\Info\Properties.cs" />
     <Compile Include="Devices\Report\DeviceReport.cs" />
+    <Compile Include="Devices\Report\Scsi.cs" />
+    <Compile Include="Devices\Report\MMC.cs" />
+    <Compile Include="Devices\Report\SSC.cs" />
     <Compile Include="Entropy.cs" />
     <Compile Include="GetPluginBase.cs" />
     <Compile Include="ImageInfo.cs" />
@@ -80,9 +83,6 @@
     <Compile Include="Devices\Report\FireWire.cs" />
     <Compile Include="Devices\Report\USB.cs" />
     <Compile Include="Devices\Report\SecureDigital.cs" />
-    <Compile Include="Devices\Report\SCSI\MMC.cs" />
-    <Compile Include="Devices\Report\SCSI\SSC.cs" />
-    <Compile Include="Devices\Report\SCSI\General.cs" />
     <Compile Include="Remote.cs" />
     <Compile Include="Devices\Report\PCMCIA.cs" />
     <Compile Include="Devices\Reader.cs" />
@@ -157,7 +157,6 @@
     <Folder Include="Devices\Scanning\" />
     <Folder Include="Devices\Dumping\" />
     <Folder Include="Devices\Report\" />
-    <Folder Include="Devices\Report\SCSI\" />
     <Folder Include="Sidecar\" />
   </ItemGroup>
   <ItemGroup>