diff --git a/pom.xml b/pom.xml
index d264e54..9c3e160 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
         </developer>
     </developers>
     <scm>
-        <connection/>
-        <developerConnection/>
+        <connection></connection>
+        <developerConnection>scm:git:https://gitea.gofwd.group/Forward_Group/ballistic-builder-spring.git</developerConnection>
         <tag/>
         <url/>
     </scm>
@@ -79,6 +79,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>42.7.7</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/group/goforward/ballistic/ApiResponse.java b/src/main/java/group/goforward/ballistic/ApiResponse.java
index eb22fff..3dd23a6 100644
--- a/src/main/java/group/goforward/ballistic/ApiResponse.java
+++ b/src/main/java/group/goforward/ballistic/ApiResponse.java
@@ -2,6 +2,9 @@ package group.goforward.ballistic;
 
 import java.time.LocalDateTime;
 
+/**
+ * @param <T>
+ */
 public class ApiResponse<T> {
 
     private static final String API_SUCCESS = "success";
diff --git a/src/main/java/group/goforward/ballistic/controllers/PsaController.java b/src/main/java/group/goforward/ballistic/controllers/PsaController.java
index 8efec1b..bf442a9 100644
--- a/src/main/java/group/goforward/ballistic/controllers/PsaController.java
+++ b/src/main/java/group/goforward/ballistic/controllers/PsaController.java
@@ -1,7 +1,7 @@
 package group.goforward.ballistic.controllers;
 
 import group.goforward.ballistic.model.Psa;
-import group.goforward.ballistic.services.PsaService;
+import group.goforward.ballistic.services.impl.PsaServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -14,10 +14,10 @@ import java.util.UUID;
 @RequestMapping("/api/psa")
 public class PsaController {
 
-    private final PsaService psaService;
+    private final PsaServiceImpl psaService;
 
     @Autowired
-    public PsaController(PsaService psaService) {
+    public PsaController(PsaServiceImpl psaService) {
         this.psaService = psaService;
     }
 
diff --git a/src/main/java/group/goforward/ballistic/model/AccountRepository.java b/src/main/java/group/goforward/ballistic/repos/AccountRepository.java
similarity index 64%
rename from src/main/java/group/goforward/ballistic/model/AccountRepository.java
rename to src/main/java/group/goforward/ballistic/repos/AccountRepository.java
index abb4486..1c8702f 100644
--- a/src/main/java/group/goforward/ballistic/model/AccountRepository.java
+++ b/src/main/java/group/goforward/ballistic/repos/AccountRepository.java
@@ -1,8 +1,9 @@
-package group.goforward.ballistic.model;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.UUID;
-
-public interface AccountRepository extends JpaRepository<Account, UUID> {
+package group.goforward.ballistic.repos;
+
+import group.goforward.ballistic.model.Account;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.UUID;
+
+public interface AccountRepository extends JpaRepository<Account, UUID> {
 }
\ No newline at end of file
diff --git a/src/main/java/group/goforward/ballistic/services/PsaService.java b/src/main/java/group/goforward/ballistic/services/PsaService.java
index 29cb6f3..337d278 100644
--- a/src/main/java/group/goforward/ballistic/services/PsaService.java
+++ b/src/main/java/group/goforward/ballistic/services/PsaService.java
@@ -1,40 +1,17 @@
 package group.goforward.ballistic.services;
+
 import group.goforward.ballistic.model.Psa;
-import group.goforward.ballistic.repos.PsaRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-@Service
-public class PsaService implements group.goforward.ballistic.services.impl.PsaService {
+public interface PsaService {
+    List<Psa> findAll();
 
-    private final PsaRepository psaRepository;
+    Optional<Psa> findById(UUID id);
 
-    @Autowired
-    public PsaService(PsaRepository psaRepository) {
-        this.psaRepository = psaRepository;
-    }
+    Psa save(Psa psa);
 
-    @Override
-    public List<Psa> findAll() {
-        return psaRepository.findAll();
-    }
-
-    @Override
-    public Optional<Psa> findById(UUID id) {
-        return psaRepository.findById(id);
-    }
-
-    @Override
-    public Psa save(Psa psa) {
-        return psaRepository.save(psa);
-    }
-
-    @Override
-    public void deleteById(UUID id) {
-        psaRepository.deleteById(id);
-    }
+    void deleteById(UUID id);
 }
diff --git a/src/main/java/group/goforward/ballistic/services/impl/PsaService.java b/src/main/java/group/goforward/ballistic/services/impl/PsaService.java
deleted file mode 100644
index e84f141..0000000
--- a/src/main/java/group/goforward/ballistic/services/impl/PsaService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package group.goforward.ballistic.services.impl;
-
-import group.goforward.ballistic.model.Psa;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-public interface PsaService {
-    List<Psa> findAll();
-
-    Optional<Psa> findById(UUID id);
-
-    Psa save(Psa psa);
-
-    void deleteById(UUID id);
-}
diff --git a/src/main/java/group/goforward/ballistic/services/impl/PsaServiceImpl.java b/src/main/java/group/goforward/ballistic/services/impl/PsaServiceImpl.java
new file mode 100644
index 0000000..1729056
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/services/impl/PsaServiceImpl.java
@@ -0,0 +1,41 @@
+package group.goforward.ballistic.services.impl;
+import group.goforward.ballistic.model.Psa;
+import group.goforward.ballistic.repos.PsaRepository;
+import group.goforward.ballistic.services.PsaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Service
+public class PsaServiceImpl implements PsaService {
+
+    private final PsaRepository psaRepository;
+
+    @Autowired
+    public PsaServiceImpl(PsaRepository psaRepository) {
+        this.psaRepository = psaRepository;
+    }
+
+    @Override
+    public List<Psa> findAll() {
+        return psaRepository.findAll();
+    }
+
+    @Override
+    public Optional<Psa> findById(UUID id) {
+        return psaRepository.findById(id);
+    }
+
+    @Override
+    public Psa save(Psa psa) {
+        return psaRepository.save(psa);
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        psaRepository.deleteById(id);
+    }
+}