diff --git a/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj b/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj
deleted file mode 100644
index 6dd4f09..0000000
--- a/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- net7.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj b/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj
deleted file mode 100644
index aa433cd..0000000
--- a/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- net7.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
diff --git a/Framerwork.ServiceModel.Client.sln b/Framerwork.ServiceModel.Client.sln
index 97efc40..92da52d 100644
--- a/Framerwork.ServiceModel.Client.sln
+++ b/Framerwork.ServiceModel.Client.sln
@@ -5,19 +5,19 @@ VisualStudioVersion = 17.4.33027.239
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client", "Connected.ServiceModel.Client\Connected.ServiceModel.Client.csproj", "{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client", "src\Connected.ServiceModel.Client\Connected.ServiceModel.Client.csproj", "{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Storage", "Connected.ServiceModel.Client.Storage\Connected.ServiceModel.Client.Storage.csproj", "{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Storage", "src\Connected.ServiceModel.Client.Storage\Connected.ServiceModel.Client.Storage.csproj", "{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{D9F21D24-E114-4901-8245-720A1094EA24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "src\Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{D9F21D24-E114-4901-8245-720A1094EA24}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\Connected.Data\Connected.Data.csproj", "{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\src\Connected.Data\Connected.Data.csproj", "{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{627E1899-4765-4E45-9732-E322B8F459B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{627E1899-4765-4E45-9732-E322B8F459B9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{422C716D-904B-42B4-AAE2-B07C44F39807}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\src\Connected.Services\Connected.Services.csproj", "{422C716D-904B-42B4-AAE2-B07C44F39807}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\connected.framework.servicemodel\Connected.ServiceModel\Connected.ServiceModel.csproj", "{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\connected.framework.servicemodel\src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Connected.ServiceModel.Client.Data/AggregatedCommandBuilder.cs b/src/Connected.ServiceModel.Client.Data/AggregatedCommandBuilder.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/AggregatedCommandBuilder.cs
rename to src/Connected.ServiceModel.Client.Data/AggregatedCommandBuilder.cs
diff --git a/Connected.ServiceModel.Client.Data/Boot.cs b/src/Connected.ServiceModel.Client.Data/Boot.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Boot.cs
rename to src/Connected.ServiceModel.Client.Data/Boot.cs
diff --git a/Connected.ServiceModel.Client.Data/CommandBuilder.cs b/src/Connected.ServiceModel.Client.Data/CommandBuilder.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/CommandBuilder.cs
rename to src/Connected.ServiceModel.Client.Data/CommandBuilder.cs
diff --git a/src/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj b/src/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj
new file mode 100644
index 0000000..b0cbe8e
--- /dev/null
+++ b/src/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj
@@ -0,0 +1,17 @@
+
+
+
+ net7.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Connected.ServiceModel.Client.Data/CqlDataType.cs b/src/Connected.ServiceModel.Client.Data/CqlDataType.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/CqlDataType.cs
rename to src/Connected.ServiceModel.Client.Data/CqlDataType.cs
diff --git a/Connected.ServiceModel.Client.Data/CqlFormatter.cs b/src/Connected.ServiceModel.Client.Data/CqlFormatter.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/CqlFormatter.cs
rename to src/Connected.ServiceModel.Client.Data/CqlFormatter.cs
diff --git a/Connected.ServiceModel.Client.Data/CqlLanguage.cs b/src/Connected.ServiceModel.Client.Data/CqlLanguage.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/CqlLanguage.cs
rename to src/Connected.ServiceModel.Client.Data/CqlLanguage.cs
diff --git a/Connected.ServiceModel.Client.Data/CqlLinguist.cs b/src/Connected.ServiceModel.Client.Data/CqlLinguist.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/CqlLinguist.cs
rename to src/Connected.ServiceModel.Client.Data/CqlLinguist.cs
diff --git a/Connected.ServiceModel.Client.Data/CqlTypeSystem.cs b/src/Connected.ServiceModel.Client.Data/CqlTypeSystem.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/CqlTypeSystem.cs
rename to src/Connected.ServiceModel.Client.Data/CqlTypeSystem.cs
diff --git a/Connected.ServiceModel.Client.Data/DataParameterCollection.cs b/src/Connected.ServiceModel.Client.Data/DataParameterCollection.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/DataParameterCollection.cs
rename to src/Connected.ServiceModel.Client.Data/DataParameterCollection.cs
diff --git a/Connected.ServiceModel.Client.Data/DeleteCommandBuilder.cs b/src/Connected.ServiceModel.Client.Data/DeleteCommandBuilder.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/DeleteCommandBuilder.cs
rename to src/Connected.ServiceModel.Client.Data/DeleteCommandBuilder.cs
diff --git a/Connected.ServiceModel.Client.Data/InsertCommandBuilder.cs b/src/Connected.ServiceModel.Client.Data/InsertCommandBuilder.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/InsertCommandBuilder.cs
rename to src/Connected.ServiceModel.Client.Data/InsertCommandBuilder.cs
diff --git a/Connected.ServiceModel.Client.Data/Remote/RemoteTableColumn.cs b/src/Connected.ServiceModel.Client.Data/Remote/RemoteTableColumn.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Remote/RemoteTableColumn.cs
rename to src/Connected.ServiceModel.Client.Data/Remote/RemoteTableColumn.cs
diff --git a/Connected.ServiceModel.Client.Data/Remote/RemoteTableService.cs b/src/Connected.ServiceModel.Client.Data/Remote/RemoteTableService.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Remote/RemoteTableService.cs
rename to src/Connected.ServiceModel.Client.Data/Remote/RemoteTableService.cs
diff --git a/Connected.ServiceModel.Client.Data/Remote/TableArgs.cs b/src/Connected.ServiceModel.Client.Data/Remote/TableArgs.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Remote/TableArgs.cs
rename to src/Connected.ServiceModel.Client.Data/Remote/TableArgs.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/ExistingSchema.cs b/src/Connected.ServiceModel.Client.Data/Schema/ExistingSchema.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/ExistingSchema.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/ExistingSchema.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/SchemaColumn.cs b/src/Connected.ServiceModel.Client.Data/Schema/SchemaColumn.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/SchemaColumn.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/SchemaColumn.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/SchemaExecutionContext.cs b/src/Connected.ServiceModel.Client.Data/Schema/SchemaExecutionContext.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/SchemaExecutionContext.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/SchemaExecutionContext.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/SynchronizationCommand.cs b/src/Connected.ServiceModel.Client.Data/Schema/SynchronizationCommand.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/SynchronizationCommand.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/SynchronizationCommand.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/SynchronizationQuery.cs b/src/Connected.ServiceModel.Client.Data/Schema/SynchronizationQuery.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/SynchronizationQuery.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/SynchronizationQuery.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/SynchronizationTransaction.cs b/src/Connected.ServiceModel.Client.Data/Schema/SynchronizationTransaction.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/SynchronizationTransaction.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/SynchronizationTransaction.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/TableCreate.cs b/src/Connected.ServiceModel.Client.Data/Schema/TableCreate.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/TableCreate.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/TableCreate.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/TableExists.cs b/src/Connected.ServiceModel.Client.Data/Schema/TableExists.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/TableExists.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/TableExists.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/TableSynchronize.cs b/src/Connected.ServiceModel.Client.Data/Schema/TableSynchronize.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/TableSynchronize.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/TableSynchronize.cs
diff --git a/Connected.ServiceModel.Client.Data/Schema/TableTransaction.cs b/src/Connected.ServiceModel.Client.Data/Schema/TableTransaction.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/Schema/TableTransaction.cs
rename to src/Connected.ServiceModel.Client.Data/Schema/TableTransaction.cs
diff --git a/Connected.ServiceModel.Client.Data/TableCommand.cs b/src/Connected.ServiceModel.Client.Data/TableCommand.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableCommand.cs
rename to src/Connected.ServiceModel.Client.Data/TableCommand.cs
diff --git a/Connected.ServiceModel.Client.Data/TableConnection.cs b/src/Connected.ServiceModel.Client.Data/TableConnection.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableConnection.cs
rename to src/Connected.ServiceModel.Client.Data/TableConnection.cs
diff --git a/Connected.ServiceModel.Client.Data/TableDataCommand.cs b/src/Connected.ServiceModel.Client.Data/TableDataCommand.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableDataCommand.cs
rename to src/Connected.ServiceModel.Client.Data/TableDataCommand.cs
diff --git a/Connected.ServiceModel.Client.Data/TableDataConnection.cs b/src/Connected.ServiceModel.Client.Data/TableDataConnection.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableDataConnection.cs
rename to src/Connected.ServiceModel.Client.Data/TableDataConnection.cs
diff --git a/Connected.ServiceModel.Client.Data/TableDataParameter.cs b/src/Connected.ServiceModel.Client.Data/TableDataParameter.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableDataParameter.cs
rename to src/Connected.ServiceModel.Client.Data/TableDataParameter.cs
diff --git a/Connected.ServiceModel.Client.Data/TableDataReader.cs b/src/Connected.ServiceModel.Client.Data/TableDataReader.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableDataReader.cs
rename to src/Connected.ServiceModel.Client.Data/TableDataReader.cs
diff --git a/Connected.ServiceModel.Client.Data/TableReader.cs b/src/Connected.ServiceModel.Client.Data/TableReader.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableReader.cs
rename to src/Connected.ServiceModel.Client.Data/TableReader.cs
diff --git a/Connected.ServiceModel.Client.Data/TableSchemaMiddleware.cs b/src/Connected.ServiceModel.Client.Data/TableSchemaMiddleware.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableSchemaMiddleware.cs
rename to src/Connected.ServiceModel.Client.Data/TableSchemaMiddleware.cs
diff --git a/Connected.ServiceModel.Client.Data/TableStorageProvider.cs b/src/Connected.ServiceModel.Client.Data/TableStorageProvider.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableStorageProvider.cs
rename to src/Connected.ServiceModel.Client.Data/TableStorageProvider.cs
diff --git a/Connected.ServiceModel.Client.Data/TableTransaction.cs b/src/Connected.ServiceModel.Client.Data/TableTransaction.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableTransaction.cs
rename to src/Connected.ServiceModel.Client.Data/TableTransaction.cs
diff --git a/Connected.ServiceModel.Client.Data/TableWriter.cs b/src/Connected.ServiceModel.Client.Data/TableWriter.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/TableWriter.cs
rename to src/Connected.ServiceModel.Client.Data/TableWriter.cs
diff --git a/Connected.ServiceModel.Client.Data/UpdateCommandBuilder.cs b/src/Connected.ServiceModel.Client.Data/UpdateCommandBuilder.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Data/UpdateCommandBuilder.cs
rename to src/Connected.ServiceModel.Client.Data/UpdateCommandBuilder.cs
diff --git a/Connected.ServiceModel.Client.Storage/Bootstrapper.cs b/src/Connected.ServiceModel.Client.Storage/Bootstrapper.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Storage/Bootstrapper.cs
rename to src/Connected.ServiceModel.Client.Storage/Bootstrapper.cs
diff --git a/src/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj b/src/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj
new file mode 100644
index 0000000..ebd30d7
--- /dev/null
+++ b/src/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj
@@ -0,0 +1,16 @@
+
+
+
+ net7.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
diff --git a/Connected.ServiceModel.Client.Storage/StorageOps.cs b/src/Connected.ServiceModel.Client.Storage/StorageOps.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Storage/StorageOps.cs
rename to src/Connected.ServiceModel.Client.Storage/StorageOps.cs
diff --git a/Connected.ServiceModel.Client.Storage/StorageService.cs b/src/Connected.ServiceModel.Client.Storage/StorageService.cs
similarity index 100%
rename from Connected.ServiceModel.Client.Storage/StorageService.cs
rename to src/Connected.ServiceModel.Client.Storage/StorageService.cs
diff --git a/Connected.ServiceModel.Client/Bootstrapper.cs b/src/Connected.ServiceModel.Client/Bootstrapper.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Bootstrapper.cs
rename to src/Connected.ServiceModel.Client/Bootstrapper.cs
diff --git a/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj b/src/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj
similarity index 51%
rename from Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj
rename to src/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj
index 2697573..b1f63d5 100644
--- a/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj
+++ b/src/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/Connected.ServiceModel.Client/Net/ConnectedServer.cs b/src/Connected.ServiceModel.Client/Net/ConnectedServer.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Net/ConnectedServer.cs
rename to src/Connected.ServiceModel.Client/Net/ConnectedServer.cs
diff --git a/Connected.ServiceModel.Client/Net/ConnectedServerArgs.cs b/src/Connected.ServiceModel.Client/Net/ConnectedServerArgs.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Net/ConnectedServerArgs.cs
rename to src/Connected.ServiceModel.Client/Net/ConnectedServerArgs.cs
diff --git a/Connected.ServiceModel.Client/Net/ConnectedServerOps.cs b/src/Connected.ServiceModel.Client/Net/ConnectedServerOps.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Net/ConnectedServerOps.cs
rename to src/Connected.ServiceModel.Client/Net/ConnectedServerOps.cs
diff --git a/Connected.ServiceModel.Client/Net/IConnectedServer.cs b/src/Connected.ServiceModel.Client/Net/IConnectedServer.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Net/IConnectedServer.cs
rename to src/Connected.ServiceModel.Client/Net/IConnectedServer.cs
diff --git a/Connected.ServiceModel.Client/Subscription/ISubscription.cs b/src/Connected.ServiceModel.Client/Subscription/ISubscription.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Subscription/ISubscription.cs
rename to src/Connected.ServiceModel.Client/Subscription/ISubscription.cs
diff --git a/Connected.ServiceModel.Client/Subscription/ISubscriptionService.cs b/src/Connected.ServiceModel.Client/Subscription/ISubscriptionService.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Subscription/ISubscriptionService.cs
rename to src/Connected.ServiceModel.Client/Subscription/ISubscriptionService.cs
diff --git a/Connected.ServiceModel.Client/Subscription/Subscription.cs b/src/Connected.ServiceModel.Client/Subscription/Subscription.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Subscription/Subscription.cs
rename to src/Connected.ServiceModel.Client/Subscription/Subscription.cs
diff --git a/Connected.ServiceModel.Client/Subscription/SubscriptionOps.cs b/src/Connected.ServiceModel.Client/Subscription/SubscriptionOps.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Subscription/SubscriptionOps.cs
rename to src/Connected.ServiceModel.Client/Subscription/SubscriptionOps.cs
diff --git a/Connected.ServiceModel.Client/Subscription/SubscriptionService.cs b/src/Connected.ServiceModel.Client/Subscription/SubscriptionService.cs
similarity index 100%
rename from Connected.ServiceModel.Client/Subscription/SubscriptionService.cs
rename to src/Connected.ServiceModel.Client/Subscription/SubscriptionService.cs