8 files changed, 18 insertions, 18 deletions

diff --git a/src/Main.java b/src/Main.java
index 933259318..a60d0661f 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,4 +1,4 @@
-import net.sourceforge.opentracking.Server;
+import org.traccar.Server;
 
 public class Main {
 
diff --git a/src/org/traccar/helper/NamedParameterStatement.java b/src/org/traccar/helper/NamedParameterStatement.java
index 4e5ffc4fc..63c31fb04 100644
--- a/src/org/traccar/helper/NamedParameterStatement.java
+++ b/src/org/traccar/helper/NamedParameterStatement.java
@@ -1,4 +1,4 @@
-package net.sourceforge.opentracking.helper;
+package org.traccar.helper;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
index 6d0e0a8d9..410477d19 100644
--- a/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking.protocol.gl200;
+package org.traccar.protocol.gl200;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import org.jboss.netty.channel.ChannelEvent;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
diff --git a/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java
index 85e29cc0e..7c11e939f 100644
--- a/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking.protocol.gps103;
+package org.traccar.protocol.gps103;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import org.jboss.netty.channel.ChannelEvent;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
diff --git a/src/org/traccar/protocol/t55/T55ProtocolDecoder.java b/src/org/traccar/protocol/t55/T55ProtocolDecoder.java
index 01954b474..08c5e6447 100644
--- a/src/org/traccar/protocol/t55/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/t55/T55ProtocolDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking.protocol.t55;
+package org.traccar.protocol.t55;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import org.jboss.netty.channel.ChannelEvent;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
diff --git a/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
index 12108b121..de81faec5 100644
--- a/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking.protocol.tk103;
+package org.traccar.protocol.tk103;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import org.jboss.netty.channel.ChannelEvent;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
diff --git a/src/org/traccar/protocol/xexun/XexunFrameDecoder.java b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
index 839e5b3ec..f09fd337d 100644
--- a/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
+++ b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking.protocol.xexun;
+package org.traccar.protocol.xexun;
 
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 import org.jboss.netty.channel.Channel;
diff --git a/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
index 872569e1a..8102650cd 100644
--- a/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking.protocol.xexun;
+package org.traccar.protocol.xexun;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -26,8 +26,8 @@ import java.util.TimerTask;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import org.jboss.netty.channel.ChannelEvent;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;