diff --git a/Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage Demo.xcscheme b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage Demo.xcscheme
similarity index 89%
rename from Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage Demo.xcscheme
rename to SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage Demo.xcscheme
index dfaec08a..cd5b547c 100644
--- a/Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage Demo.xcscheme	
+++ b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage Demo.xcscheme	
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "53761294155AB74D005750A4"
                BuildableName = "SDWebImage Demo.app"
                BlueprintName = "SDWebImage Demo"
-               ReferencedContainer = "container:SDWebImage Demo.xcodeproj">
+               ReferencedContainer = "container:Examples/SDWebImage Demo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
             BlueprintIdentifier = "53761294155AB74D005750A4"
             BuildableName = "SDWebImage Demo.app"
             BlueprintName = "SDWebImage Demo"
-            ReferencedContainer = "container:SDWebImage Demo.xcodeproj">
+            ReferencedContainer = "container:Examples/SDWebImage Demo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </TestAction>
@@ -54,7 +54,7 @@
             BlueprintIdentifier = "53761294155AB74D005750A4"
             BuildableName = "SDWebImage Demo.app"
             BlueprintName = "SDWebImage Demo"
-            ReferencedContainer = "container:SDWebImage Demo.xcodeproj">
+            ReferencedContainer = "container:Examples/SDWebImage Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -72,7 +72,7 @@
             BlueprintIdentifier = "53761294155AB74D005750A4"
             BuildableName = "SDWebImage Demo.app"
             BlueprintName = "SDWebImage Demo"
-            ReferencedContainer = "container:SDWebImage Demo.xcodeproj">
+            ReferencedContainer = "container:Examples/SDWebImage Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+MKAnnotation.xcscheme b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage+MKAnnotation.xcscheme
similarity index 83%
rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+MKAnnotation.xcscheme
rename to SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage+MKAnnotation.xcscheme
index 960bec99..978d862b 100644
--- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+MKAnnotation.xcscheme
+++ b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage+MKAnnotation.xcscheme
@@ -39,6 +39,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "531041C2157EAFA400BBABC3"
+            BuildableName = "libSDWebImage+MKAnnotation.a"
+            BlueprintName = "SDWebImage+MKAnnotation"
+            ReferencedContainer = "container:SDWebImage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme
similarity index 84%
rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme
rename to SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme
index 2729268e..8ecaa668 100644
--- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme
+++ b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme
@@ -39,6 +39,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "537D957317ECC1FE0097C263"
+            BuildableName = "libSDWebImage+WebP.a"
+            BlueprintName = "SDWebImage+WebP"
+            ReferencedContainer = "container:SDWebImage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage.xcscheme
similarity index 84%
rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme
rename to SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage.xcscheme
index f6873b79..35d7d3f3 100644
--- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme
+++ b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImage.xcscheme
@@ -39,6 +39,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "53761307155AD0D5005750A4"
+            BuildableName = "libSDWebImage.a"
+            BlueprintName = "SDWebImage"
+            ReferencedContainer = "container:SDWebImage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImageFramework.xcscheme b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImageFramework.xcscheme
similarity index 84%
rename from SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImageFramework.xcscheme
rename to SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImageFramework.xcscheme
index b4ae91e4..1cea4256 100644
--- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImageFramework.xcscheme
+++ b/SDWebImage.xcworkspace/xcshareddata/xcschemes/SDWebImageFramework.xcscheme
@@ -39,6 +39,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "539F912B16316D2D00160719"
+            BuildableName = "SDWebImageFramework"
+            BlueprintName = "SDWebImageFramework"
+            ReferencedContainer = "container:SDWebImage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/SDWebImage.xcworkspace/xcshareddata/xcschemes/Tests.xcscheme b/SDWebImage.xcworkspace/xcshareddata/xcschemes/Tests.xcscheme
new file mode 100644
index 00000000..bf7f4596
--- /dev/null
+++ b/SDWebImage.xcworkspace/xcshareddata/xcschemes/Tests.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0610"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DA248D52195472AA00390AB0"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:Tests/SDWebImage Tests.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DA248D52195472AA00390AB0"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:Tests/SDWebImage Tests.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DA248D52195472AA00390AB0"
+            BuildableName = "Tests.xctest"
+            BlueprintName = "Tests"
+            ReferencedContainer = "container:Tests/SDWebImage Tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DA248D52195472AA00390AB0"
+            BuildableName = "Tests.xctest"
+            BlueprintName = "Tests"
+            ReferencedContainer = "container:Tests/SDWebImage Tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DA248D52195472AA00390AB0"
+            BuildableName = "Tests.xctest"
+            BlueprintName = "Tests"
+            ReferencedContainer = "container:Tests/SDWebImage Tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>