diff --git a/app/src/main/java/de/nicidienase/chaosflix/CardPresenter.java b/app/src/main/java/de/nicidienase/chaosflix/CardPresenter.java
index 38757e5d..655d2895 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/CardPresenter.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/CardPresenter.java
@@ -17,13 +17,12 @@ package de.nicidienase.chaosflix;
 import android.graphics.drawable.Drawable;
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;
-import android.util.Log;
 import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
 
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Event;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Event;
 
 /*
  * A CardPresenter is used to generate Views and bind Objects to them on demand.
diff --git a/app/src/main/java/de/nicidienase/chaosflix/EventDetailsDescriptionPresenter.java b/app/src/main/java/de/nicidienase/chaosflix/EventDetailsDescriptionPresenter.java
index 06e918c2..e87d2797 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/EventDetailsDescriptionPresenter.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/EventDetailsDescriptionPresenter.java
@@ -3,7 +3,7 @@ package de.nicidienase.chaosflix;
 import android.support.v17.leanback.widget.AbstractDetailsDescriptionPresenter;
 import android.text.TextUtils;
 
-import de.nicidienase.chaosflix.entities.Event;
+import de.nicidienase.chaosflix.entities.recording.Event;
 
 /**
  * Created by felix on 18.03.17.
diff --git a/app/src/main/java/de/nicidienase/chaosflix/ItemViewClickedListener.java b/app/src/main/java/de/nicidienase/chaosflix/ItemViewClickedListener.java
index 7fa4a0aa..204fd6d2 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/ItemViewClickedListener.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/ItemViewClickedListener.java
@@ -14,8 +14,8 @@ import android.support.v4.app.ActivityOptionsCompat;
 import de.nicidienase.chaosflix.activities.DetailsActivity;
 import de.nicidienase.chaosflix.activities.EventDetailsActivity;
 import de.nicidienase.chaosflix.activities.EventsActivity;
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Event;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Event;
 
 /**
  * Created by felix on 21.03.17.
diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/PlaybackOverlayActivity.java b/app/src/main/java/de/nicidienase/chaosflix/activities/PlaybackOverlayActivity.java
index a51ad4f9..5a51b40d 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/PlaybackOverlayActivity.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/PlaybackOverlayActivity.java
@@ -30,8 +30,8 @@ import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 
 import de.nicidienase.chaosflix.R;
-import de.nicidienase.chaosflix.entities.Event;
-import de.nicidienase.chaosflix.entities.Recording;
+import de.nicidienase.chaosflix.entities.recording.Event;
+import de.nicidienase.chaosflix.entities.recording.Recording;
 import de.nicidienase.chaosflix.fragments.PlaybackOverlayFragment;
 
 /**
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Conference.java b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conference.java
similarity index 98%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Conference.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conference.java
index 25c3bdcd..122b917a 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Conference.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conference.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.recording;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -10,7 +10,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by felix on 11.03.17.
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Conferences.java b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conferences.java
similarity index 98%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Conferences.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conferences.java
index 4da828fe..0df4765e 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Conferences.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conferences.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.recording;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Event.java b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Event.java
similarity index 99%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Event.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/recording/Event.java
index 776f98e5..73d4c7c3 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Event.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Event.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.recording;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Recording.java b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Recording.java
similarity index 98%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Recording.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/recording/Recording.java
index 88b69e07..461b10fe 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Recording.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/recording/Recording.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.recording;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Group.java b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Group.java
similarity index 81%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Group.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Group.java
index 0c7316ca..60a876c3 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Group.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Group.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.streaming;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import java.util.List;
  * Created by felix on 23.03.17.
  */
 
-class Group {
+public class Group {
 	String group;
 	List<Room> rooms;
 
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/StreamingConference.java b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/LiveConference.java
similarity index 89%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/StreamingConference.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/streaming/LiveConference.java
index 6c8e6d03..d276abd1 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/StreamingConference.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/LiveConference.java
@@ -1,12 +1,14 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.streaming;
 
 import java.util.List;
 
+import de.nicidienase.chaosflix.entities.streaming.Group;
+
 /**
  * Created by felix on 23.03.17.
  */
 
-public class StreamingConference {
+public class LiveConference {
 	String conference;
 	String slug;
 	String author;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Room.java b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Room.java
similarity index 92%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Room.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Room.java
index 6af40c66..2949b7ce 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Room.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Room.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.streaming;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import java.util.List;
  * Created by felix on 23.03.17.
  */
 
-class Room {
+public class Room {
 	String slug;
 	String shedulename;
 	String thumb;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/Stream.java b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Stream.java
similarity index 94%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/Stream.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Stream.java
index 3a42c782..83940b18 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/Stream.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Stream.java
@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.streaming;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/de/nicidienase/chaosflix/entities/StreamUrl.java b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/StreamUrl.java
similarity index 84%
rename from app/src/main/java/de/nicidienase/chaosflix/entities/StreamUrl.java
rename to app/src/main/java/de/nicidienase/chaosflix/entities/streaming/StreamUrl.java
index f0183e5b..52ee59cf 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/entities/StreamUrl.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/entities/streaming/StreamUrl.java
@@ -1,10 +1,10 @@
-package de.nicidienase.chaosflix.entities;
+package de.nicidienase.chaosflix.entities.streaming;
 
 /**
  * Created by felix on 23.03.17.
  */
 
-class StreamUrl {
+public class StreamUrl {
 	String display;
 	String tech;
 	String url;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
index 16cd3298..b992cd5f 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
@@ -16,8 +16,10 @@ import java.util.Set;
 import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
 import de.nicidienase.chaosflix.R;
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Conferences;
+import de.nicidienase.chaosflix.activities.ConferencesActivity;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Conferences;
+import de.nicidienase.chaosflix.network.MediaApiService;
 import de.nicidienase.chaosflix.network.RecordingClient;
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
index 6f2d6584..266a99b3 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
@@ -12,8 +12,8 @@ import java.util.List;
 
 import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Conferences;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Conferences;
 import de.nicidienase.chaosflix.network.RecordingClient;
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
index d457a395..2fe8c1f4 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
@@ -49,8 +49,8 @@ import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
 import de.nicidienase.chaosflix.R;
 import de.nicidienase.chaosflix.activities.EventsActivity;
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Event;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Event;
 import de.nicidienase.chaosflix.network.RecordingClient;
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
index 381ce99f..84a10069 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
@@ -39,9 +39,9 @@ import de.nicidienase.chaosflix.R;
 import de.nicidienase.chaosflix.activities.DetailsActivity;
 import de.nicidienase.chaosflix.activities.EventDetailsActivity;
 import de.nicidienase.chaosflix.activities.PlaybackOverlayActivity;
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Event;
-import de.nicidienase.chaosflix.entities.Recording;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Event;
+import de.nicidienase.chaosflix.entities.recording.Recording;
 import de.nicidienase.chaosflix.network.RecordingClient;
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/PlaybackOverlayFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/PlaybackOverlayFragment.java
index 5698db25..31d2c6b0 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/PlaybackOverlayFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/PlaybackOverlayFragment.java
@@ -52,8 +52,8 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import java.util.HashMap;
 
 import de.nicidienase.chaosflix.activities.DetailsActivity;
-import de.nicidienase.chaosflix.entities.Event;
-import de.nicidienase.chaosflix.entities.Recording;
+import de.nicidienase.chaosflix.entities.recording.Event;
+import de.nicidienase.chaosflix.entities.recording.Recording;
 import de.nicidienase.chaosflix.network.RecordingClient;
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/network/MediaApiService.java b/app/src/main/java/de/nicidienase/chaosflix/network/MediaApiService.java
index cad31d61..cdedb27f 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/network/MediaApiService.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/network/MediaApiService.java
@@ -7,6 +7,11 @@ import android.os.IBinder;
 import android.support.annotation.Nullable;
 
 import de.nicidienase.chaosflix.R;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Conferences;
+import de.nicidienase.chaosflix.entities.recording.Event;
+import de.nicidienase.chaosflix.entities.recording.Recording;
+import de.nicidienase.chaosflix.entities.streaming.LiveConference;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/network/RecordingClient.java b/app/src/main/java/de/nicidienase/chaosflix/network/RecordingClient.java
index 4e76cb0d..bc06b285 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/network/RecordingClient.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/network/RecordingClient.java
@@ -1,15 +1,11 @@
 package de.nicidienase.chaosflix.network;
 
-import android.util.Log;
-
-import java.io.IOException;
 import java.util.List;
 
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Conferences;
-import de.nicidienase.chaosflix.entities.Event;
-import de.nicidienase.chaosflix.entities.Recording;
-import retrofit2.Call;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Conferences;
+import de.nicidienase.chaosflix.entities.recording.Event;
+import de.nicidienase.chaosflix.entities.recording.Recording;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.http.Path;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/network/RecordingService.java b/app/src/main/java/de/nicidienase/chaosflix/network/RecordingService.java
index 9dbabcd5..416db8d8 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/network/RecordingService.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/network/RecordingService.java
@@ -2,11 +2,11 @@ package de.nicidienase.chaosflix.network;
 
 import java.util.List;
 
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Conferences;
-import de.nicidienase.chaosflix.entities.Event;
-import de.nicidienase.chaosflix.entities.Recording;
-import retrofit2.Call;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Conferences;
+import de.nicidienase.chaosflix.entities.recording.Event;
+import de.nicidienase.chaosflix.entities.recording.Recording;
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
 
diff --git a/app/src/main/java/de/nicidienase/chaosflix/network/StreamingClient.java b/app/src/main/java/de/nicidienase/chaosflix/network/StreamingClient.java
index 37029bc7..5ae14c85 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/network/StreamingClient.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/network/StreamingClient.java
@@ -2,8 +2,7 @@ package de.nicidienase.chaosflix.network;
 
 import java.util.List;
 
-import de.nicidienase.chaosflix.entities.StreamingConference;
-import retrofit2.Call;
+import de.nicidienase.chaosflix.entities.streaming.LiveConference;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
diff --git a/app/src/main/java/de/nicidienase/chaosflix/network/StreamingService.java b/app/src/main/java/de/nicidienase/chaosflix/network/StreamingService.java
index b73a4f6e..997af2fe 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/network/StreamingService.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/network/StreamingService.java
@@ -2,8 +2,8 @@ package de.nicidienase.chaosflix.network;
 
 import java.util.List;
 
-import de.nicidienase.chaosflix.entities.StreamingConference;
-import retrofit2.Call;
+import de.nicidienase.chaosflix.entities.streaming.LiveConference;
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 
 /**
diff --git a/app/src/test/java/de/nicidienase/chaosflix/RecordingClientTest.java b/app/src/test/java/de/nicidienase/chaosflix/RecordingClientTest.java
index 74a1a925..182976bd 100644
--- a/app/src/test/java/de/nicidienase/chaosflix/RecordingClientTest.java
+++ b/app/src/test/java/de/nicidienase/chaosflix/RecordingClientTest.java
@@ -10,14 +10,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
-import de.nicidienase.chaosflix.entities.Conference;
-import de.nicidienase.chaosflix.entities.Conferences;
-import de.nicidienase.chaosflix.entities.Event;
-import de.nicidienase.chaosflix.entities.Recording;
+import de.nicidienase.chaosflix.entities.recording.Conference;
+import de.nicidienase.chaosflix.entities.recording.Event;
 import de.nicidienase.chaosflix.network.RecordingClient;
 
 /**
diff --git a/app/src/test/java/de/nicidienase/chaosflix/StreamingClientTest.java b/app/src/test/java/de/nicidienase/chaosflix/StreamingClientTest.java
index dd3261f2..b789559e 100644
--- a/app/src/test/java/de/nicidienase/chaosflix/StreamingClientTest.java
+++ b/app/src/test/java/de/nicidienase/chaosflix/StreamingClientTest.java
@@ -9,7 +9,7 @@ import static org.junit.Assert.*;
 import java.io.IOException;
 import java.util.List;
 
-import de.nicidienase.chaosflix.entities.StreamingConference;
+import de.nicidienase.chaosflix.entities.streaming.LiveConference;
 import de.nicidienase.chaosflix.network.StreamingClient;
 import de.nicidienase.chaosflix.network.StreamingService;
 import okhttp3.mockwebserver.MockResponse;