diff --git a/src/de/danoeh/antennapod/AppConfig.java b/src/de/danoeh/antennapod/AppConfig.java
index ab3626388..7aab19fd3 100644
--- a/src/de/danoeh/antennapod/AppConfig.java
+++ b/src/de/danoeh/antennapod/AppConfig.java
@@ -1,5 +1,5 @@
 package de.danoeh.antennapod;
 
 public final class AppConfig {
-    public final static boolean DEBUG = false;
+    public final static boolean DEBUG = true;
 }
diff --git a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 8f5f14f9f..2f8e159ad 100644
--- a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -13,8 +13,8 @@ import com.actionbarsherlock.view.MenuItem;
 import de.danoeh.antennapod.asynctask.FeedImageLoader;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedManager;
-import de.danoeh.antennapod.util.FeedMenuHandler;
 import de.danoeh.antennapod.util.LangUtils;
+import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 
diff --git a/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
index 9883882f9..a65dbbf39 100644
--- a/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
+++ b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
@@ -20,8 +20,8 @@ import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.fragment.FeedlistFragment;
 import de.danoeh.antennapod.fragment.ItemlistFragment;
-import de.danoeh.antennapod.util.FeedMenuHandler;
 import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
 
 /** Displays a List of FeedItems */
 public class FeedItemlistActivity extends SherlockFragmentActivity {
diff --git a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index 339cb3e3f..81f002aca 100644
--- a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -14,7 +14,7 @@ import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.danoeh.antennapod.util.FlattrUtils;
+import de.danoeh.antennapod.util.flattr.FlattrUtils;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 
diff --git a/src/de/danoeh/antennapod/activity/ItemviewActivity.java b/src/de/danoeh/antennapod/activity/ItemviewActivity.java
index 90bbee72e..58105554d 100644
--- a/src/de/danoeh/antennapod/activity/ItemviewActivity.java
+++ b/src/de/danoeh/antennapod/activity/ItemviewActivity.java
@@ -24,8 +24,8 @@ import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.fragment.FeedlistFragment;
 import de.danoeh.antennapod.fragment.ItemDescriptionFragment;
 import de.danoeh.antennapod.fragment.ItemlistFragment;
-import de.danoeh.antennapod.util.FeedItemMenuHandler;
 import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
 
 /** Displays a single FeedItem and provides various actions */
 public class ItemviewActivity extends SherlockFragmentActivity {
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 2338dba53..309f658a2 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -55,9 +55,9 @@ import de.danoeh.antennapod.fragment.ItemDescriptionFragment;
 import de.danoeh.antennapod.service.PlaybackService;
 import de.danoeh.antennapod.service.PlayerStatus;
 import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.FeedItemMenuHandler;
 import de.danoeh.antennapod.util.MediaPlayerError;
 import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
 
 public class MediaplayerActivity extends SherlockFragmentActivity implements
 		SurfaceHolder.Callback {
diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
index d9d00ce2e..af1b1dbae 100644
--- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -11,7 +11,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.util.FlattrUtils;
+import de.danoeh.antennapod.util.flattr.FlattrUtils;
 
 public class PreferenceActivity extends SherlockPreferenceActivity {
 	private static final String TAG = "PreferenceActivity";
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
index 4cf496eab..c0d0b10bc 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
@@ -8,7 +8,7 @@ import android.util.Log;
 import android.widget.Toast;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.util.FlattrUtils;
+import de.danoeh.antennapod.util.flattr.FlattrUtils;
 
 /** Performs a click action in a background thread. */
 /*
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java b/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
index 7873cadf3..b61f88a50 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
@@ -9,7 +9,7 @@ import android.os.AsyncTask;
 import android.util.Log;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.util.FlattrUtils;
+import de.danoeh.antennapod.util.flattr.FlattrUtils;
 
 /** Fetches the access token in the background in order to avoid networkOnMainThread exception. */
 /*
diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index 4c30ca788..9deb28193 100644
--- a/src/de/danoeh/antennapod/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -11,8 +11,8 @@ import de.danoeh.antennapod.activity.MediaplayerActivity;
 import de.danoeh.antennapod.asynctask.DownloadStatus;
 import de.danoeh.antennapod.service.PlaybackService;
 import de.danoeh.antennapod.storage.*;
-import de.danoeh.antennapod.util.FeedItemPubdateComparator;
 import de.danoeh.antennapod.util.FeedtitleComparator;
+import de.danoeh.antennapod.util.comparator.FeedItemPubdateComparator;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
diff --git a/src/de/danoeh/antennapod/feed/FeedSearcher.java b/src/de/danoeh/antennapod/feed/FeedSearcher.java
index ff8457934..cb98e3bee 100644
--- a/src/de/danoeh/antennapod/feed/FeedSearcher.java
+++ b/src/de/danoeh/antennapod/feed/FeedSearcher.java
@@ -10,7 +10,7 @@ import android.util.Log;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.util.SearchResultValueComparator;
+import de.danoeh.antennapod.util.comparator.SearchResultValueComparator;
 
 /** Performs search on Feeds and FeedItems */
 public class FeedSearcher {
diff --git a/src/de/danoeh/antennapod/fragment/FeedlistFragment.java b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
index ae16fad4c..aef5f2115 100644
--- a/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
@@ -6,7 +6,7 @@ import de.danoeh.antennapod.asynctask.FeedRemover;
 import de.danoeh.antennapod.feed.*;
 import de.danoeh.antennapod.service.DownloadService;
 import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.FeedMenuHandler;
+import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 import android.os.AsyncTask;
diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 9d440a121..151838147 100644
--- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -28,7 +28,7 @@ import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.service.DownloadService;
 import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.FeedItemMenuHandler;
+import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 
diff --git a/src/de/danoeh/antennapod/util/FeedItemPubdateComparator.java b/src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
similarity index 91%
rename from src/de/danoeh/antennapod/util/FeedItemPubdateComparator.java
rename to src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
index bfeaf59e8..b9ee6c07e 100644
--- a/src/de/danoeh/antennapod/util/FeedItemPubdateComparator.java
+++ b/src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.util.comparator;
 
 import java.util.Comparator;
 
diff --git a/src/de/danoeh/antennapod/util/SearchResultValueComparator.java b/src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
similarity index 85%
rename from src/de/danoeh/antennapod/util/SearchResultValueComparator.java
rename to src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
index 4bbfac666..ab7d47673 100644
--- a/src/de/danoeh/antennapod/util/SearchResultValueComparator.java
+++ b/src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.util.comparator;
 
 import java.util.Comparator;
 
diff --git a/src/de/danoeh/antennapod/util/FlattrServiceCreator.java b/src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
similarity index 94%
rename from src/de/danoeh/antennapod/util/FlattrServiceCreator.java
rename to src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
index 99aaa82e8..97c4c6c6b 100644
--- a/src/de/danoeh/antennapod/util/FlattrServiceCreator.java
+++ b/src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
@@ -1,3 +1,4 @@
+package de.danoeh.antennapod.util.flattr;
 /*
 package de.danoeh.antennapod.util;
 
diff --git a/src/de/danoeh/antennapod/util/FlattrUtils.java b/src/de/danoeh/antennapod/util/flattr/FlattrUtils.java
similarity index 99%
rename from src/de/danoeh/antennapod/util/FlattrUtils.java
rename to src/de/danoeh/antennapod/util/flattr/FlattrUtils.java
index b72d71ff1..eff0dc49b 100644
--- a/src/de/danoeh/antennapod/util/FlattrUtils.java
+++ b/src/de/danoeh/antennapod/util/flattr/FlattrUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.util.flattr;
 
 import java.util.EnumSet;
 
diff --git a/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
similarity index 97%
rename from src/de/danoeh/antennapod/util/FeedItemMenuHandler.java
rename to src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index c8c6d9eb3..9cdb7d519 100644
--- a/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.util.menuhandler;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,6 +12,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.ShareUtils;
 
 /** Handles interactions with the FeedItemMenu. */
 public class FeedItemMenuHandler {
diff --git a/src/de/danoeh/antennapod/util/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
similarity index 96%
rename from src/de/danoeh/antennapod/util/FeedMenuHandler.java
rename to src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
index 2c24c973c..35e22ebee 100644
--- a/src/de/danoeh/antennapod/util/FeedMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.util.menuhandler;
 
 import android.content.Context;
 import android.content.Intent;
@@ -16,6 +16,7 @@ import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.service.DownloadService;
 import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.ShareUtils;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;