diff --git a/src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java b/src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java
index a47bcf2..df18425 100644
--- a/src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java
+++ b/src/de/frosch95/geofrogger/fx/GeoFroggerFXMain.java
@@ -33,10 +33,7 @@ import javafx.scene.Scene;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 
-import java.sql.SQLException;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * @author Andreas
@@ -46,7 +43,7 @@ public class GeoFroggerFXMain extends Application {
   @Override
   public void start(Stage stage) throws Exception {
     loadCustomFonts();
-    FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("geofrogger.fxml"), ResourceBundle.getBundle("de.frosch95.geofrogger.fx.geofrogger"));
+    FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("geofrogger/geofrogger.fxml"), ResourceBundle.getBundle("de.frosch95.geofrogger.fx.geofrogger"));
     Parent root = (Parent)fxmlLoader.load();
     Scene scene = new Scene(root);
     stage.setScene(scene);
diff --git a/src/de/frosch95/geofrogger/fx/CacheDetailsController.java b/src/de/frosch95/geofrogger/fx/cachedetails/CacheDetailsController.java
similarity index 98%
rename from src/de/frosch95/geofrogger/fx/CacheDetailsController.java
rename to src/de/frosch95/geofrogger/fx/cachedetails/CacheDetailsController.java
index 9a4df38..5b1f139 100644
--- a/src/de/frosch95/geofrogger/fx/CacheDetailsController.java
+++ b/src/de/frosch95/geofrogger/fx/cachedetails/CacheDetailsController.java
@@ -23,10 +23,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package de.frosch95.geofrogger.fx;
+package de.frosch95.geofrogger.fx.cachedetails;
 
 import de.frosch95.geofrogger.application.SessionContext;
 import de.frosch95.geofrogger.application.SessionContextListener;
+import de.frosch95.geofrogger.fx.components.MapPaneWrapper;
 import de.frosch95.geofrogger.fx.components.GeocachingIcons;
 import de.frosch95.geofrogger.fx.components.IconManager;
 import de.frosch95.geofrogger.model.Cache;
diff --git a/src/de/frosch95/geofrogger/fx/cache_details.fxml b/src/de/frosch95/geofrogger/fx/cachedetails/cache_details.fxml
similarity index 97%
rename from src/de/frosch95/geofrogger/fx/cache_details.fxml
rename to src/de/frosch95/geofrogger/fx/cachedetails/cache_details.fxml
index 06131bc..8f2d846 100644
--- a/src/de/frosch95/geofrogger/fx/cache_details.fxml
+++ b/src/de/frosch95/geofrogger/fx/cachedetails/cache_details.fxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import de.frosch95.geofrogger.fx.MapPaneWrapper?>
+<?import de.frosch95.geofrogger.fx.components.MapPaneWrapper?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 <?import java.net.URL?>
 <AnchorPane fx:id="cacheDetailPane" styleClass="details-pane" xmlns:fx="http://javafx.com/fxml"
-            fx:controller="de.frosch95.geofrogger.fx.CacheDetailsController">
+            fx:controller="de.frosch95.geofrogger.fx.cachedetails.CacheDetailsController">
   <children>
     <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="-1.0" styleClass="details-header"
           AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -142,6 +142,6 @@
     </TabPane>
   </children>
   <stylesheets>
-    <URL value="@geofrogger.css"/>
+    <URL value="@../geofrogger.css"/>
   </stylesheets>
 </AnchorPane>
diff --git a/src/de/frosch95/geofrogger/fx/CacheListController.java b/src/de/frosch95/geofrogger/fx/cachelist/CacheListController.java
similarity index 96%
rename from src/de/frosch95/geofrogger/fx/CacheListController.java
rename to src/de/frosch95/geofrogger/fx/cachelist/CacheListController.java
index cff557e..3ffb0d1 100644
--- a/src/de/frosch95/geofrogger/fx/CacheListController.java
+++ b/src/de/frosch95/geofrogger/fx/cachelist/CacheListController.java
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package de.frosch95.geofrogger.fx;
+package de.frosch95.geofrogger.fx.cachelist;
 
 import de.frosch95.geofrogger.application.SessionContext;
 import de.frosch95.geofrogger.application.SessionContextListener;
@@ -42,7 +42,7 @@ import java.net.URL;
 import java.util.List;
 import java.util.ResourceBundle;
 
-import static de.frosch95.geofrogger.fx.JavaFXUtils.addClasses;
+import static de.frosch95.geofrogger.fx.utils.JavaFXUtils.addClasses;
 
 /**
  * FXML Controller class
diff --git a/src/de/frosch95/geofrogger/fx/cache_list.fxml b/src/de/frosch95/geofrogger/fx/cachelist/cache_list.fxml
similarity index 94%
rename from src/de/frosch95/geofrogger/fx/cache_list.fxml
rename to src/de/frosch95/geofrogger/fx/cachelist/cache_list.fxml
index 24124ad..295f787 100644
--- a/src/de/frosch95/geofrogger/fx/cache_list.fxml
+++ b/src/de/frosch95/geofrogger/fx/cachelist/cache_list.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 <?import java.net.URL?>
-<AnchorPane xmlns:fx="http://javafx.com/fxml" fx:controller="de.frosch95.geofrogger.fx.CacheListController">
+<AnchorPane xmlns:fx="http://javafx.com/fxml" fx:controller="de.frosch95.geofrogger.fx.cachelist.CacheListController">
   <children>
     <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="-1.0" styleClass="cache-header"
           AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -33,6 +33,6 @@
               AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0"/>
   </children>
   <stylesheets>
-    <URL value="@geofrogger.css"/>
+    <URL value="@../geofrogger.css"/>
   </stylesheets>
 </AnchorPane>
diff --git a/src/de/frosch95/geofrogger/fx/components/CacheListCell.java b/src/de/frosch95/geofrogger/fx/components/CacheListCell.java
index cc84074..f1259e8 100644
--- a/src/de/frosch95/geofrogger/fx/components/CacheListCell.java
+++ b/src/de/frosch95/geofrogger/fx/components/CacheListCell.java
@@ -35,8 +35,8 @@ import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
 
-import static de.frosch95.geofrogger.fx.JavaFXUtils.addClasses;
-import static de.frosch95.geofrogger.fx.JavaFXUtils.removeClasses;
+import static de.frosch95.geofrogger.fx.utils.JavaFXUtils.addClasses;
+import static de.frosch95.geofrogger.fx.utils.JavaFXUtils.removeClasses;
 
 /**
  * Multi-Column-Row list cell to shows the most important data in a list.
diff --git a/src/de/frosch95/geofrogger/fx/MapPaneWrapper.java b/src/de/frosch95/geofrogger/fx/components/MapPaneWrapper.java
similarity index 96%
rename from src/de/frosch95/geofrogger/fx/MapPaneWrapper.java
rename to src/de/frosch95/geofrogger/fx/components/MapPaneWrapper.java
index 668b73e..721e546 100644
--- a/src/de/frosch95/geofrogger/fx/MapPaneWrapper.java
+++ b/src/de/frosch95/geofrogger/fx/components/MapPaneWrapper.java
@@ -23,8 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package de.frosch95.geofrogger.fx;
+package de.frosch95.geofrogger.fx.components;
 
+import de.frosch95.geofrogger.fx.utils.JavaFXUtils;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.layout.Pane;
diff --git a/src/de/frosch95/geofrogger/fx/GeofroggerController.java b/src/de/frosch95/geofrogger/fx/geofrogger/GeofroggerController.java
similarity index 99%
rename from src/de/frosch95/geofrogger/fx/GeofroggerController.java
rename to src/de/frosch95/geofrogger/fx/geofrogger/GeofroggerController.java
index 3fe5ada..ada6a80 100644
--- a/src/de/frosch95/geofrogger/fx/GeofroggerController.java
+++ b/src/de/frosch95/geofrogger/fx/geofrogger/GeofroggerController.java
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package de.frosch95.geofrogger.fx;
+package de.frosch95.geofrogger.fx.geofrogger;
 
 import de.frosch95.geofrogger.application.ProgressEvent;
 import de.frosch95.geofrogger.application.ServiceManager;
@@ -49,7 +49,6 @@ import org.controlsfx.dialog.Dialog;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.sql.SQLException;
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
diff --git a/src/de/frosch95/geofrogger/fx/geofrogger.fxml b/src/de/frosch95/geofrogger/fx/geofrogger/geofrogger.fxml
similarity index 87%
rename from src/de/frosch95/geofrogger/fx/geofrogger.fxml
rename to src/de/frosch95/geofrogger/fx/geofrogger/geofrogger.fxml
index 92d5ebe..512465c 100644
--- a/src/de/frosch95/geofrogger/fx/geofrogger.fxml
+++ b/src/de/frosch95/geofrogger/fx/geofrogger/geofrogger.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.text.Font?>
 <?import java.net.URL?>
 <VBox prefHeight="800.0" prefWidth="1280.0" minHeight="600.0" minWidth="800.0" xmlns:fx="http://javafx.com/fxml"
-      fx:controller="de.frosch95.geofrogger.fx.GeofroggerController">
+      fx:controller="de.frosch95.geofrogger.fx.geofrogger.GeofroggerController">
   <children>
     <MenuBar VBox.vgrow="NEVER">
       <menus>
@@ -28,10 +28,10 @@
     <SplitPane dividerPositions="0.3779342723004695" focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0"
                VBox.vgrow="ALWAYS">
       <items>
-        <fx:include source="cache_list.fxml" fx:id="cacheListContent"/>
+        <fx:include source="../cachelist/cache_list.fxml" fx:id="cacheListContent"/>
         <ScrollPane fitToHeight="true" fitToWidth="true" pannable="false" prefHeight="-1.0" prefWidth="-1.0">
           <content>
-            <fx:include source="cache_details.fxml" fx:id="cacheDetailsContent"/>
+            <fx:include source="../cachedetails/cache_details.fxml" fx:id="cacheDetailsContent"/>
           </content>
         </ScrollPane>
       </items>
@@ -55,6 +55,6 @@
     </HBox>
   </children>
   <stylesheets>
-    <URL value="@geofrogger.css"/>
+    <URL value="@../geofrogger.css"/>
   </stylesheets>
 </VBox>
diff --git a/src/de/frosch95/geofrogger/fx/settings.fxml b/src/de/frosch95/geofrogger/fx/settings/settings.fxml
similarity index 100%
rename from src/de/frosch95/geofrogger/fx/settings.fxml
rename to src/de/frosch95/geofrogger/fx/settings/settings.fxml
diff --git a/src/de/frosch95/geofrogger/fx/JavaFXUtils.java b/src/de/frosch95/geofrogger/fx/utils/JavaFXUtils.java
similarity index 98%
rename from src/de/frosch95/geofrogger/fx/JavaFXUtils.java
rename to src/de/frosch95/geofrogger/fx/utils/JavaFXUtils.java
index 25901cf..053f70e 100644
--- a/src/de/frosch95/geofrogger/fx/JavaFXUtils.java
+++ b/src/de/frosch95/geofrogger/fx/utils/JavaFXUtils.java
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package de.frosch95.geofrogger.fx;
+package de.frosch95.geofrogger.fx.utils;
 
 import javafx.scene.Node;