From 17086a87eff83e412cbda3ca1419dc52b7758c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20T=C3=A2che?= <guillaume.tache@epfl.ch>
Date: Mon, 16 Sep 2024 20:01:12 +0200
Subject: [PATCH] Moves some classes

---
 .../gui/{ => main}/MainController.java        |  2 +-
 .../gui/{ => main}/MainModel.java             |  2 +-
 .../gui/{ => media}/MediaController.java      |  2 +-
 .../gui/{ => media}/MediaModel.java           |  2 +-
 .../ParametersController.java                 |  2 +-
 .../gui/{ => parameters}/ParametersModel.java |  2 +-
 .../gui/{ => setup}/SetupController.java      |  2 +-
 .../gui/{ => setup}/SetupModel.java           |  2 +-
 .../{ => subtitles}/SubtitlesController.java  |  2 +-
 .../gui/{ => subtitles}/SubtitlesModel.java   |  2 +-
 .../gui/{ => work}/WorkController.java        |  4 +-
 .../gui/{ => work}/WorkModel.java             |  2 +-
 .../gui/{ => work}/WorkStatus.java            |  2 +-
 gui/api/src/main/java/module-info.java        |  6 ++
 .../gui/{ => main}/fx/FXMainController.java   |  5 +-
 .../gui/{ => main}/fx/FXMainModel.java        |  4 +-
 .../gui/{ => media}/fx/FXMediaBinder.java     |  4 +-
 .../gui/{ => media}/fx/FXMediaController.java |  4 +-
 .../gui/{ => media}/fx/FXMediaModel.java      |  6 +-
 .../fx/FXParametersController.java            |  5 +-
 .../fx/FXParametersModel.java                 |  6 +-
 .../gui/{ => setup}/fx/FXSetupController.java |  5 +-
 .../gui/{ => setup}/fx/FXSetupModel.java      |  4 +-
 .../{ => subtitles}/fx/FXSubtitlesBinder.java |  6 +-
 .../fx/FXSubtitlesController.java             |  5 +-
 .../{ => subtitles}/fx/FXSubtitlesModel.java  |  6 +-
 .../fx/LanguageStringConverter.java           |  2 +-
 .../fx/TimeStringConverter.java               |  2 +-
 .../gui/{ => work}/fx/FXWorkBinder.java       |  5 +-
 .../gui/{ => work}/fx/FXWorkController.java   |  8 ++-
 .../gui/{ => work}/fx/FXWorkModel.java        | 24 +++----
 .../autosubtitle/modules/gui/fx/FXModule.java | 12 ++--
 .../setup/gui/fx/FXSetupUserBridge.java       |  2 +-
 gui/fx/src/main/java/module-info.java         | 12 ++++
 .../gtache/autosubtitle/gui/fx/mainView.fxml  |  2 +-
 .../gtache/autosubtitle/gui/fx/mediaView.fxml |  2 +-
 .../autosubtitle/gui/fx/parametersView.fxml   | 54 ++++++++--------
 .../gtache/autosubtitle/gui/fx/setupView.fxml | 63 ++++++++++---------
 .../autosubtitle/gui/fx/subtitlesView.fxml    | 33 ++++++----
 .../gtache/autosubtitle/gui/fx/workView.fxml  | 50 ++++++++-------
 .../{ => main}/fx/TestFXMainController.java   |  2 +-
 .../gui/{ => main}/fx/TestFXMainModel.java    |  2 +-
 .../gui/{ => media}/fx/TestFXMediaBinder.java |  6 +-
 .../{ => media}/fx/TestFXMediaController.java |  2 +-
 .../gui/{ => media}/fx/TestFXMediaModel.java  |  2 +-
 .../fx/TestFXParametersController.java        |  3 +-
 .../fx/TestFXParametersModel.java             |  2 +-
 .../{ => setup}/fx/TestFXSetupController.java |  3 +-
 .../gui/{ => setup}/fx/TestFXSetupModel.java  |  2 +-
 .../fx/TestFXSubtitlesController.java         |  2 +-
 .../fx/TestFXSubtitlesModel.java              |  2 +-
 .../fx/TestLanguageStringConverter.java       |  2 +-
 .../fx/TestTimeStringConverter.java           |  2 +-
 .../gui/{ => work}/fx/TestFXWorkBinder.java   |  7 ++-
 .../{ => work}/fx/TestFXWorkController.java   |  2 +-
 .../gui/{ => work}/fx/TestFXWorkModel.java    |  4 +-
 .../modules/gui/fx/TestFXModule.java          | 12 ++--
 57 files changed, 242 insertions(+), 180 deletions(-)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => main}/MainController.java (84%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => main}/MainModel.java (84%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => media}/MediaController.java (89%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => media}/MediaModel.java (96%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => parameters}/ParametersController.java (83%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => parameters}/ParametersModel.java (97%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => setup}/SetupController.java (95%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => setup}/SetupModel.java (98%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/SubtitlesController.java (93%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/SubtitlesModel.java (98%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => work}/WorkController.java (88%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => work}/WorkModel.java (97%)
 rename gui/api/src/main/java/com/github/gtache/autosubtitle/gui/{ => work}/WorkStatus.java (72%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => main}/fx/FXMainController.java (86%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => main}/fx/FXMainModel.java (86%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => media}/fx/FXMediaBinder.java (81%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => media}/fx/FXMediaController.java (98%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => media}/fx/FXMediaModel.java (93%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => parameters}/fx/FXParametersController.java (96%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => parameters}/fx/FXParametersModel.java (96%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => setup}/fx/FXSetupController.java (98%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => setup}/fx/FXSetupModel.java (97%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/FXSubtitlesBinder.java (92%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/FXSubtitlesController.java (98%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/FXSubtitlesModel.java (98%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/LanguageStringConverter.java (88%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/TimeStringConverter.java (92%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => work}/fx/FXWorkBinder.java (77%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => work}/fx/FXWorkController.java (96%)
 rename gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/{ => work}/fx/FXWorkModel.java (87%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => main}/fx/TestFXMainController.java (98%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => main}/fx/TestFXMainModel.java (90%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => media}/fx/TestFXMediaBinder.java (85%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => media}/fx/TestFXMediaController.java (99%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => media}/fx/TestFXMediaModel.java (97%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => parameters}/fx/TestFXParametersController.java (96%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => parameters}/fx/TestFXParametersModel.java (98%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => setup}/fx/TestFXSetupController.java (96%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => setup}/fx/TestFXSetupModel.java (98%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/TestFXSubtitlesController.java (98%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/TestFXSubtitlesModel.java (97%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/TestLanguageStringConverter.java (92%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => subtitles}/fx/TestTimeStringConverter.java (96%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => work}/fx/TestFXWorkBinder.java (72%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => work}/fx/TestFXWorkController.java (98%)
 rename gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/{ => work}/fx/TestFXWorkModel.java (94%)

diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainController.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainController.java
similarity index 84%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainController.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainController.java
index a4f437e..bd6aaaa 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainController.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.main;
 
 /**
  * Controller for the main view
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainModel.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainModel.java
similarity index 84%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainModel.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainModel.java
index e69d43d..fac95e6 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainModel.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.main;
 
 /**
  * Model for the main view
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaController.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaController.java
similarity index 89%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaController.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaController.java
index ba4600f..a3c3f97 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaController.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.media;
 
 /**
  * Controller for the media view
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaModel.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaModel.java
similarity index 96%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaModel.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaModel.java
index 9884081..38a4c56 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaModel.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.media;
 
 import com.github.gtache.autosubtitle.Video;
 import com.github.gtache.autosubtitle.subtitle.EditableSubtitle;
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersController.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersController.java
similarity index 83%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersController.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersController.java
index 5cda24b..dd16db9 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersController.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.parameters;
 
 /**
  * Controller for the parameters view
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersModel.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersModel.java
similarity index 97%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersModel.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersModel.java
index 5c9d87d..d04aa6a 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersModel.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.parameters;
 
 import com.github.gtache.autosubtitle.subtitle.OutputFormat;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupController.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupController.java
similarity index 95%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupController.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupController.java
index 82695e2..097dd73 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupController.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.setup;
 
 /**
  * Controller for the setup view
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupModel.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupModel.java
similarity index 98%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupModel.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupModel.java
index e384775..ca78259 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupModel.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.setup;
 
 import com.github.gtache.autosubtitle.setup.SetupStatus;
 
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesController.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesController.java
similarity index 93%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesController.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesController.java
index d6987fc..7f86cd7 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesController.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.subtitles;
 
 import com.github.gtache.autosubtitle.Language;
 
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesModel.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesModel.java
similarity index 98%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesModel.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesModel.java
index ede2812..99c410d 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesModel.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.subtitles;
 
 import com.github.gtache.autosubtitle.Language;
 import com.github.gtache.autosubtitle.VideoInfo;
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkController.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkController.java
similarity index 88%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkController.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkController.java
index c9521a0..5267bb2 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkController.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.work;
 
 import java.nio.file.Path;
 
@@ -18,7 +18,7 @@ public interface WorkController {
      * @param file The path to the video
      */
     void loadVideo(final Path file);
-    
+
     /**
      * @return The model
      */
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkModel.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkModel.java
similarity index 97%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkModel.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkModel.java
index 1e6d01a..644ef0f 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkModel.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.work;
 
 import com.github.gtache.autosubtitle.Video;
 import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
diff --git a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkStatus.java b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkStatus.java
similarity index 72%
rename from gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkStatus.java
rename to gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkStatus.java
index 1e3dd4f..7d26ba5 100644
--- a/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkStatus.java
+++ b/gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkStatus.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui;
+package com.github.gtache.autosubtitle.gui.work;
 
 /**
  * Possible statuses for the work controller
diff --git a/gui/api/src/main/java/module-info.java b/gui/api/src/main/java/module-info.java
index b6373f0..c7c870b 100644
--- a/gui/api/src/main/java/module-info.java
+++ b/gui/api/src/main/java/module-info.java
@@ -4,4 +4,10 @@
 module com.github.gtache.autosubtitle.gui.api {
     requires transitive com.github.gtache.autosubtitle.api;
     exports com.github.gtache.autosubtitle.gui;
+    exports com.github.gtache.autosubtitle.gui.main;
+    exports com.github.gtache.autosubtitle.gui.media;
+    exports com.github.gtache.autosubtitle.gui.parameters;
+    exports com.github.gtache.autosubtitle.gui.setup;
+    exports com.github.gtache.autosubtitle.gui.subtitles;
+    exports com.github.gtache.autosubtitle.gui.work;
 }
\ No newline at end of file
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainController.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainController.java
similarity index 86%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainController.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainController.java
index 9128461..6e7ad5f 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainController.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainController.java
@@ -1,6 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.main.fx;
 
-import com.github.gtache.autosubtitle.gui.MainController;
+import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
+import com.github.gtache.autosubtitle.gui.main.MainController;
 import javafx.fxml.FXML;
 import javafx.scene.control.TabPane;
 import javafx.stage.Window;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainModel.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainModel.java
similarity index 86%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainModel.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainModel.java
index 7aa546b..5a48505 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainModel.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainModel.java
@@ -1,6 +1,6 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.main.fx;
 
-import com.github.gtache.autosubtitle.gui.MainModel;
+import com.github.gtache.autosubtitle.gui.main.MainModel;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaBinder.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaBinder.java
similarity index 81%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaBinder.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaBinder.java
index db6b516..76650c0 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaBinder.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaBinder.java
@@ -1,5 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.media.fx;
 
+import com.github.gtache.autosubtitle.gui.fx.FXBinder;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkModel;
 import javafx.beans.binding.Bindings;
 
 import javax.inject.Inject;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaController.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaController.java
similarity index 98%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaController.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaController.java
index d981826..3417977 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaController.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaController.java
@@ -1,8 +1,8 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.media.fx;
 
 import com.github.gtache.autosubtitle.File;
-import com.github.gtache.autosubtitle.gui.MediaController;
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
+import com.github.gtache.autosubtitle.gui.media.MediaController;
 import com.github.gtache.autosubtitle.modules.gui.impl.Pause;
 import com.github.gtache.autosubtitle.modules.gui.impl.Play;
 import com.github.gtache.autosubtitle.subtitle.Subtitle;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaModel.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaModel.java
similarity index 93%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaModel.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaModel.java
index 99f1786..99fdf1f 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaModel.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaModel.java
@@ -1,7 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.media.fx;
 
 import com.github.gtache.autosubtitle.Video;
-import com.github.gtache.autosubtitle.gui.MediaModel;
+import com.github.gtache.autosubtitle.gui.media.MediaModel;
 import com.github.gtache.autosubtitle.subtitle.EditableSubtitle;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
@@ -12,7 +12,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 /**
- * FX implementation of {@link com.github.gtache.autosubtitle.gui.MediaModel}
+ * FX implementation of {@link MediaModel}
  */
 @Singleton
 public class FXMediaModel implements MediaModel {
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersController.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersController.java
similarity index 96%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersController.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersController.java
index 73e464a..9f353da 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersController.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersController.java
@@ -1,6 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.parameters.fx;
 
-import com.github.gtache.autosubtitle.gui.ParametersController;
+import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
+import com.github.gtache.autosubtitle.gui.parameters.ParametersController;
 import com.github.gtache.autosubtitle.subtitle.OutputFormat;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersModel.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersModel.java
similarity index 96%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersModel.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersModel.java
index c58c629..6424404 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersModel.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersModel.java
@@ -1,6 +1,6 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.parameters.fx;
 
-import com.github.gtache.autosubtitle.gui.ParametersModel;
+import com.github.gtache.autosubtitle.gui.parameters.ParametersModel;
 import com.github.gtache.autosubtitle.modules.impl.FontName;
 import com.github.gtache.autosubtitle.modules.impl.FontSize;
 import com.github.gtache.autosubtitle.modules.impl.MaxLineLength;
@@ -65,7 +65,7 @@ public class FXParametersModel implements ParametersModel {
         extractionModel.set(model);
     }
 
-    ObjectProperty<ExtractionModel> extractionModelProperty() {
+    public ObjectProperty<ExtractionModel> extractionModelProperty() {
         return extractionModel;
     }
 
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupController.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupController.java
similarity index 98%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupController.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupController.java
index d924789..808947b 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupController.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupController.java
@@ -1,6 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.setup.fx;
 
-import com.github.gtache.autosubtitle.gui.SetupController;
+import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
+import com.github.gtache.autosubtitle.gui.setup.SetupController;
 import com.github.gtache.autosubtitle.modules.setup.impl.SubtitleExtractorSetup;
 import com.github.gtache.autosubtitle.modules.setup.impl.TranslatorSetup;
 import com.github.gtache.autosubtitle.modules.setup.impl.VideoConverterSetup;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupModel.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupModel.java
similarity index 97%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupModel.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupModel.java
index 5b9e6ac..b8fb6aa 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupModel.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupModel.java
@@ -1,6 +1,6 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.setup.fx;
 
-import com.github.gtache.autosubtitle.gui.SetupModel;
+import com.github.gtache.autosubtitle.gui.setup.SetupModel;
 import com.github.gtache.autosubtitle.setup.SetupStatus;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesBinder.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesBinder.java
similarity index 92%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesBinder.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesBinder.java
index ddbf450..6188a8d 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesBinder.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesBinder.java
@@ -1,8 +1,10 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.Language;
 import com.github.gtache.autosubtitle.Video;
-import com.github.gtache.autosubtitle.gui.WorkStatus;
+import com.github.gtache.autosubtitle.gui.fx.FXBinder;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkModel;
+import com.github.gtache.autosubtitle.gui.work.WorkStatus;
 import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleCollectionImpl;
 import javafx.beans.binding.Bindings;
 
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesController.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesController.java
similarity index 98%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesController.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesController.java
index b315c26..b81d6b4 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesController.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesController.java
@@ -1,8 +1,9 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.Language;
-import com.github.gtache.autosubtitle.gui.SubtitlesController;
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
+import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
+import com.github.gtache.autosubtitle.gui.subtitles.SubtitlesController;
 import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
 import com.github.gtache.autosubtitle.subtitle.SubtitleImporterExporter;
 import com.github.gtache.autosubtitle.subtitle.converter.ParseException;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesModel.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesModel.java
similarity index 98%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesModel.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesModel.java
index 3091eaf..2615724 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesModel.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesModel.java
@@ -1,8 +1,8 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.Language;
 import com.github.gtache.autosubtitle.VideoInfo;
-import com.github.gtache.autosubtitle.gui.SubtitlesModel;
+import com.github.gtache.autosubtitle.gui.subtitles.SubtitlesModel;
 import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleCollectionImpl;
 import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl;
 import javafx.beans.binding.Bindings;
@@ -124,7 +124,7 @@ public class FXSubtitlesModel implements SubtitlesModel<ObservableSubtitleImpl,
     ObjectProperty<VideoInfo> videoInfoProperty() {
         return videoInfo;
     }
-    
+
     @Override
     public ObservableList<Language> availableTranslationsLanguage() {
         return FXCollections.unmodifiableObservableList(availableTranslationLanguages);
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/LanguageStringConverter.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/LanguageStringConverter.java
similarity index 88%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/LanguageStringConverter.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/LanguageStringConverter.java
index b15ee2e..263a212 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/LanguageStringConverter.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/LanguageStringConverter.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.Language;
 import javafx.util.StringConverter;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/TimeStringConverter.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TimeStringConverter.java
similarity index 92%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/TimeStringConverter.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TimeStringConverter.java
index 37a529d..8baeaa7 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/TimeStringConverter.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TimeStringConverter.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
 import javafx.util.StringConverter;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkBinder.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkBinder.java
similarity index 77%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkBinder.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkBinder.java
index 7609efc..bfb1843 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkBinder.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkBinder.java
@@ -1,4 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.work.fx;
+
+import com.github.gtache.autosubtitle.gui.fx.FXBinder;
+import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersModel;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkController.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkController.java
similarity index 96%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkController.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkController.java
index 0671eaa..d66b1df 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkController.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkController.java
@@ -1,9 +1,11 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.work.fx;
 
 import com.github.gtache.autosubtitle.VideoConverter;
 import com.github.gtache.autosubtitle.VideoLoader;
-import com.github.gtache.autosubtitle.gui.WorkController;
-import com.github.gtache.autosubtitle.gui.WorkStatus;
+import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
+import com.github.gtache.autosubtitle.gui.media.fx.FXMediaController;
+import com.github.gtache.autosubtitle.gui.work.WorkController;
+import com.github.gtache.autosubtitle.gui.work.WorkStatus;
 import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractEvent;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractException;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkModel.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkModel.java
similarity index 87%
rename from gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkModel.java
rename to gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkModel.java
index 8a05892..938a779 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkModel.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkModel.java
@@ -1,9 +1,9 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.work.fx;
 
 import com.github.gtache.autosubtitle.Language;
 import com.github.gtache.autosubtitle.Video;
-import com.github.gtache.autosubtitle.gui.WorkModel;
-import com.github.gtache.autosubtitle.gui.WorkStatus;
+import com.github.gtache.autosubtitle.gui.work.WorkModel;
+import com.github.gtache.autosubtitle.gui.work.WorkStatus;
 import com.github.gtache.autosubtitle.subtitle.EditableSubtitle;
 import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
@@ -72,7 +72,7 @@ public class FXWorkModel implements WorkModel {
         this.video.set(video);
     }
 
-    ObjectProperty<Video> videoProperty() {
+    public ObjectProperty<Video> videoProperty() {
         return video;
     }
 
@@ -100,7 +100,7 @@ public class FXWorkModel implements WorkModel {
         workStatus.set(status);
     }
 
-    ObjectProperty<WorkStatus> statusProperty() {
+    public ObjectProperty<WorkStatus> statusProperty() {
         return workStatus;
     }
 
@@ -137,7 +137,7 @@ public class FXWorkModel implements WorkModel {
         this.canExport.set(canExport);
     }
 
-    BooleanProperty canExportProperty() {
+    public BooleanProperty canExportProperty() {
         return canExport;
     }
 
@@ -149,7 +149,7 @@ public class FXWorkModel implements WorkModel {
     ReadOnlyBooleanProperty isProgressVisibleProperty() {
         return isProgressVisible.getReadOnlyProperty();
     }
-    
+
     @Override
     public SubtitleCollection<?> extractedCollection() {
         return extractedCollection.get();
@@ -160,23 +160,23 @@ public class FXWorkModel implements WorkModel {
         extractedCollection.set(collection);
     }
 
-    ObjectProperty<SubtitleCollection<?>> extractedCollectionProperty() {
+    public ObjectProperty<SubtitleCollection<?>> extractedCollectionProperty() {
         return extractedCollection;
     }
 
-    ObjectProperty<EditableSubtitle> selectedSubtitleProperty() {
+    public ObjectProperty<EditableSubtitle> selectedSubtitleProperty() {
         return selectedSubtitle;
     }
 
-    ObservableList<ObservableSubtitleImpl> subtitles() {
+    public ObservableList<ObservableSubtitleImpl> subtitles() {
         return subtitles;
     }
 
-    ObservableMap<Language, ObservableSubtitleCollectionImpl> collections() {
+    public ObservableMap<Language, ObservableSubtitleCollectionImpl> collections() {
         return collections;
     }
 
-    ObjectProperty<Language> videoLanguageProperty() {
+    public ObjectProperty<Language> videoLanguageProperty() {
         return videoLanguage;
     }
 }
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/modules/gui/fx/FXModule.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/modules/gui/fx/FXModule.java
index dc8b728..d5aae2c 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/modules/gui/fx/FXModule.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/modules/gui/fx/FXModule.java
@@ -2,12 +2,12 @@ package com.github.gtache.autosubtitle.modules.gui.fx;
 
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
 import com.github.gtache.autosubtitle.gui.fx.ColonTimeFormatter;
-import com.github.gtache.autosubtitle.gui.fx.FXMainController;
-import com.github.gtache.autosubtitle.gui.fx.FXMediaController;
-import com.github.gtache.autosubtitle.gui.fx.FXParametersController;
-import com.github.gtache.autosubtitle.gui.fx.FXSetupController;
-import com.github.gtache.autosubtitle.gui.fx.FXSubtitlesController;
-import com.github.gtache.autosubtitle.gui.fx.FXWorkController;
+import com.github.gtache.autosubtitle.gui.main.fx.FXMainController;
+import com.github.gtache.autosubtitle.gui.media.fx.FXMediaController;
+import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersController;
+import com.github.gtache.autosubtitle.gui.setup.fx.FXSetupController;
+import com.github.gtache.autosubtitle.gui.subtitles.fx.FXSubtitlesController;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkController;
 import com.github.gtache.autosubtitle.modules.gui.impl.Pause;
 import com.github.gtache.autosubtitle.modules.gui.impl.Play;
 import com.github.gtache.autosubtitle.modules.setup.gui.fx.FXSetupModule;
diff --git a/gui/fx/src/main/java/com/github/gtache/autosubtitle/setup/gui/fx/FXSetupUserBridge.java b/gui/fx/src/main/java/com/github/gtache/autosubtitle/setup/gui/fx/FXSetupUserBridge.java
index 57ace22..372715b 100644
--- a/gui/fx/src/main/java/com/github/gtache/autosubtitle/setup/gui/fx/FXSetupUserBridge.java
+++ b/gui/fx/src/main/java/com/github/gtache/autosubtitle/setup/gui/fx/FXSetupUserBridge.java
@@ -1,6 +1,6 @@
 package com.github.gtache.autosubtitle.setup.gui.fx;
 
-import com.github.gtache.autosubtitle.gui.fx.FXMainController;
+import com.github.gtache.autosubtitle.gui.main.fx.FXMainController;
 import com.github.gtache.autosubtitle.setup.SetupUserBridge;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
diff --git a/gui/fx/src/main/java/module-info.java b/gui/fx/src/main/java/module-info.java
index e710571..f6671ff 100644
--- a/gui/fx/src/main/java/module-info.java
+++ b/gui/fx/src/main/java/module-info.java
@@ -17,4 +17,16 @@ module com.github.gtache.autosubtitle.gui.fx {
     exports com.github.gtache.autosubtitle.subtitle.gui.fx;
     exports com.github.gtache.autosubtitle.modules.gui.fx;
     opens com.github.gtache.autosubtitle.gui.fx to javafx.fxml;
+    exports com.github.gtache.autosubtitle.gui.main.fx;
+    opens com.github.gtache.autosubtitle.gui.main.fx to javafx.fxml;
+    exports com.github.gtache.autosubtitle.gui.media.fx;
+    opens com.github.gtache.autosubtitle.gui.media.fx to javafx.fxml;
+    exports com.github.gtache.autosubtitle.gui.parameters.fx;
+    opens com.github.gtache.autosubtitle.gui.parameters.fx to javafx.fxml;
+    exports com.github.gtache.autosubtitle.gui.setup.fx;
+    opens com.github.gtache.autosubtitle.gui.setup.fx to javafx.fxml;
+    exports com.github.gtache.autosubtitle.gui.subtitles.fx;
+    opens com.github.gtache.autosubtitle.gui.subtitles.fx to javafx.fxml;
+    exports com.github.gtache.autosubtitle.gui.work.fx;
+    opens com.github.gtache.autosubtitle.gui.work.fx to javafx.fxml;
 }
\ No newline at end of file
diff --git a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mainView.fxml b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mainView.fxml
index 2f2fb73..f93226a 100644
--- a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mainView.fxml
+++ b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mainView.fxml
@@ -3,7 +3,7 @@
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
 <TabPane fx:id="tabPane" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="com.github.gtache.autosubtitle.gui.fx.FXMainController">
+         fx:controller="com.github.gtache.autosubtitle.gui.main.fx.FXMainController">
     <tabs>
         <Tab closable="false" text="%main.tab.work.label">
             <content>
diff --git a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mediaView.fxml b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mediaView.fxml
index 34136f3..215069e 100644
--- a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mediaView.fxml
+++ b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mediaView.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.media.MediaView?>
 <BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="com.github.gtache.autosubtitle.gui.fx.FXMediaController">
+            fx:controller="com.github.gtache.autosubtitle.gui.media.fx.FXMediaController">
     <bottom>
         <VBox BorderPane.alignment="CENTER">
             <children>
diff --git a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/parametersView.fxml b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/parametersView.fxml
index 67a52d8..dd2557c 100644
--- a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/parametersView.fxml
+++ b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/parametersView.fxml
@@ -9,37 +9,41 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import org.controlsfx.control.PrefixSelectionComboBox?>
 
-<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXParametersController">
+<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="10.0"
+          xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersController">
     <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" />
-        <ColumnConstraints hgrow="SOMETIMES" />
+        <ColumnConstraints hgrow="SOMETIMES"/>
+        <ColumnConstraints hgrow="SOMETIMES"/>
     </columnConstraints>
     <rowConstraints>
-        <RowConstraints vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
     </rowConstraints>
     <children>
-        <Label text="%parameters.extraction.model.label" />
-        <PrefixSelectionComboBox fx:id="extractionModelCombobox" GridPane.columnIndex="1" />
-        <PrefixSelectionComboBox fx:id="extractionOutputFormat" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-        <Label text="%parameters.subtitles.output.format" GridPane.rowIndex="1" />
-        <Label text="%parameters.subtitles.font.size" GridPane.rowIndex="3" />
-        <Label text="%parameters.subtitles.font.family" GridPane.rowIndex="2" />
-        <PrefixSelectionComboBox fx:id="fontFamilyCombobox" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-        <TextField fx:id="fontSizeField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-        <Button mnemonicParsing="false" onAction="#savePressed" text="%parameters.button.save.label" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-        <Button mnemonicParsing="false" onAction="#resetPressed" text="%parameters.button.reset.label" GridPane.rowIndex="6" />
-      <Label text="%parameters.subtitles.max.length.label" GridPane.rowIndex="4" />
-      <Label text="%parameters.subtitles.max.lines.label" GridPane.rowIndex="5" />
-      <TextField fx:id="maxLengthField" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <TextField fx:id="maxLinesField" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+        <Label text="%parameters.extraction.model.label"/>
+        <PrefixSelectionComboBox fx:id="extractionModelCombobox" GridPane.columnIndex="1"/>
+        <PrefixSelectionComboBox fx:id="extractionOutputFormat" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+        <Label text="%parameters.subtitles.output.format" GridPane.rowIndex="1"/>
+        <Label text="%parameters.subtitles.font.size" GridPane.rowIndex="3"/>
+        <Label text="%parameters.subtitles.font.family" GridPane.rowIndex="2"/>
+        <PrefixSelectionComboBox fx:id="fontFamilyCombobox" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+        <TextField fx:id="fontSizeField" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+        <Button mnemonicParsing="false" onAction="#savePressed" text="%parameters.button.save.label"
+                GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+        <Button mnemonicParsing="false" onAction="#resetPressed" text="%parameters.button.reset.label"
+                GridPane.rowIndex="6"/>
+        <Label text="%parameters.subtitles.max.length.label" GridPane.rowIndex="4"/>
+        <Label text="%parameters.subtitles.max.lines.label" GridPane.rowIndex="5"/>
+        <TextField fx:id="maxLengthField" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+        <TextField fx:id="maxLinesField" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
     </children>
     <padding>
-        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 </GridPane>
diff --git a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/setupView.fxml b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/setupView.fxml
index 308ea2a..2192a3c 100644
--- a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/setupView.fxml
+++ b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/setupView.fxml
@@ -8,40 +8,47 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXSetupController">
+<GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="com.github.gtache.autosubtitle.gui.setup.fx.FXSetupController">
     <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" />
-        <ColumnConstraints hgrow="SOMETIMES" />
-        <ColumnConstraints hgrow="SOMETIMES" />
-      <ColumnConstraints hgrow="ALWAYS" />
-      <ColumnConstraints hgrow="SOMETIMES" />
+        <ColumnConstraints hgrow="SOMETIMES"/>
+        <ColumnConstraints hgrow="SOMETIMES"/>
+        <ColumnConstraints hgrow="SOMETIMES"/>
+        <ColumnConstraints hgrow="ALWAYS"/>
+        <ColumnConstraints hgrow="SOMETIMES"/>
     </columnConstraints>
     <rowConstraints>
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
-        <RowConstraints vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints vgrow="SOMETIMES"/>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS"/>
     </rowConstraints>
     <children>
-        <Label fx:id="converterNameLabel" text="Label" GridPane.rowIndex="1" />
-        <Label fx:id="converterStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-        <Label fx:id="extractorNameLabel" text="Label" GridPane.rowIndex="2" />
-        <Label fx:id="extractorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-        <Label fx:id="translatorNameLabel" text="Label" GridPane.rowIndex="3" />
-        <Label fx:id="translatorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-        <MenuButton fx:id="converterButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-        <MenuButton fx:id="extractorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-        <MenuButton fx:id="translatorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <Label text="%setup.description.label" GridPane.columnSpan="2147483647" />
-      <ProgressBar fx:id="converterProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3" GridPane.rowIndex="1" />
-      <ProgressBar fx:id="extractorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3" GridPane.rowIndex="2" />
-      <ProgressBar fx:id="translatorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3" GridPane.rowIndex="3" />
-      <Label fx:id="converterProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="1" />
-      <Label fx:id="extractorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="2" />
-      <Label fx:id="translatorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="3" />
+        <Label fx:id="converterNameLabel" text="Label" GridPane.rowIndex="1"/>
+        <Label fx:id="converterStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+        <Label fx:id="extractorNameLabel" text="Label" GridPane.rowIndex="2"/>
+        <Label fx:id="extractorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+        <Label fx:id="translatorNameLabel" text="Label" GridPane.rowIndex="3"/>
+        <Label fx:id="translatorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+        <MenuButton fx:id="converterButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2"
+                    GridPane.rowIndex="1"/>
+        <MenuButton fx:id="extractorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2"
+                    GridPane.rowIndex="2"/>
+        <MenuButton fx:id="translatorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2"
+                    GridPane.rowIndex="3"/>
+        <Label text="%setup.description.label" GridPane.columnSpan="2147483647"/>
+        <ProgressBar fx:id="converterProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3"
+                     GridPane.rowIndex="1"/>
+        <ProgressBar fx:id="extractorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3"
+                     GridPane.rowIndex="2"/>
+        <ProgressBar fx:id="translatorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3"
+                     GridPane.rowIndex="3"/>
+        <Label fx:id="converterProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="1"/>
+        <Label fx:id="extractorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="2"/>
+        <Label fx:id="translatorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="3"/>
     </children>
     <padding>
-        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 </GridPane>
diff --git a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/subtitlesView.fxml b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/subtitlesView.fxml
index d1bbfab..0228ada 100644
--- a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/subtitlesView.fxml
+++ b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/subtitlesView.fxml
@@ -11,14 +11,15 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.PrefixSelectionComboBox?>
 
-<VBox spacing="10" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXSubtitlesController">
+<VBox spacing="10" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.github.gtache.autosubtitle.gui.subtitles.fx.FXSubtitlesController">
     <children>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
             <children>
-                <Label text="%subtitles.language.label" />
-                <PrefixSelectionComboBox fx:id="languageCombobox" />
-                <Label text="%subtitles.translate.label" />
-                <ComboBox fx:id="translationsCombobox" />
+                <Label text="%subtitles.language.label"/>
+                <PrefixSelectionComboBox fx:id="languageCombobox"/>
+                <Label text="%subtitles.translate.label"/>
+                <ComboBox fx:id="translationsCombobox"/>
             </children>
         </HBox>
         <TabPane fx:id="tabPane" VBox.vgrow="ALWAYS">
@@ -27,12 +28,15 @@
                     <content>
                         <TableView fx:id="subtitlesTable" editable="true">
                             <columns>
-                                <TableColumn fx:id="startColumn" prefWidth="50.0" sortable="false" text="%subtitles.table.column.from.label" />
-                                <TableColumn fx:id="endColumn" prefWidth="50.0" sortable="false" text="%subtitles.table.column.to.label" />
-                                <TableColumn fx:id="textColumn" prefWidth="75.0" sortable="false" text="%subtitles.table.column.text.label" />
+                                <TableColumn fx:id="startColumn" prefWidth="50.0" sortable="false"
+                                             text="%subtitles.table.column.from.label"/>
+                                <TableColumn fx:id="endColumn" prefWidth="50.0" sortable="false"
+                                             text="%subtitles.table.column.to.label"/>
+                                <TableColumn fx:id="textColumn" prefWidth="75.0" sortable="false"
+                                             text="%subtitles.table.column.text.label"/>
                             </columns>
                             <columnResizePolicy>
-                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
                             </columnResizePolicy>
                         </TableView>
                     </content>
@@ -41,10 +45,13 @@
         </TabPane>
         <HBox spacing="10.0">
             <children>
-                <Button fx:id="loadButton" mnemonicParsing="false" onAction="#loadPressed" text="%subtitles.button.load.label" />
-                <Button fx:id="saveButton" mnemonicParsing="false" onAction="#savePressed" text="%subtitles.button.subtitles.save.label" />
-                <Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetButtonPressed" text="%subtitles.button.reset.label" />
-                <Button fx:id="addButton" mnemonicParsing="false" onAction="#addPressed" text="+" />
+                <Button fx:id="loadButton" mnemonicParsing="false" onAction="#loadPressed"
+                        text="%subtitles.button.load.label"/>
+                <Button fx:id="saveButton" mnemonicParsing="false" onAction="#savePressed"
+                        text="%subtitles.button.subtitles.save.label"/>
+                <Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetButtonPressed"
+                        text="%subtitles.button.reset.label"/>
+                <Button fx:id="addButton" mnemonicParsing="false" onAction="#addPressed" text="+"/>
             </children>
         </HBox>
     </children>
diff --git a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/workView.fxml b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/workView.fxml
index 67cff2c..73d3cf4 100644
--- a/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/workView.fxml
+++ b/gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/workView.fxml
@@ -11,51 +11,59 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXWorkController">
+<GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="com.github.gtache.autosubtitle.gui.work.fx.FXWorkController">
     <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" />
-        <ColumnConstraints hgrow="ALWAYS" />
-        <ColumnConstraints hgrow="SOMETIMES" />
+        <ColumnConstraints hgrow="SOMETIMES"/>
+        <ColumnConstraints hgrow="ALWAYS"/>
+        <ColumnConstraints hgrow="SOMETIMES"/>
     </columnConstraints>
     <rowConstraints>
-        <RowConstraints vgrow="NEVER" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="NEVER" />
-        <RowConstraints vgrow="NEVER" />
+        <RowConstraints vgrow="NEVER"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="NEVER"/>
+        <RowConstraints vgrow="NEVER"/>
     </rowConstraints>
     <children>
-        <TextField fx:id="fileField" editable="false" GridPane.columnIndex="1" />
-        <Button mnemonicParsing="false" onAction="#fileButtonPressed" text="%work.button.file.label" GridPane.columnIndex="2" />
+        <TextField fx:id="fileField" editable="false" GridPane.columnIndex="1"/>
+        <Button mnemonicParsing="false" onAction="#fileButtonPressed" text="%work.button.file.label"
+                GridPane.columnIndex="2"/>
         <HBox spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
             <children>
-                <Button fx:id="extractButton" mnemonicParsing="false" onAction="#extractPressed" text="%work.button.extract.label" />
+                <Button fx:id="extractButton" mnemonicParsing="false" onAction="#extractPressed"
+                        text="%work.button.extract.label"/>
             </children>
         </HBox>
         <HBox alignment="CENTER_RIGHT" spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
             <children>
-                <Button fx:id="exportSoftButton" mnemonicParsing="false" onAction="#exportSoftPressed" text="%work.button.export.soft.label">
+                <Button fx:id="exportSoftButton" mnemonicParsing="false" onAction="#exportSoftPressed"
+                        text="%work.button.export.soft.label">
                     <tooltip>
-                        <Tooltip text="%work.button.export.soft.tooltip" />
+                        <Tooltip text="%work.button.export.soft.tooltip"/>
                     </tooltip>
                 </Button>
-                <Button fx:id="exportHardButton" mnemonicParsing="false" onAction="#exportHardPressed" text="%work.button.export.hard.label">
+                <Button fx:id="exportHardButton" mnemonicParsing="false" onAction="#exportHardPressed"
+                        text="%work.button.export.hard.label">
                     <tooltip>
-                        <Tooltip text="%work.button.export.hard.tooltip" />
+                        <Tooltip text="%work.button.export.hard.tooltip"/>
                     </tooltip>
                 </Button>
             </children>
         </HBox>
-        <fx:include fx:id="subtitles" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" source="subtitlesView.fxml" GridPane.columnIndex="0" GridPane.columnSpan="1" GridPane.rowIndex="0" GridPane.rowSpan="3" GridPane.vgrow="ALWAYS" />
-        <fx:include fx:id="media" source="mediaView.fxml" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" />
-        <Label fx:id="progressLabel" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+        <fx:include fx:id="subtitles" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+                    source="subtitlesView.fxml" GridPane.columnIndex="0" GridPane.columnSpan="1" GridPane.rowIndex="0"
+                    GridPane.rowSpan="3" GridPane.vgrow="ALWAYS"/>
+        <fx:include fx:id="media" source="mediaView.fxml" GridPane.columnIndex="1" GridPane.columnSpan="2147483647"
+                    GridPane.rowIndex="1"/>
+        <Label fx:id="progressLabel" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
         <HBox spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="3">
             <children>
-                <Label fx:id="progressDetailLabel" />
-                <ProgressBar fx:id="progressBar" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
+                <Label fx:id="progressDetailLabel"/>
+                <ProgressBar fx:id="progressBar" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS"/>
             </children>
         </HBox>
     </children>
     <padding>
-        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 </GridPane>
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainController.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainController.java
similarity index 98%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainController.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainController.java
index 4a47fe7..d4a9ff4 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainController.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.main.fx;
 
 import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent;
 import javafx.fxml.FXMLLoader;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainModel.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainModel.java
similarity index 90%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainModel.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainModel.java
index 8692f6a..fe67062 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainModel.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.main.fx;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaBinder.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaBinder.java
similarity index 85%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaBinder.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaBinder.java
index 2ab16ed..0a4db25 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaBinder.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaBinder.java
@@ -1,6 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.media.fx;
 
 import com.github.gtache.autosubtitle.Video;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkModel;
 import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl;
 import org.junit.jupiter.api.Test;
 
@@ -9,12 +10,13 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 
 class TestFXMediaBinder {
 
     @Test
     void testCreateBindings() {
-        final var workModel = new FXWorkModel();
+        final var workModel = spy(FXWorkModel.class);
         final var mediaModel = new FXMediaModel();
         final var binder = new FXMediaBinder(workModel, mediaModel);
         binder.createBindings();
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaController.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaController.java
similarity index 99%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaController.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaController.java
index 3aae977..f03139f 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaController.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.media.fx;
 
 import com.github.gtache.autosubtitle.Video;
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaModel.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaModel.java
similarity index 97%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaModel.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaModel.java
index 08c610f..1a059ec 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaModel.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.media.fx;
 
 import com.github.gtache.autosubtitle.Video;
 import com.github.gtache.autosubtitle.VideoInfo;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersController.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersController.java
similarity index 96%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersController.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersController.java
index 2c5c641..62dea60 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersController.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersController.java
@@ -1,8 +1,9 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.parameters.fx;
 
 import com.github.gtache.autosubtitle.VideoConverter;
 import com.github.gtache.autosubtitle.VideoLoader;
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkBinder;
 import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent;
 import com.github.gtache.autosubtitle.subtitle.converter.SubtitleConverter;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersModel.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersModel.java
similarity index 98%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersModel.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersModel.java
index 1ee5d9a..01a2acc 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersModel.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.parameters.fx;
 
 import com.github.gtache.autosubtitle.subtitle.OutputFormat;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupController.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupController.java
similarity index 96%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupController.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupController.java
index 268f55b..e4b7b71 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupController.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupController.java
@@ -1,8 +1,9 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.setup.fx;
 
 import com.github.gtache.autosubtitle.VideoConverter;
 import com.github.gtache.autosubtitle.VideoLoader;
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkBinder;
 import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent;
 import com.github.gtache.autosubtitle.subtitle.converter.SubtitleConverter;
 import com.github.gtache.autosubtitle.subtitle.extractor.SubtitleExtractor;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupModel.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupModel.java
similarity index 98%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupModel.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupModel.java
index 94d2515..17ca316 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupModel.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.setup.fx;
 
 import com.github.gtache.autosubtitle.setup.SetupStatus;
 import org.junit.jupiter.api.Test;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesController.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesController.java
similarity index 98%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesController.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesController.java
index c8638b2..05f5b7c 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesController.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.VideoConverter;
 import com.github.gtache.autosubtitle.VideoLoader;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesModel.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesModel.java
similarity index 97%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesModel.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesModel.java
index 9bc6626..436bb74 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesModel.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesModel.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.Language;
 import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestLanguageStringConverter.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestLanguageStringConverter.java
similarity index 92%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestLanguageStringConverter.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestLanguageStringConverter.java
index cfe3796..9d23990 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestLanguageStringConverter.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestLanguageStringConverter.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.Language;
 import org.junit.jupiter.api.Test;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestTimeStringConverter.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestTimeStringConverter.java
similarity index 96%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestTimeStringConverter.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestTimeStringConverter.java
index 3df62b2..a5c74a9 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestTimeStringConverter.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestTimeStringConverter.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.subtitles.fx;
 
 import com.github.gtache.autosubtitle.gui.TimeFormatter;
 import org.junit.jupiter.api.Test;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkBinder.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkBinder.java
similarity index 72%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkBinder.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkBinder.java
index b8271ef..ba2ee96 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkBinder.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkBinder.java
@@ -1,18 +1,19 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.work.fx;
 
+import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersModel;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 class TestFXWorkBinder {
 
     @Test
     void testBindings() {
         final var workModel = new FXWorkModel();
-        final var parametersModel = new FXParametersModel(mock(ExtractionModelProvider.class), "Arial", 12, 40, 1);
+        final var parametersModel = mock(FXParametersModel.class, withSettings().defaultAnswer(CALLS_REAL_METHODS).useConstructor(mock(ExtractionModelProvider.class), "Arial", 12, 40, 1));
         final var binder = new FXWorkBinder(workModel, parametersModel);
         binder.createBindings();
         assertNull(workModel.extractionModel());
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkController.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkController.java
similarity index 98%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkController.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkController.java
index 4c04acd..330fca2 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkController.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkController.java
@@ -1,4 +1,4 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.work.fx;
 
 import com.github.gtache.autosubtitle.VideoConverter;
 import com.github.gtache.autosubtitle.VideoLoader;
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkModel.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkModel.java
similarity index 94%
rename from gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkModel.java
rename to gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkModel.java
index 8417ebd..c2e1efa 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkModel.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkModel.java
@@ -1,7 +1,7 @@
-package com.github.gtache.autosubtitle.gui.fx;
+package com.github.gtache.autosubtitle.gui.work.fx;
 
 import com.github.gtache.autosubtitle.Video;
-import com.github.gtache.autosubtitle.gui.WorkStatus;
+import com.github.gtache.autosubtitle.gui.work.WorkStatus;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
 import org.junit.jupiter.api.Test;
 
diff --git a/gui/fx/src/test/java/com/github/gtache/autosubtitle/modules/gui/fx/TestFXModule.java b/gui/fx/src/test/java/com/github/gtache/autosubtitle/modules/gui/fx/TestFXModule.java
index df2ba13..6017094 100644
--- a/gui/fx/src/test/java/com/github/gtache/autosubtitle/modules/gui/fx/TestFXModule.java
+++ b/gui/fx/src/test/java/com/github/gtache/autosubtitle/modules/gui/fx/TestFXModule.java
@@ -1,11 +1,11 @@
 package com.github.gtache.autosubtitle.modules.gui.fx;
 
-import com.github.gtache.autosubtitle.gui.fx.FXMainController;
-import com.github.gtache.autosubtitle.gui.fx.FXMediaController;
-import com.github.gtache.autosubtitle.gui.fx.FXParametersController;
-import com.github.gtache.autosubtitle.gui.fx.FXSetupController;
-import com.github.gtache.autosubtitle.gui.fx.FXSubtitlesController;
-import com.github.gtache.autosubtitle.gui.fx.FXWorkController;
+import com.github.gtache.autosubtitle.gui.main.fx.FXMainController;
+import com.github.gtache.autosubtitle.gui.media.fx.FXMediaController;
+import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersController;
+import com.github.gtache.autosubtitle.gui.setup.fx.FXSetupController;
+import com.github.gtache.autosubtitle.gui.subtitles.fx.FXSubtitlesController;
+import com.github.gtache.autosubtitle.gui.work.fx.FXWorkController;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.image.Image;
 import org.junit.jupiter.api.Test;