From 228e4e8e1a1af57ed0b1a77ac86a42c23b2b63eb Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sat, 19 Sep 2020 14:32:43 +0900
Subject: [PATCH] rename CoreStoreDemo to LegacyDemo

---
 .../contents.xcworkspacedata                  |   2 +-
 .../xcshareddata/CoreStoreDemo.xccheckout     |  53 -----------
 .../xcshareddata/CoreStoreDemo.xcscmblueprint |  30 ------
 .../xcshareddata/HardcoreDataDemo.xccheckout  |  53 -----------
 .../xcschemes/CoreStoreDemo.xcscheme          |  87 ------------------
 .../Base.lproj/LaunchScreen.xib.orig          |  53 -----------
 .../xcschemes/xcschememanagement.plist        |   2 +-
 .../LegacyDemo.xcodeproj}/project.pbxproj     |  54 +++++------
 .../contents.xcworkspacedata                  |   2 +-
 .../xcschemes/xcschememanagement.plist        |  12 ++-
 .../LegacyDemo}/AppDelegate.swift             |   2 +-
 .../LegacyDemo}/Base.lproj/LaunchScreen.xib   |   0
 .../LegacyDemo}/Base.lproj/Main.storyboard    |  32 +++----
 ...etchingAndQueryingDemoViewController.swift |   2 +-
 .../FetchingResultsViewController.swift       |   2 +-
 .../QueryingResultsViewController.swift       |   2 +-
 .../Fetching and Querying Demo/TimeZone.swift |   2 +-
 .../AppIcon.appiconset/Contents.json          |   0
 .../AppIcon.appiconset/Icon-60@2x.png         | Bin
 .../AppIcon.appiconset/Icon-60@3x-1.png       | Bin
 .../AppIcon.appiconset/Icon-60@3x.png         | Bin
 .../AppIcon.appiconset/Icon-76.png            | Bin
 .../AppIcon.appiconset/Icon-76@2x.png         | Bin
 .../Mask + Oval 1 + Oval 1 + Oval 1.png       | Bin
 .../LegacyDemo}/Images.xcassets/Contents.json |   0
 .../CoreStoreIcon.imageset/Contents.json      |   0
 .../CoreStoreIcon@2x.png                      | Bin
 .../first.imageset/Contents.json              |   0
 .../Images.xcassets/first.imageset/first.pdf  | Bin
 .../second.imageset/Contents.json             |   0
 .../second.imageset/second.pdf                | Bin
 .../LegacyDemo}/Info.plist                    |   4 +-
 .../LegacyDemo.xcdatamodel}/contents          |   4 +-
 .../CollectionViewDemoViewController.swift    |   2 +-
 .../ColorsDemo.swift                          |   2 +-
 .../ListObserverDemoViewController.swift      |   2 +-
 .../ObjectObserverDemoViewController.swift    |   2 +-
 .../ObserversViewController.swift             |   2 +-
 .../Palette.swift                             |   2 +-
 .../PaletteCollectionSectionHeaderView.swift  |   2 +-
 .../PaletteCollectionViewCell.swift           |   2 +-
 .../PaletteTableViewCell.swift                |   2 +-
 .../CustomLoggerViewController.swift          |   2 +-
 .../MigrationsDemoViewController.swift        |   2 +-
 .../MyAppModel.xcdatamodeld/.xccurrentversion |   0
 .../MyAppModel.xcdatamodel/contents           |   0
 .../MIgrations Demo/OrganismProtocol.swift    |   2 +-
 .../OrganismTableViewCell.swift               |   2 +-
 .../MIgrations Demo/OrganismV1.swift          |   2 +-
 .../MIgrations Demo/OrganismV2.swift          |   2 +-
 .../xcmapping.xml                             |   0
 .../OrganismV2ToV3MigrationPolicy.swift       |   2 +-
 .../MIgrations Demo/OrganismV3.swift          |   2 +-
 .../xcmapping.xml                             |   0
 .../.xccurrentversion                         |   0
 .../MigrationDemo.xcdatamodel/contents        |   2 +-
 .../MigrationDemoV2.xcdatamodel/contents      |   2 +-
 .../MigrationDemoV3.xcdatamodel/contents      |   2 +-
 .../Stack Setup Demo/FemaleAccount.swift      |   2 +-
 .../Stack Setup Demo/MaleAccount.swift        |   2 +-
 .../StackSetupDemoViewController.swift        |   2 +-
 .../Stack Setup Demo/UserAccount.swift        |   2 +-
 .../StackSetupDemo.xcdatamodel/contents       |   6 +-
 .../SwiftUIContainerViewController.swift      |   2 +-
 .../SwiftUI Demo/SwiftUIView.swift            |   2 +-
 .../LegacyDemo}/Transactions Demo/Place.swift |   2 +-
 .../TransactionsDemoViewController.swift      |   2 +-
 {CoreStoreDemo => LegacyDemo}/appIcons.sketch | Bin
 README.md                                     |   4 +-
 69 files changed, 96 insertions(+), 368 deletions(-)
 delete mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout
 delete mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint
 delete mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout
 delete mode 100644 CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
 delete mode 100644 CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib.orig
 rename {CoreStoreDemo/CoreStoreDemo.xcodeproj => LegacyDemo/LegacyDemo.xcodeproj}/project.pbxproj (94%)
 rename {CoreStoreDemo/CoreStoreDemo.xcodeproj => LegacyDemo/LegacyDemo.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (68%)
 rename CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings => LegacyDemo/LegacyDemo.xcodeproj/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist (54%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/AppDelegate.swift (96%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Base.lproj/LaunchScreen.xib (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Base.lproj/Main.storyboard (98%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Fetching and Querying Demo/FetchingResultsViewController.swift (98%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Fetching and Querying Demo/QueryingResultsViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Fetching and Querying Demo/TimeZone.swift (95%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Contents.json (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Icon-76.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/Contents.json (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/CoreStoreIcon.imageset/Contents.json (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/first.imageset/Contents.json (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/first.imageset/first.pdf (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/second.imageset/Contents.json (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Images.xcassets/second.imageset/second.pdf (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Info.plist (100%)
 rename {CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel => LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel}/contents (90%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/CollectionViewDemoViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/ColorsDemo.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/ListObserverDemoViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/ObjectObserverDemoViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/ObserversViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/Palette.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift (95%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/PaletteCollectionViewCell.swift (95%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/List and Object Observers Demo/PaletteTableViewCell.swift (95%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Loggers Demo/CustomLoggerViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/MigrationsDemoViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismProtocol.swift (93%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismTableViewCell.swift (96%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismV1.swift (96%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismV2.swift (97%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift (98%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismV3.swift (97%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MigrationDemo.xcdatamodeld/.xccurrentversion (100%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents (88%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents (89%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents (90%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Stack Setup Demo/FemaleAccount.swift (92%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Stack Setup Demo/MaleAccount.swift (92%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Stack Setup Demo/StackSetupDemoViewController.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Stack Setup Demo/UserAccount.swift (95%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents (76%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/SwiftUI Demo/SwiftUIContainerViewController.swift (98%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/SwiftUI Demo/SwiftUIView.swift (99%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Transactions Demo/Place.swift (98%)
 rename {CoreStoreDemo/CoreStoreDemo => LegacyDemo/LegacyDemo}/Transactions Demo/TransactionsDemoViewController.swift (99%)
 rename {CoreStoreDemo => LegacyDemo}/appIcons.sketch (100%)

diff --git a/CoreStore.xcworkspace/contents.xcworkspacedata b/CoreStore.xcworkspace/contents.xcworkspacedata
index a804436..a57c826 100644
--- a/CoreStore.xcworkspace/contents.xcworkspacedata
+++ b/CoreStore.xcworkspace/contents.xcworkspacedata
@@ -8,6 +8,6 @@
       location = "group:CoreStore.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:CoreStoreDemo/CoreStoreDemo.xcodeproj">
+      location = "group:/Users/JohnEstropia/Documents/XCodeProjects/CoreStore/LegacyDemo/LegacyDemo.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout
deleted file mode 100644
index 346694d..0000000
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>B6855E48-4B19-4321-B1C7-CB2706E12777</string>
-	<key>IDESourceControlProjectName</key>
-	<string>CoreStoreDemo</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>github.com:JohnEstropia/CoreStore.git</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>github.com:JohnEstropia/GCDKit.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>CoreStoreDemo/CoreStoreDemo.xcodeproj</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>../../..</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>../../..Libraries/GCDKit</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>github.com:JohnEstropia/CoreStore.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>111</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-			<key>IDESourceControlWCCName</key>
-			<string>CoreStore</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>8B2E522D57154DFA93A06982C36315ECBEA4FA97</string>
-			<key>IDESourceControlWCCName</key>
-			<string>GCDKit</string>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint
deleted file mode 100644
index 19c5427..0000000
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48",
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
-
-  },
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
-    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
-  },
-  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B6855E48-4B19-4321-B1C7-CB2706E12777",
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStoreLibraries\/GCDKit",
-    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore"
-  },
-  "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStoreDemo",
-  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
-  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStoreDemo\/CoreStoreDemo.xcodeproj",
-  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/CoreStore.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48"
-    },
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/GCDKit.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout
deleted file mode 100644
index 202d445..0000000
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>7C5E31AC-5DD0-43DA-A5C6-AF73B4532D86</string>
-	<key>IDESourceControlProjectName</key>
-	<string>project</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>github.com:JohnEstropia/HardcoreData.git</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>github.com:JohnEstropia/GCDKit.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>../../..</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>../../..Libraries/GCDKit</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>github.com:JohnEstropia/HardcoreData.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>111</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>8B2E522D57154DFA93A06982C36315ECBEA4FA97</string>
-			<key>IDESourceControlWCCName</key>
-			<string>GCDKit</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-			<key>IDESourceControlWCCName</key>
-			<string>HardcoreData</string>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
deleted file mode 100644
index df8f438..0000000
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-               BuildableName = "CoreStoreDemo.app"
-               BlueprintName = "CoreStoreDemo"
-               ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib.orig b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib.orig
deleted file mode 100644
index 5948784..0000000
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib.orig
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<<<<<<< Updated upstream
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
-=======
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
->>>>>>> Stashed changes
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-<<<<<<< Updated upstream
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-=======
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439.5" width="441" height="20.5"/>
->>>>>>> Stashed changes
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="133" width="441" height="57.5"/>
-                    <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
diff --git a/Demo/Demo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist b/Demo/Demo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
index 5a1cd28..5596ec8 100644
--- a/Demo/Demo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Demo/Demo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Demo.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/LegacyDemo/LegacyDemo.xcodeproj/project.pbxproj
similarity index 94%
rename from CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
rename to LegacyDemo/LegacyDemo.xcodeproj/project.pbxproj
index 4da2f9f..c1d5087 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/LegacyDemo/LegacyDemo.xcodeproj/project.pbxproj
@@ -21,7 +21,7 @@
 		B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52977E01B120F8A003D50A5 /* CoreLocation.framework */; };
 		B52977E41B121635003D50A5 /* Place.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977E31B121635003D50A5 /* Place.swift */; };
 		B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */; };
-		B54AAD521AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */; };
+		B54AAD521AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD501AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld */; };
 		B54AAD591AF4D26E00848AE0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD571AF4D26E00848AE0 /* Main.storyboard */; };
 		B54AAD5B1AF4D26E00848AE0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */; };
 		B54AAD5E1AF4D26E00848AE0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */; };
@@ -80,10 +80,10 @@
 		B52977DE1B120F83003D50A5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
 		B52977E01B120F8A003D50A5 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		B52977E31B121635003D50A5 /* Place.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Place.swift; sourceTree = "<group>"; };
-		B54AAD491AF4D26E00848AE0 /* CoreStoreDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CoreStoreDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		B54AAD491AF4D26E00848AE0 /* LegacyDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LegacyDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B54AAD4D1AF4D26E00848AE0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		B54AAD511AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = CoreStoreDemo.xcdatamodel; sourceTree = "<group>"; };
+		B54AAD511AF4D26E00848AE0 /* LegacyDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LegacyDemo.xcdatamodel; sourceTree = "<group>"; };
 		B54AAD581AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		B54AAD5D1AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
@@ -104,7 +104,7 @@
 		B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorsDemo.swift; sourceTree = "<group>"; };
 		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionSectionHeaderView.swift; sourceTree = "<group>"; };
-		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
+		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
 		B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = "<group>"; };
 		B5EE25861B36E2520000406B /* OrganismV2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2.swift; sourceTree = "<group>"; };
@@ -178,7 +178,7 @@
 			isa = PBXGroup;
 			children = (
 				B52977E21B120F90003D50A5 /* Frameworks */,
-				B54AAD4B1AF4D26E00848AE0 /* CoreStoreDemo */,
+				B54AAD4B1AF4D26E00848AE0 /* LegacyDemo */,
 				B54AAD4A1AF4D26E00848AE0 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -186,12 +186,12 @@
 		B54AAD4A1AF4D26E00848AE0 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B54AAD491AF4D26E00848AE0 /* CoreStoreDemo.app */,
+				B54AAD491AF4D26E00848AE0 /* LegacyDemo.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		B54AAD4B1AF4D26E00848AE0 /* CoreStoreDemo */ = {
+		B54AAD4B1AF4D26E00848AE0 /* LegacyDemo */ = {
 			isa = PBXGroup;
 			children = (
 				B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */,
@@ -205,12 +205,12 @@
 				B54AAD571AF4D26E00848AE0 /* Main.storyboard */,
 				B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */,
 				B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */,
-				B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */,
+				B54AAD501AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld */,
 				B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */,
 				B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */,
 				B54AAD4C1AF4D26E00848AE0 /* Supporting Files */,
 			);
-			path = CoreStoreDemo;
+			path = LegacyDemo;
 			sourceTree = "<group>";
 		};
 		B54AAD4C1AF4D26E00848AE0 /* Supporting Files */ = {
@@ -270,9 +270,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */ = {
+		B54AAD481AF4D26E00848AE0 /* LegacyDemo */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "CoreStoreDemo" */;
+			buildConfigurationList = B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "LegacyDemo" */;
 			buildPhases = (
 				B54AAD451AF4D26E00848AE0 /* Sources */,
 				B54AAD461AF4D26E00848AE0 /* Frameworks */,
@@ -283,9 +283,9 @@
 			);
 			dependencies = (
 			);
-			name = CoreStoreDemo;
-			productName = CoreStoreDemo;
-			productReference = B54AAD491AF4D26E00848AE0 /* CoreStoreDemo.app */;
+			name = LegacyDemo;
+			productName = LegacyDemo;
+			productReference = B54AAD491AF4D26E00848AE0 /* LegacyDemo.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -305,7 +305,7 @@
 					};
 				};
 			};
-			buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "CoreStoreDemo" */;
+			buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "LegacyDemo" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -318,7 +318,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */,
+				B54AAD481AF4D26E00848AE0 /* LegacyDemo */,
 			);
 		};
 /* End PBXProject section */
@@ -358,7 +358,7 @@
 				B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */,
 				B56964DA1B231BCA0075EE4A /* MaleAccount.swift in Sources */,
 				B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */,
-				B54AAD521AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld in Sources */,
+				B54AAD521AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld in Sources */,
 				B5EE259B1B3EA4890000406B /* OrganismV3.swift in Sources */,
 				B503FAE11AFDC71700F90881 /* Palette.swift in Sources */,
 				B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */,
@@ -511,9 +511,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = 2JT32EJ5BH;
-				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
+				INFOPLIST_FILE = LegacyDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.legacydemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 			};
@@ -524,9 +524,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = 2JT32EJ5BH;
-				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
+				INFOPLIST_FILE = LegacyDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.legacydemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -536,7 +536,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "CoreStoreDemo" */ = {
+		B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "LegacyDemo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				B54AAD6B1AF4D26E00848AE0 /* Debug */,
@@ -545,7 +545,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "CoreStoreDemo" */ = {
+		B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "LegacyDemo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				B54AAD6E1AF4D26E00848AE0 /* Debug */,
@@ -557,13 +557,13 @@
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
-		B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */ = {
+		B54AAD501AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				B54AAD511AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodel */,
+				B54AAD511AF4D26E00848AE0 /* LegacyDemo.xcdatamodel */,
 			);
-			currentVersion = B54AAD511AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodel */;
-			path = CoreStoreDemo.xcdatamodeld;
+			currentVersion = B54AAD511AF4D26E00848AE0 /* LegacyDemo.xcdatamodel */;
+			path = LegacyDemo.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
 		};
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LegacyDemo/LegacyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 68%
rename from CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to LegacyDemo/LegacyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 5100eb1..c81ed91 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/LegacyDemo/LegacyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:CoreStoreDemo.xcodeproj">
+      location = "self:LegacyDemo.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings b/LegacyDemo/LegacyDemo.xcodeproj/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist
similarity index 54%
rename from CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings
rename to LegacyDemo/LegacyDemo.xcodeproj/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist
index 659c876..d7fe770 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings
+++ b/LegacyDemo/LegacyDemo.xcodeproj/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -2,9 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
-	<true/>
-	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
-	<true/>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>LegacyDemo.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift b/LegacyDemo/LegacyDemo/AppDelegate.swift
similarity index 96%
rename from CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
rename to LegacyDemo/LegacyDemo/AppDelegate.swift
index 863a104..c52cf26 100644
--- a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
+++ b/LegacyDemo/LegacyDemo/AppDelegate.swift
@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib b/LegacyDemo/LegacyDemo/Base.lproj/LaunchScreen.xib
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib
rename to LegacyDemo/LegacyDemo/Base.lproj/LaunchScreen.xib
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/LegacyDemo/LegacyDemo/Base.lproj/Main.storyboard
similarity index 98%
rename from CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
rename to LegacyDemo/LegacyDemo/Base.lproj/Main.storyboard
index 4cf6df6..c99974c 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/LegacyDemo/LegacyDemo/Base.lproj/Main.storyboard
@@ -24,7 +24,7 @@
         <!--SNS Accounts-->
         <scene sceneID="3If-81-mNf">
             <objects>
-                <tableViewController id="AW4-lY-JNk" customClass="StackSetupDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="AW4-lY-JNk" customClass="StackSetupDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="S3A-lm-AuA">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -110,7 +110,7 @@
         <!--Evolution-->
         <scene sceneID="iwU-Hv-zNr">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="iVv-Vc-nCL" customClass="MigrationsDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="iVv-Vc-nCL" customClass="MigrationsDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Un6-jI-efh"/>
                         <viewControllerLayoutGuide type="bottom" id="t9A-zf-Iew"/>
@@ -124,7 +124,7 @@
                                 <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="separatorColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrganismTableViewCell" id="WVb-th-o8c" customClass="OrganismTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrganismTableViewCell" id="WVb-th-o8c" customClass="OrganismTableViewCell" customModule="LegacyDemo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WVb-th-o8c" id="JBq-Ml-a9p">
@@ -473,7 +473,7 @@
         <!--SwiftUI-->
         <scene sceneID="Uiz-5a-tKq">
             <objects>
-                <viewController id="rhi-tx-cSW" customClass="SwiftUIContainerViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="rhi-tx-cSW" customClass="SwiftUIContainerViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="0Nq-lg-kDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="72Q-TT-uXH"/>
@@ -505,7 +505,7 @@
         <!--Object Observer-->
         <scene sceneID="Y7v-tc-8cX">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="dX3-kR-CYC" customClass="ObjectObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="dX3-kR-CYC" customClass="ObjectObserverDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="J6W-Ki-cRQ"/>
                         <viewControllerLayoutGuide type="bottom" id="aI4-O3-OCi"/>
@@ -629,7 +629,7 @@
         <!--Colors-->
         <scene sceneID="3lD-lX-hIc">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="YOI-b7-Nxn" customClass="ObserversViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="YOI-b7-Nxn" customClass="ObserversViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="IML-3o-caw"/>
                         <viewControllerLayoutGuide type="bottom" id="LNL-mj-D7l"/>
@@ -720,12 +720,12 @@
         <!--ListPublisher-->
         <scene sceneID="gkX-bd-Rel">
             <objects>
-                <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="DAz-BE-6Ca">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="G3X-70-BCD" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="G3X-70-BCD" customClass="PaletteTableViewCell" customModule="LegacyDemo" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G3X-70-BCD" id="aT8-nz-i5l">
@@ -780,7 +780,7 @@
         <!--Placemarks-->
         <scene sceneID="LRD-q1-hw1">
             <objects>
-                <viewController id="jPl-fH-NlD" customClass="TransactionsDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="jPl-fH-NlD" customClass="TransactionsDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="1of-hY-qOU"/>
                         <viewControllerLayoutGuide type="bottom" id="RZg-hi-T8O"/>
@@ -817,7 +817,7 @@
         <!--Logger-->
         <scene sceneID="n7W-0g-bbY">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="5yy-0N-QDU" customClass="CustomLoggerViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="5yy-0N-QDU" customClass="CustomLoggerViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="pvA-Nu-u2P"/>
                         <viewControllerLayoutGuide type="bottom" id="Cwn-Jd-4Lr"/>
@@ -901,7 +901,7 @@
         <!--ListPublisher-->
         <scene sceneID="CXQ-vG-dtK">
             <objects>
-                <collectionViewController id="EKY-1g-ALK" customClass="CollectionViewDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <collectionViewController id="EKY-1g-ALK" customClass="CollectionViewDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="hx3-j3-Q80">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -913,7 +913,7 @@
                             <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                         </collectionViewFlowLayout>
                         <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PaletteCollectionViewCell" id="x2U-Yq-KAx" customClass="PaletteCollectionViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PaletteCollectionViewCell" id="x2U-Yq-KAx" customClass="PaletteCollectionViewCell" customModule="LegacyDemo" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="50" width="50" height="50"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="Alc-Is-Hc1">
@@ -937,7 +937,7 @@
                                 </connections>
                             </collectionViewCell>
                         </cells>
-                        <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PaletteCollectionSectionHeaderView" id="bRa-K0-IUz" customClass="PaletteCollectionSectionHeaderView" customModule="CoreStoreDemo" customModuleProvider="target">
+                        <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PaletteCollectionSectionHeaderView" id="bRa-K0-IUz" customClass="PaletteCollectionSectionHeaderView" customModule="LegacyDemo" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
@@ -975,7 +975,7 @@
         <!--Time Zones-->
         <scene sceneID="nFT-bo-7y9">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="qbj-MK-nIY" customClass="FetchingAndQueryingDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="qbj-MK-nIY" customClass="FetchingAndQueryingDemoViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="dgu-PC-LiB"/>
                         <viewControllerLayoutGuide type="bottom" id="DlN-cN-JXd"/>
@@ -1059,7 +1059,7 @@
         <!--Fetch Results-->
         <scene sceneID="kk7-cC-Fj8">
             <objects>
-                <tableViewController id="tIs-pN-OgO" customClass="FetchingResultsViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="tIs-pN-OgO" customClass="FetchingResultsViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="36" sectionFooterHeight="22" id="tVl-tT-UDk">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1105,7 +1105,7 @@
         <!--Query Results-->
         <scene sceneID="eUn-Bw-RNd">
             <objects>
-                <tableViewController id="o9D-Xm-13g" customClass="QueryingResultsViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="o9D-Xm-13g" customClass="QueryingResultsViewController" customModule="LegacyDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="36" sectionFooterHeight="22" id="bMh-zR-xwu">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift
rename to LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift
index 9ff315d..5d8de68 100644
--- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  FetchingAndQueryingDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/12.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingResultsViewController.swift
similarity index 98%
rename from CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift
rename to LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingResultsViewController.swift
index 239649a..1e93e7f 100644
--- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift	
+++ b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingResultsViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  FetchingResultsViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/QueryingResultsViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift
rename to LegacyDemo/LegacyDemo/Fetching and Querying Demo/QueryingResultsViewController.swift
index 1375122..17a663e 100644
--- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift	
+++ b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/QueryingResultsViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  QueryingResultsViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/TimeZone.swift
similarity index 95%
rename from CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift
rename to LegacyDemo/LegacyDemo/Fetching and Querying Demo/TimeZone.swift
index 97c8cbd..c112b69 100644
--- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift	
+++ b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/TimeZone.swift	
@@ -1,6 +1,6 @@
 //
 //  TimeZone.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/15.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/Contents.json
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/Contents.json
rename to LegacyDemo/LegacyDemo/Images.xcassets/Contents.json
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json
rename to LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png b/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png
rename to LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/first.imageset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/Contents.json
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/first.imageset/Contents.json
rename to LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/Contents.json
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/first.imageset/first.pdf b/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/first.pdf
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/first.imageset/first.pdf
rename to LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/first.pdf
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/second.imageset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/Contents.json
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/second.imageset/Contents.json
rename to LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/Contents.json
diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/second.imageset/second.pdf b/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/second.pdf
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Images.xcassets/second.imageset/second.pdf
rename to LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/second.pdf
diff --git a/CoreStoreDemo/CoreStoreDemo/Info.plist b/LegacyDemo/LegacyDemo/Info.plist
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/Info.plist
rename to LegacyDemo/LegacyDemo/Info.plist
index 3f0a53f..e33343c 100644
--- a/CoreStoreDemo/CoreStoreDemo/Info.plist
+++ b/LegacyDemo/LegacyDemo/Info.plist
@@ -48,9 +48,9 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents b/LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel/contents
similarity index 90%
rename from CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents
rename to LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel/contents
index f334ebd..3b181e8 100644
--- a/CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents
+++ b/LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel/contents
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="18G1012" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
-    <entity name="Place" representedClassName="CoreStoreDemo.Place" syncable="YES">
+    <entity name="Place" representedClassName="LegacyDemo.Place" syncable="YES">
         <attribute name="latitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="longitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="subtitle" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
-    <entity name="TimeZone" representedClassName="CoreStoreDemo.TimeZone" syncable="YES">
+    <entity name="TimeZone" representedClassName="LegacyDemo.TimeZone" syncable="YES">
         <attribute name="abbreviation" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="daylightSavingTimeOffset" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasDaylightSavingTime" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
index 8ff77b5..73ac494 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  CollectionViewDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Estropia on 2019/10/17.
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ColorsDemo.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/ColorsDemo.swift
index a3d182b..4b488db 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ColorsDemo.swift	
@@ -1,6 +1,6 @@
 //
 //  ColorsDemo.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2019/10/17.
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 0d4f341..ec0ba86 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  ListObserverDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
index 68fd561..0c8fd1a 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  ObjectObserverDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/06.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObserversViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/ObserversViewController.swift
index 9731e94..e85627c 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObserversViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  ObserversViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/Palette.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/Palette.swift
index 0f0120a..bc3124e 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/Palette.swift	
@@ -1,6 +1,6 @@
 //
 //  Palette.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift
similarity index 95%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift
index b2fa540..ecf7166 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift	
@@ -1,6 +1,6 @@
 //
 //  PaletteCollectionSectionHeaderView.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Estropia on 2019/10/17.
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift
similarity index 95%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift
index 156ccf2..2bf508f 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift	
@@ -1,6 +1,6 @@
 //
 //  PaletteCollectionViewCell.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Estropia on 2019/10/17.
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteTableViewCell.swift
similarity index 95%
rename from CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift
rename to LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteTableViewCell.swift
index efdeafa..86b144d 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift	
+++ b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteTableViewCell.swift	
@@ -1,6 +1,6 @@
 //
 //  PaletteTableViewCell.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift b/LegacyDemo/LegacyDemo/Loggers Demo/CustomLoggerViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift
rename to LegacyDemo/LegacyDemo/Loggers Demo/CustomLoggerViewController.swift
index 8f25aee..2de764e 100644
--- a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift	
+++ b/LegacyDemo/LegacyDemo/Loggers Demo/CustomLoggerViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  CustomLoggerViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/05.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/MigrationsDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/MigrationsDemoViewController.swift
index fd7aa76..fc6a662 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/MigrationsDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  MigrationsDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion b/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion
rename to LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents
rename to LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismProtocol.swift
similarity index 93%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismProtocol.swift
index 48afe59..d672fed 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismProtocol.swift	
@@ -1,6 +1,6 @@
 //
 //  OrganismProtocol.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift
similarity index 96%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift
index 924b323..356e8af 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift	
@@ -1,6 +1,6 @@
 //
 //  OrganismTableViewCell.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/07/12.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV1.swift
similarity index 96%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV1.swift
index 818ad7c..ea96d24 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV1.swift	
@@ -1,6 +1,6 @@
 //
 //  OrganismV1.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2.swift
similarity index 97%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2.swift
index e2c242a..931fcab 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2.swift	
@@ -1,6 +1,6 @@
 //
 //  OrganismV2.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift
similarity index 98%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift
index ca10fb8..033593e 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift	
@@ -1,6 +1,6 @@
 //
 //  OrganismV2ToV3MigrationPolicy.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3.swift
similarity index 97%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3.swift
index 99afd41..e2a910e 100644
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift	
+++ b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3.swift	
@@ -1,6 +1,6 @@
 //
 //  OrganismV3.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml
rename to LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml
diff --git a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/.xccurrentversion b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/.xccurrentversion
similarity index 100%
rename from CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/.xccurrentversion
rename to LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/.xccurrentversion
diff --git a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
similarity index 88%
rename from CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
rename to LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
index 0bfb5f2..9063bad 100644
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
+++ b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11198.3" systemVersion="15F34" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV1" syncable="YES">
+    <entity name="Organism" representedClassName="LegacyDemo.OrganismV1" syncable="YES">
         <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasHead" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasTail" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
similarity index 89%
rename from CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
rename to LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
index cc9fb18..3a252de 100644
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
+++ b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11198.3" systemVersion="15F34" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV2" syncable="YES">
+    <entity name="Organism" representedClassName="LegacyDemo.OrganismV2" syncable="YES">
         <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasHead" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasTail" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
similarity index 90%
rename from CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
rename to LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
index 61c02bc..1d684b5 100644
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
+++ b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16E195" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV3" syncable="YES">
+    <entity name="Organism" representedClassName="LegacyDemo.OrganismV3" syncable="YES">
         <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasHead" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasTail" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/FemaleAccount.swift
similarity index 92%
rename from CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift
rename to LegacyDemo/LegacyDemo/Stack Setup Demo/FemaleAccount.swift
index 3316b44..e370d49 100644
--- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift	
+++ b/LegacyDemo/LegacyDemo/Stack Setup Demo/FemaleAccount.swift	
@@ -1,6 +1,6 @@
 //
 //  FemaleAccount.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/MaleAccount.swift
similarity index 92%
rename from CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift
rename to LegacyDemo/LegacyDemo/Stack Setup Demo/MaleAccount.swift
index 2d55e72..faba9ba 100644
--- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift	
+++ b/LegacyDemo/LegacyDemo/Stack Setup Demo/MaleAccount.swift	
@@ -1,6 +1,6 @@
 //
 //  MaleAccount.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/StackSetupDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift
rename to LegacyDemo/LegacyDemo/Stack Setup Demo/StackSetupDemoViewController.swift
index 9ecfd58..d2422b5 100644
--- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/Stack Setup Demo/StackSetupDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  StackSetupDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/UserAccount.swift
similarity index 95%
rename from CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift
rename to LegacyDemo/LegacyDemo/Stack Setup Demo/UserAccount.swift
index 53635cd..b3e1e57 100644
--- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift	
+++ b/LegacyDemo/LegacyDemo/Stack Setup Demo/UserAccount.swift	
@@ -1,6 +1,6 @@
 //
 //  UserAccount.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents b/LegacyDemo/LegacyDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents
similarity index 76%
rename from CoreStoreDemo/CoreStoreDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents
rename to LegacyDemo/LegacyDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents
index 37b3cb2..71bef7a 100644
--- a/CoreStoreDemo/CoreStoreDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents
+++ b/LegacyDemo/LegacyDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14D136" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
-    <entity name="FemaleAccount" representedClassName="CoreStoreDemo.FemaleAccount" parentEntity="UserAccount" syncable="YES"/>
-    <entity name="MaleAccount" representedClassName="CoreStoreDemo.MaleAccount" parentEntity="UserAccount" syncable="YES"/>
-    <entity name="UserAccount" representedClassName="CoreStoreDemo.UserAccount" isAbstract="YES" syncable="YES">
+    <entity name="FemaleAccount" representedClassName="LegacyDemo.FemaleAccount" parentEntity="UserAccount" syncable="YES"/>
+    <entity name="MaleAccount" representedClassName="LegacyDemo.MaleAccount" parentEntity="UserAccount" syncable="YES"/>
+    <entity name="UserAccount" representedClassName="LegacyDemo.UserAccount" isAbstract="YES" syncable="YES">
         <attribute name="accountType" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="friends" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
similarity index 98%
rename from CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
rename to LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
index 6933882..d1c6fe7 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
+++ b/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  SwiftUIContainerViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2019/10/02.
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIView.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
rename to LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIView.swift
index 764119c..d8e41ab 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -1,6 +1,6 @@
 //
 //  SwiftUIView.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2019/10/02.
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift b/LegacyDemo/LegacyDemo/Transactions Demo/Place.swift
similarity index 98%
rename from CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift
rename to LegacyDemo/LegacyDemo/Transactions Demo/Place.swift
index 3d68f0c..37670f2 100644
--- a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift	
+++ b/LegacyDemo/LegacyDemo/Transactions Demo/Place.swift	
@@ -1,6 +1,6 @@
 //
 //  Place.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift b/LegacyDemo/LegacyDemo/Transactions Demo/TransactionsDemoViewController.swift
similarity index 99%
rename from CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift
rename to LegacyDemo/LegacyDemo/Transactions Demo/TransactionsDemoViewController.swift
index 3ab191e..abd270b 100644
--- a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift	
+++ b/LegacyDemo/LegacyDemo/Transactions Demo/TransactionsDemoViewController.swift	
@@ -1,6 +1,6 @@
 //
 //  TransactionsDemoViewController.swift
-//  CoreStoreDemo
+//  LegacyDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
 //  Copyright © 2018 John Rommel Estropia. All rights reserved.
diff --git a/CoreStoreDemo/appIcons.sketch b/LegacyDemo/appIcons.sketch
similarity index 100%
rename from CoreStoreDemo/appIcons.sketch
rename to LegacyDemo/appIcons.sketch
diff --git a/README.md b/README.md
index df65475..72228ec 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
 
 - [TL;DR (a.k.a. sample codes)](#tldr-aka-sample-codes)
 - [Architecture](#architecture)
-- CoreStore Tutorials (All of these have demos in the **CoreStoreDemo** app project!)
+- CoreStore Tutorials (All of these have demos in the **Demo** app project!)
     - [Setting up](#setting-up)
         - [In-memory store](#in-memory-store)
         - [Local store](#local-store)
@@ -172,7 +172,7 @@ let maxAge = try dataStack.queryValue(
 
 But really, there's a reason I wrote this huge *README*. Read up on the details!
 
-Check out the **CoreStoreDemo** app project for sample codes as well!
+Check out the **Demo** app project for sample codes as well!