diff --git a/java/ucp/SharedPoolCodeSample.java b/java/jdbc/AdvancedSamples/SharedPoolCodeSample.java
similarity index 100%
rename from java/ucp/SharedPoolCodeSample.java
rename to java/jdbc/AdvancedSamples/SharedPoolCodeSample.java
diff --git a/java/ucp/SharedPoolCodeSample.xml b/java/jdbc/AdvancedSamples/SharedPoolCodeSample.xml
similarity index 100%
rename from java/ucp/SharedPoolCodeSample.xml
rename to java/jdbc/AdvancedSamples/SharedPoolCodeSample.xml
diff --git a/java/ucp/SharedPoolReadme.md b/java/jdbc/AdvancedSamples/SharedPoolReadme.md
similarity index 100%
rename from java/ucp/SharedPoolReadme.md
rename to java/jdbc/AdvancedSamples/SharedPoolReadme.md
diff --git a/java/ucp/ConnectionManagementSamples/UCPSample.java b/java/jdbc/BasicSamples/UCPSample.java
similarity index 100%
rename from java/ucp/ConnectionManagementSamples/UCPSample.java
rename to java/jdbc/BasicSamples/UCPSample.java
diff --git a/java/ucp/ConnectionManagementSamples/UCPWithDRCPSample.java b/java/jdbc/BasicSamples/UCPWithDRCPSample.java
similarity index 100%
rename from java/ucp/ConnectionManagementSamples/UCPWithDRCPSample.java
rename to java/jdbc/BasicSamples/UCPWithDRCPSample.java