diff --git a/fishingcontest/.gitignore b/.gitignore
similarity index 100%
rename from fishingcontest/.gitignore
rename to .gitignore
diff --git a/fishingcontest/.classpath b/fishingcontest/.classpath
deleted file mode 100644
index 953de0b..0000000
--- a/fishingcontest/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<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 excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<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 excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/fishingcontest/.project b/fishingcontest/.project
deleted file mode 100644
index f927638..0000000
--- a/fishingcontest/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>fishingcontest</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/fishingcontest/pom.xml b/pom.xml
similarity index 100%
rename from fishingcontest/pom.xml
rename to pom.xml
diff --git a/fishingcontest/src/main/java/org/fc/data/BoatsComparator.java b/src/main/java/org/fc/data/BoatsComparator.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/BoatsComparator.java
rename to src/main/java/org/fc/data/BoatsComparator.java
diff --git a/fishingcontest/src/main/java/org/fc/data/Contest.java b/src/main/java/org/fc/data/Contest.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/Contest.java
rename to src/main/java/org/fc/data/Contest.java
diff --git a/fishingcontest/src/main/java/org/fc/data/ContestDrawException.java b/src/main/java/org/fc/data/ContestDrawException.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/ContestDrawException.java
rename to src/main/java/org/fc/data/ContestDrawException.java
diff --git a/fishingcontest/src/main/java/org/fc/data/FinalResultsComparator.java b/src/main/java/org/fc/data/FinalResultsComparator.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/FinalResultsComparator.java
rename to src/main/java/org/fc/data/FinalResultsComparator.java
diff --git a/fishingcontest/src/main/java/org/fc/data/NonRegistered.java b/src/main/java/org/fc/data/NonRegistered.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/NonRegistered.java
rename to src/main/java/org/fc/data/NonRegistered.java
diff --git a/fishingcontest/src/main/java/org/fc/data/ResultViever.java b/src/main/java/org/fc/data/ResultViever.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/ResultViever.java
rename to src/main/java/org/fc/data/ResultViever.java
diff --git a/fishingcontest/src/main/java/org/fc/data/RoundResultsComparator.java b/src/main/java/org/fc/data/RoundResultsComparator.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/data/RoundResultsComparator.java
rename to src/main/java/org/fc/data/RoundResultsComparator.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/Catch.java b/src/main/java/org/fc/entity/Catch.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/Catch.java
rename to src/main/java/org/fc/entity/Catch.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/FinalResult.java b/src/main/java/org/fc/entity/FinalResult.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/FinalResult.java
rename to src/main/java/org/fc/entity/FinalResult.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/Gain.java b/src/main/java/org/fc/entity/Gain.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/Gain.java
rename to src/main/java/org/fc/entity/Gain.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/Result.java b/src/main/java/org/fc/entity/Result.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/Result.java
rename to src/main/java/org/fc/entity/Result.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/Round.java b/src/main/java/org/fc/entity/Round.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/Round.java
rename to src/main/java/org/fc/entity/Round.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/Team.java b/src/main/java/org/fc/entity/Team.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/Team.java
rename to src/main/java/org/fc/entity/Team.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/report/Boats.java b/src/main/java/org/fc/entity/report/Boats.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/report/Boats.java
rename to src/main/java/org/fc/entity/report/Boats.java
diff --git a/fishingcontest/src/main/java/org/fc/entity/report/CatchForm.java b/src/main/java/org/fc/entity/report/CatchForm.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/entity/report/CatchForm.java
rename to src/main/java/org/fc/entity/report/CatchForm.java
diff --git a/fishingcontest/src/main/java/org/fc/reports/ReportLoaderObject.java b/src/main/java/org/fc/reports/ReportLoaderObject.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/reports/ReportLoaderObject.java
rename to src/main/java/org/fc/reports/ReportLoaderObject.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java b/src/main/java/org/fc/ui/app/CatchDataEntry.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java
rename to src/main/java/org/fc/ui/app/CatchDataEntry.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/FishingContestApp.java b/src/main/java/org/fc/ui/app/FishingContestApp.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/FishingContestApp.java
rename to src/main/java/org/fc/ui/app/FishingContestApp.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/Reports.java b/src/main/java/org/fc/ui/app/Reports.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/Reports.java
rename to src/main/java/org/fc/ui/app/Reports.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/RoundParameter.java b/src/main/java/org/fc/ui/app/RoundParameter.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/RoundParameter.java
rename to src/main/java/org/fc/ui/app/RoundParameter.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/TeamFilter.java b/src/main/java/org/fc/ui/app/TeamFilter.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/TeamFilter.java
rename to src/main/java/org/fc/ui/app/TeamFilter.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/TeamFrame.java b/src/main/java/org/fc/ui/app/TeamFrame.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/TeamFrame.java
rename to src/main/java/org/fc/ui/app/TeamFrame.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/TeamWindow.java b/src/main/java/org/fc/ui/app/TeamWindow.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/TeamWindow.java
rename to src/main/java/org/fc/ui/app/TeamWindow.java
diff --git a/fishingcontest/src/main/java/org/fc/ui/app/UiHelperBean.java b/src/main/java/org/fc/ui/app/UiHelperBean.java
similarity index 100%
rename from fishingcontest/src/main/java/org/fc/ui/app/UiHelperBean.java
rename to src/main/java/org/fc/ui/app/UiHelperBean.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/DataSetEmptyException.java b/src/main/java/yaf/reporting/DataSetEmptyException.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/DataSetEmptyException.java
rename to src/main/java/yaf/reporting/DataSetEmptyException.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/DataSource.java b/src/main/java/yaf/reporting/DataSource.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/DataSource.java
rename to src/main/java/yaf/reporting/DataSource.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/DataSourceFactory.java b/src/main/java/yaf/reporting/DataSourceFactory.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/DataSourceFactory.java
rename to src/main/java/yaf/reporting/DataSourceFactory.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/JRDesignFieldAdapter.java b/src/main/java/yaf/reporting/JRDesignFieldAdapter.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/JRDesignFieldAdapter.java
rename to src/main/java/yaf/reporting/JRDesignFieldAdapter.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/ReportDescriptor.java b/src/main/java/yaf/reporting/ReportDescriptor.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/ReportDescriptor.java
rename to src/main/java/yaf/reporting/ReportDescriptor.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/ReportParameterProvider.java b/src/main/java/yaf/reporting/ReportParameterProvider.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/ReportParameterProvider.java
rename to src/main/java/yaf/reporting/ReportParameterProvider.java
diff --git a/fishingcontest/src/main/java/yaf/reporting/ui/PrintDialog.java b/src/main/java/yaf/reporting/ui/PrintDialog.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/reporting/ui/PrintDialog.java
rename to src/main/java/yaf/reporting/ui/PrintDialog.java
diff --git a/fishingcontest/src/main/java/yaf/share/exceptions/ReportException.java b/src/main/java/yaf/share/exceptions/ReportException.java
similarity index 100%
rename from fishingcontest/src/main/java/yaf/share/exceptions/ReportException.java
rename to src/main/java/yaf/share/exceptions/ReportException.java
diff --git a/fishingcontest/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
similarity index 100%
rename from fishingcontest/src/main/resources/log4j.properties
rename to src/main/resources/log4j.properties
diff --git a/fishingcontest/src/main/resources/org/fc/reports/FinalResults.jasper b/src/main/resources/org/fc/reports/FinalResults.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/FinalResults.jasper
rename to src/main/resources/org/fc/reports/FinalResults.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/FinalResults.jrxml b/src/main/resources/org/fc/reports/FinalResults.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/FinalResults.jrxml
rename to src/main/resources/org/fc/reports/FinalResults.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/FinalResults6.jasper b/src/main/resources/org/fc/reports/FinalResults6.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/FinalResults6.jasper
rename to src/main/resources/org/fc/reports/FinalResults6.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/FinalResults6.jrxml b/src/main/resources/org/fc/reports/FinalResults6.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/FinalResults6.jrxml
rename to src/main/resources/org/fc/reports/FinalResults6.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/RoundResults.jasper b/src/main/resources/org/fc/reports/RoundResults.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/RoundResults.jasper
rename to src/main/resources/org/fc/reports/RoundResults.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/RoundResults.jrxml b/src/main/resources/org/fc/reports/RoundResults.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/RoundResults.jrxml
rename to src/main/resources/org/fc/reports/RoundResults.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/boats.jasper b/src/main/resources/org/fc/reports/boats.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/boats.jasper
rename to src/main/resources/org/fc/reports/boats.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/boats.jrxml b/src/main/resources/org/fc/reports/boats.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/boats.jrxml
rename to src/main/resources/org/fc/reports/boats.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/catchFormStatic.jasper b/src/main/resources/org/fc/reports/catchFormStatic.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/catchFormStatic.jasper
rename to src/main/resources/org/fc/reports/catchFormStatic.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/catchFormStatic.jrxml b/src/main/resources/org/fc/reports/catchFormStatic.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/catchFormStatic.jrxml
rename to src/main/resources/org/fc/reports/catchFormStatic.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/catchForms-after1table.jrxml b/src/main/resources/org/fc/reports/catchForms-after1table.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/catchForms-after1table.jrxml
rename to src/main/resources/org/fc/reports/catchForms-after1table.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/catchForms.jasper b/src/main/resources/org/fc/reports/catchForms.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/catchForms.jasper
rename to src/main/resources/org/fc/reports/catchForms.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/catchForms.jrxml b/src/main/resources/org/fc/reports/catchForms.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/catchForms.jrxml
rename to src/main/resources/org/fc/reports/catchForms.jrxml
diff --git a/fishingcontest/src/main/resources/org/fc/reports/teams.jasper b/src/main/resources/org/fc/reports/teams.jasper
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/teams.jasper
rename to src/main/resources/org/fc/reports/teams.jasper
diff --git a/fishingcontest/src/main/resources/org/fc/reports/teams.jrxml b/src/main/resources/org/fc/reports/teams.jrxml
similarity index 100%
rename from fishingcontest/src/main/resources/org/fc/reports/teams.jrxml
rename to src/main/resources/org/fc/reports/teams.jrxml