diff --git a/pom.xml b/pom.xml
index 71adc41..0090adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>application</groupId>
+	<groupId>main.java.jFxKasse</groupId>
 	<artifactId>jFxKasse</artifactId>
 	<version>0.1.0 - without Printer</version>
 	<name>jFxKasse</name>
@@ -68,7 +68,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<mainClass>application.Main</mainClass>
+					<mainClass>main.java.jFxKasse.application.Main</mainClass>
 				</configuration>
 			</plugin>
 			
@@ -82,7 +82,7 @@
 					<transformers>
 						<transformer
 							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-							<mainClass>application.JavaFX11Main</mainClass>
+							<mainClass>main.java.jFxKasse.application.JavaFX11Main</mainClass>
 						</transformer>
 					</transformers>
 				</configuration>
diff --git a/src/application/JavaFX11Main.java b/src/main/java/jFxKasse/application/JavaFX11Main.java
similarity index 54%
rename from src/application/JavaFX11Main.java
rename to src/main/java/jFxKasse/application/JavaFX11Main.java
index 5ef7a71..96163df 100644
--- a/src/application/JavaFX11Main.java
+++ b/src/main/java/jFxKasse/application/JavaFX11Main.java
@@ -1,4 +1,6 @@
-package application;
+package main.java.jFxKasse.application;
+
+import main.java.jFxKasse.application.Main;
 
 public class JavaFX11Main
 {
@@ -6,7 +8,5 @@ public class JavaFX11Main
 	public static void main(String[] args)
 	{
 		  Main.main(args);
-
 	}
-
 }
diff --git a/src/application/Main.java b/src/main/java/jFxKasse/application/Main.java
similarity index 84%
rename from src/application/Main.java
rename to src/main/java/jFxKasse/application/Main.java
index c837bbc..d7bcca4 100644
--- a/src/application/Main.java
+++ b/src/main/java/jFxKasse/application/Main.java
@@ -1,17 +1,21 @@
-package application;
+package main.java.jFxKasse.application;
+
+import javafx.application.Application;
 
 import java.io.File;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.application.Application;
+
 import javafx.fxml.FXMLLoader;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import main.java.jFxKasse.controller.MainWindowController;
+import main.java.jFxKasse.controller.DBController;
 import javafx.scene.Scene;
 import javafx.scene.layout.AnchorPane;
 
-public class Main extends Application
+public class Main extends Application 
 {
 	private MainWindowController mwc;
 
@@ -32,7 +36,7 @@ public class Main extends Application
 	{
 		try {
 			FXMLLoader loader = new FXMLLoader(
-					getClass().getResource("MainWindow.fxml"));
+					getClass().getResource("/fxml/MainWindow.fxml"));
 			AnchorPane pane = loader.load();
 			primaryStage.setTitle("jFxKasse"); // Title of window
 
@@ -43,7 +47,7 @@ public class Main extends Application
 
 			Scene scene = new Scene(pane);
 			scene.getStylesheets()
-					.add(Main.class.getResource("application.css").toExternalForm());
+					.add(Main.class.getResource("/css/application.css").toExternalForm());
 			primaryStage.setScene(scene);
 			primaryStage.show(); // shows the stage
 
diff --git a/src/application/DBController.java b/src/main/java/jFxKasse/controller/DBController.java
similarity index 95%
rename from src/application/DBController.java
rename to src/main/java/jFxKasse/controller/DBController.java
index d2784f3..8471e51 100644
--- a/src/application/DBController.java
+++ b/src/main/java/jFxKasse/controller/DBController.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.jFxKasse.controller;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -7,9 +7,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+
+import main.java.jFxKasse.application.Main;
+import main.java.jFxKasse.datatypes.tableDataJob;
+import main.java.jFxKasse.datatypes.tableDataPositionen;
+
 import java.io.File;
 
-class DBController
+public class DBController
 {
 	private Connection connection;
 
@@ -32,7 +37,7 @@ class DBController
 		}
 	}
 
-	DBController(Main main)
+	public DBController(Main main)
 	{
 		this.main = main;
 	}
diff --git a/src/application/MainWindowController.java b/src/main/java/jFxKasse/controller/MainWindowController.java
similarity index 94%
rename from src/application/MainWindowController.java
rename to src/main/java/jFxKasse/controller/MainWindowController.java
index 1292af0..f80614e 100644
--- a/src/application/MainWindowController.java
+++ b/src/main/java/jFxKasse/controller/MainWindowController.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.jFxKasse.controller;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
@@ -38,6 +38,11 @@ import javafx.scene.control.Tab;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.util.Pair;
+import main.java.jFxKasse.application.Main;
+import main.java.jFxKasse.datatypes.Job;
+import main.java.jFxKasse.datatypes.tableDataCurrentOrder;
+import main.java.jFxKasse.datatypes.tableDataJob;
+import main.java.jFxKasse.datatypes.tableDataPositionen;
 
 
 public class MainWindowController
diff --git a/src/application/Job.java b/src/main/java/jFxKasse/datatypes/Job.java
similarity index 99%
rename from src/application/Job.java
rename to src/main/java/jFxKasse/datatypes/Job.java
index e31512e..cbc5556 100644
--- a/src/application/Job.java
+++ b/src/main/java/jFxKasse/datatypes/Job.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.jFxKasse.datatypes;
 
 import java.util.ArrayList;
 
diff --git a/src/application/tableDataCurrentOrder.java b/src/main/java/jFxKasse/datatypes/tableDataCurrentOrder.java
similarity index 91%
rename from src/application/tableDataCurrentOrder.java
rename to src/main/java/jFxKasse/datatypes/tableDataCurrentOrder.java
index 7a86a5e..d62b5ce 100644
--- a/src/application/tableDataCurrentOrder.java
+++ b/src/main/java/jFxKasse/datatypes/tableDataCurrentOrder.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.jFxKasse.datatypes;
 
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/application/tableDataJob.java b/src/main/java/jFxKasse/datatypes/tableDataJob.java
similarity index 93%
rename from src/application/tableDataJob.java
rename to src/main/java/jFxKasse/datatypes/tableDataJob.java
index 3e3744f..a3a1072 100644
--- a/src/application/tableDataJob.java
+++ b/src/main/java/jFxKasse/datatypes/tableDataJob.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.jFxKasse.datatypes;
 
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/application/tableDataPositionen.java b/src/main/java/jFxKasse/datatypes/tableDataPositionen.java
similarity index 92%
rename from src/application/tableDataPositionen.java
rename to src/main/java/jFxKasse/datatypes/tableDataPositionen.java
index b22bafe..33227bf 100644
--- a/src/application/tableDataPositionen.java
+++ b/src/main/java/jFxKasse/datatypes/tableDataPositionen.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.jFxKasse.datatypes;
 
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/application/application.css b/src/main/resources/css/application.css
similarity index 100%
rename from src/application/application.css
rename to src/main/resources/css/application.css
diff --git a/src/application/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml
similarity index 100%
rename from src/application/MainWindow.fxml
rename to src/main/resources/fxml/MainWindow.fxml