diff --git a/pom.xml b/pom.xml
index a27ee2b..ded628d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.sadtech.autoresponder</groupId>
     <artifactId>autoresponder</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-RELEASE</version>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/src/main/java/org/sadtech/autoresponder/Autoresponder.java b/src/main/java/org/sadtech/autoresponder/Autoresponder.java
index c823ded..f7c1a43 100644
--- a/src/main/java/org/sadtech/autoresponder/Autoresponder.java
+++ b/src/main/java/org/sadtech/autoresponder/Autoresponder.java
@@ -1,9 +1,9 @@
 package org.sadtech.autoresponder;
 
 import org.apache.log4j.Logger;
+import org.sadtech.autoresponder.compare.UnitPriorityComparator;
 import org.sadtech.autoresponder.entity.Person;
 import org.sadtech.autoresponder.entity.Unit;
-import org.sadtech.autoresponder.entity.compare.UnitPriorityComparator;
 import org.sadtech.autoresponder.service.PersonService;
 import org.sadtech.autoresponder.submodule.parser.Parser;
 
diff --git a/src/main/java/org/sadtech/autoresponder/entity/compare/UnitPriorityComparator.java b/src/main/java/org/sadtech/autoresponder/compare/UnitPriorityComparator.java
similarity index 88%
rename from src/main/java/org/sadtech/autoresponder/entity/compare/UnitPriorityComparator.java
rename to src/main/java/org/sadtech/autoresponder/compare/UnitPriorityComparator.java
index 41003ad..1f33e56 100644
--- a/src/main/java/org/sadtech/autoresponder/entity/compare/UnitPriorityComparator.java
+++ b/src/main/java/org/sadtech/autoresponder/compare/UnitPriorityComparator.java
@@ -1,4 +1,4 @@
-package org.sadtech.autoresponder.entity.compare;
+package org.sadtech.autoresponder.compare;
 
 import org.sadtech.autoresponder.entity.Unit;
 
diff --git a/src/main/java/org/sadtech/autoresponder/entity/Unit.java b/src/main/java/org/sadtech/autoresponder/entity/Unit.java
index 690e008..66e01b0 100644
--- a/src/main/java/org/sadtech/autoresponder/entity/Unit.java
+++ b/src/main/java/org/sadtech/autoresponder/entity/Unit.java
@@ -1,6 +1,8 @@
 package org.sadtech.autoresponder.entity;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 public abstract class Unit {
diff --git a/src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java b/src/main/java/org/sadtech/autoresponder/repository/PersonRepositoryMap.java
similarity index 82%
rename from src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java
rename to src/main/java/org/sadtech/autoresponder/repository/PersonRepositoryMap.java
index ea3806d..74b75fc 100644
--- a/src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java
+++ b/src/main/java/org/sadtech/autoresponder/repository/PersonRepositoryMap.java
@@ -1,9 +1,9 @@
-package org.sadtech.autoresponder.repository.impl;
+package org.sadtech.autoresponder.repository;
 
 import org.sadtech.autoresponder.entity.Person;
-import org.sadtech.autoresponder.repository.PersonRepository;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class PersonRepositoryMap implements PersonRepository {
 
diff --git a/src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java b/src/main/java/org/sadtech/autoresponder/service/PersonServiceImpl.java
similarity index 85%
rename from src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java
rename to src/main/java/org/sadtech/autoresponder/service/PersonServiceImpl.java
index 53d1ad3..2aba89f 100644
--- a/src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java
+++ b/src/main/java/org/sadtech/autoresponder/service/PersonServiceImpl.java
@@ -1,11 +1,9 @@
-package org.sadtech.autoresponder.service.impl;
-
-import org.sadtech.autoresponder.entity.Person;
-import org.sadtech.autoresponder.repository.PersonRepository;
-import org.sadtech.autoresponder.repository.impl.PersonRepositoryMap;
-import org.sadtech.autoresponder.service.PersonService;
+package org.sadtech.autoresponder.service;
 
 import org.apache.log4j.Logger;
+import org.sadtech.autoresponder.entity.Person;
+import org.sadtech.autoresponder.repository.PersonRepository;
+import org.sadtech.autoresponder.repository.PersonRepositoryMap;
 
 public class PersonServiceImpl implements PersonService {
 
diff --git a/src/main/java/org/sadtech/autoresponder/service/UnitService.java b/src/main/java/org/sadtech/autoresponder/service/UnitService.java
deleted file mode 100644
index 6d24d62..0000000
--- a/src/main/java/org/sadtech/autoresponder/service/UnitService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-//package org.sadtech.autoresponder.service;
-//
-//import org.sadtech.autoresponder.entity.Unit;
-//
-//import java.util.Set;
-//
-//public interface UnitService {
-//
-//    Set<Unit> menuUnit();
-//
-//    void addUnit(Unit unit);
-//
-//}