diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index 679e9ee..8fbd78d 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -72,7 +72,7 @@ public final class LoginDialog extends Dialog<Void> {
 		this.localDB				= localDB;
 		this.receivedMessageCache	= receivedMessageCache;
 
-		final var loader = new FXMLLoader(getClass().getResource("LoginDialog.fxml"));
+		final var loader = new FXMLLoader(getClass().getResource("/fxml/LoginDialog.fxml"));
 		loader.setController(this);
 		final var dialogPane = loader.<DialogPane>load();
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 118fea6..becc467 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -124,7 +124,7 @@ public final class Startup extends Application {
 				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
 
 		// Prepare stage and load ChatScene
-		var	loader		= new FXMLLoader(getClass().getResource("ChatScene.fxml"));
+		var	loader		= new FXMLLoader(getClass().getResource("/fxml/ChatScene.fxml"));
 		var	anchorPane	= loader.<GridPane>load();
 		var	chatScene	= new Scene(anchorPane);
 		stage.setTitle("Envoy");
diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
similarity index 100%
rename from src/main/java/envoy/client/ui/ChatScene.fxml
rename to src/main/resources/fxml/ChatScene.fxml
diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/resources/fxml/LoginDialog.fxml
similarity index 100%
rename from src/main/java/envoy/client/ui/LoginDialog.fxml
rename to src/main/resources/fxml/LoginDialog.fxml