diff --git a/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java b/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java
index 16b18a795a104cc8360026f7765c45ca457af90a..7a519688a42350022b6f2ab1241f46aba7021414 100644
--- a/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java
+++ b/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java
@@ -45,8 +45,8 @@ public class CacheConfiguration {
     @Bean
     public JCacheManagerCustomizer cacheManagerCustomizer() {
         return cm -> {
-            createCache(cm, at.ac.uibk.gitsearch.repository.UserRepository.USERS_BY_LOGIN_CACHE);
-            createCache(cm, at.ac.uibk.gitsearch.repository.UserRepository.USERS_BY_EMAIL_CACHE);
+            createCache(cm, at.ac.uibk.gitsearch.repository.jpa.UserRepository.USERS_BY_LOGIN_CACHE);
+            createCache(cm, at.ac.uibk.gitsearch.repository.jpa.UserRepository.USERS_BY_EMAIL_CACHE);
             createCache(cm, EditorialPagesService.PAGES_CACHE);
             createCache(cm, MetaDataRepository.EXERCISE_BY_ID_CACHE);
 
diff --git a/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java b/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
index c63bf657e0e351362dc6a473840b3d9c73bb254f..8475218590f4ac8b0f251a9f0ddbba63aa995eb3 100644
--- a/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
+++ b/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
@@ -17,7 +17,7 @@ import tech.jhipster.config.h2.H2ConfigurationHelper;
 @Configuration
 @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware")
 @EnableTransactionManagement
-@EnableJpaRepositories("at.ac.uibk.gitsearch.repository")
+@EnableJpaRepositories("at.ac.uibk.gitsearch.repository.jpa")
 @EnableElasticsearchRepositories("at.ac.uibk.gitsearch.repository.search")
 public class DatabaseConfiguration {
 
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuditEventConverter.java
similarity index 98%
rename from src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuditEventConverter.java
index d09c6def6e1c031dab348493357e17c262e51994..d515e24b084cd179a8e35f219199999185f7cb98 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuditEventConverter.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
 import java.util.ArrayList;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java
similarity index 94%
rename from src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java
index ed12bdedf8ae0cb821e643033cae9f85f6280178..8aa9dc68c8af409fcaa361f237e63b87c9a7e4f7 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.Authority;
 import java.util.List;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/CustomAuditEventRepository.java
similarity index 95%
rename from src/main/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/CustomAuditEventRepository.java
index 482f30aa2af7443b29f7ef59d9bb262a096da4ba..47db67ab88a9bede67bef23932f313279d17e396 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/CustomAuditEventRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.config.Constants;
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
@@ -20,12 +20,12 @@ import org.springframework.transaction.annotation.Transactional;
 @Repository
 public class CustomAuditEventRepository implements AuditEventRepository {
 
-    private static final String AUTHORIZATION_FAILURE = "AUTHORIZATION_FAILURE";
+    static final String AUTHORIZATION_FAILURE = "AUTHORIZATION_FAILURE";
 
     /**
      * Should be the same as in Liquibase migration.
      */
-    protected static final int EVENT_DATA_COLUMN_MAX_LENGTH = 255;
+    public static final int EVENT_DATA_COLUMN_MAX_LENGTH = 255;
 
     private final PersistenceAuditEventRepository persistenceAuditEventRepository;
 
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/LikesRepository.java
similarity index 93%
rename from src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/LikesRepository.java
index 36a70a114c6594f6ae3eb0e4c0fb10681223245f..9f07a1496d46f84c17fc8c8d40426d50b490a8eb 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/LikesRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.Likes;
 import org.springframework.data.jpa.repository.*;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/PersistenceAuditEventRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/PersistenceAuditEventRepository.java
similarity index 94%
rename from src/main/java/at/ac/uibk/gitsearch/repository/PersistenceAuditEventRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/PersistenceAuditEventRepository.java
index 5951bd528ac0dae37e04d2db5ae8158ee610a8f6..a909e6c8b4a6acb2d183d9c21defadf038e9d428 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/PersistenceAuditEventRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/PersistenceAuditEventRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
 import java.time.Instant;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/SavedSearchesRepository.java
similarity index 92%
rename from src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/SavedSearchesRepository.java
index bdba9f25260d930793c5513f07a70b9f272b7587..4f31cdda55c7ae3a64c731b48f6a5d48d07d99fa 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/SavedSearchesRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.SavedSearches;
 import java.util.List;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/StatisticsRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java
similarity index 96%
rename from src/main/java/at/ac/uibk/gitsearch/repository/StatisticsRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java
index 05b78584705890e0d55efb9b74c71440d95f10be..eddc185cfe4e7ac34c7afe0e283b2844b2598c1c 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/StatisticsRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.Statistics;
 import java.util.List;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java
similarity index 97%
rename from src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java
index c009a984579b6863b032e99082a7dd1a9dba31da..33e601575a2882ac3840d8a4c69a2523368cb85a 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.User;
 import java.time.Instant;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/UserWatchListRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserWatchListRepository.java
similarity index 97%
rename from src/main/java/at/ac/uibk/gitsearch/repository/UserWatchListRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserWatchListRepository.java
index 2bf0ae307656e542f3c7c48e177c43c339744d4f..fea3a954128732e892f3892333083e27a8c73e8a 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/UserWatchListRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserWatchListRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.User;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/WatchListEntryRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/WatchListEntryRepository.java
similarity index 95%
rename from src/main/java/at/ac/uibk/gitsearch/repository/WatchListEntryRepository.java
rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/WatchListEntryRepository.java
index f77179812605f8ba461ab4bcb2a0c9a0942d4843..d44e43000bf6d9c066124dc7194b36ec7afdb33f 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/WatchListEntryRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/WatchListEntryRepository.java
@@ -1,4 +1,4 @@
-package at.ac.uibk.gitsearch.repository;
+package at.ac.uibk.gitsearch.repository.jpa;
 
 import at.ac.uibk.gitsearch.domain.WatchListEntry;
 import java.util.List;
diff --git a/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java b/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java
index 9522b045570d3e4c6839e69667f4dfe9b8446ee5..73d12fa44ae7e9975050fc74cf9aa721fccbc2fa 100644
--- a/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.security;
 
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import java.util.*;
 import java.util.stream.Collectors;
 import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java b/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java
index 14e3ea6f75bbfba8b9e725cffe1f1bf2026ce593..1c1184e265f6e1e3b781254f510b51696162ecf7 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java
@@ -1,6 +1,6 @@
 package at.ac.uibk.gitsearch.service;
 
-import at.ac.uibk.gitsearch.repository.StatisticsRepository;
+import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository;
 import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java b/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java
index 70d5e53744d563e450f87281663c7f1a9c2eb73c..ca3c8928ed7abfafdcf0a0c759166d38c86d4152 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.service;
 
-import at.ac.uibk.gitsearch.repository.AuditEventConverter;
-import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository;
+import at.ac.uibk.gitsearch.repository.jpa.AuditEventConverter;
+import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Optional;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java b/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java
index bce2b67a40817b916c37cb1f1770cfae3c4ddcb6..93483cd42389bf0bff33a2c1c5c7aebd991b3223 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java
@@ -3,7 +3,7 @@ package at.ac.uibk.gitsearch.service;
 // for static metamodels
 import at.ac.uibk.gitsearch.domain.Likes;
 import at.ac.uibk.gitsearch.domain.Likes_;
-import at.ac.uibk.gitsearch.repository.LikesRepository;
+import at.ac.uibk.gitsearch.repository.jpa.LikesRepository;
 import at.ac.uibk.gitsearch.service.dto.LikesCriteria;
 import java.util.List;
 import org.slf4j.Logger;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java b/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java
index a0caeefc135c0817369e475aaca852ae28803e86..3ecad0503c849f88d68369fd9db15cb83cf65508 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.service;
 
 import at.ac.uibk.gitsearch.domain.Likes;
-import at.ac.uibk.gitsearch.repository.LikesRepository;
+import at.ac.uibk.gitsearch.repository.jpa.LikesRepository;
 import java.util.List;
 import java.util.Optional;
 import org.slf4j.Logger;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/MailService.java b/src/main/java/at/ac/uibk/gitsearch/service/MailService.java
index b8a5085d7974f9ed0e1330f34d066fd0afb6e751..c12be8812072421447d342b047ccf15439813e47 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/MailService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/MailService.java
@@ -3,7 +3,7 @@ package at.ac.uibk.gitsearch.service;
 import at.ac.uibk.gitsearch.domain.User;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
 import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.List;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java b/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java
index 471445ed0841f41fa0bdf0239adece53ea8a87e4..e473ad82a36027c1676f015ff36da7dd858d2e51 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.service;
 
 import at.ac.uibk.gitsearch.domain.SavedSearches;
-import at.ac.uibk.gitsearch.repository.SavedSearchesRepository;
+import at.ac.uibk.gitsearch.repository.jpa.SavedSearchesRepository;
 import at.ac.uibk.gitsearch.repository.search.SavedSearchesSearchRepository;
 import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO;
 import at.ac.uibk.gitsearch.service.mapper.SavedSearchesMapper;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/UserService.java b/src/main/java/at/ac/uibk/gitsearch/service/UserService.java
index bd4939117f6312607160e60830613a29530b99a3..02597c3b70674bbcdc8d5e5110fc5d0da87efa11 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/UserService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/UserService.java
@@ -3,8 +3,8 @@ package at.ac.uibk.gitsearch.service;
 import at.ac.uibk.gitsearch.config.Constants;
 import at.ac.uibk.gitsearch.domain.Authority;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.AuthorityRepository;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.AuthorityRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.repository.search.UserSearchRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.security.SecurityUtils;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java
index f2d19697f939dd4971af8fb2793dcc76f8b5eb49..4144ce91e640ae32c9361891abe3cc9d21df619b 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java
@@ -2,7 +2,7 @@ package at.ac.uibk.gitsearch.service;
 
 import at.ac.uibk.gitsearch.domain.*; // for static metamodels
 import at.ac.uibk.gitsearch.domain.UserWatchList;
-import at.ac.uibk.gitsearch.repository.UserWatchListRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository;
 import at.ac.uibk.gitsearch.service.dto.UserWatchListCriteria;
 import at.ac.uibk.gitsearch.service.dto.UserWatchListDTO;
 import at.ac.uibk.gitsearch.service.mapper.UserWatchListMapper;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java
index d26b4149a73342dd0b354ff3b455ad31adcea149..a03dc6942a31a698c53fb9394e3db2cc01dd0cd5 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java
@@ -3,7 +3,7 @@ package at.ac.uibk.gitsearch.service;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
 import at.ac.uibk.gitsearch.domain.WatchListEntry;
 import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency;
-import at.ac.uibk.gitsearch.repository.UserWatchListRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository;
 import at.ac.uibk.gitsearch.repository.search.MetaDataRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum;
 import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java b/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java
index c6b9cbf98ffa94901bba45a61aa68a603f3a1e60..a168d41e5af55a6c22c9ee670bd97f953a15bc74 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.service;
 
 import at.ac.uibk.gitsearch.domain.WatchListEntry;
-import at.ac.uibk.gitsearch.repository.WatchListEntryRepository;
+import at.ac.uibk.gitsearch.repository.jpa.WatchListEntryRepository;
 import at.ac.uibk.gitsearch.repository.search.WatchListEntrySearchRepository;
 import at.ac.uibk.gitsearch.service.dto.WatchListEntryDTO;
 import at.ac.uibk.gitsearch.service.mapper.WatchListEntryMapper;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java b/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java
index 4b32d1475383d17007e5290dc26e37cd0b59e1df..31b42bbfff0ac4f47467c46de572741439072c7e 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.service.impl;
 
 import at.ac.uibk.gitsearch.domain.Statistics;
-import at.ac.uibk.gitsearch.repository.StatisticsRepository;
+import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository;
 import at.ac.uibk.gitsearch.repository.search.StatisticsSearchRepository;
 import at.ac.uibk.gitsearch.service.StatisticsService;
 import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java
index a045e047f891e08968427b6a78e24996d0d16835..22da4ebbd183fcd0ffdcbc8b7af0775465bd95b0 100644
--- a/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java
+++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java
@@ -1,7 +1,7 @@
 package at.ac.uibk.gitsearch.web.rest;
 
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.security.SecurityUtils;
 import at.ac.uibk.gitsearch.service.MailService;
 import at.ac.uibk.gitsearch.service.UserService;
diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java
index 5c468ed042febc29de0bbe0b232c17bcd8697a75..00c709199f60db238b0ebbfff16338e62427ce59 100644
--- a/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java
+++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java
@@ -1,6 +1,6 @@
 package at.ac.uibk.gitsearch.web.rest;
 
-import at.ac.uibk.gitsearch.repository.SavedSearchesRepository;
+import at.ac.uibk.gitsearch.repository.jpa.SavedSearchesRepository;
 import at.ac.uibk.gitsearch.service.SavedSearchesService;
 import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO;
 import at.ac.uibk.gitsearch.web.rest.errors.BadRequestAlertException;
diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java
index b07503cee9743299f478a46fb2e2ef0647dfb5fe..c96599a8df68e14d4be58a302fd93899f9bd181e 100644
--- a/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java
+++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java
@@ -1,6 +1,6 @@
 package at.ac.uibk.gitsearch.web.rest;
 
-import at.ac.uibk.gitsearch.repository.StatisticsRepository;
+import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository;
 import at.ac.uibk.gitsearch.service.SearchService;
 import at.ac.uibk.gitsearch.service.StatisticsService;
 import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
@@ -146,7 +146,7 @@ public class StatisticsResource {
     /*
     getStatisticsByExerciseId is used to match the exerciseId of a Gitlab project with the database object for the statistics
     If a rest request for an exerciseId comes from the client and there is no object with a fitting exerciseId in the DB the server will create a new db entry with number of views
-    as 1 and downloads as 0 
+    as 1 and downloads as 0
     */
 
     @GetMapping("/statistics/exercise/**")
diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java
index 13e58f327b655e59cba0c97ca14cfce712cd676d..2e63a881434592b993ac3317e8a974425c05846b 100644
--- a/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java
+++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java
@@ -2,7 +2,7 @@ package at.ac.uibk.gitsearch.web.rest;
 
 import at.ac.uibk.gitsearch.config.Constants;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.service.MailService;
 import at.ac.uibk.gitsearch.service.UserService;
diff --git a/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java b/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java
index f1a1fd19aa0691340fb6ccfc3c8621359673d2bc..265ac337d22a536f4266dfd56242faec202b4f78 100644
--- a/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java
@@ -1,11 +1,14 @@
 package at.ac.uibk.gitsearch.repository;
 
-import static at.ac.uibk.gitsearch.repository.CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH;
+import static at.ac.uibk.gitsearch.repository.jpa.CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.config.Constants;
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
+import at.ac.uibk.gitsearch.repository.jpa.AuditEventConverter;
+import at.ac.uibk.gitsearch.repository.jpa.CustomAuditEventRepository;
+import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
diff --git a/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java
index 4d3820f91fd80921bbbfbf1896e9d0325e0327e6..1ebbda3f939ab9feca9ab7bf0abed3fea9ca561e 100644
--- a/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java
@@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import java.util.Locale;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java
index ced22109ff4073583a2be87a38a1b2846c335934..078ac2887abe1de0eb6ffbcac6557b95bbb2afe9 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java
@@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
-import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository;
+import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java
index 637649fe6da68fee37732b9eccde7e1dd494ffc0..3997494d2e04ff7ddd4b1b55d2c7e72be47b7d47 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java
@@ -11,8 +11,8 @@ import at.ac.uibk.gitsearch.domain.User;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
 import at.ac.uibk.gitsearch.domain.WatchListEntry;
 import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency;
-import at.ac.uibk.gitsearch.repository.UserRepository;
-import at.ac.uibk.gitsearch.repository.UserWatchListRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository;
 import at.ac.uibk.gitsearch.repository.search.MetaDataRepository;
 import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestConfiguration;
 import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java
index 2f1ca6fd68aa300b45cd9a53a0342e2de76a9c1f..15e1b5745e516706334aff9a61e5cdd1a1874e2e 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java
@@ -7,7 +7,7 @@ import static org.mockito.Mockito.*;
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.config.Constants;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java
index 2d531f5506963b00df4de1051aca82907a4d7e51..bdefd44dbeb65d5ffd4b626cb473cfe91c35694f 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java
@@ -8,7 +8,7 @@ import static org.mockito.Mockito.when;
 
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.repository.search.UserSearchRepository;
 import java.time.Instant;
 import java.time.LocalDateTime;
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java
index 8667e952a6ce521383af4193cc93562deaedf7d9..c1c8cde585a64df8491ada6662b79f69fb1f8f3d 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java
@@ -7,7 +7,7 @@ import at.ac.uibk.gitsearch.domain.User;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
 import at.ac.uibk.gitsearch.domain.WatchListEntry;
 import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency;
-import at.ac.uibk.gitsearch.repository.UserWatchListRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository;
 import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestConfiguration;
 import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
 import java.io.IOException;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java
index 3bda149c52def359441af02d0c9fb1dffb729f4e..a9e797b23d5bdab6d377d5504c547efc3883b4cb 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java
@@ -12,8 +12,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.config.Constants;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.AuthorityRepository;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.AuthorityRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.service.UserService;
 import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java
index b634d4febd8eeca39141a923b778c6e28d66bcae..669e81bbbc093914fd74365bcfdade2546a98f8a 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java
@@ -10,7 +10,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
-import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository;
+import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import java.time.Instant;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java
index d0f36619dd1a3a108b377bce3713ed356af62fc6..fa00740df5bc2932a3d04cd6f8e0760ffc39031a 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java
@@ -17,8 +17,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.Likes;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.LikesRepository;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.LikesRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.repository.search.LikesSearchRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.service.LikesService;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java
index 51ceeacdbdf114295a9ec11ab11484b3c079d95b..ec939297d8778098be4fe2fc655121564668b691 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java
@@ -8,7 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.repository.search.UserSearchRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import javax.persistence.EntityManager;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java
index e552daa1c72fb82fcffb3906a5affa138c564ffb..ab99943269c0b18d59bc4b981f52b667b98038ce 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java
@@ -18,7 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.domain.SavedSearches;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.SavedSearchesRepository;
+import at.ac.uibk.gitsearch.repository.jpa.SavedSearchesRepository;
 import at.ac.uibk.gitsearch.repository.search.SavedSearchesSearchRepository;
 import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO;
 import at.ac.uibk.gitsearch.service.mapper.SavedSearchesMapper;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java
index 482b266dd931b839de9863cf37ce35d443f4f003..bc1e71ce3bbeb1c8f24e94ce9f76bd89beb98548 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java
@@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.Statistics;
-import at.ac.uibk.gitsearch.repository.StatisticsRepository;
+import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository;
 import at.ac.uibk.gitsearch.repository.search.StatisticsSearchRepository;
 import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestConfiguration;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java
index 279926f0d9b4241c002abd0ffc601fbb35a8ccee..cf18b9fdfe0aa3ee0737855ef809b60038ffab1d 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java
@@ -12,7 +12,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.web.rest.vm.LoginVM;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java
index 2d06f80b25e2f8ada7ac477233f09210d1b78668..1c34aae25f67992f6bee270bf4fa8b4c26806c97 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java
@@ -14,7 +14,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import at.ac.uibk.gitsearch.IntegrationTest;
 import at.ac.uibk.gitsearch.domain.Authority;
 import at.ac.uibk.gitsearch.domain.User;
-import at.ac.uibk.gitsearch.repository.UserRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
 import at.ac.uibk.gitsearch.repository.search.UserSearchRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java
index 4065d1fd3f428e5bdc5d65666eef224924d78587..14e49cc0007260ba8942ee1ed35ceab7f0fc9d97 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java
@@ -15,7 +15,7 @@ import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.User;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
 import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency;
-import at.ac.uibk.gitsearch.repository.UserWatchListRepository;
+import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository;
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.service.dto.UserWatchListDTO;
 import at.ac.uibk.gitsearch.service.mapper.UserWatchListMapper;
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java
index ce4ab5411d90d3a6c8734ed533db507ed9cb26ea..9ff302cf40dac1b6b625b939d7edaa9f081bd833 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java
@@ -17,7 +17,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import at.ac.uibk.gitsearch.GitsearchApp;
 import at.ac.uibk.gitsearch.domain.UserWatchList;
 import at.ac.uibk.gitsearch.domain.WatchListEntry;
-import at.ac.uibk.gitsearch.repository.WatchListEntryRepository;
+import at.ac.uibk.gitsearch.repository.jpa.WatchListEntryRepository;
 import at.ac.uibk.gitsearch.repository.search.WatchListEntrySearchRepository;
 import at.ac.uibk.gitsearch.service.WatchListEntryService;
 import at.ac.uibk.gitsearch.service.dto.WatchListEntryDTO;