diff --git a/bootloader/src/main/java/jGnash.java b/bootloader/src/main/java/jGnash.java
index 1e2ea65c7..1d77eb92b 100644
--- a/bootloader/src/main/java/jGnash.java
+++ b/bootloader/src/main/java/jGnash.java
@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import jgnash.app.jGnashFx;
 import jgnash.bootloader.BootLoader;
 import jgnash.bootloader.BootLoaderDialog;
 
diff --git a/jgnash-fx/src/main/java/jGnashFx.java b/jgnash-fx/src/main/java/jgnash/app/jGnashFx.java
similarity index 99%
rename from jgnash-fx/src/main/java/jGnashFx.java
rename to jgnash-fx/src/main/java/jgnash/app/jGnashFx.java
index 6f5e2b284..ac8d32a1f 100644
--- a/jgnash-fx/src/main/java/jGnashFx.java
+++ b/jgnash-fx/src/main/java/jgnash/app/jGnashFx.java
@@ -15,6 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+package jgnash.app;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/jgnash-fx/src/main/resources/META-INF/MANIFEST.MF b/jgnash-fx/src/main/resources/META-INF/MANIFEST.MF
index e66b94338..df4ec2b77 100644
--- a/jgnash-fx/src/main/resources/META-INF/MANIFEST.MF
+++ b/jgnash-fx/src/main/resources/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Application-Name: jGnashFx
 JavaFX-Application-Class: jGnashFx
-Main-Class: jGnashFx
+Main-Class: jgnash.app.jGnashFx