16 files changed, 17 insertions, 18 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 4e6055174..d50a0c626 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -24,7 +24,7 @@ import org.traccar.geocode.GoogleReverseGeocoder;
 import org.traccar.geocode.NominatimReverseGeocoder;
 import org.traccar.geocode.ReverseGeocoder;
 import org.traccar.helper.Log;
-import org.traccar.http.WebServer;
+import org.traccar.web.WebServer;
 
 public class Context {
     
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 04695c4a5..f68ff2ae6 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -34,8 +34,8 @@ import javax.sql.DataSource;
 import org.traccar.Config;
 import org.traccar.helper.DriverDelegate;
 import org.traccar.helper.Log;
-import org.traccar.http.AsyncServlet;
-import org.traccar.http.JsonConverter;
+import org.traccar.web.AsyncServlet;
+import org.traccar.web.JsonConverter;
 import org.traccar.model.Device;
 import org.traccar.model.MiscFormatter;
 import org.traccar.model.Permission;
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index dccb4851e..af9d353c5 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -16,7 +16,7 @@
 package org.traccar.model;
 
 import org.traccar.helper.Hashing;
-import org.traccar.http.JsonIgnore;
+import org.traccar.web.JsonIgnore;
 
 public class User implements Factory {
 
diff --git a/src/org/traccar/http/AsyncServlet.java b/src/org/traccar/web/AsyncServlet.java
index 0fc1cd2fb..20a71ec1c 100644
--- a/src/org/traccar/http/AsyncServlet.java
+++ b/src/org/traccar/web/AsyncServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/org/traccar/http/BaseServlet.java b/src/org/traccar/web/BaseServlet.java
index 394e4d317..28b4b467e 100644
--- a/src/org/traccar/http/BaseServlet.java
+++ b/src/org/traccar/web/BaseServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/org/traccar/http/CommandsServlet.java b/src/org/traccar/web/CommandsServlet.java
index 8b3d43fe7..b12c0fa53 100644
--- a/src/org/traccar/http/CommandsServlet.java
+++ b/src/org/traccar/web/CommandsServlet.java
@@ -1,4 +1,4 @@
-package org.traccar.http;
+package org.traccar.web;
 
 import javax.json.Json;
 import javax.json.JsonObject;
diff --git a/src/org/traccar/http/DeviceServlet.java b/src/org/traccar/web/DeviceServlet.java
index d1af1c106..6b65efa8b 100644
--- a/src/org/traccar/http/DeviceServlet.java
+++ b/src/org/traccar/web/DeviceServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/org/traccar/http/EnumFactory.java b/src/org/traccar/web/EnumFactory.java
index 6e9971f71..efbfd4b20 100644
--- a/src/org/traccar/http/EnumFactory.java
+++ b/src/org/traccar/web/EnumFactory.java
@@ -1,4 +1,4 @@
-package org.traccar.http;
+package org.traccar.web;
 
 import org.traccar.model.Factory;
 
diff --git a/src/org/traccar/http/JsonConverter.java b/src/org/traccar/web/JsonConverter.java
index deb676f6e..7962ac8ab 100644
--- a/src/org/traccar/http/JsonConverter.java
+++ b/src/org/traccar/web/JsonConverter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import java.beans.Introspector;
 import java.io.Reader;
diff --git a/src/org/traccar/http/JsonIgnore.java b/src/org/traccar/web/JsonIgnore.java
index ad7791e0d..208cdc627 100644
--- a/src/org/traccar/http/JsonIgnore.java
+++ b/src/org/traccar/web/JsonIgnore.java
@@ -1,4 +1,4 @@
-package org.traccar.http;
+package org.traccar.web;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/web/MainServlet.java
index 29eaaec33..eaadef245 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/web/MainServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
diff --git a/src/org/traccar/http/PositionServlet.java b/src/org/traccar/web/PositionServlet.java
index 6f973be3c..a29b5b274 100644
--- a/src/org/traccar/http/PositionServlet.java
+++ b/src/org/traccar/web/PositionServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/org/traccar/http/ServerServlet.java b/src/org/traccar/web/ServerServlet.java
index 836a109fc..631737eb0 100644
--- a/src/org/traccar/http/ServerServlet.java
+++ b/src/org/traccar/web/ServerServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/org/traccar/http/UserServlet.java b/src/org/traccar/web/UserServlet.java
index 976a62890..eac4b0b13 100644
--- a/src/org/traccar/http/UserServlet.java
+++ b/src/org/traccar/web/UserServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/web/WebServer.java
index 785d817e8..698796467 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.http;
+package org.traccar.web;
 
 import java.net.InetSocketAddress;
 import javax.naming.InitialContext;
diff --git a/test/org/traccar/http/JsonConverterTest.java b/test/org/traccar/web/JsonConverterTest.java
index b318420e0..07d70d3f2 100644
--- a/test/org/traccar/http/JsonConverterTest.java
+++ b/test/org/traccar/web/JsonConverterTest.java
@@ -1,7 +1,6 @@
-package org.traccar.http;
+package org.traccar.web;
 
 import org.junit.Test;
-import org.traccar.http.JsonConverter;
 import org.traccar.model.Factory;
 
 import java.io.Reader;