diff --git a/samples/CustomClaimsProvider/ADMIN/SharePointProjectItem.spdata b/custom-claims-provider-samples/CustomClaimsProvider/ADMIN/SharePointProjectItem.spdata
similarity index 100%
rename from samples/CustomClaimsProvider/ADMIN/SharePointProjectItem.spdata
rename to custom-claims-provider-samples/CustomClaimsProvider/ADMIN/SharePointProjectItem.spdata
diff --git a/samples/CustomClaimsProvider/CustomClaimsProvider.csproj b/custom-claims-provider-samples/CustomClaimsProvider/CustomClaimsProvider.csproj
similarity index 100%
rename from samples/CustomClaimsProvider/CustomClaimsProvider.csproj
rename to custom-claims-provider-samples/CustomClaimsProvider/CustomClaimsProvider.csproj
diff --git a/samples/CustomClaimsProvider/CustomClaimsProvider.sln b/custom-claims-provider-samples/CustomClaimsProvider/CustomClaimsProvider.sln
similarity index 100%
rename from samples/CustomClaimsProvider/CustomClaimsProvider.sln
rename to custom-claims-provider-samples/CustomClaimsProvider/CustomClaimsProvider.sln
diff --git a/samples/CustomClaimsProvider/EntraCP_Custom.cs b/custom-claims-provider-samples/CustomClaimsProvider/EntraCP_Custom.cs
similarity index 100%
rename from samples/CustomClaimsProvider/EntraCP_Custom.cs
rename to custom-claims-provider-samples/CustomClaimsProvider/EntraCP_Custom.cs
diff --git a/samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.Template.xml b/custom-claims-provider-samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.Template.xml
similarity index 100%
rename from samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.Template.xml
rename to custom-claims-provider-samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.Template.xml
diff --git a/samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.feature b/custom-claims-provider-samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.feature
similarity index 100%
rename from samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.feature
rename to custom-claims-provider-samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.ClaimsProvider.feature
diff --git a/samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.EventReceiver.cs b/custom-claims-provider-samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.EventReceiver.cs
similarity index 100%
rename from samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.EventReceiver.cs
rename to custom-claims-provider-samples/CustomClaimsProvider/Features/EntraCP.Custom.ClaimsProvider/EntraCP.Custom.EventReceiver.cs
diff --git a/samples/CustomClaimsProvider/Package/Package.Template.xml b/custom-claims-provider-samples/CustomClaimsProvider/Package/Package.Template.xml
similarity index 100%
rename from samples/CustomClaimsProvider/Package/Package.Template.xml
rename to custom-claims-provider-samples/CustomClaimsProvider/Package/Package.Template.xml
diff --git a/samples/CustomClaimsProvider/Package/Package.package b/custom-claims-provider-samples/CustomClaimsProvider/Package/Package.package
similarity index 100%
rename from samples/CustomClaimsProvider/Package/Package.package
rename to custom-claims-provider-samples/CustomClaimsProvider/Package/Package.package
diff --git a/samples/CustomClaimsProvider/Properties/AssemblyInfo.cs b/custom-claims-provider-samples/CustomClaimsProvider/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/CustomClaimsProvider/Properties/AssemblyInfo.cs
rename to custom-claims-provider-samples/CustomClaimsProvider/Properties/AssemblyInfo.cs
diff --git a/custom-claims-provider-samples/CustomClaimsProvider/README.md b/custom-claims-provider-samples/CustomClaimsProvider/README.md
new file mode 100644
index 00000000..a854b433
--- /dev/null
+++ b/custom-claims-provider-samples/CustomClaimsProvider/README.md
@@ -0,0 +1,9 @@
+# Sample with a hard-coded configuration and a manual reference to EntraCP
+
+This project shows how to create a claims provider that inherits EntraCP. It uses a simple, hard-coded configuration to specify the tenant.
+
+> [!WARNING]
+> Do NOT deploy this solution in a SharePoint farm that already has EntraCP deployed, unless both use **exactly** the same versions of NuGet dependencies. If they use different versions, that may cause errors when loading DLLs, due to mismatches with the assembly bindings in the machine.config file.
+
+> [!IMPORTANT]  
+> You need to manually add a reference to `Yvand.EntraCP.dll`, and its version will determine the version of the Nuget packages `Azure.Identity` and `Microsoft.Graph` you should use in your project, because that will allow you to reuse the same assembly bindings provided in the file `assembly-bindings.config` and avoid the tedious task of figuring them all out by yourself.
diff --git a/samples/README.md b/custom-claims-provider-samples/README.md
similarity index 100%
rename from samples/README.md
rename to custom-claims-provider-samples/README.md
diff --git a/samples/CustomClaimsProvider/README.md b/samples/CustomClaimsProvider/README.md
deleted file mode 100644
index 94bb58c5..00000000
--- a/samples/CustomClaimsProvider/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sample with a hard-coded configuration
-
-This project shows how to create a claims provider that inherits EntraCP. It uses a simple, hard-coded configuration to specify the tenant.
-
-Do NOT deploy this solution in a SharePoint farm that already has EntraCP deployed, unless both use **exactly** the same versions of NuGet dependencies. If they use different versions, that may cause errors when loading DLLs, due to mismatches with the assembly bindings in the machine.config file.
diff --git a/samples/Yvand.EntraCP.dll b/samples/Yvand.EntraCP.dll
deleted file mode 100644
index 89a103d5..00000000
Binary files a/samples/Yvand.EntraCP.dll and /dev/null differ