12 files changed, 16 insertions, 13 deletions
diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index ebd0dcade..199167419 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -47,6 +47,9 @@ import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.Statistics;
 import org.traccar.model.User;
+import org.traccar.storage.QueryBuilder;
+import org.traccar.storage.QueryExtended;
+import org.traccar.storage.QueryIgnore;
 
 import javax.sql.DataSource;
 import java.beans.Introspector;
diff --git a/src/main/java/org/traccar/model/Calendar.java b/src/main/java/org/traccar/model/Calendar.java
index 0b45ca6c8..af6364626 100644
--- a/src/main/java/org/traccar/model/Calendar.java
+++ b/src/main/java/org/traccar/model/Calendar.java
@@ -24,7 +24,7 @@ import net.fortuna.ical4j.filter.predicate.PeriodRule;
 import net.fortuna.ical4j.model.DateTime;
 import net.fortuna.ical4j.model.Period;
 import net.fortuna.ical4j.model.component.CalendarComponent;
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryIgnore;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/traccar/model/Command.java b/src/main/java/org/traccar/model/Command.java
index 99930d1e6..71bc232e9 100644
--- a/src/main/java/org/traccar/model/Command.java
+++ b/src/main/java/org/traccar/model/Command.java
@@ -15,7 +15,7 @@
  */
 package org.traccar.model;
 
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryIgnore;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/src/main/java/org/traccar/model/Device.java b/src/main/java/org/traccar/model/Device.java
index 0c9be932d..46de8003d 100644
--- a/src/main/java/org/traccar/model/Device.java
+++ b/src/main/java/org/traccar/model/Device.java
@@ -18,8 +18,8 @@ package org.traccar.model;
 import java.util.Date;
 import java.util.List;
 
-import org.traccar.database.QueryExtended;
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryExtended;
+import org.traccar.storage.QueryIgnore;
 
 public class Device extends GroupedModel {
 
diff --git a/src/main/java/org/traccar/model/Geofence.java b/src/main/java/org/traccar/model/Geofence.java
index 85f392f99..a451da9f5 100644
--- a/src/main/java/org/traccar/model/Geofence.java
+++ b/src/main/java/org/traccar/model/Geofence.java
@@ -19,7 +19,7 @@ import java.text.ParseException;
 
 import org.traccar.Context;
 import org.traccar.config.Keys;
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryIgnore;
 import org.traccar.geofence.GeofenceCircle;
 import org.traccar.geofence.GeofenceGeometry;
 import org.traccar.geofence.GeofencePolygon;
diff --git a/src/main/java/org/traccar/model/Notification.java b/src/main/java/org/traccar/model/Notification.java
index f1983a03a..01ca2711c 100644
--- a/src/main/java/org/traccar/model/Notification.java
+++ b/src/main/java/org/traccar/model/Notification.java
@@ -18,7 +18,7 @@ package org.traccar.model;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryIgnore;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/src/main/java/org/traccar/model/Position.java b/src/main/java/org/traccar/model/Position.java
index 09d25e832..bbea58901 100644
--- a/src/main/java/org/traccar/model/Position.java
+++ b/src/main/java/org/traccar/model/Position.java
@@ -17,7 +17,7 @@ package org.traccar.model;
 
 import java.util.Date;
 
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryIgnore;
 
 public class Position extends Message {
 
diff --git a/src/main/java/org/traccar/model/Server.java b/src/main/java/org/traccar/model/Server.java
index 03d087cac..fdb071a18 100644
--- a/src/main/java/org/traccar/model/Server.java
+++ b/src/main/java/org/traccar/model/Server.java
@@ -17,7 +17,7 @@ package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.traccar.Context;
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryIgnore;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Server extends ExtendedModel {
diff --git a/src/main/java/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java
index 359bdc2c2..447cf691c 100644
--- a/src/main/java/org/traccar/model/User.java
+++ b/src/main/java/org/traccar/model/User.java
@@ -17,8 +17,8 @@ package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import org.traccar.database.QueryExtended;
-import org.traccar.database.QueryIgnore;
+import org.traccar.storage.QueryExtended;
+import org.traccar.storage.QueryIgnore;
 import org.traccar.helper.Hashing;
 
 import java.util.Date;
diff --git a/src/main/java/org/traccar/database/QueryBuilder.java b/src/main/java/org/traccar/storage/QueryBuilder.java
index 396cbf562..c7800f19b 100644
--- a/src/main/java/org/traccar/database/QueryBuilder.java
+++ b/src/main/java/org/traccar/storage/QueryBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.database;
+package org.traccar.storage;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/traccar/database/QueryExtended.java b/src/main/java/org/traccar/storage/QueryExtended.java
index 07bc2c211..3796f1f40 100644
--- a/src/main/java/org/traccar/database/QueryExtended.java
+++ b/src/main/java/org/traccar/storage/QueryExtended.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.database;
+package org.traccar.storage;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/org/traccar/database/QueryIgnore.java b/src/main/java/org/traccar/storage/QueryIgnore.java
index ac835cf2f..553d4b9fc 100644
--- a/src/main/java/org/traccar/database/QueryIgnore.java
+++ b/src/main/java/org/traccar/storage/QueryIgnore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.traccar.database;
+package org.traccar.storage;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;