diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/MediaBrowser/MediaBrowserMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/MediaBrowser/MediaBrowserMetadata.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/Roksbox/RoksboxMetadata.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Roksbox/RoksboxMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/Roksbox/RoksboxMetadata.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Roksbox/RoksboxMetadata.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/Roksbox/RoksboxMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Roksbox/RoksboxMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/Roksbox/RoksboxMetadataSettings.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Roksbox/RoksboxMetadataSettings.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Wdtv/WdtvMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/Wdtv/WdtvMetadata.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Wdtv/WdtvMetadata.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/Wdtv/WdtvMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Wdtv/WdtvMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/Wdtv/WdtvMetadataSettings.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Wdtv/WdtvMetadataSettings.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Xbmc/XbmcMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/Xbmc/XbmcMetadata.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Xbmc/XbmcMetadata.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Consumers/Xbmc/XbmcMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Xbmc/XbmcMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Consumers/Xbmc/XbmcMetadataSettings.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Consumers/Xbmc/XbmcMetadataSettings.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/ExistingMetadataImporter.cs b/src/NzbDrone.Core/Extras/Metadata_step1/ExistingMetadataImporter.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/ExistingMetadataImporter.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/ExistingMetadataImporter.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Files/CleanMetadataFileService.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Files/CleanMetadataFileService.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Files/CleanMetadataFileService.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Files/CleanMetadataFileService.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Files/ImageFileResult.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Files/ImageFileResult.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Files/ImageFileResult.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Files/ImageFileResult.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Files/MetadataFile.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFile.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Files/MetadataFile.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFile.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Files/MetadataFileRepository.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFileRepository.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Files/MetadataFileRepository.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFileRepository.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Files/MetadataFileResult.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFileResult.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Files/MetadataFileResult.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFileResult.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/Files/MetadataFileService.cs b/src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFileService.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/Files/MetadataFileService.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/Files/MetadataFileService.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/IMetadata.cs b/src/NzbDrone.Core/Extras/Metadata_step1/IMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/IMetadata.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/IMetadata.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/MetadataBase.cs b/src/NzbDrone.Core/Extras/Metadata_step1/MetadataBase.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/MetadataBase.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/MetadataBase.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/MetadataDefinition.cs b/src/NzbDrone.Core/Extras/Metadata_step1/MetadataDefinition.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/MetadataDefinition.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/MetadataDefinition.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/MetadataFactory.cs b/src/NzbDrone.Core/Extras/Metadata_step1/MetadataFactory.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/MetadataFactory.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/MetadataFactory.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/MetadataRepository.cs b/src/NzbDrone.Core/Extras/Metadata_step1/MetadataRepository.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/MetadataRepository.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/MetadataRepository.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/MetadataService.cs b/src/NzbDrone.Core/Extras/Metadata_step1/MetadataService.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/MetadataService.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/MetadataService.cs
diff --git a/src/NzbDrone.Core/Extras/MetaData/MetadataType.cs b/src/NzbDrone.Core/Extras/Metadata_step1/MetadataType.cs
similarity index 100%
rename from src/NzbDrone.Core/Extras/MetaData/MetadataType.cs
rename to src/NzbDrone.Core/Extras/Metadata_step1/MetadataType.cs