diff --git a/config/test/log4j2.xml b/config/test/log4j2.xml
index d9034ea63d..cd9926ca8c 100644
--- a/config/test/log4j2.xml
+++ b/config/test/log4j2.xml
@@ -13,7 +13,7 @@
         <Root level="info">
             <AppenderRef ref="Console-Appender"/>
         </Root>
-        <Logger name="net.corda. level="info" additivity="false">
+        <Logger name="net.corda" level="info" additivity="false">
             <AppenderRef ref="Console-Appender"/>
         </Logger>
     </Loggers>
diff --git a/gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Cordform.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordform.groovy
similarity index 95%
rename from gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Cordform.groovy
rename to gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordform.groovy
index 46363ee385..bcc6a6a537 100644
--- a/gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Cordform.groovy
+++ b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordform.groovy
@@ -3,10 +3,9 @@ package net.corda.plugins
 import org.apache.tools.ant.filters.FixCrLfFilter
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
+
 import java.nio.file.Path
 import java.nio.file.Paths
-import org.gradle.api.Project
-
 /**
  * Creates nodes based on the configuration of this task in the gradle configuration DSL.
  *
@@ -67,7 +66,7 @@ class Cordform extends DefaultTask {
      */
     protected void installRunScript() {
         project.copy {
-            from Cordformation.getPluginFile(project, "net.corda.plugins/runnodes")
+            from Cordformation.getPluginFile(project, "net/corda/plugins/runnodes")
             filter { String line -> line.replace("JAR_NAME", Node.JAR_NAME) }
             // Replaces end of line with lf to avoid issues with the bash interpreter and Windows style line endings.
             filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
diff --git a/gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Cordformation.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy
similarity index 100%
rename from gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Cordformation.groovy
rename to gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy
diff --git a/gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Node.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy
similarity index 100%
rename from gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Node.groovy
rename to gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy
diff --git a/gradle-plugins/cordformation/src/main/resources/META-INF/gradle-plugins/com.r3corda.plugins.cordformation.properties b/gradle-plugins/cordformation/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.cordformation.properties
similarity index 100%
rename from gradle-plugins/cordformation/src/main/resources/META-INF/gradle-plugins/com.r3corda.plugins.cordformation.properties
rename to gradle-plugins/cordformation/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.cordformation.properties
diff --git a/gradle-plugins/cordformation/src/main/resources/com/r3corda/plugins/runnodes b/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes
similarity index 100%
rename from gradle-plugins/cordformation/src/main/resources/com/r3corda/plugins/runnodes
rename to gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes
diff --git a/gradle-plugins/publish-utils/src/main/groovy/com/r3corda/plugins/DefaultPublishTasks.groovy b/gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/DefaultPublishTasks.groovy
similarity index 100%
rename from gradle-plugins/publish-utils/src/main/groovy/com/r3corda/plugins/DefaultPublishTasks.groovy
rename to gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/DefaultPublishTasks.groovy
diff --git a/gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/com.r3corda.plugins.publish-utils.properties b/gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.publish-utils.properties
similarity index 100%
rename from gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/com.r3corda.plugins.publish-utils.properties
rename to gradle-plugins/publish-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.publish-utils.properties
diff --git a/gradle-plugins/quasar-utils/src/main/groovy/com/r3corda/plugins/QuasarPlugin.groovy b/gradle-plugins/quasar-utils/src/main/groovy/net/corda/plugins/QuasarPlugin.groovy
similarity index 100%
rename from gradle-plugins/quasar-utils/src/main/groovy/com/r3corda/plugins/QuasarPlugin.groovy
rename to gradle-plugins/quasar-utils/src/main/groovy/net/corda/plugins/QuasarPlugin.groovy
diff --git a/gradle-plugins/quasar-utils/src/main/resources/META-INF/gradle-plugins/com.r3corda.plugins.quasar-utils.properties b/gradle-plugins/quasar-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.quasar-utils.properties
similarity index 100%
rename from gradle-plugins/quasar-utils/src/main/resources/META-INF/gradle-plugins/com.r3corda.plugins.quasar-utils.properties
rename to gradle-plugins/quasar-utils/src/main/resources/META-INF/gradle-plugins/net.corda.plugins.quasar-utils.properties