diff --git a/DiscImageChef.Server/App_Start/Ata.cs b/DiscImageChef.Server/Core/Ata.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/Ata.cs
rename to DiscImageChef.Server/Core/Ata.cs
diff --git a/DiscImageChef.Server/App_Start/ScsiEvpd.cs b/DiscImageChef.Server/Core/ScsiEvpd.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/ScsiEvpd.cs
rename to DiscImageChef.Server/Core/ScsiEvpd.cs
diff --git a/DiscImageChef.Server/App_Start/ScsiInquiry.cs b/DiscImageChef.Server/Core/ScsiInquiry.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/ScsiInquiry.cs
rename to DiscImageChef.Server/Core/ScsiInquiry.cs
diff --git a/DiscImageChef.Server/App_Start/ScsiMmcFeatures.cs b/DiscImageChef.Server/Core/ScsiMmcFeatures.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/ScsiMmcFeatures.cs
rename to DiscImageChef.Server/Core/ScsiMmcFeatures.cs
diff --git a/DiscImageChef.Server/App_Start/ScsiMmcMode.cs b/DiscImageChef.Server/Core/ScsiMmcMode.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/ScsiMmcMode.cs
rename to DiscImageChef.Server/Core/ScsiMmcMode.cs
diff --git a/DiscImageChef.Server/App_Start/ScsiModeSense.cs b/DiscImageChef.Server/Core/ScsiModeSense.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/ScsiModeSense.cs
rename to DiscImageChef.Server/Core/ScsiModeSense.cs
diff --git a/DiscImageChef.Server/App_Start/SscTestedMedia.cs b/DiscImageChef.Server/Core/SscTestedMedia.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/SscTestedMedia.cs
rename to DiscImageChef.Server/Core/SscTestedMedia.cs
diff --git a/DiscImageChef.Server/App_Start/StatsConverter.cs b/DiscImageChef.Server/Core/StatsConverter.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/StatsConverter.cs
rename to DiscImageChef.Server/Core/StatsConverter.cs
diff --git a/DiscImageChef.Server/App_Start/TestedMedia.cs b/DiscImageChef.Server/Core/TestedMedia.cs
similarity index 100%
rename from DiscImageChef.Server/App_Start/TestedMedia.cs
rename to DiscImageChef.Server/Core/TestedMedia.cs