diff --git a/block-storage/build.gradle b/block-storage/build.gradle
index 3872b3b..bb4c405 100644
--- a/block-storage/build.gradle
+++ b/block-storage/build.gradle
@@ -1,13 +1,16 @@
-apply plugin: 'antlr'
+//apply plugin: 'antlr'
+//apply plugin: 'java'
+
+System.out.println(dependencies.class);
 
 dependencies {
-	compile project(':byte-utils')
-	compile project(':file-utils')
-	compile project(':pdb-utils')
+  api lib_primitive_collections
+	implementation project(':byte-utils')
+	implementation project(':file-utils')
+	implementation project(':pdb-utils')
 	
 	
-	compile lib_log4j2_slf4j_impl
-    compile lib_primitive_collections
+	implementation lib_log4j2_slf4j_impl
 }
 
 
diff --git a/build.gradle b/build.gradle
index 3c19780..22aea64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,7 @@ ext {
  * The shared configuration for all sub-projects:
  */
 subprojects {
-	apply plugin: 'java'
+	apply plugin: 'java-library'
 	apply plugin: 'eclipse'
 	
 	compileJava.options.encoding = 'UTF-8'
@@ -87,7 +87,7 @@ subprojects {
 	
 	// dependencies that all sub-projects have 
 	dependencies {
-		testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
+		testImplementation group: 'org.testng', name: 'testng', version: '6.14.3'
 	}
 	
    task eclipseSettings(type: Copy) {
@@ -117,5 +117,5 @@ subprojects {
 }
 
 wrapper {
-    gradleVersion = '6.0-rc-2'
+    gradleVersion = '6.0'
 }
diff --git a/byte-utils/build.gradle b/byte-utils/build.gradle
index f44f859..ed54cf5 100644
--- a/byte-utils/build.gradle
+++ b/byte-utils/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-	compile lib_log4j2_slf4j_impl
-    compile lib_primitive_collections
+	implementation lib_log4j2_slf4j_impl
+  implementation lib_primitive_collections
 }
diff --git a/data-store/build.gradle b/data-store/build.gradle
index 2f526a1..7ef0238 100644
--- a/data-store/build.gradle
+++ b/data-store/build.gradle
@@ -1,16 +1,17 @@
 apply plugin: 'antlr'
 
 dependencies {
-	compile project(':pdb-api')
-	compile project(':file-utils')
-	compile project(':pdb-utils')
-	compile project(':block-storage')
+	implementation project(':pdb-api')
+	implementation project(':file-utils')
+	implementation project(':pdb-utils')
+	api project(':block-storage')
+	implementation project(':byte-utils')
 	antlr lib_antlr
 	
-	compile lib_primitive_collections
-	compile lib_commons_lang3
+	implementation lib_primitive_collections
+	implementation lib_commons_lang3
 
-    compile lib_log4j2_slf4j_impl
+  implementation lib_log4j2_slf4j_impl
 }
 
 
diff --git a/file-utils/build.gradle b/file-utils/build.gradle
index 334361b..e208024 100644
--- a/file-utils/build.gradle
+++ b/file-utils/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-	compile lib_log4j2_slf4j_impl
+	implementation lib_log4j2_slf4j_impl
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 02aa881..6ce793f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pdb-api/build.gradle b/pdb-api/build.gradle
index 0ec309f..292b1dc 100644
--- a/pdb-api/build.gradle
+++ b/pdb-api/build.gradle
@@ -1,7 +1,7 @@
 
 dependencies {
-    compile project(':byte-utils')
-	compile project(':pdb-utils')
-	compile project(':file-utils')
-    compile lib_primitive_collections
+  implementation project(':byte-utils')
+	implementation project(':pdb-utils')
+	implementation project(':file-utils')
+  implementation lib_primitive_collections
 }
\ No newline at end of file
diff --git a/pdb-plotting/build.gradle b/pdb-plotting/build.gradle
index 27bdf73..3507ffe 100644
--- a/pdb-plotting/build.gradle
+++ b/pdb-plotting/build.gradle
@@ -1,7 +1,12 @@
 
 dependencies {
-	compile project(':performanceDb')
-	compile lib_primitive_collections
-	compile lib_jackson_databind
+	implementation project(':performanceDb')
+	implementation project(':file-utils')
+  implementation project(':pdb-utils')
+	implementation lib_primitive_collections
+	implementation lib_jackson_databind
+	
+  implementation lib_log4j2_core
+  implementation lib_log4j2_slf4j_impl
 }
 
diff --git a/pdb-ui/build.gradle b/pdb-ui/build.gradle
index 25f30a5..935a7f7 100644
--- a/pdb-ui/build.gradle
+++ b/pdb-ui/build.gradle
@@ -10,21 +10,26 @@ applicationDefaultJvmArgs = [
 	]
 
 dependencies {
-	compile project(':performanceDb')
-	compile project(':pdb-plotting')
+	implementation project(':performanceDb')
+	implementation project(':pdb-plotting')
   implementation project(':pdb-js')
+  implementation project(':pdb-utils')
+  
+  implementation lib_commons_lang3
+  implementation lib_primitive_collections
 	
-	compile(lib_spring_boot_mustache) {
+	implementation(lib_spring_boot_mustache) {
 		exclude module: 'spring-boot-starter-logging'
 	}
-	compile(lib_spring_boot_web){
+	implementation(lib_spring_boot_web){
 		exclude module: 'spring-boot-starter-logging'
 	}
-	compile(lib_spring_boot_log4j2)
+	implementation(lib_spring_boot_log4j2)
 	
-	testCompile(lib_spring_boot_test){
+	testImplementation(lib_spring_boot_test){
 		exclude module: 'spring-boot-starter-logging'
 	}
+	testImplementation project(':file-utils')
 }
 
 jar {
diff --git a/pdb-utils/build.gradle b/pdb-utils/build.gradle
index 5df39ff..bc1163a 100644
--- a/pdb-utils/build.gradle
+++ b/pdb-utils/build.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-    compile lib_primitive_collections
-	compile lib_log4j2_core
-    compile lib_log4j2_slf4j_impl
+  implementation lib_primitive_collections
+	implementation lib_log4j2_core
+  implementation lib_log4j2_slf4j_impl
 }
\ No newline at end of file
diff --git a/performanceDb/build.gradle b/performanceDb/build.gradle
index ce2841d..4990177 100644
--- a/performanceDb/build.gradle
+++ b/performanceDb/build.gradle
@@ -1,11 +1,12 @@
 
 dependencies {
-	compile project(':pdb-api')
-	compile project(':data-store')
-	compile project(':file-utils')
-	compile lib_jackson_databind
-	compile lib_commons_collections4
+	api project(':pdb-api')
+	api project(':data-store')
+	implementation project(':file-utils')
+	implementation lib_jackson_databind
+	implementation lib_commons_collections4
 	
-	compile lib_log4j2_core
-	compile lib_log4j2_slf4j_impl
+	implementation lib_log4j2_core
+	implementation lib_log4j2_slf4j_impl
+  testImplementation project(':pdb-utils')
 }