diff --git a/app/src/main/java/com/annimon/hotarufx/Main.java b/app/src/main/java/com/annimon/hotarufx/Main.java
index c4ac6e8..910686a 100644
--- a/app/src/main/java/com/annimon/hotarufx/Main.java
+++ b/app/src/main/java/com/annimon/hotarufx/Main.java
@@ -1,6 +1,6 @@
 package com.annimon.hotarufx;
 
-import com.annimon.hotarufx.ui.ClickableHyperLink;
+import com.annimon.hotarufx.ui.control.ClickableHyperLink;
 import com.annimon.hotarufx.ui.controller.EditorController;
 import java.io.IOException;
 import javafx.application.Application;
diff --git a/app/src/main/java/com/annimon/hotarufx/ui/ClickableHyperLink.java b/app/src/main/java/com/annimon/hotarufx/ui/control/ClickableHyperLink.java
similarity index 95%
rename from app/src/main/java/com/annimon/hotarufx/ui/ClickableHyperLink.java
rename to app/src/main/java/com/annimon/hotarufx/ui/control/ClickableHyperLink.java
index ac21258..a89dae8 100644
--- a/app/src/main/java/com/annimon/hotarufx/ui/ClickableHyperLink.java
+++ b/app/src/main/java/com/annimon/hotarufx/ui/control/ClickableHyperLink.java
@@ -1,4 +1,4 @@
-package com.annimon.hotarufx.ui;
+package com.annimon.hotarufx.ui.control;
 
 import java.util.Optional;
 import javafx.application.HostServices;
diff --git a/app/src/main/java/com/annimon/hotarufx/ui/ColorPickerBox.java b/app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java
similarity index 99%
rename from app/src/main/java/com/annimon/hotarufx/ui/ColorPickerBox.java
rename to app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java
index ea8f8c5..24d76d0 100644
--- a/app/src/main/java/com/annimon/hotarufx/ui/ColorPickerBox.java
+++ b/app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java
@@ -1,5 +1,6 @@
-package com.annimon.hotarufx.ui;
+package com.annimon.hotarufx.ui.control;
 
+import com.annimon.hotarufx.ui.FontAwesomeIcon;
 import java.util.regex.Pattern;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
diff --git a/app/src/main/java/com/annimon/hotarufx/ui/LibraryItem.java b/app/src/main/java/com/annimon/hotarufx/ui/control/LibraryItem.java
similarity index 96%
rename from app/src/main/java/com/annimon/hotarufx/ui/LibraryItem.java
rename to app/src/main/java/com/annimon/hotarufx/ui/control/LibraryItem.java
index 3446586..20e7274 100644
--- a/app/src/main/java/com/annimon/hotarufx/ui/LibraryItem.java
+++ b/app/src/main/java/com/annimon/hotarufx/ui/control/LibraryItem.java
@@ -1,4 +1,4 @@
-package com.annimon.hotarufx.ui;
+package com.annimon.hotarufx.ui.control;
 
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java
index 4f8c4d7..519525f 100644
--- a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java
+++ b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java
@@ -12,7 +12,7 @@ import com.annimon.hotarufx.lexer.HotaruLexer;
 import com.annimon.hotarufx.lib.Context;
 import com.annimon.hotarufx.parser.HotaruParser;
 import com.annimon.hotarufx.parser.visitors.InterpreterVisitor;
-import com.annimon.hotarufx.ui.LibraryItem;
+import com.annimon.hotarufx.ui.control.LibraryItem;
 import com.annimon.hotarufx.ui.SyntaxHighlighter;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/resources/fxml/About.fxml b/app/src/main/resources/fxml/About.fxml
index d8e1926..63cc86a 100644
--- a/app/src/main/resources/fxml/About.fxml
+++ b/app/src/main/resources/fxml/About.fxml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.annimon.hotarufx.ui.control.ClickableHyperLink?>
+<?import com.annimon.hotarufx.ui.*?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.text.TextFlow?>
-<?import com.annimon.hotarufx.ui.LineText?>
 <?import javafx.scene.text.Text?>
-<?import com.annimon.hotarufx.ui.FontAwesomeIcon?>
-<?import com.annimon.hotarufx.ui.ClickableHyperLink?>
+<?import javafx.scene.text.TextFlow?>
 <ScrollPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1"
             prefWidth="400.0" prefHeight="300.0"
             minWidth="NaN" minHeight="NaN"
diff --git a/app/src/main/resources/fxml/Editor.fxml b/app/src/main/resources/fxml/Editor.fxml
index c819593..222b7f0 100644
--- a/app/src/main/resources/fxml/Editor.fxml
+++ b/app/src/main/resources/fxml/Editor.fxml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.annimon.hotarufx.ui.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.FlowPane?>
@@ -15,6 +14,9 @@
 <?import javafx.scene.shape.SVGPath?>
 <?import javafx.scene.text.Text?>
 <?import org.fxmisc.richtext.CodeArea?>
+<?import com.annimon.hotarufx.ui.control.ColorPickerBox?>
+<?import com.annimon.hotarufx.ui.control.LibraryItem?>
+<?import com.annimon.hotarufx.ui.FontAwesomeIcon?>
 <BorderPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1"
             prefWidth="800.0" prefHeight="600.0"
             minWidth="NaN" minHeight="NaN"