diff --git a/.classpath b/.classpath
index d4abc99..ccf96a8 100644
--- a/.classpath
+++ b/.classpath
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -15,6 +9,9 @@
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
+		<accessrules>
+			<accessrule kind="accessible" pattern="javafx/**"/>
+		</accessrules>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@@ -22,5 +19,17 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index b331910..b4f1be7 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
 encoding/resources=UTF-8
 encoding/src=UTF-8
diff --git a/pom.xml b/pom.xml
index f7f5681..3b4954b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
 	<build>
 		<finalName>JavaFXWebBrowser-${project.version}</finalName>
-		<sourceDirectory>src</sourceDirectory>
+		<sourceDirectory>src/main/java</sourceDirectory>
 		<resources>
 			<resource>
 				<directory>resources</directory>
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/application/Main.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/application/Main.java
index 9206bd4..c64c9d5 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/application/Main.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/application/Main.java
@@ -8,15 +8,16 @@
  * and this list of conditions without modification.
  */
 
-package main.java.com.goxr3plus.javafxwebbrowser.application;
+package com.goxr3plus.JavaFXWebBrowser.application;
+
+import com.goxr3plus.JavaFXWebBrowser.browser.WebBrowserController;
+import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
 
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-import main.java.com.goxr3plus.javafxwebbrowser.browser.WebBrowserController;
-import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;
 
 /**
  * From here you start the application
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/AutoCompleteTextField.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/AutoCompleteTextField.java
index 5553584..261247e 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/AutoCompleteTextField.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/AutoCompleteTextField.java
@@ -1,7 +1,7 @@
 /*
  * 
  */
-package main.java.com.goxr3plus.javafxwebbrowser.browser;
+package com.goxr3plus.JavaFXWebBrowser.browser;
 
 import java.util.List;
 import java.util.SortedSet;
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserController.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserController.java
index 6d66ade..7dd8d48 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserController.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserController.java
@@ -1,7 +1,7 @@
 /**
  * TODO LISENSE
  */
-package main.java.com.goxr3plus.javafxwebbrowser.browser;
+package com.goxr3plus.JavaFXWebBrowser.browser;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -11,6 +11,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
 import com.jfoenix.controls.JFXButton;
 
 import javafx.fxml.FXML;
@@ -18,7 +19,6 @@
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.layout.StackPane;
-import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;
 
 /**
  * @author GOXR3PLUS
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabContextMenu.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabContextMenu.java
index 91689a3..910b136 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabContextMenu.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabContextMenu.java
@@ -1,14 +1,15 @@
-package main.java.com.goxr3plus.javafxwebbrowser.browser;
+package com.goxr3plus.JavaFXWebBrowser.browser;
 
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
+
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
-import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;
 
 public class WebBrowserTabContextMenu extends ContextMenu {
 	
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabController.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabController.java
index 7744186..8ca9063 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabController.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/browser/WebBrowserTabController.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package main.java.com.goxr3plus.javafxwebbrowser.browser;
+package com.goxr3plus.JavaFXWebBrowser.browser;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -15,6 +15,8 @@
 
 import org.apache.commons.validator.routines.UrlValidator;
 
+import com.goxr3plus.JavaFXWebBrowser.marquee.Marquee;
+import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
 import com.jfoenix.controls.JFXButton;
 
 import javafx.application.Platform;
@@ -43,8 +45,6 @@
 import javafx.scene.web.WebHistory;
 import javafx.scene.web.WebHistory.Entry;
 import javafx.scene.web.WebView;
-import main.java.com.goxr3plus.javafxwebbrowser.marquee.Marquee;
-import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;
 import net.sf.image4j.codec.ico.ICODecoder;
 
 /**
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/marquee/Marquee.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/marquee/Marquee.java
index 8e0c95c..b723d51 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/marquee/Marquee.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/marquee/Marquee.java
@@ -1,7 +1,9 @@
-package main.java.com.goxr3plus.javafxwebbrowser.marquee;
+package com.goxr3plus.JavaFXWebBrowser.marquee;
 
 import java.io.IOException;
 
+import com.goxr3plus.JavaFXWebBrowser.tools.InfoTool;
+
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -15,7 +17,6 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 import javafx.util.Duration;
-import main.java.com.goxr3plus.javafxwebbrowser.tools.InfoTool;
 
 /**
  * When the screen element is not big enough to show the text then an animation will start automatically
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/settings/SettingsWindow.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/settings/SettingsWindow.java
new file mode 100644
index 0000000..ce1f825
--- /dev/null
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/settings/SettingsWindow.java
@@ -0,0 +1,6 @@
+package com.goxr3plus.JavaFXWebBrowser.settings;
+
+//TODO
+public class SettingsWindow {
+	
+}
diff --git a/src/main/java/com/goxr3plus/JavaFXWebBrowser/tools/InfoTool.java b/src/main/java/com/goxr3plus/JavaFXWebBrowser/tools/InfoTool.java
index da014c7..bbba313 100644
--- a/src/main/java/com/goxr3plus/JavaFXWebBrowser/tools/InfoTool.java
+++ b/src/main/java/com/goxr3plus/JavaFXWebBrowser/tools/InfoTool.java
@@ -1,15 +1,16 @@
 /*
  * 
  */
-package main.java.com.goxr3plus.javafxwebbrowser.tools;
+package com.goxr3plus.JavaFXWebBrowser.tools;
 
 import java.io.File;
 import java.net.URISyntaxException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.goxr3plus.JavaFXWebBrowser.application.Main;
+
 import javafx.scene.image.Image;
-import main.java.com.goxr3plus.javafxwebbrowser.application.Main;
 
 /**
  * Provides useful methods for retrieving informations.
diff --git a/src/main/java/com/goxr3plus/javafxwebbrowser/settings/SettingsWindow.java b/src/main/java/com/goxr3plus/javafxwebbrowser/settings/SettingsWindow.java
deleted file mode 100644
index 070a883..0000000
--- a/src/main/java/com/goxr3plus/javafxwebbrowser/settings/SettingsWindow.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package main.java.com.goxr3plus.javafxwebbrowser.settings;
-
-//TODO
-public class SettingsWindow {
-	
-}