diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/CrudRepositoryService.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/CrudRepositoryService.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/vaadin/flow/spring/data/CrudRepositoryService.java
rename to vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/CrudRepositoryService.java
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/JpaFilterConverter.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/JpaFilterConverter.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/vaadin/flow/spring/data/JpaFilterConverter.java
rename to vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/JpaFilterConverter.java
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/ListRepositoryService.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/ListRepositoryService.java
similarity index 94%
rename from vaadin-spring/src/main/java/com/vaadin/flow/spring/data/ListRepositoryService.java
rename to vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/ListRepositoryService.java
index e9dec64303b..63579718125 100644
--- a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/ListRepositoryService.java
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/ListRepositoryService.java
@@ -1,17 +1,19 @@
-package com.vaadin.flow.spring.data;
+package com.vaadin.flow.spring.data.jpa;
 
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Optional;
 
 import com.googlecode.gentyref.GenericTypeReflector;
-import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 
 import com.vaadin.flow.Nullable;
+import com.vaadin.flow.spring.data.CountService;
+import com.vaadin.flow.spring.data.GetService;
+import com.vaadin.flow.spring.data.ListService;
 import com.vaadin.flow.spring.data.filter.Filter;
 
 /**
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/PropertyStringFilterSpecification.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/PropertyStringFilterSpecification.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/vaadin/flow/spring/data/PropertyStringFilterSpecification.java
rename to vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/PropertyStringFilterSpecification.java
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/package-info.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/package-info.java
new file mode 100644
index 00000000000..741ae7120fb
--- /dev/null
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/package-info.java
@@ -0,0 +1,2 @@
+@org.springframework.lang.NonNullApi
+package com.vaadin.flow.spring.data.jpa;