diff --git a/CoreStore.podspec b/CoreStore.podspec index 04aeddc..bc7fe3e 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -16,7 +16,5 @@ Pod::Spec.new do |s| s.public_header_files = "Sources/**/*.h" s.frameworks = "Foundation", "CoreData" s.requires_arc = true - s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D USE_FRAMEWORKS -D DEBUG', - 'OTHER_SWIFT_FLAGS[config=Release]' => '-D USE_FRAMEWORKS', - 'GCC_PREPROCESSOR_DEFINITIONS' => 'USE_FRAMEWORKS=1' } + s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG' } end diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 51bb760..e4ed3f4 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -1110,7 +1110,7 @@ B52F743C1E9B8724005F3DAC /* XcodeDataModelSchema.swift */, B52F743B1E9B8724005F3DAC /* LegacyXcodeDataModelSchema.swift */, ); - path = "Dynamic Schema"; + name = "Dynamic Schema"; sourceTree = ""; }; B53FBA101CAB607000F0D40A /* Convenience */ = { @@ -1203,7 +1203,7 @@ B56923DF1EB827F5007C4DC9 /* XcodeSchemaMappingProvider.swift */, B56923DC1EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift */, ); - path = "Schema Mapping Providers"; + name = "Schema Mapping Providers"; sourceTree = ""; }; B56964D11B22FF700075EE4A /* Migrating */ = { @@ -1217,7 +1217,7 @@ B56965231B356B820075EE4A /* MigrationResult.swift */, B56923DB1EB827F5007C4DC9 /* Schema Mapping Providers */, ); - path = Migrating; + name = Migrating; sourceTree = ""; }; B57358D71E5A7F9B0094B50A /* Dynamic Models */ = { @@ -1232,7 +1232,7 @@ B5D339E11E948C3600C880DE /* Value.swift */, B5A991EB1E9DC2CE0091A2E3 /* VersionLock.swift */, ); - path = "Dynamic Models"; + name = "Dynamic Models"; sourceTree = ""; }; B5A5F26B1CAFF8D0004AB9AF /* Swift */ = { @@ -1271,7 +1271,7 @@ B53FBA101CAB607000F0D40A /* Convenience */, B5E222211CA4DE5700BA2E95 /* Internal */, ); - path = ObjectiveC; + name = ObjectiveC; sourceTree = ""; }; B5E1B5A61CAA49CE007FD580 /* Migrating */ = { @@ -1314,7 +1314,7 @@ B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */, B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */, ); - path = Importing; + name = Importing; sourceTree = ""; }; B5E84EDA1AFF84500064E85B /* Setup */ = { @@ -1325,7 +1325,7 @@ B57358D71E5A7F9B0094B50A /* Dynamic Models */, B5FE4DA01C84818B00FA6A91 /* StorageInterfaces */, ); - path = Setup; + name = Setup; sourceTree = ""; }; B5E84EE21AFF84610064E85B /* Logging */ = { @@ -1336,7 +1336,7 @@ B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */, B51FE5AA1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift */, ); - path = Logging; + name = Logging; sourceTree = ""; }; B5E84EE91AFF846E0064E85B /* Transactions */ = { @@ -1352,7 +1352,7 @@ B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */, B5E84EF21AFF846E0064E85B /* SaveResult.swift */, ); - path = Transactions; + name = Transactions; sourceTree = ""; }; B5E84EFD1AFF847B0064E85B /* Fetching and Querying */ = { @@ -1368,7 +1368,7 @@ B5E84F0A1AFF847B0064E85B /* Protocol Clauses */, B5E84EFF1AFF847B0064E85B /* Concrete Clauses */, ); - path = "Fetching and Querying"; + name = "Fetching and Querying"; sourceTree = ""; }; B5E84EFF1AFF847B0064E85B /* Concrete Clauses */ = { @@ -1381,7 +1381,7 @@ B5E84F021AFF847B0064E85B /* GroupBy.swift */, B5E84F001AFF847B0064E85B /* Tweak.swift */, ); - path = "Concrete Clauses"; + name = "Concrete Clauses"; sourceTree = ""; }; B5E84F0A1AFF847B0064E85B /* Protocol Clauses */ = { @@ -1389,7 +1389,7 @@ children = ( B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */, ); - path = "Protocol Clauses"; + name = "Protocol Clauses"; sourceTree = ""; }; B5E84F191AFF84860064E85B /* Observing */ = { @@ -1404,7 +1404,7 @@ B5E84F1D1AFF84860064E85B /* ListMonitor.swift */, B5E84F1E1AFF84860064E85B /* ListObserver.swift */, ); - path = Observing; + name = Observing; sourceTree = ""; }; B5E84F261AFF84920064E85B /* Convenience */ = { @@ -1417,7 +1417,7 @@ B5A9921E1EA898710091A2E3 /* UserInfo.swift */, B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */, ); - path = Convenience; + name = Convenience; sourceTree = ""; }; B5E84F291AFF849C0064E85B /* Internal */ = { @@ -1444,7 +1444,7 @@ B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */, B5E84F2D1AFF849C0064E85B /* WeakObject.swift */, ); - path = Internal; + name = Internal; sourceTree = ""; }; B5ECDBEA1CA6BEAC00C7F112 /* Protocol Clauses */ = { @@ -1478,7 +1478,7 @@ B59FA0AD1CCBAC95007C9BCA /* ICloudStore.swift */, B5677D3C1CD3B1E400322BFC /* ICloudStoreObserver.swift */, ); - path = StorageInterfaces; + name = StorageInterfaces; sourceTree = ""; }; /* End PBXGroup section */ @@ -2519,9 +2519,8 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", "$(inherited)", - "USE_FRAMEWORKS=1", + "DEBUG=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2535,7 +2534,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS -D DEBUG"; + OTHER_SWIFT_FLAGS = "-D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; PRODUCT_NAME = CoreStore; SDKROOT = iphoneos; @@ -2576,7 +2575,7 @@ ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = "USE_FRAMEWORKS=1"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -2587,7 +2586,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; PRODUCT_NAME = CoreStore; SDKROOT = iphoneos; diff --git a/Sources/Transactions/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift similarity index 100% rename from Sources/Transactions/AsynchronousDataTransaction.swift rename to Sources/AsynchronousDataTransaction.swift diff --git a/Sources/Importing/BaseDataTransaction+Importing.swift b/Sources/BaseDataTransaction+Importing.swift similarity index 100% rename from Sources/Importing/BaseDataTransaction+Importing.swift rename to Sources/BaseDataTransaction+Importing.swift diff --git a/Sources/Fetching and Querying/BaseDataTransaction+Querying.swift b/Sources/BaseDataTransaction+Querying.swift similarity index 100% rename from Sources/Fetching and Querying/BaseDataTransaction+Querying.swift rename to Sources/BaseDataTransaction+Querying.swift diff --git a/Sources/Transactions/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift similarity index 100% rename from Sources/Transactions/BaseDataTransaction.swift rename to Sources/BaseDataTransaction.swift diff --git a/Sources/ObjectiveC/CSAsynchronousDataTransaction.swift b/Sources/CSAsynchronousDataTransaction.swift similarity index 100% rename from Sources/ObjectiveC/CSAsynchronousDataTransaction.swift rename to Sources/CSAsynchronousDataTransaction.swift diff --git a/Sources/ObjectiveC/CSBaseDataTransaction+Querying.swift b/Sources/CSBaseDataTransaction+Querying.swift similarity index 100% rename from Sources/ObjectiveC/CSBaseDataTransaction+Querying.swift rename to Sources/CSBaseDataTransaction+Querying.swift diff --git a/Sources/ObjectiveC/CSBaseDataTransaction.swift b/Sources/CSBaseDataTransaction.swift similarity index 100% rename from Sources/ObjectiveC/CSBaseDataTransaction.swift rename to Sources/CSBaseDataTransaction.swift diff --git a/Sources/ObjectiveC/CSClauseTypes.swift b/Sources/CSClauseTypes.swift similarity index 100% rename from Sources/ObjectiveC/CSClauseTypes.swift rename to Sources/CSClauseTypes.swift diff --git a/Sources/ObjectiveC/CSCoreStore+Migrating.swift b/Sources/CSCoreStore+Migrating.swift similarity index 100% rename from Sources/ObjectiveC/CSCoreStore+Migrating.swift rename to Sources/CSCoreStore+Migrating.swift diff --git a/Sources/ObjectiveC/CSCoreStore+Observing.swift b/Sources/CSCoreStore+Observing.swift similarity index 100% rename from Sources/ObjectiveC/CSCoreStore+Observing.swift rename to Sources/CSCoreStore+Observing.swift diff --git a/Sources/ObjectiveC/CSCoreStore+Querying.swift b/Sources/CSCoreStore+Querying.swift similarity index 100% rename from Sources/ObjectiveC/CSCoreStore+Querying.swift rename to Sources/CSCoreStore+Querying.swift diff --git a/Sources/ObjectiveC/CSCoreStore+Setup.swift b/Sources/CSCoreStore+Setup.swift similarity index 100% rename from Sources/ObjectiveC/CSCoreStore+Setup.swift rename to Sources/CSCoreStore+Setup.swift diff --git a/Sources/ObjectiveC/CSCoreStore+Transaction.swift b/Sources/CSCoreStore+Transaction.swift similarity index 100% rename from Sources/ObjectiveC/CSCoreStore+Transaction.swift rename to Sources/CSCoreStore+Transaction.swift diff --git a/Sources/ObjectiveC/CSCoreStore.swift b/Sources/CSCoreStore.swift similarity index 100% rename from Sources/ObjectiveC/CSCoreStore.swift rename to Sources/CSCoreStore.swift diff --git a/Sources/ObjectiveC/CSDataStack+Migrating.swift b/Sources/CSDataStack+Migrating.swift similarity index 100% rename from Sources/ObjectiveC/CSDataStack+Migrating.swift rename to Sources/CSDataStack+Migrating.swift diff --git a/Sources/ObjectiveC/CSDataStack+Observing.swift b/Sources/CSDataStack+Observing.swift similarity index 100% rename from Sources/ObjectiveC/CSDataStack+Observing.swift rename to Sources/CSDataStack+Observing.swift diff --git a/Sources/ObjectiveC/CSDataStack+Querying.swift b/Sources/CSDataStack+Querying.swift similarity index 100% rename from Sources/ObjectiveC/CSDataStack+Querying.swift rename to Sources/CSDataStack+Querying.swift diff --git a/Sources/ObjectiveC/CSDataStack+Transaction.swift b/Sources/CSDataStack+Transaction.swift similarity index 100% rename from Sources/ObjectiveC/CSDataStack+Transaction.swift rename to Sources/CSDataStack+Transaction.swift diff --git a/Sources/ObjectiveC/CSDataStack.swift b/Sources/CSDataStack.swift similarity index 100% rename from Sources/ObjectiveC/CSDataStack.swift rename to Sources/CSDataStack.swift diff --git a/Sources/ObjectiveC/CSDynamicSchema.swift b/Sources/CSDynamicSchema.swift similarity index 100% rename from Sources/ObjectiveC/CSDynamicSchema.swift rename to Sources/CSDynamicSchema.swift diff --git a/Sources/ObjectiveC/CSError.swift b/Sources/CSError.swift similarity index 100% rename from Sources/ObjectiveC/CSError.swift rename to Sources/CSError.swift diff --git a/Sources/ObjectiveC/CSFrom.swift b/Sources/CSFrom.swift similarity index 100% rename from Sources/ObjectiveC/CSFrom.swift rename to Sources/CSFrom.swift diff --git a/Sources/ObjectiveC/CSGroupBy.swift b/Sources/CSGroupBy.swift similarity index 100% rename from Sources/ObjectiveC/CSGroupBy.swift rename to Sources/CSGroupBy.swift diff --git a/Sources/ObjectiveC/CSInMemoryStore.swift b/Sources/CSInMemoryStore.swift similarity index 100% rename from Sources/ObjectiveC/CSInMemoryStore.swift rename to Sources/CSInMemoryStore.swift diff --git a/Sources/ObjectiveC/CSInto.swift b/Sources/CSInto.swift similarity index 100% rename from Sources/ObjectiveC/CSInto.swift rename to Sources/CSInto.swift diff --git a/Sources/ObjectiveC/CSLegacyXcodeDataModelSchema.swift b/Sources/CSLegacyXcodeDataModelSchema.swift similarity index 100% rename from Sources/ObjectiveC/CSLegacyXcodeDataModelSchema.swift rename to Sources/CSLegacyXcodeDataModelSchema.swift diff --git a/Sources/ObjectiveC/CSListMonitor.swift b/Sources/CSListMonitor.swift similarity index 100% rename from Sources/ObjectiveC/CSListMonitor.swift rename to Sources/CSListMonitor.swift diff --git a/Sources/ObjectiveC/CSListObserver.swift b/Sources/CSListObserver.swift similarity index 100% rename from Sources/ObjectiveC/CSListObserver.swift rename to Sources/CSListObserver.swift diff --git a/Sources/ObjectiveC/CSMigrationResult.swift b/Sources/CSMigrationResult.swift similarity index 100% rename from Sources/ObjectiveC/CSMigrationResult.swift rename to Sources/CSMigrationResult.swift diff --git a/Sources/ObjectiveC/CSMigrationType.swift b/Sources/CSMigrationType.swift similarity index 100% rename from Sources/ObjectiveC/CSMigrationType.swift rename to Sources/CSMigrationType.swift diff --git a/Sources/ObjectiveC/CSObjectMonitor.swift b/Sources/CSObjectMonitor.swift similarity index 100% rename from Sources/ObjectiveC/CSObjectMonitor.swift rename to Sources/CSObjectMonitor.swift diff --git a/Sources/ObjectiveC/CSObjectObserver.swift b/Sources/CSObjectObserver.swift similarity index 100% rename from Sources/ObjectiveC/CSObjectObserver.swift rename to Sources/CSObjectObserver.swift diff --git a/Sources/ObjectiveC/CSOrderBy.swift b/Sources/CSOrderBy.swift similarity index 100% rename from Sources/ObjectiveC/CSOrderBy.swift rename to Sources/CSOrderBy.swift diff --git a/Sources/ObjectiveC/CSSQliteStore.swift b/Sources/CSSQliteStore.swift similarity index 100% rename from Sources/ObjectiveC/CSSQliteStore.swift rename to Sources/CSSQliteStore.swift diff --git a/Sources/ObjectiveC/CSSaveResult.swift b/Sources/CSSaveResult.swift similarity index 100% rename from Sources/ObjectiveC/CSSaveResult.swift rename to Sources/CSSaveResult.swift diff --git a/Sources/ObjectiveC/CSSectionBy.swift b/Sources/CSSectionBy.swift similarity index 100% rename from Sources/ObjectiveC/CSSectionBy.swift rename to Sources/CSSectionBy.swift diff --git a/Sources/ObjectiveC/CSSelect.swift b/Sources/CSSelect.swift similarity index 100% rename from Sources/ObjectiveC/CSSelect.swift rename to Sources/CSSelect.swift diff --git a/Sources/ObjectiveC/CSSetupResult.swift b/Sources/CSSetupResult.swift similarity index 100% rename from Sources/ObjectiveC/CSSetupResult.swift rename to Sources/CSSetupResult.swift diff --git a/Sources/ObjectiveC/CSStorageInterface.swift b/Sources/CSStorageInterface.swift similarity index 100% rename from Sources/ObjectiveC/CSStorageInterface.swift rename to Sources/CSStorageInterface.swift diff --git a/Sources/ObjectiveC/CSSynchronousDataTransaction.swift b/Sources/CSSynchronousDataTransaction.swift similarity index 100% rename from Sources/ObjectiveC/CSSynchronousDataTransaction.swift rename to Sources/CSSynchronousDataTransaction.swift diff --git a/Sources/ObjectiveC/CSTweak.swift b/Sources/CSTweak.swift similarity index 100% rename from Sources/ObjectiveC/CSTweak.swift rename to Sources/CSTweak.swift diff --git a/Sources/ObjectiveC/CSUnsafeDataTransaction.swift b/Sources/CSUnsafeDataTransaction.swift similarity index 100% rename from Sources/ObjectiveC/CSUnsafeDataTransaction.swift rename to Sources/CSUnsafeDataTransaction.swift diff --git a/Sources/ObjectiveC/CSWhere.swift b/Sources/CSWhere.swift similarity index 100% rename from Sources/ObjectiveC/CSWhere.swift rename to Sources/CSWhere.swift diff --git a/Sources/ObjectiveC/CSXcodeDataModelSchema.swift b/Sources/CSXcodeDataModelSchema.swift similarity index 100% rename from Sources/ObjectiveC/CSXcodeDataModelSchema.swift rename to Sources/CSXcodeDataModelSchema.swift diff --git a/Sources/Fetching and Querying/Protocol Clauses/ClauseTypes.swift b/Sources/ClauseTypes.swift similarity index 100% rename from Sources/Fetching and Querying/Protocol Clauses/ClauseTypes.swift rename to Sources/ClauseTypes.swift diff --git a/Sources/Logging/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift similarity index 100% rename from Sources/Logging/CoreStore+CustomDebugStringConvertible.swift rename to Sources/CoreStore+CustomDebugStringConvertible.swift diff --git a/Sources/Logging/CoreStore+Logging.swift b/Sources/CoreStore+Logging.swift similarity index 100% rename from Sources/Logging/CoreStore+Logging.swift rename to Sources/CoreStore+Logging.swift diff --git a/Sources/Migrating/CoreStore+Migration.swift b/Sources/CoreStore+Migration.swift similarity index 100% rename from Sources/Migrating/CoreStore+Migration.swift rename to Sources/CoreStore+Migration.swift diff --git a/Sources/Observing/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift similarity index 100% rename from Sources/Observing/CoreStore+Observing.swift rename to Sources/CoreStore+Observing.swift diff --git a/Sources/Fetching and Querying/CoreStore+Querying.swift b/Sources/CoreStore+Querying.swift similarity index 100% rename from Sources/Fetching and Querying/CoreStore+Querying.swift rename to Sources/CoreStore+Querying.swift diff --git a/Sources/Setup/CoreStore+Setup.swift b/Sources/CoreStore+Setup.swift similarity index 100% rename from Sources/Setup/CoreStore+Setup.swift rename to Sources/CoreStore+Setup.swift diff --git a/Sources/Transactions/CoreStore+Transaction.swift b/Sources/CoreStore+Transaction.swift similarity index 100% rename from Sources/Transactions/CoreStore+Transaction.swift rename to Sources/CoreStore+Transaction.swift diff --git a/Sources/ObjectiveC/CoreStoreBridge.h b/Sources/CoreStoreBridge.h similarity index 100% rename from Sources/ObjectiveC/CoreStoreBridge.h rename to Sources/CoreStoreBridge.h diff --git a/Sources/ObjectiveC/CoreStoreBridge.m b/Sources/CoreStoreBridge.m similarity index 100% rename from Sources/ObjectiveC/CoreStoreBridge.m rename to Sources/CoreStoreBridge.m diff --git a/Sources/ObjectiveC/CoreStoreBridge.swift b/Sources/CoreStoreBridge.swift similarity index 100% rename from Sources/ObjectiveC/CoreStoreBridge.swift rename to Sources/CoreStoreBridge.swift diff --git a/Sources/Internal/CoreStoreFetchRequest+CoreStore.swift b/Sources/CoreStoreFetchRequest+CoreStore.swift similarity index 100% rename from Sources/Internal/CoreStoreFetchRequest+CoreStore.swift rename to Sources/CoreStoreFetchRequest+CoreStore.swift diff --git a/Sources/Internal/CoreStoreFetchedResultsController.swift b/Sources/CoreStoreFetchedResultsController.swift similarity index 100% rename from Sources/Internal/CoreStoreFetchedResultsController.swift rename to Sources/CoreStoreFetchedResultsController.swift diff --git a/Sources/Logging/CoreStoreLogger.swift b/Sources/CoreStoreLogger.swift similarity index 100% rename from Sources/Logging/CoreStoreLogger.swift rename to Sources/CoreStoreLogger.swift diff --git a/Sources/Convenience/CoreStoreObject+Convenience.swift b/Sources/CoreStoreObject+Convenience.swift similarity index 100% rename from Sources/Convenience/CoreStoreObject+Convenience.swift rename to Sources/CoreStoreObject+Convenience.swift diff --git a/Sources/Fetching and Querying/CoreStoreObject+Querying.swift b/Sources/CoreStoreObject+Querying.swift similarity index 100% rename from Sources/Fetching and Querying/CoreStoreObject+Querying.swift rename to Sources/CoreStoreObject+Querying.swift diff --git a/Sources/Setup/Dynamic Models/CoreStoreObject.swift b/Sources/CoreStoreObject.swift similarity index 100% rename from Sources/Setup/Dynamic Models/CoreStoreObject.swift rename to Sources/CoreStoreObject.swift diff --git a/Sources/Setup/Dynamic Models/Dynamic Schema/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Dynamic Schema/CoreStoreSchema.swift rename to Sources/CoreStoreSchema.swift diff --git a/Sources/Migrating/Schema Mapping Providers/CustomSchemaMappingProvider.swift b/Sources/CustomSchemaMappingProvider.swift similarity index 100% rename from Sources/Migrating/Schema Mapping Providers/CustomSchemaMappingProvider.swift rename to Sources/CustomSchemaMappingProvider.swift diff --git a/Sources/Migrating/DataStack+Migration.swift b/Sources/DataStack+Migration.swift similarity index 100% rename from Sources/Migrating/DataStack+Migration.swift rename to Sources/DataStack+Migration.swift diff --git a/Sources/Observing/DataStack+Observing.swift b/Sources/DataStack+Observing.swift similarity index 100% rename from Sources/Observing/DataStack+Observing.swift rename to Sources/DataStack+Observing.swift diff --git a/Sources/Fetching and Querying/DataStack+Querying.swift b/Sources/DataStack+Querying.swift similarity index 100% rename from Sources/Fetching and Querying/DataStack+Querying.swift rename to Sources/DataStack+Querying.swift diff --git a/Sources/Transactions/DataStack+Transaction.swift b/Sources/DataStack+Transaction.swift similarity index 100% rename from Sources/Transactions/DataStack+Transaction.swift rename to Sources/DataStack+Transaction.swift diff --git a/Sources/Setup/DataStack.swift b/Sources/DataStack.swift similarity index 100% rename from Sources/Setup/DataStack.swift rename to Sources/DataStack.swift diff --git a/Sources/Logging/DefaultLogger.swift b/Sources/DefaultLogger.swift similarity index 100% rename from Sources/Logging/DefaultLogger.swift rename to Sources/DefaultLogger.swift diff --git a/Sources/Internal/DispatchQueue+CoreStore.swift b/Sources/DispatchQueue+CoreStore.swift similarity index 100% rename from Sources/Internal/DispatchQueue+CoreStore.swift rename to Sources/DispatchQueue+CoreStore.swift diff --git a/Sources/Setup/Dynamic Models/DynamicObject.swift b/Sources/DynamicObject.swift similarity index 100% rename from Sources/Setup/Dynamic Models/DynamicObject.swift rename to Sources/DynamicObject.swift diff --git a/Sources/Convenience/DynamicSchema+Convenience.swift b/Sources/DynamicSchema+Convenience.swift similarity index 100% rename from Sources/Convenience/DynamicSchema+Convenience.swift rename to Sources/DynamicSchema+Convenience.swift diff --git a/Sources/Setup/Dynamic Models/Dynamic Schema/DynamicSchema.swift b/Sources/DynamicSchema.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Dynamic Schema/DynamicSchema.swift rename to Sources/DynamicSchema.swift diff --git a/Sources/Setup/Dynamic Models/Entity.swift b/Sources/Entity.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Entity.swift rename to Sources/Entity.swift diff --git a/Sources/Internal/EntityIdentifier.swift b/Sources/EntityIdentifier.swift similarity index 100% rename from Sources/Internal/EntityIdentifier.swift rename to Sources/EntityIdentifier.swift diff --git a/Sources/Fetching and Querying/FetchableSource.swift b/Sources/FetchableSource.swift similarity index 100% rename from Sources/Fetching and Querying/FetchableSource.swift rename to Sources/FetchableSource.swift diff --git a/Sources/Internal/FetchedResultsControllerDelegate.swift b/Sources/FetchedResultsControllerDelegate.swift similarity index 100% rename from Sources/Internal/FetchedResultsControllerDelegate.swift rename to Sources/FetchedResultsControllerDelegate.swift diff --git a/Sources/Fetching and Querying/Concrete Clauses/From.swift b/Sources/From.swift similarity index 100% rename from Sources/Fetching and Querying/Concrete Clauses/From.swift rename to Sources/From.swift diff --git a/Sources/Internal/Functions.swift b/Sources/Functions.swift similarity index 100% rename from Sources/Internal/Functions.swift rename to Sources/Functions.swift diff --git a/Sources/Fetching and Querying/Concrete Clauses/GroupBy.swift b/Sources/GroupBy.swift similarity index 100% rename from Sources/Fetching and Querying/Concrete Clauses/GroupBy.swift rename to Sources/GroupBy.swift diff --git a/Sources/Setup/StorageInterfaces/ICloudStore.swift b/Sources/ICloudStore.swift similarity index 100% rename from Sources/Setup/StorageInterfaces/ICloudStore.swift rename to Sources/ICloudStore.swift diff --git a/Sources/Setup/StorageInterfaces/ICloudStoreObserver.swift b/Sources/ICloudStoreObserver.swift similarity index 100% rename from Sources/Setup/StorageInterfaces/ICloudStoreObserver.swift rename to Sources/ICloudStoreObserver.swift diff --git a/Sources/Importing/ImportableAttributeType.swift b/Sources/ImportableAttributeType.swift similarity index 100% rename from Sources/Importing/ImportableAttributeType.swift rename to Sources/ImportableAttributeType.swift diff --git a/Sources/Importing/ImportableObject.swift b/Sources/ImportableObject.swift similarity index 100% rename from Sources/Importing/ImportableObject.swift rename to Sources/ImportableObject.swift diff --git a/Sources/Importing/ImportableUniqueObject.swift b/Sources/ImportableUniqueObject.swift similarity index 100% rename from Sources/Importing/ImportableUniqueObject.swift rename to Sources/ImportableUniqueObject.swift diff --git a/Sources/Setup/StorageInterfaces/InMemoryStore.swift b/Sources/InMemoryStore.swift similarity index 100% rename from Sources/Setup/StorageInterfaces/InMemoryStore.swift rename to Sources/InMemoryStore.swift diff --git a/Sources/Migrating/Schema Mapping Providers/InferredSchemaMappingProvider.swift b/Sources/InferredSchemaMappingProvider.swift similarity index 100% rename from Sources/Migrating/Schema Mapping Providers/InferredSchemaMappingProvider.swift rename to Sources/InferredSchemaMappingProvider.swift diff --git a/Sources/Transactions/Into.swift b/Sources/Into.swift similarity index 100% rename from Sources/Transactions/Into.swift rename to Sources/Into.swift diff --git a/Sources/Setup/StorageInterfaces/LegacySQLiteStore.swift b/Sources/LegacySQLiteStore.swift similarity index 100% rename from Sources/Setup/StorageInterfaces/LegacySQLiteStore.swift rename to Sources/LegacySQLiteStore.swift diff --git a/Sources/Setup/Dynamic Models/Dynamic Schema/LegacyXcodeDataModelSchema.swift b/Sources/LegacyXcodeDataModelSchema.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Dynamic Schema/LegacyXcodeDataModelSchema.swift rename to Sources/LegacyXcodeDataModelSchema.swift diff --git a/Sources/Observing/ListMonitor.swift b/Sources/ListMonitor.swift similarity index 100% rename from Sources/Observing/ListMonitor.swift rename to Sources/ListMonitor.swift diff --git a/Sources/Observing/ListObserver.swift b/Sources/ListObserver.swift similarity index 100% rename from Sources/Observing/ListObserver.swift rename to Sources/ListObserver.swift diff --git a/Sources/Migrating/MigrationChain.swift b/Sources/MigrationChain.swift similarity index 100% rename from Sources/Migrating/MigrationChain.swift rename to Sources/MigrationChain.swift diff --git a/Sources/Internal/MigrationManager.swift b/Sources/MigrationManager.swift similarity index 100% rename from Sources/Internal/MigrationManager.swift rename to Sources/MigrationManager.swift diff --git a/Sources/Migrating/MigrationResult.swift b/Sources/MigrationResult.swift similarity index 100% rename from Sources/Migrating/MigrationResult.swift rename to Sources/MigrationResult.swift diff --git a/Sources/Migrating/MigrationType.swift b/Sources/MigrationType.swift similarity index 100% rename from Sources/Migrating/MigrationType.swift rename to Sources/MigrationType.swift diff --git a/Sources/Internal/NSEntityDescription+DynamicModel.swift b/Sources/NSEntityDescription+DynamicModel.swift similarity index 100% rename from Sources/Internal/NSEntityDescription+DynamicModel.swift rename to Sources/NSEntityDescription+DynamicModel.swift diff --git a/Sources/Internal/NSEntityDescription+Migration.swift b/Sources/NSEntityDescription+Migration.swift similarity index 100% rename from Sources/Internal/NSEntityDescription+Migration.swift rename to Sources/NSEntityDescription+Migration.swift diff --git a/Sources/Convenience/NSFetchedResultsController+Convenience.swift b/Sources/NSFetchedResultsController+Convenience.swift similarity index 100% rename from Sources/Convenience/NSFetchedResultsController+Convenience.swift rename to Sources/NSFetchedResultsController+Convenience.swift diff --git a/Sources/ObjectiveC/NSFetchedResultsController+ObjectiveC.swift b/Sources/NSFetchedResultsController+ObjectiveC.swift similarity index 100% rename from Sources/ObjectiveC/NSFetchedResultsController+ObjectiveC.swift rename to Sources/NSFetchedResultsController+ObjectiveC.swift diff --git a/Sources/Convenience/NSManagedObject+Convenience.swift b/Sources/NSManagedObject+Convenience.swift similarity index 100% rename from Sources/Convenience/NSManagedObject+Convenience.swift rename to Sources/NSManagedObject+Convenience.swift diff --git a/Sources/Internal/NSManagedObject+DynamicModel.swift b/Sources/NSManagedObject+DynamicModel.swift similarity index 100% rename from Sources/Internal/NSManagedObject+DynamicModel.swift rename to Sources/NSManagedObject+DynamicModel.swift diff --git a/Sources/Internal/NSManagedObject+Logging.swift b/Sources/NSManagedObject+Logging.swift similarity index 100% rename from Sources/Internal/NSManagedObject+Logging.swift rename to Sources/NSManagedObject+Logging.swift diff --git a/Sources/ObjectiveC/NSManagedObject+ObjectiveC.swift b/Sources/NSManagedObject+ObjectiveC.swift similarity index 100% rename from Sources/ObjectiveC/NSManagedObject+ObjectiveC.swift rename to Sources/NSManagedObject+ObjectiveC.swift diff --git a/Sources/Transactions/NSManagedObject+Transaction.swift b/Sources/NSManagedObject+Transaction.swift similarity index 100% rename from Sources/Transactions/NSManagedObject+Transaction.swift rename to Sources/NSManagedObject+Transaction.swift diff --git a/Sources/Internal/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift similarity index 100% rename from Sources/Internal/NSManagedObjectContext+CoreStore.swift rename to Sources/NSManagedObjectContext+CoreStore.swift diff --git a/Sources/ObjectiveC/NSManagedObjectContext+ObjectiveC.swift b/Sources/NSManagedObjectContext+ObjectiveC.swift similarity index 100% rename from Sources/ObjectiveC/NSManagedObjectContext+ObjectiveC.swift rename to Sources/NSManagedObjectContext+ObjectiveC.swift diff --git a/Sources/Internal/NSManagedObjectContext+Querying.swift b/Sources/NSManagedObjectContext+Querying.swift similarity index 100% rename from Sources/Internal/NSManagedObjectContext+Querying.swift rename to Sources/NSManagedObjectContext+Querying.swift diff --git a/Sources/Internal/NSManagedObjectContext+Setup.swift b/Sources/NSManagedObjectContext+Setup.swift similarity index 100% rename from Sources/Internal/NSManagedObjectContext+Setup.swift rename to Sources/NSManagedObjectContext+Setup.swift diff --git a/Sources/Internal/NSManagedObjectContext+Transaction.swift b/Sources/NSManagedObjectContext+Transaction.swift similarity index 100% rename from Sources/Internal/NSManagedObjectContext+Transaction.swift rename to Sources/NSManagedObjectContext+Transaction.swift diff --git a/Sources/Internal/NSManagedObjectModel+Migration.swift b/Sources/NSManagedObjectModel+Migration.swift similarity index 100% rename from Sources/Internal/NSManagedObjectModel+Migration.swift rename to Sources/NSManagedObjectModel+Migration.swift diff --git a/Sources/Internal/NSPersistentStore+Setup.swift b/Sources/NSPersistentStore+Setup.swift similarity index 100% rename from Sources/Internal/NSPersistentStore+Setup.swift rename to Sources/NSPersistentStore+Setup.swift diff --git a/Sources/Internal/NSPersistentStoreCoordinator+Setup.swift b/Sources/NSPersistentStoreCoordinator+Setup.swift similarity index 100% rename from Sources/Internal/NSPersistentStoreCoordinator+Setup.swift rename to Sources/NSPersistentStoreCoordinator+Setup.swift diff --git a/Sources/Internal/NotificationObserver.swift b/Sources/NotificationObserver.swift similarity index 100% rename from Sources/Internal/NotificationObserver.swift rename to Sources/NotificationObserver.swift diff --git a/Sources/Observing/ObjectMonitor.swift b/Sources/ObjectMonitor.swift similarity index 100% rename from Sources/Observing/ObjectMonitor.swift rename to Sources/ObjectMonitor.swift diff --git a/Sources/Observing/ObjectObserver.swift b/Sources/ObjectObserver.swift similarity index 100% rename from Sources/Observing/ObjectObserver.swift rename to Sources/ObjectObserver.swift diff --git a/Sources/Fetching and Querying/Concrete Clauses/OrderBy.swift b/Sources/OrderBy.swift similarity index 100% rename from Sources/Fetching and Querying/Concrete Clauses/OrderBy.swift rename to Sources/OrderBy.swift diff --git a/Sources/Convenience/Progress+Convenience.swift b/Sources/Progress+Convenience.swift similarity index 100% rename from Sources/Convenience/Progress+Convenience.swift rename to Sources/Progress+Convenience.swift diff --git a/Sources/ObjectiveC/Progress+ObjectiveC.swift b/Sources/Progress+ObjectiveC.swift similarity index 100% rename from Sources/ObjectiveC/Progress+ObjectiveC.swift rename to Sources/Progress+ObjectiveC.swift diff --git a/Sources/Fetching and Querying/QueryableAttributeType.swift b/Sources/QueryableAttributeType.swift similarity index 100% rename from Sources/Fetching and Querying/QueryableAttributeType.swift rename to Sources/QueryableAttributeType.swift diff --git a/Sources/Fetching and Querying/QueryableSource.swift b/Sources/QueryableSource.swift similarity index 100% rename from Sources/Fetching and Querying/QueryableSource.swift rename to Sources/QueryableSource.swift diff --git a/Sources/Setup/Dynamic Models/Relationship.swift b/Sources/Relationship.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Relationship.swift rename to Sources/Relationship.swift diff --git a/Sources/Setup/StorageInterfaces/SQLiteStore.swift b/Sources/SQLiteStore.swift similarity index 100% rename from Sources/Setup/StorageInterfaces/SQLiteStore.swift rename to Sources/SQLiteStore.swift diff --git a/Sources/Transactions/SaveResult.swift b/Sources/SaveResult.swift similarity index 100% rename from Sources/Transactions/SaveResult.swift rename to Sources/SaveResult.swift diff --git a/Sources/Setup/Dynamic Models/SchemaHistory.swift b/Sources/SchemaHistory.swift similarity index 100% rename from Sources/Setup/Dynamic Models/SchemaHistory.swift rename to Sources/SchemaHistory.swift diff --git a/Sources/Migrating/Schema Mapping Providers/SchemaMappingProvider.swift b/Sources/SchemaMappingProvider.swift similarity index 100% rename from Sources/Migrating/Schema Mapping Providers/SchemaMappingProvider.swift rename to Sources/SchemaMappingProvider.swift diff --git a/Sources/Observing/SectionBy.swift b/Sources/SectionBy.swift similarity index 100% rename from Sources/Observing/SectionBy.swift rename to Sources/SectionBy.swift diff --git a/Sources/Fetching and Querying/Concrete Clauses/Select.swift b/Sources/Select.swift similarity index 100% rename from Sources/Fetching and Querying/Concrete Clauses/Select.swift rename to Sources/Select.swift diff --git a/Sources/Migrating/SetupResult.swift b/Sources/SetupResult.swift similarity index 100% rename from Sources/Migrating/SetupResult.swift rename to Sources/SetupResult.swift diff --git a/Sources/Setup/StorageInterfaces/StorageInterface.swift b/Sources/StorageInterface.swift similarity index 100% rename from Sources/Setup/StorageInterfaces/StorageInterface.swift rename to Sources/StorageInterface.swift diff --git a/Sources/Transactions/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift similarity index 100% rename from Sources/Transactions/SynchronousDataTransaction.swift rename to Sources/SynchronousDataTransaction.swift diff --git a/Sources/Fetching and Querying/Concrete Clauses/Tweak.swift b/Sources/Tweak.swift similarity index 100% rename from Sources/Fetching and Querying/Concrete Clauses/Tweak.swift rename to Sources/Tweak.swift diff --git a/Sources/Observing/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift similarity index 100% rename from Sources/Observing/UnsafeDataTransaction+Observing.swift rename to Sources/UnsafeDataTransaction+Observing.swift diff --git a/Sources/Transactions/UnsafeDataTransaction.swift b/Sources/UnsafeDataTransaction.swift similarity index 100% rename from Sources/Transactions/UnsafeDataTransaction.swift rename to Sources/UnsafeDataTransaction.swift diff --git a/Sources/Convenience/UserInfo.swift b/Sources/UserInfo.swift similarity index 100% rename from Sources/Convenience/UserInfo.swift rename to Sources/UserInfo.swift diff --git a/Sources/Setup/Dynamic Models/Value.swift b/Sources/Value.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Value.swift rename to Sources/Value.swift diff --git a/Sources/Setup/Dynamic Models/VersionLock.swift b/Sources/VersionLock.swift similarity index 100% rename from Sources/Setup/Dynamic Models/VersionLock.swift rename to Sources/VersionLock.swift diff --git a/Sources/Internal/WeakObject.swift b/Sources/WeakObject.swift similarity index 100% rename from Sources/Internal/WeakObject.swift rename to Sources/WeakObject.swift diff --git a/Sources/Fetching and Querying/Concrete Clauses/Where.swift b/Sources/Where.swift similarity index 100% rename from Sources/Fetching and Querying/Concrete Clauses/Where.swift rename to Sources/Where.swift diff --git a/Sources/Setup/Dynamic Models/Dynamic Schema/XcodeDataModelSchema.swift b/Sources/XcodeDataModelSchema.swift similarity index 100% rename from Sources/Setup/Dynamic Models/Dynamic Schema/XcodeDataModelSchema.swift rename to Sources/XcodeDataModelSchema.swift diff --git a/Sources/Migrating/Schema Mapping Providers/XcodeSchemaMappingProvider.swift b/Sources/XcodeSchemaMappingProvider.swift similarity index 100% rename from Sources/Migrating/Schema Mapping Providers/XcodeSchemaMappingProvider.swift rename to Sources/XcodeSchemaMappingProvider.swift