diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index b2f7423..fad04af 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -26,7 +26,7 @@ import de.sebse.fuplanner.fragments.StartupFragment;
 import de.sebse.fuplanner.services.GoogleAuth.Credentials;
 import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
 import de.sebse.fuplanner.services.KVV.KVV;
-import de.sebse.fuplanner.services.KVV.Modules;
+import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 public class MainActivity extends AppCompatActivity
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesRecyclerViewAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesRecyclerViewAdapter.java
index f574738..8cd26f2 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesRecyclerViewAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesRecyclerViewAdapter.java
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.fragments.ModulesFragment.OnModulesFragmentInteractionListener;
-import de.sebse.fuplanner.services.KVV.Modules;
+import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.ui.ItemViewHolder;
 
 /**
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
index f25c5ec..246c102 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
@@ -13,10 +13,10 @@ import com.ms.square.android.expandabletextview.ExpandableTextView;
 import java.util.ArrayList;
 
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.Announcement;
-import de.sebse.fuplanner.services.KVV.Assignment;
-import de.sebse.fuplanner.services.KVV.Event;
-import de.sebse.fuplanner.services.KVV.Modules;
+import de.sebse.fuplanner.services.KVV.types.Announcement;
+import de.sebse.fuplanner.services.KVV.types.Assignment;
+import de.sebse.fuplanner.services.KVV.types.Event;
+import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.Conversion;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.CustomViewHolder;
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
index 50714f0..d69cbc9 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
@@ -15,7 +15,7 @@ import android.view.ViewGroup;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.services.KVV.KVV;
-import de.sebse.fuplanner.services.KVV.Modules;
+import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
index 8c4a695..f0fe9b6 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
@@ -6,6 +6,8 @@ import android.support.annotation.NonNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import de.sebse.fuplanner.services.KVV.types.LoginToken;
+import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
index f016cac..a470bc3 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.sebse.fuplanner.services.KVV.types.LoginToken;
 import de.sebse.fuplanner.tools.network.HTTPService;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
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 b70c058..1a0d3f8 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
@@ -9,12 +9,16 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.MatchResult;
 
+import de.sebse.fuplanner.services.KVV.types.Announcement;
+import de.sebse.fuplanner.services.KVV.types.Assignment;
+import de.sebse.fuplanner.services.KVV.types.Event;
+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.AsyncQueue;
 import de.sebse.fuplanner.tools.EventList;
 import de.sebse.fuplanner.tools.Regex;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/LastTokenCallback.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/LastTokenCallback.java
index a4f7e10..9740b1e 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/LastTokenCallback.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/LastTokenCallback.java
@@ -1,5 +1,7 @@
 package de.sebse.fuplanner.services.KVV;
 
+import de.sebse.fuplanner.services.KVV.types.LoginToken;
+
 /**
  * Created by sebastian on 31.01.18.
  */
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Announcement.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
similarity index 86%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Announcement.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
index 83b4a2c..bdf2d4e 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Announcement.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 public class Announcement {
     private final String id;
@@ -7,7 +7,7 @@ public class Announcement {
     private final String createdBy;
     private final long createdOn;
 
-    Announcement(String id, String title, String body, String createdBy, long createdOn) {
+    public Announcement(String id, String title, String body, String createdBy, long createdOn) {
 
         this.id = id;
         this.title = title;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
similarity index 84%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
index bf8703c..b9b288a 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -12,7 +12,7 @@ public class Assignment {
     private final String gradeScale;
     private final ArrayList<String> urls;
 
-    Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList<String> urls) {//, String grade
+    public Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList<String> urls) {//, String grade
         this.id = id;
         this.title = title;
         this.dueTime = dueTime;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Event.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
similarity index 87%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Event.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
index 342551e..c4db484 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Event.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 import java.util.Date;
 
@@ -9,7 +9,7 @@ public class Event {
     private final long duration;
     private final long firstTime;
 
-    Event(String id, String type, String title, long duration, long firstTime) {
+    public Event(String id, String type, String title, long duration, long firstTime) {
         this.id = id;
         this.type = type;
         this.title = title;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
similarity index 92%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
index e23fbe5..06f8c43 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 public class Gradebook {
     private final String itemName;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Lecturer.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Lecturer.java
similarity index 86%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Lecturer.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/Lecturer.java
index 47da51a..6e090cb 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Lecturer.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Lecturer.java
@@ -1,14 +1,14 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-class Lecturer {
+public class Lecturer {
     private final String firstname;
     private final String surname;
     private final String mail;
 
-    Lecturer(String parsableString) throws NoSuchFieldException {
+    public Lecturer(String parsableString) throws NoSuchFieldException {
         Pattern pattern = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)\\|\\|", Pattern.DOTALL);
         Matcher matcher = pattern.matcher(parsableString);
         if (!matcher.find()) {
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/LoginToken.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
similarity index 96%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/LoginToken.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
index 98ba2d4..fcb6e32 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/LoginToken.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 import java.util.HashMap;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
similarity index 96%
rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java
rename to app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
index e2b399e..74cdf42 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.KVV.types;
 
 import android.support.annotation.NonNull;
 import android.support.v7.util.SortedList;
@@ -21,7 +21,7 @@ public class Modules /*extends EventEmitter<Triplet<Integer, Modules.UpgradeModu
     private String latestSemester = null;
     private Logger log = new Logger(this);
 
-    Modules() {
+    public Modules() {
         this.list = new SortedList<>(Module.class, new SortedList.Callback<Module>() {
             @Override
             public int compare(Module o1, Module o2) {
@@ -63,7 +63,7 @@ public class Modules /*extends EventEmitter<Triplet<Integer, Modules.UpgradeModu
         });
     }
 
-    Module addModule(String semester, HashSet<String> lvNumber, String title, HashSet<Lecturer> lecturer, String type, String description, String ID) {
+    public Module addModule(String semester, HashSet<String> lvNumber, String title, HashSet<Lecturer> lecturer, String type, String description, String ID) {
         Module m = new Module(semester, lvNumber, title, lecturer, type, description, ID);
         this.list.add(m);
         try {
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/EventList.java b/app/src/main/java/de/sebse/fuplanner/tools/EventList.java
index 5f83b35..24cede4 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/EventList.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/EventList.java
@@ -3,7 +3,7 @@ package de.sebse.fuplanner.tools;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import de.sebse.fuplanner.services.KVV.Event;
+import de.sebse.fuplanner.services.KVV.types.Event;
 
 public class EventList extends ArrayList<Event> {
     private int split = 0;