diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java
index 075fe39..f914eea 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java
@@ -7,8 +7,6 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.Locale;
 
-import de.sebse.fuplanner.tools.SortedListDay;
-
 public class Canteen implements Serializable, Iterable<Day> {
     private final int id;
     private final String name;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java
index 6a2046a..d70dad1 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java
@@ -11,8 +11,6 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Iterator;
 
-import de.sebse.fuplanner.tools.SortedListCanteen;
-
 public class Canteens implements Serializable, Iterable<Canteen> {
     public static final int[] availableCanteens = {27, 28, 42};
     private static final String FILE_NAME = "CanteensSaving";
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java
index ee6b774..4270ebd 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java
@@ -6,8 +6,6 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.Iterator;
 
-import de.sebse.fuplanner.tools.SortedListMeal;
-
 public class Day implements Serializable, Iterable<Meal> {
     private final int canteenId;
     private final Calendar calendar;
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedListCanteen.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java
similarity index 54%
rename from app/src/main/java/de/sebse/fuplanner/tools/SortedListCanteen.java
rename to app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java
index fe80cf6..6beaa18 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedListCanteen.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java
@@ -1,21 +1,21 @@
-package de.sebse.fuplanner.tools;
+package de.sebse.fuplanner.services.Canteen.types;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.tools.SortedList;
 
 public class SortedListCanteen extends SortedList<Canteen, Integer, String> {
     @Override
-    int compare(Canteen o1, Canteen o2) {
+    public int compare(Canteen o1, Canteen o2) {
         // TODO correct implementation
         return Integer.compare(o1.getId(), o2.getId());
     }
 
     @Override
-    boolean hasIdentifier(Canteen o1, Integer id) {
+    public boolean hasIdentifier(Canteen o1, Integer id) {
         return o1.getId() == id;
     }
 
     @Override
-    boolean hasFilter(Canteen o1, String filter) {
+    public boolean hasFilter(Canteen o1, String filter) {
         return o1.getCity().equals(filter);
     }
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedListDay.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java
similarity index 58%
rename from app/src/main/java/de/sebse/fuplanner/tools/SortedListDay.java
rename to app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java
index 6576f83..8ded38d 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedListDay.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java
@@ -1,23 +1,22 @@
-package de.sebse.fuplanner.tools;
+package de.sebse.fuplanner.services.Canteen.types;
 
 import java.util.Calendar;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.Day;
+import de.sebse.fuplanner.tools.SortedList;
 
 public class SortedListDay extends SortedList<Day, Calendar, String> {
     @Override
-    int compare(Day o1, Day o2) {
+    public int compare(Day o1, Day o2) {
         return Canteen.calendarToKey(o1.getCalendar()).compareTo(Canteen.calendarToKey(o2.getCalendar()));
     }
 
     @Override
-    boolean hasIdentifier(Day o1, Calendar id) {
+    public boolean hasIdentifier(Day o1, Calendar id) {
         return Canteen.calendarToKey(o1.getCalendar()).equals(Canteen.calendarToKey(id));
     }
 
     @Override
-    boolean hasFilter(Day o1, String filter) {
+    public boolean hasFilter(Day o1, String filter) {
         return false;
     }
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedListMeal.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java
similarity index 52%
rename from app/src/main/java/de/sebse/fuplanner/tools/SortedListMeal.java
rename to app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java
index 9a3cbac..8c5d090 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedListMeal.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java
@@ -1,20 +1,20 @@
-package de.sebse.fuplanner.tools;
+package de.sebse.fuplanner.services.Canteen.types;
 
-import de.sebse.fuplanner.services.Canteen.types.Meal;
+import de.sebse.fuplanner.tools.SortedList;
 
 public class SortedListMeal extends SortedList<Meal, Integer, String> {
     @Override
-    int compare(Meal o1, Meal o2) {
+    public int compare(Meal o1, Meal o2) {
         return Integer.compare(o1.getId(), o2.getId());
     }
 
     @Override
-    boolean hasIdentifier(Meal o1, Integer id) {
+    public boolean hasIdentifier(Meal o1, Integer id) {
         return o1.getId() == id;
     }
 
     @Override
-    boolean hasFilter(Meal o1, String filter) {
+    public boolean hasFilter(Meal o1, String filter) {
         return o1.getCategory().equals(filter);
     }
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
index d1753cf..a5c5895 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
@@ -23,9 +23,9 @@ import de.sebse.fuplanner.services.KVV.types.Gradebook;
 import de.sebse.fuplanner.services.KVV.types.Lecturer;
 import de.sebse.fuplanner.services.KVV.types.LoginToken;
 import de.sebse.fuplanner.services.KVV.types.Modules;
-import de.sebse.fuplanner.tools.AssignmentList;
+import de.sebse.fuplanner.services.KVV.types.AssignmentList;
 import de.sebse.fuplanner.tools.AsyncQueue;
-import de.sebse.fuplanner.tools.EventList;
+import de.sebse.fuplanner.services.KVV.types.EventList;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.network.HTTPService;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/AssignmentList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/AssignmentList.java
similarity index 57%
rename from app/src/main/java/de/sebse/fuplanner/tools/AssignmentList.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/AssignmentList.java
index 60dbd3b..0516b60 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/AssignmentList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/AssignmentList.java
@@ -1,11 +1,11 @@
-package de.sebse.fuplanner.tools;
+package de.sebse.fuplanner.services.KVV.types;
 
-import de.sebse.fuplanner.services.KVV.types.Assignment;
+import de.sebse.fuplanner.tools.DateSortedList;
 
 public class AssignmentList extends DateSortedList<Assignment> {
 
     @Override
-    long getDateByItem(Assignment item) {
+    public long getDateByItem(Assignment item) {
         return item.getDueDate();
     }
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/EventList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/EventList.java
new file mode 100644
index 0000000..b89ee2d
--- /dev/null
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/EventList.java
@@ -0,0 +1,11 @@
+package de.sebse.fuplanner.services.KVV.types;
+
+import de.sebse.fuplanner.tools.DateSortedList;
+
+public class EventList extends DateSortedList<Event> {
+
+    @Override
+    public long getDateByItem(Event item) {
+        return item.getEndDate();
+    }
+}
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
index 57098ff..b799a3f 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
@@ -14,11 +14,8 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import de.sebse.fuplanner.tools.AssignmentList;
 import de.sebse.fuplanner.tools.Compare;
-import de.sebse.fuplanner.tools.EventList;
 import de.sebse.fuplanner.tools.Regex;
-import de.sebse.fuplanner.tools.SortedModuleList;
 
 /**
  * Created by sebastian on 29.10.17.
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/SortedModuleList.java
similarity index 97%
rename from app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/SortedModuleList.java
index 0d3f5c3..9ae67af 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/SortedModuleList.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.tools;
+package de.sebse.fuplanner.services.KVV.types;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -9,8 +9,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 
-import de.sebse.fuplanner.services.KVV.types.Modules;
-
 public class SortedModuleList extends AbstractList<Modules.Module> implements Serializable {
 
     private ArrayList<Modules.Module> internalList = new ArrayList<>();
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java b/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java
index 5d2c30b..8871d9d 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java
@@ -101,5 +101,5 @@ public abstract class DateSortedList<T> extends ArrayList<T> {
         return false;
     }
 
-    abstract long getDateByItem(T item);
+    public abstract long getDateByItem(T item);
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/EventList.java b/app/src/main/java/de/sebse/fuplanner/tools/EventList.java
deleted file mode 100644
index b7aabd2..0000000
--- a/app/src/main/java/de/sebse/fuplanner/tools/EventList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.sebse.fuplanner.tools;
-
-import de.sebse.fuplanner.services.KVV.types.Event;
-
-public class EventList extends DateSortedList<Event> {
-
-    @Override
-    long getDateByItem(Event item) {
-        return item.getEndDate();
-    }
-}
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java b/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java
index dbfe5f0..1e57efe 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java
@@ -21,11 +21,11 @@ public abstract class SortedList<T, I, F> implements Iterable<T>, Serializable {
         this.internalList.remove(index);
     }
 
-    abstract int compare(T o1, T o2);
+    public abstract int compare(T o1, T o2);
 
-    abstract boolean hasIdentifier(T o1, I id);
+    public abstract boolean hasIdentifier(T o1, I id);
 
-    abstract boolean hasFilter(T o1, F filter);
+    public abstract boolean hasFilter(T o1, F filter);
 
     @Nullable
     public T get(int i) {