diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index b0e9f7de98..9262c56110 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -140,12 +140,5 @@
             <artifactId>system-rules</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javafx</groupId>
-            <artifactId>jfxrt</artifactId>
-            <version>${java.version}</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/lib/ext/jfxrt.jar</systemPath>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/ASTTreeNode.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/ASTTreeNode.java
similarity index 98%
rename from pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/ASTTreeNode.java
rename to pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/ASTTreeNode.java
index 94642c519a..aec17e901d 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/ASTTreeNode.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/ASTTreeNode.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.util.fxdesigner;
+package net.sourceforge.pmd.util.fxdesigner.fxdesigner;
 
 import java.io.StringWriter;
 import java.util.Enumeration;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/Designer.java
similarity index 93%
rename from pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java
rename to pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/Designer.java
index 50eb0e0b3c..727ac369cc 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/Designer.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.util.fxdesigner;
+package net.sourceforge.pmd.util.fxdesigner.fxdesigner;
 
 import java.io.IOException;
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerController.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/DesignerController.java
similarity index 98%
rename from pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerController.java
rename to pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/DesignerController.java
index be580e44a6..e73ad82caf 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerController.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/DesignerController.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.util.fxdesigner;
+package net.sourceforge.pmd.util.fxdesigner.fxdesigner;
 
 import java.io.StringReader;
 import java.net.URL;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerUtil.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/DesignerUtil.java
similarity index 96%
rename from pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerUtil.java
rename to pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/DesignerUtil.java
index 3bf3091716..2d2890735e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerUtil.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/fxdesigner/DesignerUtil.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.util.fxdesigner;
+package net.sourceforge.pmd.util.fxdesigner.fxdesigner;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pmd-core/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxdesigner/designer.fxml
similarity index 97%
rename from pmd-core/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml
rename to pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxdesigner/designer.fxml
index f48a196188..0ad714dea1 100644
--- a/pmd-core/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxdesigner/designer.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 
-<AnchorPane prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="net.sourceforge.pmd.util.fxdesigner.Designer">
+<AnchorPane prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="net.sourceforge.pmd.util.fxdesigner.fxdesigner.Designer">
    <children>
       <BorderPane prefHeight="600.0" prefWidth="900.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <top>