diff --git a/src/main/java/link/infra/packwiz/installer/Main.java b/src/main/java/link/infra/packwiz/installer/Main.java
index de253ad..f649fb7 100644
--- a/src/main/java/link/infra/packwiz/installer/Main.java
+++ b/src/main/java/link/infra/packwiz/installer/Main.java
@@ -14,6 +14,10 @@ import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
+import link.infra.packwiz.installer.ui.CLIHandler;
+import link.infra.packwiz.installer.ui.IUserInterface;
+import link.infra.packwiz.installer.ui.InstallWindow;
+
 public class Main {
 
 	// Actual main() is in RequiresBootstrap!
diff --git a/src/main/java/link/infra/packwiz/installer/UpdateManager.java b/src/main/java/link/infra/packwiz/installer/UpdateManager.java
index b758335..fa4617b 100644
--- a/src/main/java/link/infra/packwiz/installer/UpdateManager.java
+++ b/src/main/java/link/infra/packwiz/installer/UpdateManager.java
@@ -2,6 +2,9 @@ package link.infra.packwiz.installer;
 
 import java.net.URI;
 
+import link.infra.packwiz.installer.ui.IUserInterface;
+import link.infra.packwiz.installer.ui.InstallProgress;
+
 public class UpdateManager {
 
 	public final Options opts;
diff --git a/src/main/java/link/infra/packwiz/installer/CLIHandler.java b/src/main/java/link/infra/packwiz/installer/ui/CLIHandler.java
similarity index 93%
rename from src/main/java/link/infra/packwiz/installer/CLIHandler.java
rename to src/main/java/link/infra/packwiz/installer/ui/CLIHandler.java
index 0f0fbae..2e24e0c 100644
--- a/src/main/java/link/infra/packwiz/installer/CLIHandler.java
+++ b/src/main/java/link/infra/packwiz/installer/ui/CLIHandler.java
@@ -1,4 +1,4 @@
-package link.infra.packwiz.installer;
+package link.infra.packwiz.installer.ui;
 
 public class CLIHandler implements IUserInterface {
 
diff --git a/src/main/java/link/infra/packwiz/installer/IUserInterface.java b/src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java
similarity index 91%
rename from src/main/java/link/infra/packwiz/installer/IUserInterface.java
rename to src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java
index e9d30a7..3e3f743 100644
--- a/src/main/java/link/infra/packwiz/installer/IUserInterface.java
+++ b/src/main/java/link/infra/packwiz/installer/ui/IUserInterface.java
@@ -1,4 +1,4 @@
-package link.infra.packwiz.installer;
+package link.infra.packwiz.installer.ui;
 
 public interface IUserInterface {
 	
diff --git a/src/main/java/link/infra/packwiz/installer/InstallProgress.java b/src/main/java/link/infra/packwiz/installer/ui/InstallProgress.java
similarity index 69%
rename from src/main/java/link/infra/packwiz/installer/InstallProgress.java
rename to src/main/java/link/infra/packwiz/installer/ui/InstallProgress.java
index 064f367..6526096 100644
--- a/src/main/java/link/infra/packwiz/installer/InstallProgress.java
+++ b/src/main/java/link/infra/packwiz/installer/ui/InstallProgress.java
@@ -1,4 +1,4 @@
-package link.infra.packwiz.installer;
+package link.infra.packwiz.installer.ui;
 
 public class InstallProgress {
 	public final String message;
@@ -6,14 +6,14 @@ public class InstallProgress {
 	public final int progress;
 	public final int progressTotal;
 
-	InstallProgress(String message) {
+	public InstallProgress(String message) {
 		this.message = message;
 		hasProgress = false;
 		progress = 0;
 		progressTotal = 0;
 	}
 
-	InstallProgress(String message, int progress, int progressTotal) {
+	public InstallProgress(String message, int progress, int progressTotal) {
 		this.message = message;
 		hasProgress = true;
 		this.progress = progress;
diff --git a/src/main/java/link/infra/packwiz/installer/InstallWindow.java b/src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java
similarity index 99%
rename from src/main/java/link/infra/packwiz/installer/InstallWindow.java
rename to src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java
index 07d1ed0..fcc5dce 100644
--- a/src/main/java/link/infra/packwiz/installer/InstallWindow.java
+++ b/src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java
@@ -1,4 +1,4 @@
-package link.infra.packwiz.installer;
+package link.infra.packwiz.installer.ui;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/src/main/java/link/infra/packwiz/installer/SwingWorkerButWithPublicPublish.java b/src/main/java/link/infra/packwiz/installer/ui/SwingWorkerButWithPublicPublish.java
similarity index 90%
rename from src/main/java/link/infra/packwiz/installer/SwingWorkerButWithPublicPublish.java
rename to src/main/java/link/infra/packwiz/installer/ui/SwingWorkerButWithPublicPublish.java
index 44361dd..a5c3f26 100644
--- a/src/main/java/link/infra/packwiz/installer/SwingWorkerButWithPublicPublish.java
+++ b/src/main/java/link/infra/packwiz/installer/ui/SwingWorkerButWithPublicPublish.java
@@ -1,4 +1,4 @@
-package link.infra.packwiz.installer;
+package link.infra.packwiz.installer.ui;
 
 import javax.swing.SwingWorker;