diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryListFragmentTest.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryListFragmentTest.java
index 93f8eca..5b9ac48 100644
--- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryListFragmentTest.java
+++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryListFragmentTest.java
@@ -31,7 +31,7 @@ import org.xbmc.kore.R;
 import org.xbmc.kore.testhelpers.EspressoTestUtils;
 import org.xbmc.kore.testhelpers.LoaderIdlingResource;
 import org.xbmc.kore.testhelpers.Utils;
-import org.xbmc.kore.ui.MoviesActivity;
+import org.xbmc.kore.ui.sections.video.MoviesActivity;
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest
diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryViewPagerTest.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryViewPagerTest.java
index 1ecbc40..13a2182 100644
--- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryViewPagerTest.java
+++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/RestoreSearchQueryViewPagerTest.java
@@ -32,7 +32,7 @@ import org.xbmc.kore.R;
 import org.xbmc.kore.testhelpers.EspressoTestUtils;
 import org.xbmc.kore.testhelpers.LoaderIdlingResource;
 import org.xbmc.kore.testhelpers.Utils;
-import org.xbmc.kore.ui.MusicActivity;
+import org.xbmc.kore.ui.sections.audio.MusicActivity;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d121875..025c6c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
 
         <!-- Activities -->
         <activity
-            android:name="org.xbmc.kore.ui.RemoteActivity"
+            android:name="org.xbmc.kore.ui.sections.remote.RemoteActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -51,17 +51,17 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.xbmc.kore.ui.hosts.HostManagerActivity"/>
-        <activity android:name="org.xbmc.kore.ui.hosts.AddHostActivity"/>
-        <activity android:name="org.xbmc.kore.ui.hosts.EditHostActivity"/>
-        <activity android:name="org.xbmc.kore.ui.MoviesActivity"/>
-        <activity android:name="org.xbmc.kore.ui.TVShowsActivity"/>
-        <activity android:name="org.xbmc.kore.ui.MusicActivity"/>
-        <activity android:name="org.xbmc.kore.ui.AddonsActivity"/>
-        <activity android:name="org.xbmc.kore.ui.SettingsActivity"/>
-        <activity android:name="org.xbmc.kore.ui.FileActivity"/>
-        <activity android:name="org.xbmc.kore.ui.PVRActivity"/>
-        <activity android:name="org.xbmc.kore.ui.AllCastActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.hosts.HostManagerActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.hosts.AddHostActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.hosts.EditHostActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.video.MoviesActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.video.TVShowsActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.audio.MusicActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.addon.AddonsActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.settings.SettingsActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.file.FileActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.video.PVRActivity"/>
+        <activity android:name="org.xbmc.kore.ui.sections.video.AllCastActivity"/>
 
         <!-- Providers -->
         <provider
diff --git a/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java b/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java
index 318ccba..f3e7ecd 100644
--- a/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java
+++ b/app/src/main/java/org/xbmc/kore/service/NotificationObserver.java
@@ -19,14 +19,12 @@ import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
 import android.view.View;
@@ -39,7 +37,7 @@ import org.xbmc.kore.host.HostConnectionObserver;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.jsonrpc.type.PlayerType;
-import org.xbmc.kore.ui.RemoteActivity;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.CharacterDrawable;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java
index 7e26e8e..92cbe31 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java
@@ -187,4 +187,12 @@ public abstract class AbstractListFragment extends Fragment {
 	public BaseAdapter getAdapter() {
 		return adapter;
 	}
+
+	/**
+	 * Returns the view that is displayed when the gridview has no items to show
+	 * @return
+	 */
+	public TextView getEmptyView() {
+		return emptyView;
+	}
 }
diff --git a/app/src/main/java/org/xbmc/kore/ui/GenericSelectDialog.java b/app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/GenericSelectDialog.java
rename to app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java
index 6e3bfde..8dae043 100644
--- a/app/src/main/java/org/xbmc/kore/ui/GenericSelectDialog.java
+++ b/app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.generic;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/org/xbmc/kore/ui/NavigationDrawerFragment.java b/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/NavigationDrawerFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
index 92bbd96..aeadfc3 100644
--- a/app/src/main/java/org/xbmc/kore/ui/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.generic;
 
 import android.animation.ValueAnimator;
 import android.app.Activity;
@@ -45,7 +45,15 @@ import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;
-import org.xbmc.kore.ui.hosts.HostManagerActivity;
+import org.xbmc.kore.ui.sections.addon.AddonsActivity;
+import org.xbmc.kore.ui.sections.audio.MusicActivity;
+import org.xbmc.kore.ui.sections.file.FileActivity;
+import org.xbmc.kore.ui.sections.hosts.HostManagerActivity;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
+import org.xbmc.kore.ui.sections.settings.SettingsActivity;
+import org.xbmc.kore.ui.sections.video.MoviesActivity;
+import org.xbmc.kore.ui.sections.video.PVRActivity;
+import org.xbmc.kore.ui.sections.video.TVShowsActivity;
 import org.xbmc.kore.utils.LogUtils;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/xbmc/kore/ui/SendTextDialogFragment.java b/app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/SendTextDialogFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java
index 37ecc98..d5ba51c 100644
--- a/app/src/main/java/org/xbmc/kore/ui/SendTextDialogFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.generic;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AddonDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/AddonDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonDetailsFragment.java
index daab446..c360377 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AddonDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonDetailsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.addon;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -22,7 +22,6 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AddonListContainerFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListContainerFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/AddonListContainerFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListContainerFragment.java
index 690bdb2..e9d32a3 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AddonListContainerFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListContainerFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.addon;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -27,6 +27,7 @@ import android.view.ViewGroup;
 import com.astuetz.PagerSlidingTabStrip;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.sections.file.MediaFileListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.TabsAdapter;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AddonListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/AddonListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
index bfee6b8..b92025b 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AddonListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.addon;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonOverviewFragment.java
similarity index 96%
rename from app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonOverviewFragment.java
index b15c668..52f0481 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonOverviewFragment.java
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.addon;
 
 import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
@@ -28,15 +26,12 @@ import android.view.ViewGroup;
 import com.astuetz.PagerSlidingTabStrip;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.sections.file.MediaFileListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.TabsAdapter;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/AddonsActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/AddonsActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java
index 18d3a88..afb5bb9 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AddonsActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.addon;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -30,6 +30,9 @@ import android.view.View;
 import android.view.Window;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.Utils;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/SharedElementFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java
similarity index 81%
rename from app/src/main/java/org/xbmc/kore/ui/SharedElementFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java
index 19c56ce..a786042 100644
--- a/app/src/main/java/org/xbmc/kore/ui/SharedElementFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java
@@ -1,4 +1,4 @@
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.addon;
 
 import android.support.v4.app.Fragment;
 import android.view.View;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumDetailsFragment.java
index affa858..65125d0 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumDetailsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.content.res.Resources;
@@ -58,6 +58,7 @@ import org.xbmc.kore.jsonrpc.method.Player;
 import org.xbmc.kore.jsonrpc.method.Playlist;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
+import org.xbmc.kore.ui.AbstractDetailsFragment;
 import org.xbmc.kore.utils.FileDownloadHelper;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AlbumListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/AlbumListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
index 6d0122f..745e286 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AlbumListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -46,6 +46,7 @@ import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/ArtistDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/ArtistDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistDetailsFragment.java
index cd2de63..1e02707 100644
--- a/app/src/main/java/org/xbmc/kore/ui/ArtistDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistDetailsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.os.Bundle;
diff --git a/app/src/main/java/org/xbmc/kore/ui/ArtistListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/ArtistListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java
index 9d1d63c..16f8e07 100644
--- a/app/src/main/java/org/xbmc/kore/ui/ArtistListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -40,6 +40,7 @@ import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/ArtistOverviewFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistOverviewFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/ArtistOverviewFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistOverviewFragment.java
index 9ba9782..27b3680 100644
--- a/app/src/main/java/org/xbmc/kore/ui/ArtistOverviewFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistOverviewFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.content.DialogInterface;
@@ -55,6 +55,7 @@ import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.provider.MediaProvider;
+import org.xbmc.kore.ui.AbstractDetailsFragment;
 import org.xbmc.kore.utils.FileDownloadHelper;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AudioGenresListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/AudioGenresListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java
index 608c20a..f7d2f57 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AudioGenresListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.app.Activity;
 import android.content.Context;
@@ -38,6 +38,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/MusicActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/MusicActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java
index ac251ed..d0f6044 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MusicActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -30,6 +30,9 @@ import android.view.MenuItem;
 import android.view.View;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.Utils;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/MusicListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/MusicListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java
index 8b9b296..2f8e095 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MusicListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -25,6 +25,7 @@ import android.view.ViewGroup;
 import com.astuetz.PagerSlidingTabStrip;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.TabsAdapter;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/MusicVideoDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/MusicVideoDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoDetailsFragment.java
index 27e80a6..90b64d4 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MusicVideoDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoDetailsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -54,6 +54,7 @@ import org.xbmc.kore.jsonrpc.method.Playlist;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractDetailsFragment;
 import org.xbmc.kore.utils.FileDownloadHelper;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/MusicVideoListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/MusicVideoListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java
index 043adca..ba575d6 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MusicVideoListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -37,6 +37,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/SongsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/SongsListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java
index 4aa17de..1b5968e 100644
--- a/app/src/main/java/org/xbmc/kore/ui/SongsListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -46,12 +46,12 @@ import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.provider.MediaProvider;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.FileDownloadHelper;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
 
-import java.io.File;
 import java.util.ArrayList;
 
 /**
diff --git a/app/src/main/java/org/xbmc/kore/ui/FileActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java
similarity index 94%
rename from app/src/main/java/org/xbmc/kore/ui/FileActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java
index 619c950..b46c5ec 100644
--- a/app/src/main/java/org/xbmc/kore/ui/FileActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.file;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -27,6 +27,10 @@ import android.view.MenuItem;
 import android.view.Window;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.OnBackPressedListener;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.Utils;
 
 /**
diff --git a/app/src/main/java/org/xbmc/kore/ui/FileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/file/FileListFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/FileListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/file/FileListFragment.java
index 69c8b70..af6a70b 100644
--- a/app/src/main/java/org/xbmc/kore/ui/FileListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/file/FileListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.file;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -25,6 +25,7 @@ import android.view.ViewGroup;
 import com.astuetz.PagerSlidingTabStrip;
 import org.xbmc.kore.R;
 import org.xbmc.kore.jsonrpc.method.Files;
+import org.xbmc.kore.ui.OnBackPressedListener;
 import org.xbmc.kore.utils.TabsAdapter;
 
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java
index 7e29f90..09ffe8d 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.file;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -44,6 +44,7 @@ import org.xbmc.kore.jsonrpc.type.ItemType;
 import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.jsonrpc.type.PlayerType;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
+import org.xbmc.kore.ui.AbstractListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
@@ -142,7 +143,7 @@ public class MediaFileListFragment extends AbstractListFragment {
 
         hostManager = HostManager.getInstance(getActivity());
 
-        emptyView.setOnClickListener(new View.OnClickListener() {
+        getEmptyView().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (!atRootDirectory())
@@ -242,7 +243,7 @@ public class MediaFileListFragment extends AbstractListFragment {
                 }
 
                 browseRootAlready = true;
-                emptyView.setText(getString(R.string.source_empty));
+                getEmptyView().setText(getString(R.string.source_empty));
                 ((MediaFileListAdapter) getAdapter()).setFilelistItems(rootFileLocation);
             }
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/AddHostActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java
index 9c5f3ae..cc1f8c9 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -26,7 +26,7 @@ import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.ui.BaseActivity;
-import org.xbmc.kore.ui.RemoteActivity;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 
 /**
  * Add host wizard.
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentFinish.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentFinish.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java
index 8f48ebb..63f3eb0 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentFinish.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.app.Activity;
 import android.content.Context;
@@ -39,7 +39,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.HostConnection;
 import org.xbmc.kore.service.library.LibrarySyncService;
-import org.xbmc.kore.ui.NavigationDrawerFragment;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentWelcome.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentWelcome.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java
index 744e4c4..0b13404 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentWelcome.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentZeroconf.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentZeroconf.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java
index bd4867c..4f43e6b 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentZeroconf.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java
index 91128d2..ea0c126 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -26,7 +26,6 @@ import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.ui.BaseActivity;
-import org.xbmc.kore.utils.LogUtils;
 
 /**
  * Edits a host
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/HostFragmentManualConfiguration.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/HostFragmentManualConfiguration.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java
index 266f030..69ad956 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/HostFragmentManualConfiguration.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -33,7 +32,6 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import org.xbmc.kore.R;
-import org.xbmc.kore.Settings;
 import org.xbmc.kore.eventclient.EventServerConnection;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.jsonrpc.ApiCallback;
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/HostListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/HostListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java
index 5cd78d5..171ed5b 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/HostListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -44,7 +44,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.HostConnection;
 import org.xbmc.kore.jsonrpc.method.JSONRPC;
-import org.xbmc.kore.ui.RemoteActivity;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/HostManagerActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java
similarity index 96%
rename from app/src/main/java/org/xbmc/kore/ui/hosts/HostManagerActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java
index 090eeae..73595c7 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/HostManagerActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui.hosts;
+package org.xbmc.kore.ui.sections.hosts;
 
 
 import android.os.Bundle;
@@ -25,7 +25,7 @@ import android.view.MenuItem;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseActivity;
-import org.xbmc.kore.ui.NavigationDrawerFragment;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
 import org.xbmc.kore.utils.LogUtils;
 
 /**
diff --git a/app/src/main/java/org/xbmc/kore/ui/NowPlayingFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/NowPlayingFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
index 57c48e5..b83ebd7 100644
--- a/app/src/main/java/org/xbmc/kore/ui/NowPlayingFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.remote;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -54,8 +54,9 @@ import org.xbmc.kore.jsonrpc.type.GlobalType;
 import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.jsonrpc.type.PlayerType;
 import org.xbmc.kore.jsonrpc.type.VideoType;
+import org.xbmc.kore.ui.generic.GenericSelectDialog;
+import org.xbmc.kore.ui.sections.video.AllCastActivity;
 import org.xbmc.kore.utils.LogUtils;
-import org.xbmc.kore.utils.RepeatListener;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
 
@@ -72,7 +73,7 @@ import butterknife.OnClick;
 public class NowPlayingFragment extends Fragment
         implements HostConnectionObserver.PlayerEventsObserver,
                    HostConnectionObserver.ApplicationEventsObserver,
-                   GenericSelectDialog.GenericSelectDialogListener {
+        GenericSelectDialog.GenericSelectDialogListener {
     private static final String TAG = LogUtils.makeLogTag(NowPlayingFragment.class);
 
     /**
diff --git a/app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java
index 35c1f9e..18d85af 100644
--- a/app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.remote;
 
 import android.content.res.Resources;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java
index 8aed023..f92428d 100644
--- a/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.remote;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
@@ -28,8 +26,6 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -58,8 +54,10 @@ import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.jsonrpc.type.PlayerType;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.service.ConnectionObserversManagerService;
-import org.xbmc.kore.ui.hosts.AddHostActivity;
-import org.xbmc.kore.ui.hosts.AddHostFragmentFinish;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.generic.SendTextDialogFragment;
+import org.xbmc.kore.ui.sections.hosts.AddHostActivity;
 import org.xbmc.kore.ui.views.CirclePageIndicator;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.TabsAdapter;
diff --git a/app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java
index 40afef3..5e58923 100644
--- a/app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.remote;
 
 import android.annotation.TargetApi;
 import android.content.res.ColorStateList;
@@ -37,7 +37,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.eventclient.ButtonCodes;
@@ -49,11 +48,9 @@ import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.ApiMethod;
-import org.xbmc.kore.jsonrpc.method.Application;
 import org.xbmc.kore.jsonrpc.method.GUI;
 import org.xbmc.kore.jsonrpc.method.Input;
 import org.xbmc.kore.jsonrpc.method.Player;
-import org.xbmc.kore.jsonrpc.type.ApplicationType;
 import org.xbmc.kore.jsonrpc.type.GlobalType;
 import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.jsonrpc.type.PlayerType;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java
index aa7e506..7c26094 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2013, Antonio Mendes Silva
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.settings;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/org/xbmc/kore/ui/SettingsActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/SettingsActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java
index 5e059d3..c1a48ac 100644
--- a/app/src/main/java/org/xbmc/kore/ui/SettingsActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.settings;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
diff --git a/app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java
index c538091..d9de139 100644
--- a/app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.settings;
 
 import android.Manifest;
 import android.content.Intent;
@@ -35,6 +35,7 @@ import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.service.ConnectionObserversManagerService;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/AllCastActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/AllCastActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java
index 5fea986..9036ca6 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AllCastActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -38,6 +37,8 @@ import android.widget.TextView;
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.VideoType;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/MovieDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/MovieDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/MovieDetailsFragment.java
index 388de63..3877a05 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MovieDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieDetailsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -57,6 +57,7 @@ import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.jsonrpc.type.VideoType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractDetailsFragment;
 import org.xbmc.kore.utils.FileDownloadHelper;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/MovieListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/MovieListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
index d0d427b..6dbebb7 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MovieListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -43,6 +43,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/MoviesActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/MoviesActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java
index 9df0d78..6d09231 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MoviesActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -30,6 +30,9 @@ import android.view.View;
 import android.view.Window;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.Utils;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/PVRActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/PVRActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java
index 0be2b72..4010597 100644
--- a/app/src/main/java/org/xbmc/kore/ui/PVRActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -28,6 +28,9 @@ import android.view.MenuItem;
 import android.view.Window;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.Utils;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/PVRChannelEPGListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/PVRChannelEPGListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java
index 7b9dbc5..8917889 100644
--- a/app/src/main/java/org/xbmc/kore/ui/PVRChannelEPGListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -36,14 +36,10 @@ import org.xbmc.kore.jsonrpc.method.PVR;
 import org.xbmc.kore.jsonrpc.type.PVRType;
 import org.xbmc.kore.utils.LogUtils;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
diff --git a/app/src/main/java/org/xbmc/kore/ui/PVRChannelsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/PVRChannelsListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java
index d4119ee..381fc1e 100644
--- a/app/src/main/java/org/xbmc/kore/ui/PVRChannelsListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java
@@ -13,21 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.media.Image;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,13 +35,13 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.xbmc.kore.R;
-import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.ApiException;
 import org.xbmc.kore.jsonrpc.method.PVR;
 import org.xbmc.kore.jsonrpc.method.Player;
 import org.xbmc.kore.jsonrpc.type.PVRType;
+import org.xbmc.kore.ui.OnBackPressedListener;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/PVRListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/PVRListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java
index 597b59b..2fa6ad8 100644
--- a/app/src/main/java/org/xbmc/kore/ui/PVRListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -25,6 +25,7 @@ import android.view.ViewGroup;
 import com.astuetz.PagerSlidingTabStrip;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.OnBackPressedListener;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.TabsAdapter;
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/PVRRecordingsListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java
similarity index 97%
rename from app/src/main/java/org/xbmc/kore/ui/PVRRecordingsListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java
index 3548125..2ab5af5 100644
--- a/app/src/main/java/org/xbmc/kore/ui/PVRRecordingsListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java
@@ -13,21 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -38,10 +32,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.xbmc.kore.R;
-import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;
-import org.xbmc.kore.jsonrpc.ApiException;
 import org.xbmc.kore.jsonrpc.method.PVR;
 import org.xbmc.kore.jsonrpc.method.Player;
 import org.xbmc.kore.jsonrpc.type.PVRType;
diff --git a/app/src/main/java/org/xbmc/kore/ui/TVShowDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/TVShowDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowDetailsFragment.java
index edeaf78..dd2eff5 100644
--- a/app/src/main/java/org/xbmc/kore/ui/TVShowDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowDetailsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -49,6 +49,7 @@ import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.jsonrpc.type.VideoType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractDetailsFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeDetailsFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeDetailsFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeDetailsFragment.java
index 0a86282..12e862a 100644
--- a/app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeDetailsFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeDetailsFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -53,6 +53,7 @@ import org.xbmc.kore.jsonrpc.method.VideoLibrary;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractDetailsFragment;
 import org.xbmc.kore.utils.FileDownloadHelper;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java
index 8f56d20..d8b8ab4 100644
--- a/app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -45,6 +45,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/TVShowListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
similarity index 99%
rename from app/src/main/java/org/xbmc/kore/ui/TVShowListFragment.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
index 7cdb5b4..141e76f 100644
--- a/app/src/main/java/org/xbmc/kore/ui/TVShowListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -43,6 +43,7 @@ import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.provider.MediaContract;
 import org.xbmc.kore.provider.MediaDatabase;
 import org.xbmc.kore.service.library.LibrarySyncService;
+import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
diff --git a/app/src/main/java/org/xbmc/kore/ui/TVShowsActivity.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java
similarity index 98%
rename from app/src/main/java/org/xbmc/kore/ui/TVShowsActivity.java
rename to app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java
index 8448416..97442f2 100644
--- a/app/src/main/java/org/xbmc/kore/ui/TVShowsActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.xbmc.kore.ui;
+package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -30,6 +30,9 @@ import android.view.View;
 import android.view.Window;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.ui.BaseActivity;
+import org.xbmc.kore.ui.generic.NavigationDrawerFragment;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.Utils;
 
diff --git a/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java b/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java
index 554bf35..29ad3b4 100644
--- a/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java
+++ b/app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java
@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
-import android.view.View;
 import android.widget.Toast;
 
 import org.xbmc.kore.R;
@@ -31,7 +30,7 @@ import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.method.Player;
 import org.xbmc.kore.jsonrpc.method.Playlist;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
-import org.xbmc.kore.ui.RemoteActivity;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/org/xbmc/kore/utils/UIUtils.java b/app/src/main/java/org/xbmc/kore/utils/UIUtils.java
index 9b010d3..a07e2da 100644
--- a/app/src/main/java/org/xbmc/kore/utils/UIUtils.java
+++ b/app/src/main/java/org/xbmc/kore/utils/UIUtils.java
@@ -47,7 +47,7 @@ import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.GlobalType;
 import org.xbmc.kore.jsonrpc.type.VideoType;
-import org.xbmc.kore.ui.RemoteActivity;
+import org.xbmc.kore.ui.sections.remote.RemoteActivity;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/app/src/main/res/layout/activity_all_cast.xml b/app/src/main/res/layout/activity_all_cast.xml
index b3bb555..c92ef18 100644
--- a/app/src/main/res/layout/activity_all_cast.xml
+++ b/app/src/main/res/layout/activity_all_cast.xml
@@ -49,6 +49,6 @@
               android:layout_width="@dimen/navigation_drawer_width"
               android:layout_height="match_parent"
               android:layout_gravity="start"
-              android:name="org.xbmc.kore.ui.NavigationDrawerFragment"/>
+              android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment"/>
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_host_manager.xml b/app/src/main/res/layout/activity_host_manager.xml
index 3230941..a3366ad 100644
--- a/app/src/main/res/layout/activity_host_manager.xml
+++ b/app/src/main/res/layout/activity_host_manager.xml
@@ -20,7 +20,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.xbmc.kore.ui.hosts.HostManagerActivity">
+    tools:context="org.xbmc.kore.ui.sections.hosts.HostManagerActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,13 +32,13 @@
         <fragment android:id="@+id/hosts_list"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
-                  android:name="org.xbmc.kore.ui.hosts.HostListFragment" />
+                  android:name="org.xbmc.kore.ui.sections.hosts.HostListFragment" />
     </LinearLayout>
 
     <fragment android:id="@+id/navigation_drawer"
               android:layout_width="@dimen/navigation_drawer_width"
               android:layout_height="match_parent"
               android:layout_gravity="start"
-              android:name="org.xbmc.kore.ui.NavigationDrawerFragment" />
+              android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment" />
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_remote.xml b/app/src/main/res/layout/activity_remote.xml
index 5ed3622..12fcd9f 100644
--- a/app/src/main/res/layout/activity_remote.xml
+++ b/app/src/main/res/layout/activity_remote.xml
@@ -59,6 +59,6 @@
               android:layout_width="@dimen/navigation_drawer_width"
               android:layout_height="match_parent"
               android:layout_gravity="start"
-              android:name="org.xbmc.kore.ui.NavigationDrawerFragment"/>
+              android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment"/>
 
 </android.support.v4.widget.DrawerLayout>