diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index bd86ad5..af2a198 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -1035,7 +1035,7 @@
 				B5A261201B64BFDB006EB6D3 /* MigrationType.swift */,
 				B56965231B356B820075EE4A /* MigrationResult.swift */,
 			);
-			path = Migrating;
+			name = Migrating;
 			sourceTree = "<group>";
 		};
 		B5A5F26B1CAFF8D0004AB9AF /* Swift */ = {
@@ -1073,7 +1073,7 @@
 				B53FBA101CAB607000F0D40A /* Convenience */,
 				B5E222211CA4DE5700BA2E95 /* Internal */,
 			);
-			path = ObjectiveC;
+			name = ObjectiveC;
 			sourceTree = "<group>";
 		};
 		B5E1B5A61CAA49CE007FD580 /* Migrating */ = {
@@ -1116,7 +1116,7 @@
 				B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */,
 				B509C7F31E54511B0061C547 /* CoreStoreImportableAttributeType.swift */,
 			);
-			path = Importing;
+			name = Importing;
 			sourceTree = "<group>";
 		};
 		B5E84EDA1AFF84500064E85B /* Setup */ = {
@@ -1126,7 +1126,7 @@
 				B5E84EDB1AFF84500064E85B /* DataStack.swift */,
 				B5FE4DA01C84818B00FA6A91 /* StorageInterfaces */,
 			);
-			path = Setup;
+			name = Setup;
 			sourceTree = "<group>";
 		};
 		B5E84EE21AFF84610064E85B /* Logging */ = {
@@ -1137,7 +1137,7 @@
 				B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */,
 				B51FE5AA1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift */,
 			);
-			path = Logging;
+			name = Logging;
 			sourceTree = "<group>";
 		};
 		B5E84EE91AFF846E0064E85B /* Transactions */ = {
@@ -1153,7 +1153,7 @@
 				B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */,
 				B5E84EF21AFF846E0064E85B /* SaveResult.swift */,
 			);
-			path = Transactions;
+			name = Transactions;
 			sourceTree = "<group>";
 		};
 		B5E84EFD1AFF847B0064E85B /* Fetching and Querying */ = {
@@ -1168,7 +1168,7 @@
 				B5E84F0A1AFF847B0064E85B /* Protocol Clauses */,
 				B5E84EFF1AFF847B0064E85B /* Concrete Clauses */,
 			);
-			path = "Fetching and Querying";
+			name = "Fetching and Querying";
 			sourceTree = "<group>";
 		};
 		B5E84EFF1AFF847B0064E85B /* Concrete Clauses */ = {
@@ -1181,7 +1181,7 @@
 				B5E84F021AFF847B0064E85B /* GroupBy.swift */,
 				B5E84F001AFF847B0064E85B /* Tweak.swift */,
 			);
-			path = "Concrete Clauses";
+			name = "Concrete Clauses";
 			sourceTree = "<group>";
 		};
 		B5E84F0A1AFF847B0064E85B /* Protocol Clauses */ = {
@@ -1189,7 +1189,7 @@
 			children = (
 				B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */,
 			);
-			path = "Protocol Clauses";
+			name = "Protocol Clauses";
 			sourceTree = "<group>";
 		};
 		B5E84F191AFF84860064E85B /* Observing */ = {
@@ -1204,7 +1204,7 @@
 				B5E84F1D1AFF84860064E85B /* ListMonitor.swift */,
 				B5E84F1E1AFF84860064E85B /* ListObserver.swift */,
 			);
-			path = Observing;
+			name = Observing;
 			sourceTree = "<group>";
 		};
 		B5E84F261AFF84920064E85B /* Convenience */ = {
@@ -1214,7 +1214,7 @@
 				B5FAD6A81B50A4B300714891 /* Progress+Convenience.swift */,
 				B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */,
 			);
-			path = Convenience;
+			name = Convenience;
 			sourceTree = "<group>";
 		};
 		B5E84F291AFF849C0064E85B /* Internal */ = {
@@ -1237,7 +1237,7 @@
 				B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */,
 				B5E84F2D1AFF849C0064E85B /* WeakObject.swift */,
 			);
-			path = Internal;
+			name = Internal;
 			sourceTree = "<group>";
 		};
 		B5ECDBEA1CA6BEAC00C7F112 /* Protocol Clauses */ = {
@@ -1271,7 +1271,7 @@
 				B59FA0AD1CCBAC95007C9BCA /* ICloudStore.swift */,
 				B5677D3C1CD3B1E400322BFC /* ICloudStoreObserver.swift */,
 			);
-			path = StorageInterfaces;
+			name = StorageInterfaces;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
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/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/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/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/Importing/CoreStoreImportableAttributeType.swift b/Sources/CoreStoreImportableAttributeType.swift
similarity index 100%
rename from Sources/Importing/CoreStoreImportableAttributeType.swift
rename to Sources/CoreStoreImportableAttributeType.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/Fetching and Querying/CoreStoreQueryableAttributeType.swift b/Sources/CoreStoreQueryableAttributeType.swift
similarity index 100%
rename from Sources/Fetching and Querying/CoreStoreQueryableAttributeType.swift
rename to Sources/CoreStoreQueryableAttributeType.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/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/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/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/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/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+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+Setup.swift b/Sources/NSManagedObjectModel+Setup.swift
similarity index 100%
rename from Sources/Internal/NSManagedObjectModel+Setup.swift
rename to Sources/NSManagedObjectModel+Setup.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/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/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/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/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