Moved non-gui classes to 'core' package

225 files changed, 846 insertions, 876 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
index 971a79a81..14a3b27b0 100644
--- a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
@@ -2,10 +2,10 @@ package de.test.antennapod.gpodnet;
 
 import android.test.AndroidTestCase;
 
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetDevice;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetTag;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
index 3fe42dfd0..52067c971 100644
--- a/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
@@ -2,9 +2,9 @@ package de.test.antennapod.handler;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.syndication.handler.FeedHandler;
-import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.syndication.handler.FeedHandler;
+import de.danoeh.antennapod.core.syndication.handler.UnsupportedFeedtypeException;
 import de.test.antennapod.util.syndication.feedgenerator.AtomGenerator;
 import de.test.antennapod.util.syndication.feedgenerator.FeedGenerator;
 import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
diff --git a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
index 575bbb998..1a561f282 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
@@ -2,12 +2,12 @@ package de.test.antennapod.service.download;
 
 import android.test.InstrumentationTestCase;
 import android.util.Log;
-import de.danoeh.antennapod.feed.FeedFile;
-import de.danoeh.antennapod.service.download.DownloadRequest;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.service.download.HttpDownloader;
-import de.danoeh.antennapod.util.DownloadError;
+import de.danoeh.antennapod.core.feed.FeedFile;
+import de.danoeh.antennapod.core.service.download.DownloadRequest;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.service.download.HttpDownloader;
+import de.danoeh.antennapod.core.util.DownloadError;
 import de.test.antennapod.util.service.download.HTTPBin;
 
 import java.io.File;
diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
index b7d30a7b8..aac4c245a 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
@@ -3,13 +3,13 @@ package de.test.antennapod.service.playback;
 import android.content.Context;
 import android.media.RemoteControlClient;
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.service.playback.PlaybackServiceMediaPlayer;
-import de.danoeh.antennapod.service.playback.PlayerStatus;
-import de.danoeh.antennapod.storage.PodDBAdapter;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.playback.Playable;
 import de.test.antennapod.util.service.download.HTTPBin;
 import junit.framework.AssertionFailedError;
 import org.apache.commons.io.IOUtils;
diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
index 86f609d74..81d684595 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
@@ -2,12 +2,12 @@ package de.test.antennapod.service.playback;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.service.playback.PlaybackServiceTaskManager;
-import de.danoeh.antennapod.storage.PodDBAdapter;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.service.playback.PlaybackServiceTaskManager;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
index fe337a5fb..63286d11d 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
@@ -2,14 +2,13 @@ package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.FeedItemStatistics;
-import de.danoeh.antennapod.storage.PodDBAdapter;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import static de.test.antennapod.storage.DBTestUtils.*;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.FeedItemStatistics;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
index 8859e50f9..fd5b1c393 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
@@ -4,14 +4,14 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.PodDBAdapter;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
index 947984574..e7d6396f5 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
@@ -1,12 +1,12 @@
 package de.test.antennapod.storage;
 
 import android.content.Context;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.PodDBAdapter;
-import de.danoeh.antennapod.util.comparator.FeedItemPubdateComparator;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 import junit.framework.Assert;
 
 import java.util.ArrayList;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
index c1e045b79..4678a843b 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
@@ -4,13 +4,13 @@ import android.content.Context;
 import android.database.Cursor;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index 9b98c5f89..3656582e1 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -9,8 +9,8 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
 /**
  * User interface tests for MainActivity
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
index 28271a52b..daae4bd62 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
@@ -9,12 +9,12 @@ import com.robotium.solo.Solo;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
 import java.util.List;
 
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index eac90e7c1..55fffb80a 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -6,8 +6,8 @@ import android.graphics.Bitmap;
 import android.os.Build;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import de.test.antennapod.util.service.download.HTTPBin;
 import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
 import junit.framework.Assert;
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
index e7782ff59..6c5a350de 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
@@ -1,8 +1,8 @@
 package de.test.antennapod.ui;
 
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
 import org.apache.http.HttpStatus;
 
 import java.io.File;
diff --git a/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java b/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java
index 9ab444a99..47fca41ba 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java
@@ -2,7 +2,7 @@ package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 
-import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.core.util.Converter;
 
 /**
  * Test class for converter
diff --git a/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
index bf7f57459..6d24fa526 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
@@ -3,7 +3,7 @@ package de.test.antennapod.util;
 import java.io.File;
 import java.io.IOException;
 
-import de.danoeh.antennapod.util.FileNameGenerator;
+import de.danoeh.antennapod.core.util.FileNameGenerator;
 import android.test.AndroidTestCase;
 
 public class FilenameGeneratorTest extends AndroidTestCase {
diff --git a/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
index 61d230295..7bdcfb898 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
@@ -1,7 +1,7 @@
 package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
-import de.danoeh.antennapod.util.URIUtil;
+import de.danoeh.antennapod.core.util.URIUtil;
 
 /**
  * Test class for URIUtil
diff --git a/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
index fd485e0da..d1bfb592a 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
@@ -1,7 +1,7 @@
 package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
-import de.danoeh.antennapod.util.URLChecker;
+import de.danoeh.antennapod.core.util.URLChecker;
 
 /**
  * Test class for URLChecker
diff --git a/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java b/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java
index c2b7ad316..2c56b71cc 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java
@@ -11,11 +11,11 @@ import org.jsoup.select.Elements;
 import java.util.Date;
 import java.util.List;
 
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.playback.Timeline;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.Timeline;
 
 /**
  * Test class for timeline
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
index 10414fd2a..4e5d0297f 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
@@ -1,7 +1,7 @@
 package de.test.antennapod.util.syndication;
 
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.util.syndication.FeedDiscoverer;
+import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
index 8ce6c08e4..69cc827ec 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
@@ -1,10 +1,10 @@
 package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.syndication.util.SyndDateUtils;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.syndication.util.SyndDateUtils;
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.IOException;
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
index 23518de87..fe5afd847 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
@@ -1,6 +1,6 @@
 package de.test.antennapod.util.syndication.feedgenerator;
 
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.Feed;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
index 6355d4bb9..d37434f06 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
@@ -1,9 +1,9 @@
 package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.syndication.util.SyndDateUtils;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.syndication.util.SyndDateUtils;
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.IOException;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65eac99ea..768a4abb0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
         android:name="de.danoeh.antennapod.PodcastApp"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:backupAgent=".backup.OpmlBackupAgent"
+        android:backupAgent=".core.backup.OpmlBackupAgent"
         android:restoreAnyVersion="true"
         android:logo="@drawable/ic_launcher"
         android:theme="@style/Theme.AntennaPod.Light">
@@ -75,16 +75,16 @@
             android:launchMode="singleInstance"/>
 
         <service
-            android:name=".service.download.DownloadService"
+            android:name=".core.service.download.DownloadService"
             android:enabled="true"/>
         <service
-            android:name=".service.playback.PlaybackService"
+            android:name=".core.service.playback.PlaybackService"
             android:enabled="true"
             android:exported="true">
         </service>
 
         <service
-            android:name=".service.GpodnetSyncService"
+            android:name=".core.service.GpodnetSyncService"
             android:enabled="true">
         </service>
 
@@ -98,7 +98,7 @@
         </activity>
 
         <receiver
-            android:name=".receiver.MediaButtonReceiver"
+            android:name=".core.receiver.MediaButtonReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON"/>
@@ -112,12 +112,12 @@
         </activity>
 
         <service
-            android:name=".service.playback.PlayerWidgetService"
+            android:name=".core.service.playback.PlayerWidgetService"
             android:enabled="true"
             android:exported="false">
         </service>
 
-        <receiver android:name=".receiver.PlayerWidget">
+        <receiver android:name=".core.receiver.PlayerWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
@@ -133,7 +133,7 @@
                 <action android:name="de.danoeh.antennapod.STOP_WIDGET_UPDATE"/>
             </intent-filter>
         </receiver>
-        <receiver android:name=".receiver.FeedUpdateReceiver">
+        <receiver android:name=".core.receiver.FeedUpdateReceiver">
             <intent-filter>
                 <action android:name="de.danoeh.antennapod.feedupdatereceiver.refreshFeeds"/>
             </intent-filter>
@@ -324,12 +324,12 @@
         </activity>
 
 
-        <receiver android:name=".receiver.ConnectivityActionReceiver">
+        <receiver android:name=".core.receiver.ConnectivityActionReceiver">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>
-        <receiver android:name=".receiver.AlarmUpdateReceiver">
+        <receiver android:name=".core.receiver.AlarmUpdateReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 74628f3d6..25aa9fb68 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -2,10 +2,10 @@ package de.danoeh.antennapod;
 
 import android.app.Application;
 import android.content.res.Configuration;
-import android.util.Log;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
+
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.spa.SPAUtil;
 
 /** Main application class. */
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 18d27ddda..5622bc987 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -31,23 +31,23 @@ import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.ChapterListAdapter;
 import de.danoeh.antennapod.adapter.NavListAdapter;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.feed.SimpleChapter;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.feed.SimpleChapter;
 import de.danoeh.antennapod.fragment.CoverFragment;
 import de.danoeh.antennapod.fragment.ItemDescriptionFragment;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
-import de.danoeh.antennapod.util.playback.ExternalMedia;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.playback.PlaybackController;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.util.playback.ExternalMedia;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
 
 /**
  * Activity for playing audio files.
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
index a03fa7949..239fe1893 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
@@ -30,14 +30,14 @@ import java.util.Map;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.FeedItemlistDescriptionAdapter;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 /**
  * Default implementation of OnlineFeedViewActivity. Shows the downloaded feed's items with their descriptions,
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
index 06a11c775..559fa0574 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
@@ -19,7 +19,7 @@ import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index c5f25d813..365c4216d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -14,9 +14,9 @@ import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.download.DownloadRequest;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.download.DownloadRequest;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 /**
  * Shows a username and a password text field.
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 5cf187eb6..80484df37 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -12,16 +12,16 @@ import android.view.MenuItem;
 import android.widget.*;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.util.LangUtils;
-import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.util.LangUtils;
+import de.danoeh.antennapod.core.util.menuhandler.FeedMenuHandler;
 
 /**
  * Displays information about a feed.
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index 8dde14d3b..f4a973fac 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -14,8 +14,8 @@ import android.widget.Button;
 import android.widget.TextView;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 import org.shredzone.flattr4j.exception.FlattrException;
 
 /** Guides the user through the authentication process */
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index b7014dab2..2c660019c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -25,13 +25,13 @@ import org.apache.commons.lang3.Validate;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.NavListAdapter;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.fragment.*;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.StorageUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 2e5372b60..249a3c5c3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -3,13 +3,11 @@ package de.danoeh.antennapod.activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.TypedArray;
 import android.graphics.PixelFormat;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.Menu;
@@ -24,19 +22,18 @@ import com.doomonafireball.betterpickers.hmspicker.HmsPickerBuilder;
 import com.doomonafireball.betterpickers.hmspicker.HmsPickerDialogFragment;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.dialog.TimeDialog;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.ShareUtils;
-import de.danoeh.antennapod.util.StorageUtils;
-import de.danoeh.antennapod.util.playback.MediaPlayerError;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.playback.PlaybackController;
-import org.shredzone.flattr4j.model.User;
+import de.danoeh.antennapod.core.dialog.TimeDialog;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.ShareUtils;
+import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.playback.MediaPlayerError;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
 
 /**
  * Provides general features which are both needed for playing audio and video
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 2c6d75cd8..d84e6cc03 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -16,21 +16,21 @@ import android.widget.RelativeLayout;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.dialog.AuthenticationDialog;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.download.DownloadRequest;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.service.download.HttpDownloader;
-import de.danoeh.antennapod.syndication.handler.FeedHandler;
-import de.danoeh.antennapod.syndication.handler.FeedHandlerResult;
-import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
-import de.danoeh.antennapod.util.DownloadError;
-import de.danoeh.antennapod.util.FileNameGenerator;
-import de.danoeh.antennapod.util.StorageUtils;
-import de.danoeh.antennapod.util.URLChecker;
-import de.danoeh.antennapod.util.syndication.FeedDiscoverer;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.download.DownloadRequest;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.service.download.HttpDownloader;
+import de.danoeh.antennapod.core.syndication.handler.FeedHandler;
+import de.danoeh.antennapod.core.syndication.handler.FeedHandlerResult;
+import de.danoeh.antennapod.core.syndication.handler.UnsupportedFeedtypeException;
+import de.danoeh.antennapod.core.util.DownloadError;
+import de.danoeh.antennapod.core.util.FileNameGenerator;
+import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.URLChecker;
+import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer;
 import org.apache.commons.lang3.StringUtils;
 import org.xml.sax.SAXException;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
index e09941abf..8a9ec58d3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
@@ -13,8 +13,8 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.opml.OpmlElement;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.opml.OpmlElement;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
index d3fd3949c..2e66978fd 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
@@ -4,9 +4,9 @@ import android.content.Intent;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.asynctask.OpmlFeedQueuer;
-import de.danoeh.antennapod.asynctask.OpmlImportWorker;
-import de.danoeh.antennapod.opml.OpmlElement;
+import de.danoeh.antennapod.core.asynctask.OpmlFeedQueuer;
+import de.danoeh.antennapod.core.asynctask.OpmlImportWorker;
+import de.danoeh.antennapod.core.opml.OpmlElement;
 
 import java.io.Reader;
 import java.util.ArrayList;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
index 16e663fac..e42072ead 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
@@ -2,8 +2,8 @@ package de.danoeh.antennapod.activity;
 
 import android.app.AlertDialog;
 import android.os.Bundle;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.util.LangUtils;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.LangUtils;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
index 631e69f78..162a8f2e5 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
@@ -13,9 +13,9 @@ import android.widget.TextView;
 import android.widget.Toast;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.util.LangUtils;
-import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.LangUtils;
+import de.danoeh.antennapod.core.util.StorageUtils;
 
 import java.io.*;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
index ec53ed7b6..7afa270cc 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
@@ -1,6 +1,6 @@
 package de.danoeh.antennapod.activity;
 
-import de.danoeh.antennapod.opml.OpmlElement;
+import de.danoeh.antennapod.core.opml.OpmlElement;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index cd6731c02..65efcc230 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -21,17 +21,17 @@ import android.view.MenuItem;
 import android.widget.Toast;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.FlattrClickWorker;
-import de.danoeh.antennapod.asynctask.OpmlExportWorker;
+import de.danoeh.antennapod.core.asynctask.FlattrClickWorker;
+import de.danoeh.antennapod.core.asynctask.OpmlExportWorker;
 import de.danoeh.antennapod.dialog.AuthenticationDialog;
 import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
 import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
-import de.danoeh.antennapod.util.flattr.SimpleFlattrThing;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
index d8a137eb9..173bec6b2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
@@ -12,8 +12,8 @@ import org.apache.commons.lang3.StringUtils;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.StorageUtils;
 
 /** Is show if there is now external storage available. */
 public class StorageErrorActivity extends ActionBarActivity {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 81661a288..d3df40afb 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -21,11 +21,11 @@ import android.widget.SeekBar;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.service.playback.PlayerStatus;
-import de.danoeh.antennapod.util.playback.ExternalMedia;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
+import de.danoeh.antennapod.core.util.playback.ExternalMedia;
+import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
 /**
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 6a60f65fe..d7b069b19 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -15,12 +15,12 @@ import android.widget.*;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.GpodnetSyncService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetDevice;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
index 30ad2d03f..a75789815 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
@@ -1,6 +1,6 @@
 package de.danoeh.antennapod.adapter;
 
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 public interface ActionButtonCallback {
 	/** Is called when the action button of a list item has been pressed. */
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
index 1de071a73..fecddeaf4 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
@@ -8,9 +8,9 @@ import android.widget.ImageButton;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 /**
  * Utility methods for the action button that is displayed on the right hand side
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
index f393fb7d7..c3902639a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
@@ -5,9 +5,9 @@ import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.util.Converter;
 
 /**
  * Utility methods for adapters
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
index c12de6ebd..9e59a2a1a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
@@ -16,10 +16,10 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.util.ChapterUtils;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.util.ChapterUtils;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
index 0c4cbe685..800462023 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -6,13 +6,13 @@ import android.widget.Toast;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 /**
  * Default implementation of an ActionButtonCallback
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 2cc216227..f982e86ce 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -8,10 +8,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
 
 /** Displays a list of DownloadStatus entries. */
 public class DownloadLogAdapter extends BaseAdapter {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index ef5af67de..8785916a0 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -11,9 +11,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.util.Converter;
 
 /**
  * Shows a list of downloaded episodes
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 658af9e4e..4257c6eb9 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -9,11 +9,11 @@ import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.service.download.DownloadRequest;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.ThemeUtils;
+import de.danoeh.antennapod.core.service.download.DownloadRequest;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 
 public class DownloadlistAdapter extends BaseAdapter {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
index 3f666eb8b..8b1ed9112 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
@@ -13,11 +13,11 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.Converter;
 
 /**
  * Displays unread items and items in the queue in one combined list. The
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 357b5f8b4..2f69e6580 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -9,12 +9,11 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.*;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.ThemeUtils;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 
 /**
  * List adapter for items of feeds that the user has already subscribed to.
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
index c2c2285ac..9011c8b02 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
@@ -7,7 +7,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index ef8e8ce07..a917633e6 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -11,8 +11,8 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.Feed;
 
 /**
  * BaseAdapter for the navigation drawer
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
index 8abe49133..a0829286c 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
@@ -12,11 +12,11 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.Converter;
 
 /**
  * List adapter for the list of new episodes
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
index ebe519592..bc42ad063 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
@@ -6,10 +6,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 /**
  * List adapter for the queue.
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index 2314c2269..79c1f6f99 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -9,11 +9,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedComponent;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.SearchResult;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedComponent;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.SearchResult;
 
 /**
  * List adapter for search activity.
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
index f2e78a57e..9063d35c9 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
@@ -11,8 +11,8 @@ import android.widget.TextView;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
 
 /**
  * Adapter for displaying a list of GPodnetPodcast-Objects.
diff --git a/app/src/main/java/de/danoeh/antennapod/core/ClientConfig.java b/app/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
index 72ebe6347..bf28c17ea 100644
--- a/app/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
@@ -7,12 +7,6 @@ package de.danoeh.antennapod.core;
 public class ClientConfig {
 
     /**
-     * Package name of the client. This string is used as a prefix
-     * for internal intents.
-     */
-    public static String CLIENT_PACKAGE_NAME;
-
-    /**
      * Should be used when setting User-Agent header for HTTP-requests.
      */
     public static String USER_AGENT;
diff --git a/app/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java b/app/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
index 1b0c4aab4..9e4ed8e2b 100644
--- a/app/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/DownloadServiceCallbacks.java
@@ -2,7 +2,7 @@ package de.danoeh.antennapod.core;
 
 import android.app.PendingIntent;
 
-import de.danoeh.antennapod.service.download.DownloadRequest;
+import de.danoeh.antennapod.core.service.download.DownloadRequest;
 
 /**
  * Callbacks for the DownloadService of the core module
diff --git a/app/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java b/app/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
index da64b38ad..a74c441c4 100644
--- a/app/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
@@ -2,7 +2,7 @@ package de.danoeh.antennapod.core;
 
 import android.content.Intent;
 
-import de.danoeh.antennapod.feed.MediaType;
+import de.danoeh.antennapod.core.feed.MediaType;
 
 /**
  * Callbacks for the PlaybackService of the core module
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/DownloadObserver.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/DownloadObserver.java
index 21ae5291e..8b3635af8 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/DownloadObserver.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/DownloadObserver.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.app.Activity;
 import android.content.*;
@@ -9,8 +9,8 @@ import android.util.Log;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.service.download.DownloadService;
-import de.danoeh.antennapod.service.download.Downloader;
+import de.danoeh.antennapod.core.service.download.DownloadService;
+import de.danoeh.antennapod.core.service.download.Downloader;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/FeedRemover.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
index 0549a4255..2201dfbe7 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/FeedRemover.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -7,8 +7,8 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.os.AsyncTask;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.storage.DBWriter;
 
 import java.util.concurrent.ExecutionException;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
index 9210ac1d1..44ad91981 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -23,11 +23,11 @@ import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.FlattrAuthActivity;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.NetworkUtils;
-import de.danoeh.antennapod.util.flattr.FlattrThing;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.NetworkUtils;
+import de.danoeh.antennapod.core.util.flattr.FlattrThing;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 
 /**
  * Performs a click action in a background thread.
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrStatusFetcher.java
index 04d349671..ddc4370e6 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrStatusFetcher.java
@@ -1,10 +1,10 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.content.Context;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 import org.shredzone.flattr4j.exception.FlattrException;
 import org.shredzone.flattr4j.model.Flattr;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrTokenFetcher.java
index 0dcf832f7..6f8319c7d 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrTokenFetcher.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 
 import android.annotation.SuppressLint;
@@ -10,7 +10,7 @@ import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.FlattrAuthActivity;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 import org.shredzone.flattr4j.exception.FlattrException;
 import org.shredzone.flattr4j.oauth.AccessToken;
 import org.shredzone.flattr4j.oauth.AndroidAuthenticator;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/OpmlExportWorker.java
index 4abb1a67d..9f887bda6 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/OpmlExportWorker.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -9,10 +9,10 @@ import android.os.AsyncTask;
 import android.util.Log;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.opml.OpmlWriter;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.LangUtils;
+import de.danoeh.antennapod.core.opml.OpmlWriter;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.LangUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/OpmlFeedQueuer.java
index 038b8dcc5..13144faa9 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/OpmlFeedQueuer.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -6,10 +6,10 @@ import android.content.Context;
 import android.os.AsyncTask;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.OpmlImportHolder;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.opml.OpmlElement;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.opml.OpmlElement;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 import java.util.Arrays;
 import java.util.Date;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/OpmlImportWorker.java
index 13534fa64..a4308be9b 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/OpmlImportWorker.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -10,8 +10,8 @@ import android.os.AsyncTask;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.opml.OpmlElement;
-import de.danoeh.antennapod.opml.OpmlReader;
+import de.danoeh.antennapod.core.opml.OpmlElement;
+import de.danoeh.antennapod.core.opml.OpmlReader;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoImageResource.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoImageResource.java
index 26f9d9278..c0d8049db 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoImageResource.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoImageResource.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.net.Uri;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoProvider.java b/app/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java
index 849725630..6ace92800 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoProvider.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.asynctask;
+package de.danoeh.antennapod.core.asynctask;
 
 import android.content.Context;
 import android.media.MediaMetadataRetriever;
diff --git a/app/src/main/java/de/danoeh/antennapod/backup/OpmlBackupAgent.java b/app/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java
index 56d1ca092..72b5066b3 100644
--- a/app/src/main/java/de/danoeh/antennapod/backup/OpmlBackupAgent.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.backup;
+package de.danoeh.antennapod.core.backup;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.BackupDataInputStream;
@@ -28,15 +28,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 
-import de.danoeh.antennapod.AppConfig;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.opml.OpmlElement;
-import de.danoeh.antennapod.opml.OpmlReader;
-import de.danoeh.antennapod.opml.OpmlWriter;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.LangUtils;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.opml.OpmlElement;
+import de.danoeh.antennapod.core.opml.OpmlReader;
+import de.danoeh.antennapod.core.opml.OpmlWriter;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.LangUtils;
 
 public class OpmlBackupAgent extends BackupAgentHelper {
     private static final String OPML_BACKUP_KEY = "opml";
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java b/app/src/main/java/de/danoeh/antennapod/core/dialog/ConfirmationDialog.java
index df71fff77..e51d70708 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/dialog/ConfirmationDialog.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.dialog;
+package de.danoeh.antennapod.core.dialog;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java b/app/src/main/java/de/danoeh/antennapod/core/dialog/DownloadRequestErrorDialogCreator.java
index e363a6911..a1c3a4c6a 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/dialog/DownloadRequestErrorDialogCreator.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.dialog;
+package de.danoeh.antennapod.core.dialog;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java b/app/src/main/java/de/danoeh/antennapod/core/dialog/TimeDialog.java
index bbd514640..a95e8c6c5 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/dialog/TimeDialog.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.dialog;
+package de.danoeh.antennapod.core.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/Chapter.java b/app/src/main/java/de/danoeh/antennapod/core/feed/Chapter.java
index d6151ee9f..ce3352ed6 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/Chapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/Chapter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 public abstract class Chapter extends FeedComponent {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/EventDistributor.java b/app/src/main/java/de/danoeh/antennapod/core/feed/EventDistributor.java
index 5fb72048e..65c55a361 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/EventDistributor.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/EventDistributor.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import android.os.Handler;
 import android.util.Log;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/Feed.java b/app/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
index b5415c69c..3f83ab8b6 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/Feed.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
@@ -1,14 +1,14 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import android.content.Context;
 import android.net.Uri;
 
-import de.danoeh.antennapod.asynctask.PicassoImageResource;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.EpisodeFilter;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import de.danoeh.antennapod.util.flattr.FlattrThing;
+import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.EpisodeFilter;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.util.flattr.FlattrThing;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/FeedComponent.java b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
index 48b243770..05115c1ea 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/FeedComponent.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 /**
  * Represents every possible component of a feed
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/FeedFile.java b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java
index a05533ebc..3dc58654b 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/FeedFile.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import java.io.File;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/FeedImage.java b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
index c588f5e71..51605691d 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/FeedImage.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
@@ -1,16 +1,10 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import android.net.Uri;
 
-import de.danoeh.antennapod.asynctask.PicassoImageResource;
-
-import org.apache.commons.io.IOUtils;
+import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
 
 
 public class FeedImage extends FeedFile implements PicassoImageResource {
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/FeedItem.java b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 78091ea33..55143b13b 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/FeedItem.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -1,15 +1,14 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import android.net.Uri;
 
 import de.danoeh.antennapod.PodcastApp;
-import de.danoeh.antennapod.asynctask.PicassoImageResource;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.ShownotesProvider;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import de.danoeh.antennapod.util.flattr.FlattrThing;
+import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.ShownotesProvider;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.util.flattr.FlattrThing;
 
-import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/FeedMedia.java b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
index 9298ebe8a..ab87e822d 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/FeedMedia.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -6,19 +6,16 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.Callable;
 
 import de.danoeh.antennapod.PodcastApp;
-import de.danoeh.antennapod.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.ChapterUtils;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.ChapterUtils;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 public class FeedMedia extends FeedFile implements Playable {
     private static final String TAG = "FeedMedia";
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/FeedPreferences.java b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
index 29bc5ef0c..2f0304182 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/FeedPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
@@ -1,7 +1,7 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 import android.content.Context;
-import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DBWriter;
 import org.apache.commons.lang3.StringUtils;
 
 /**
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/ID3Chapter.java b/app/src/main/java/de/danoeh/antennapod/core/feed/ID3Chapter.java
index 6dde7854e..f0ff03a93 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/ID3Chapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/ID3Chapter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 public class ID3Chapter extends Chapter {
 	public static final int CHAPTERTYPE_ID3CHAPTER = 2;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/MediaType.java b/app/src/main/java/de/danoeh/antennapod/core/feed/MediaType.java
index 324d0a221..7b3cb829d 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/MediaType.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/MediaType.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 public enum MediaType {
 	AUDIO, VIDEO, UNKNOWN
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/SearchResult.java b/app/src/main/java/de/danoeh/antennapod/core/feed/SearchResult.java
index 1cba389ec..9aa8d3170 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/SearchResult.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/SearchResult.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 public class SearchResult {
 	private FeedComponent component;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/SimpleChapter.java b/app/src/main/java/de/danoeh/antennapod/core/feed/SimpleChapter.java
index 3dab1b74d..2dadd3ec8 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/SimpleChapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/SimpleChapter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
 public class SimpleChapter extends Chapter {
 	public static final int CHAPTERTYPE_SIMPLECHAPTER = 0;
diff --git a/app/src/main/java/de/danoeh/antennapod/feed/VorbisCommentChapter.java b/app/src/main/java/de/danoeh/antennapod/core/feed/VorbisCommentChapter.java
index 59844ae1f..5b54a2d59 100644
--- a/app/src/main/java/de/danoeh/antennapod/feed/VorbisCommentChapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/feed/VorbisCommentChapter.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.feed;
+package de.danoeh.antennapod.core.feed;
 
-import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentReaderException;
+import de.danoeh.antennapod.core.util.vorbiscommentreader.VorbisCommentReaderException;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetService.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
index 038b2a367..117cbf96b 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet;
+package de.danoeh.antennapod.core.gpoddernet;
 
 import org.apache.commons.lang3.Validate;
 import org.apache.http.Header;
@@ -30,13 +30,13 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetSubscriptionChange;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetUploadChangesResponse;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
-import de.danoeh.antennapod.service.download.AntennapodHttpClient;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetDevice;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetSubscriptionChange;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetTag;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetUploadChangesResponse;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 
 /**
  * Communicates with the gpodder.net service.
@@ -396,10 +396,10 @@ public class GpodnetService {
      * @param deviceId The ID of the device whose subscriptions should be updated.
      * @param added    Collection of feed URLs of added feeds. This Collection MUST NOT contain any duplicates
      * @param removed  Collection of feed URLs of removed feeds. This Collection MUST NOT contain any duplicates
-     * @return a GpodnetUploadChangesResponse. See {@link de.danoeh.antennapod.gpoddernet.model.GpodnetUploadChangesResponse}
+     * @return a GpodnetUploadChangesResponse. See {@link de.danoeh.antennapod.core.gpoddernet.model.GpodnetUploadChangesResponse}
      * for details.
      * @throws java.lang.IllegalArgumentException                      if username, deviceId, added or removed is null.
-     * @throws de.danoeh.antennapod.gpoddernet.GpodnetServiceException if added or removed contain duplicates or if there
+     * @throws de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException if added or removed contain duplicates or if there
      *                                                                 is an authentication error.
      */
     public GpodnetUploadChangesResponse uploadChanges(String username, String deviceId, Collection<String> added,
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java
index 3b0140826..8bd56218c 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet;
+package de.danoeh.antennapod.core.gpoddernet;
 
 public class GpodnetServiceAuthenticationException extends GpodnetServiceException {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java
index a32e9357b..16f01f0f4 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet;
+package de.danoeh.antennapod.core.gpoddernet;
 
 public class GpodnetServiceBadStatusCodeException extends GpodnetServiceException {
     int statusCode;
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceException.java
index bdb394454..ce704f7e3 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet;
+package de.danoeh.antennapod.core.gpoddernet;
 
 public class GpodnetServiceException extends Exception {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetDevice.java
index 86a2171fa..4885a243a 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetDevice.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet.model;
+package de.danoeh.antennapod.core.gpoddernet.model;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetPodcast.java
index b002035c9..afebf66ac 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetPodcast.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet.model;
+package de.danoeh.antennapod.core.gpoddernet.model;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetSubscriptionChange.java
index a4617118d..a5cb8c0f0 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetSubscriptionChange.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet.model;
+package de.danoeh.antennapod.core.gpoddernet.model;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetTag.java
index 80b84095e..7178f4be5 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetTag.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet.model;
+package de.danoeh.antennapod.core.gpoddernet.model;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetUploadChangesResponse.java
index fee8c7d28..5a37efa5e 100644
--- a/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetUploadChangesResponse.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.gpoddernet.model;
+package de.danoeh.antennapod.core.gpoddernet.model;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Object returned by {@link de.danoeh.antennapod.gpoddernet.GpodnetService} in uploadChanges method.
+ * Object returned by {@link de.danoeh.antennapod.core.gpoddernet.GpodnetService} in uploadChanges method.
  */
 public class GpodnetUploadChangesResponse {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/opml/OpmlElement.java b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlElement.java
index 4cb563c04..8d0a4a842 100644
--- a/app/src/main/java/de/danoeh/antennapod/opml/OpmlElement.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlElement.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.opml;
+package de.danoeh.antennapod.core.opml;
 
 /** Represents a single feed in an OPML file. */
 public class OpmlElement {
diff --git a/app/src/main/java/de/danoeh/antennapod/opml/OpmlReader.java b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlReader.java
index 19a980dee..aa484954d 100644
--- a/app/src/main/java/de/danoeh/antennapod/opml/OpmlReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlReader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.opml;
+package de.danoeh.antennapod.core.opml;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
diff --git a/app/src/main/java/de/danoeh/antennapod/opml/OpmlSymbols.java b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlSymbols.java
index 4b0b7316a..2b831ca2a 100644
--- a/app/src/main/java/de/danoeh/antennapod/opml/OpmlSymbols.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlSymbols.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.opml;
+package de.danoeh.antennapod.core.opml;
 
 /** Contains symbols for reading and writing OPML documents. */
 public final class OpmlSymbols {
diff --git a/app/src/main/java/de/danoeh/antennapod/opml/OpmlWriter.java b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlWriter.java
index 405a5e35a..fe14b4954 100644
--- a/app/src/main/java/de/danoeh/antennapod/opml/OpmlWriter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/opml/OpmlWriter.java
@@ -1,9 +1,9 @@
-package de.danoeh.antennapod.opml;
+package de.danoeh.antennapod.core.opml;
 
 import android.util.Log;
 import android.util.Xml;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.Feed;
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.IOException;
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/GpodnetPreferences.java b/app/src/main/java/de/danoeh/antennapod/core/preferences/GpodnetPreferences.java
index bdfe297a6..716a74f53 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/GpodnetPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/preferences/GpodnetPreferences.java
@@ -1,12 +1,12 @@
-package de.danoeh.antennapod.preferences;
+package de.danoeh.antennapod.core.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.PodcastApp;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.service.GpodnetSyncService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PlaybackPreferences.java b/app/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java
index 1d1ab052f..756b4067c 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PlaybackPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.preferences;
+package de.danoeh.antennapod.core.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/UserPreferences.java b/app/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index d7807ddac..1669fc601 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/UserPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.preferences;
+package de.danoeh.antennapod.core.preferences;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.receiver.FeedUpdateReceiver;
+import de.danoeh.antennapod.core.receiver.FeedUpdateReceiver;
 
 /**
  * Provides access to preferences set by the user in the settings screen. A
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java b/app/src/main/java/de/danoeh/antennapod/core/receiver/AlarmUpdateReceiver.java
index a0539e276..2057b0881 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/receiver/AlarmUpdateReceiver.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.receiver;
+package de.danoeh.antennapod.core.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.util.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /** Listens for events that make it necessary to reset the update alarm. */
 public class AlarmUpdateReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java b/app/src/main/java/de/danoeh/antennapod/core/receiver/ConnectivityActionReceiver.java
index 4dcf0b6aa..e6b1a1b49 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/receiver/ConnectivityActionReceiver.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.receiver;
+package de.danoeh.antennapod.core.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -10,9 +10,9 @@ import android.util.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.NetworkUtils;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 
 public class ConnectivityActionReceiver extends BroadcastReceiver {
 	private static final String TAG = "ConnectivityActionReceiver";
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java b/app/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
index 3c283a30b..ec63bc2ae 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.receiver;
+package de.danoeh.antennapod.core.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -10,8 +10,8 @@ import android.util.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBTasks;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBTasks;
 
 /** Refreshes all feeds when it receives an intent */
 public class FeedUpdateReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/MediaButtonReceiver.java b/app/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java
index 1edebd275..be54148cf 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/MediaButtonReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.receiver;
+package de.danoeh.antennapod.core.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -6,12 +6,12 @@ import android.content.Intent;
 import android.util.Log;
 import android.view.KeyEvent;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
 
 /** Receives media button events. */
 public class MediaButtonReceiver extends BroadcastReceiver {
 	private static final String TAG = "MediaButtonReceiver";
-	public static final String EXTRA_KEYCODE = "de.danoeh.antennapod.service.extra.MediaButtonReceiver.KEYCODE";
+	public static final String EXTRA_KEYCODE = "de.danoeh.antennapod.core.service.extra.MediaButtonReceiver.KEYCODE";
 
 	public static final String NOTIFY_BUTTON_RECEIVER = "de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER";
 
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
index 9f8892181..3dcfecdbd 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.receiver;
+package de.danoeh.antennapod.core.receiver;
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -9,7 +9,7 @@ import android.util.Log;
 import org.apache.commons.lang3.StringUtils;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.service.playback.PlayerWidgetService;
+import de.danoeh.antennapod.core.service.playback.PlayerWidgetService;
 
 public class PlayerWidget extends AppWidgetProvider {
 	private static final String TAG = "PlayerWidget";
diff --git a/app/src/main/java/de/danoeh/antennapod/service/GpodnetSyncService.java b/app/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index efc44c66a..8a2659029 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/GpodnetSyncService.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service;
+package de.danoeh.antennapod.core.service;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -12,18 +12,18 @@ import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceAuthenticationException;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetSubscriptionChange;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetUploadChangesResponse;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.NetworkUtils;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceAuthenticationException;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetSubscriptionChange;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetUploadChangesResponse;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 
 import java.util.Date;
 import java.util.LinkedList;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/APRedirectHandler.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/APRedirectHandler.java
index ddf8d605d..1c62eaa77 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/APRedirectHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/APRedirectHandler.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/AntennapodHttpClient.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index be331ce9b..dc792db81 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/AntennapodHttpClient.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import android.util.Log;
 import de.danoeh.antennapod.AppConfig;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/DownloadRequest.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
index e803d30d4..c79da0a48 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/DownloadRequest.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/DownloadService.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index d0d75d2d7..e9381d509 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/DownloadService.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ -34,7 +34,6 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionService;
@@ -59,23 +58,23 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DownloadAuthenticationActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.NavListAdapter;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.FeedPreferences;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.FeedPreferences;
 import de.danoeh.antennapod.fragment.DownloadsFragment;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.syndication.handler.FeedHandler;
-import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
-import de.danoeh.antennapod.util.ChapterUtils;
-import de.danoeh.antennapod.util.DownloadError;
-import de.danoeh.antennapod.util.InvalidFeedException;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.syndication.handler.FeedHandler;
+import de.danoeh.antennapod.core.syndication.handler.UnsupportedFeedtypeException;
+import de.danoeh.antennapod.core.util.ChapterUtils;
+import de.danoeh.antennapod.core.util.DownloadError;
+import de.danoeh.antennapod.core.util.InvalidFeedException;
 
 /**
  * Manages the download of feedfiles in the app. Downloads can be enqueued viathe startService intent.
@@ -91,12 +90,12 @@ public class DownloadService extends Service {
      * Cancels one download. The intent MUST have an EXTRA_DOWNLOAD_URL extra that contains the download URL of the
      * object whose download should be cancelled.
      */
-    public static final String ACTION_CANCEL_DOWNLOAD = "action.de.danoeh.antennapod.service.cancelDownload";
+    public static final String ACTION_CANCEL_DOWNLOAD = "action.de.danoeh.antennapod.core.service.cancelDownload";
 
     /**
      * Cancels all running downloads.
      */
-    public static final String ACTION_CANCEL_ALL_DOWNLOADS = "action.de.danoeh.antennapod.service.cancelAllDownloads";
+    public static final String ACTION_CANCEL_ALL_DOWNLOADS = "action.de.danoeh.antennapod.core.service.cancelAllDownloads";
 
     /**
      * Extra for ACTION_CANCEL_DOWNLOAD
@@ -107,7 +106,7 @@ public class DownloadService extends Service {
      * Sent by the DownloadService when the content of the downloads list
      * changes.
      */
-    public static final String ACTION_DOWNLOADS_CONTENT_CHANGED = "action.de.danoeh.antennapod.service.downloadsContentChanged";
+    public static final String ACTION_DOWNLOADS_CONTENT_CHANGED = "action.de.danoeh.antennapod.core.service.downloadsContentChanged";
 
     /**
      * Extra for ACTION_ENQUEUE_DOWNLOAD intent.
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/DownloadStatus.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloadStatus.java
index 1d76770bb..d05650d10 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/DownloadStatus.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloadStatus.java
@@ -1,9 +1,9 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import org.apache.commons.lang3.Validate;
 
-import de.danoeh.antennapod.feed.FeedFile;
-import de.danoeh.antennapod.util.DownloadError;
+import de.danoeh.antennapod.core.feed.FeedFile;
+import de.danoeh.antennapod.core.util.DownloadError;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/Downloader.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
index 80cc5b3f8..5af9c2d05 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/Downloader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/DownloaderCallback.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloaderCallback.java
index 08420e83a..2d9347b0a 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/DownloaderCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/DownloaderCallback.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 /**
  * Callback used by the Downloader-classes to notify the requester that the
diff --git a/app/src/main/java/de/danoeh/antennapod/service/download/HttpDownloader.java b/app/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index 7ae96dc07..cba59be01 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/download/HttpDownloader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -1,14 +1,14 @@
-package de.danoeh.antennapod.service.download;
+package de.danoeh.antennapod.core.service.download;
 
 import android.net.http.AndroidHttpClient;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.util.DownloadError;
-import de.danoeh.antennapod.util.StorageUtils;
-import de.danoeh.antennapod.util.URIUtil;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.util.DownloadError;
+import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.URIUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackService.java b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 96b9588c4..c191c9521 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackService.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.playback;
+package de.danoeh.antennapod.core.service.playback;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ -38,20 +38,20 @@ import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity;
 import de.danoeh.antennapod.activity.VideoplayerActivity;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.receiver.MediaButtonReceiver;
-import de.danoeh.antennapod.receiver.PlayerWidget;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.core.receiver.PlayerWidget;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 /**
  * Controls the MediaPlayer that plays a FeedMedia-file
@@ -69,34 +69,34 @@ public class PlaybackService extends Service {
     /**
      * True if media should be streamed.
      */
-    public static final String EXTRA_SHOULD_STREAM = "extra.de.danoeh.antennapod.service.shouldStream";
+    public static final String EXTRA_SHOULD_STREAM = "extra.de.danoeh.antennapod.core.service.shouldStream";
     /**
      * True if playback should be started immediately after media has been
      * prepared.
      */
-    public static final String EXTRA_START_WHEN_PREPARED = "extra.de.danoeh.antennapod.service.startWhenPrepared";
+    public static final String EXTRA_START_WHEN_PREPARED = "extra.de.danoeh.antennapod.core.service.startWhenPrepared";
 
-    public static final String EXTRA_PREPARE_IMMEDIATELY = "extra.de.danoeh.antennapod.service.prepareImmediately";
+    public static final String EXTRA_PREPARE_IMMEDIATELY = "extra.de.danoeh.antennapod.core.service.prepareImmediately";
 
-    public static final String ACTION_PLAYER_STATUS_CHANGED = "action.de.danoeh.antennapod.service.playerStatusChanged";
+    public static final String ACTION_PLAYER_STATUS_CHANGED = "action.de.danoeh.antennapod.core.service.playerStatusChanged";
     private static final String AVRCP_ACTION_PLAYER_STATUS_CHANGED = "com.android.music.playstatechanged";
     private static final String AVRCP_ACTION_META_CHANGED = "com.android.music.metachanged";
 
-    public static final String ACTION_PLAYER_NOTIFICATION = "action.de.danoeh.antennapod.service.playerNotification";
-    public static final String EXTRA_NOTIFICATION_CODE = "extra.de.danoeh.antennapod.service.notificationCode";
-    public static final String EXTRA_NOTIFICATION_TYPE = "extra.de.danoeh.antennapod.service.notificationType";
+    public static final String ACTION_PLAYER_NOTIFICATION = "action.de.danoeh.antennapod.core.service.playerNotification";
+    public static final String EXTRA_NOTIFICATION_CODE = "extra.de.danoeh.antennapod.core.service.notificationCode";
+    public static final String EXTRA_NOTIFICATION_TYPE = "extra.de.danoeh.antennapod.core.service.notificationType";
 
     /**
      * If the PlaybackService receives this action, it will stop playback and
      * try to shutdown.
      */
-    public static final String ACTION_SHUTDOWN_PLAYBACK_SERVICE = "action.de.danoeh.antennapod.service.actionShutdownPlaybackService";
+    public static final String ACTION_SHUTDOWN_PLAYBACK_SERVICE = "action.de.danoeh.antennapod.core.service.actionShutdownPlaybackService";
 
     /**
      * If the PlaybackService receives this action, it will end playback of the
      * current episode and load the next episode if there is one available.
      */
-    public static final String ACTION_SKIP_CURRENT_EPISODE = "action.de.danoeh.antennapod.service.skipCurrentEpisode";
+    public static final String ACTION_SKIP_CURRENT_EPISODE = "action.de.danoeh.antennapod.core.service.skipCurrentEpisode";
 
     /**
      * Used in NOTIFICATION_TYPE_RELOAD.
@@ -1038,7 +1038,7 @@ public class PlaybackService extends Service {
     }
 
     /**
-     * @see de.danoeh.antennapod.service.playback.PlaybackServiceMediaPlayer#seekToChapter(de.danoeh.antennapod.feed.Chapter)
+     * @see de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer#seekToChapter(de.danoeh.antennapod.core.feed.Chapter)
      */
     public void seekToChapter(Chapter c) {
         mediaPlayer.seekToChapter(c);
diff --git a/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index 49f20012d..62ad59166 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.playback;
+package de.danoeh.antennapod.core.service.playback;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -22,14 +22,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.receiver.MediaButtonReceiver;
-import de.danoeh.antennapod.util.playback.AudioPlayer;
-import de.danoeh.antennapod.util.playback.IPlayer;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.playback.VideoPlayer;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.core.util.playback.AudioPlayer;
+import de.danoeh.antennapod.core.util.playback.IPlayer;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.VideoPlayer;
 
 /**
  * Manages the MediaPlayer object of the PlaybackService.
@@ -149,7 +149,7 @@ public class PlaybackServiceMediaPlayer {
      * <p/>
      * This method requires the playerLock and is executed on the caller's thread.
      *
-     * @see #playMediaObject(de.danoeh.antennapod.util.playback.Playable, boolean, boolean, boolean)
+     * @see #playMediaObject(de.danoeh.antennapod.core.util.playback.Playable, boolean, boolean, boolean)
      */
     private void playMediaObject(final Playable playable, final boolean forceReset, final boolean stream, final boolean startWhenPrepared, final boolean prepareImmediately) {
         Validate.notNull(playable);
diff --git a/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java
index 680ec2e2f..1b33e8667 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.playback;
+package de.danoeh.antennapod.core.service.playback;
 
 import android.content.Context;
 import android.util.Log;
@@ -6,10 +6,10 @@ import android.util.Log;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 import java.util.List;
 import java.util.concurrent.*;
diff --git a/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerStatus.java b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerStatus.java
index 3d2b4ad39..1ad0c25d9 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerStatus.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerStatus.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.playback;
+package de.danoeh.antennapod.core.service.playback;
 
 public enum PlayerStatus {
     INDETERMINATE,  // player is currently changing its state, listeners should wait until the player has left this state.
diff --git a/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerWidgetService.java
index 71bc40c2a..495e2c0f2 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerWidgetService.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.service.playback;
+package de.danoeh.antennapod.core.service.playback;
 
 import android.app.PendingIntent;
 import android.app.Service;
@@ -14,10 +14,10 @@ import android.view.View;
 import android.widget.RemoteViews;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.receiver.MediaButtonReceiver;
-import de.danoeh.antennapod.receiver.PlayerWidget;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.core.receiver.PlayerWidget;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 /** Updates the state of the player widget */
 public class PlayerWidgetService extends Service {
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/DBReader.java b/app/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index e49ea4f83..1b93e6ea2 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/DBReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -1,18 +1,18 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.util.DownloadError;
-import de.danoeh.antennapod.util.comparator.DownloadStatusComparator;
-import de.danoeh.antennapod.util.comparator.FeedItemPubdateComparator;
-import de.danoeh.antennapod.util.comparator.PlaybackCompletionDateComparator;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import de.danoeh.antennapod.util.flattr.FlattrThing;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.util.DownloadError;
+import de.danoeh.antennapod.core.util.comparator.DownloadStatusComparator;
+import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator;
+import de.danoeh.antennapod.core.util.comparator.PlaybackCompletionDateComparator;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.util.flattr.FlattrThing;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,7 +23,7 @@ import java.util.List;
  * Provides methods for reading data from the AntennaPod database.
  * In general, all database calls in DBReader-methods are executed on the caller's thread.
  * This means that the caller should make sure that DBReader-methods are not executed on the GUI-thread.
- * This class will use the {@link de.danoeh.antennapod.feed.EventDistributor} to notify listeners about changes in the database.
+ * This class will use the {@link de.danoeh.antennapod.core.feed.EventDistributor} to notify listeners about changes in the database.
  */
 public final class DBReader {
     private static final String TAG = "DBReader";
@@ -48,7 +48,7 @@ public final class DBReader {
      * @param context A context that is used for opening a database connection.
      * @return A list of Feeds, sorted alphabetically by their title. A Feed-object
      * of the returned list does NOT have its list of FeedItems yet. The FeedItem-list
-     * can be loaded separately with {@link #getFeedItemList(android.content.Context, de.danoeh.antennapod.feed.Feed)}.
+     * can be loaded separately with {@link #getFeedItemList(android.content.Context, de.danoeh.antennapod.core.feed.Feed)}.
      */
     public static List<Feed> getFeedList(final Context context) {
         if (BuildConfig.DEBUG)
@@ -108,7 +108,7 @@ public final class DBReader {
      *                       A Feed is considered expired if 'lastUpdate < (currentTime - expirationTime)' evaluates to true.
      * @return A list of Feeds, sorted alphabetically by their title. A Feed-object
      * of the returned list does NOT have its list of FeedItems yet. The FeedItem-list
-     * can be loaded separately with {@link #getFeedItemList(android.content.Context, de.danoeh.antennapod.feed.Feed)}.
+     * can be loaded separately with {@link #getFeedItemList(android.content.Context, de.danoeh.antennapod.core.feed.Feed)}.
      */
     public static List<Feed> getExpiredFeedsList(final Context context, final long expirationTime) {
         if (BuildConfig.DEBUG)
@@ -394,7 +394,7 @@ public final class DBReader {
      *
      * @param context A context that is used for opening a database connection.
      * @return A list of IDs sorted by the same order as the queue. The caller can wrap the returned
-     * list in a {@link de.danoeh.antennapod.util.QueueAccess} object for easier access to the queue's properties.
+     * list in a {@link de.danoeh.antennapod.core.util.QueueAccess} object for easier access to the queue's properties.
      */
     public static List<Long> getQueueIDList(Context context) {
         PodDBAdapter adapter = new PodDBAdapter(context);
@@ -426,7 +426,7 @@ public final class DBReader {
      *
      * @param context A context that is used for opening a database connection.
      * @return A list of FeedItems sorted by the same order as the queue. The caller can wrap the returned
-     * list in a {@link de.danoeh.antennapod.util.QueueAccess} object for easier access to the queue's properties.
+     * list in a {@link de.danoeh.antennapod.core.util.QueueAccess} object for easier access to the queue's properties.
      */
     public static List<FeedItem> getQueue(Context context) {
         if (BuildConfig.DEBUG)
@@ -619,7 +619,7 @@ public final class DBReader {
 
     /**
      * Loads the FeedItemStatistics objects of all Feeds in the database. This method should be preferred over
-     * {@link #getFeedItemList(android.content.Context, de.danoeh.antennapod.feed.Feed)} if only metadata about
+     * {@link #getFeedItemList(android.content.Context, de.danoeh.antennapod.core.feed.Feed)} if only metadata about
      * the FeedItems is needed.
      *
      * @param context A context that is used for opening a database connection.
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/DBTasks.java b/app/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index a230ba797..28cab29b9 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/DBTasks.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -1,23 +1,23 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.asynctask.FlattrClickWorker;
-import de.danoeh.antennapod.asynctask.FlattrStatusFetcher;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.GpodnetSyncService;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.util.DownloadError;
-import de.danoeh.antennapod.util.NetworkUtils;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.comparator.FeedItemPubdateComparator;
-import de.danoeh.antennapod.util.exception.MediaFileNotFoundException;
-import de.danoeh.antennapod.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.asynctask.FlattrClickWorker;
+import de.danoeh.antennapod.core.asynctask.FlattrStatusFetcher;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.util.DownloadError;
+import de.danoeh.antennapod.core.util.NetworkUtils;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator;
+import de.danoeh.antennapod.core.util.exception.MediaFileNotFoundException;
+import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 
 import java.util.*;
 import java.util.concurrent.*;
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/DBWriter.java b/app/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index 9916ac97f..225f74c96 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/DBWriter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import android.app.backup.BackupManager;
 import android.content.Context;
@@ -8,16 +8,16 @@ import android.database.Cursor;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.asynctask.FlattrClickWorker;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
-import de.danoeh.antennapod.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import de.danoeh.antennapod.util.flattr.FlattrThing;
-import de.danoeh.antennapod.util.flattr.SimpleFlattrThing;
+import de.danoeh.antennapod.core.asynctask.FlattrClickWorker;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.util.flattr.FlattrThing;
+import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing;
 import org.shredzone.flattr4j.model.Flattr;
 
 import java.io.File;
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequestException.java b/app/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java
index 0ef766e58..c85559e20 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequestException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 /**
  * Thrown by the DownloadRequester if a download request contains invalid data
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequester.java b/app/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
index d305c572b..c313055a5 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequester.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
@@ -1,18 +1,17 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 import android.webkit.URLUtil;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.download.DownloadRequest;
-import de.danoeh.antennapod.service.download.DownloadService;
-import de.danoeh.antennapod.util.FileNameGenerator;
-import de.danoeh.antennapod.util.URLChecker;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.download.DownloadRequest;
+import de.danoeh.antennapod.core.service.download.DownloadService;
+import de.danoeh.antennapod.core.util.FileNameGenerator;
+import de.danoeh.antennapod.core.util.URLChecker;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/FeedItemStatistics.java b/app/src/main/java/de/danoeh/antennapod/core/storage/FeedItemStatistics.java
index 8cb040756..f6a59836b 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/FeedItemStatistics.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/FeedItemStatistics.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/FeedSearcher.java b/app/src/main/java/de/danoeh/antennapod/core/storage/FeedSearcher.java
index e7aa93f83..41b379471 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/FeedSearcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/FeedSearcher.java
@@ -1,10 +1,10 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.SearchResult;
-import de.danoeh.antennapod.util.comparator.SearchResultValueComparator;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.SearchResult;
+import de.danoeh.antennapod.core.util.comparator.SearchResultValueComparator;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/de/danoeh/antennapod/storage/PodDBAdapter.java b/app/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index 2a3aafe8c..eb6592510 100644
--- a/app/src/main/java/de/danoeh/antennapod/storage/PodDBAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.storage;
+package de.danoeh.antennapod.core.storage;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -17,15 +17,15 @@ import java.util.Arrays;
 import java.util.List;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedComponent;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.FeedPreferences;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.util.flattr.FlattrStatus;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedComponent;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.FeedPreferences;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 
 // TODO Remove media column from feeditem table
 
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandler.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandler.java
index aafa1c209..9efc5888f 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandler.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.syndication.handler;
+package de.danoeh.antennapod.core.syndication.handler;
 
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.Feed;
 import org.apache.commons.io.input.XmlStreamReader;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandlerResult.java
index 41aa29b52..45d1413bf 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandlerResult.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.syndication.handler;
+package de.danoeh.antennapod.core.syndication.handler;
 
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.Feed;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/handler/HandlerState.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/HandlerState.java
index 17f84724f..4fe8e1aff 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/handler/HandlerState.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/HandlerState.java
@@ -1,9 +1,9 @@
-package de.danoeh.antennapod.syndication.handler;
+package de.danoeh.antennapod.core.syndication.handler;
 
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.syndication.namespace.Namespace;
-import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.syndication.namespace.Namespace;
+import de.danoeh.antennapod.core.syndication.namespace.SyndElement;
 
 import java.util.*;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/handler/SyndHandler.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/SyndHandler.java
index 15dc94d65..573c873eb 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/handler/SyndHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/SyndHandler.java
@@ -1,10 +1,10 @@
-package de.danoeh.antennapod.syndication.handler;
+package de.danoeh.antennapod.core.syndication.handler;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.syndication.namespace.*;
-import de.danoeh.antennapod.syndication.namespace.atom.NSAtom;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.syndication.namespace.*;
+import de.danoeh.antennapod.core.syndication.namespace.atom.NSAtom;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/handler/TypeGetter.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/TypeGetter.java
index 2496e112a..e1ebd63a5 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/handler/TypeGetter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/TypeGetter.java
@@ -1,11 +1,10 @@
-package de.danoeh.antennapod.syndication.handler;
+package de.danoeh.antennapod.core.syndication.handler;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.Feed;
 import org.apache.commons.io.input.XmlStreamReader;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
index 605dad2fb..3da9251d9 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.syndication.handler;
+package de.danoeh.antennapod.core.syndication.handler;
 
-import de.danoeh.antennapod.syndication.handler.TypeGetter.Type;
+import de.danoeh.antennapod.core.syndication.handler.TypeGetter.Type;
 
 public class UnsupportedFeedtypeException extends Exception {
 	private static final long serialVersionUID = 9105878964928170669L;
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSContent.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSContent.java
index 9ad3026be..71bf69ffa 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSContent.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSContent.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
-import de.danoeh.antennapod.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
 import org.xml.sax.Attributes;
 
 public class NSContent extends Namespace {
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSITunes.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
index d8cbe040b..fb794d7e0 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSITunes.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
@@ -1,7 +1,7 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
 import org.xml.sax.Attributes;
 
 public class NSITunes extends Namespace {
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSMedia.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSMedia.java
index cc23167c1..15c377f79 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSMedia.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSMedia.java
@@ -1,10 +1,10 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.syndication.handler.HandlerState;
-import de.danoeh.antennapod.syndication.util.SyndTypeUtils;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.syndication.util.SyndTypeUtils;
 import org.xml.sax.Attributes;
 
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSRSS20.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java
index 9572f87ae..fd8f6176b 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSRSS20.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java
@@ -1,13 +1,13 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.syndication.handler.HandlerState;
-import de.danoeh.antennapod.syndication.util.SyndDateUtils;
-import de.danoeh.antennapod.syndication.util.SyndTypeUtils;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.syndication.util.SyndDateUtils;
+import de.danoeh.antennapod.core.syndication.util.SyndTypeUtils;
 import org.xml.sax.Attributes;
 
 /**
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
index 3f983ee88..2b4a2767d 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
@@ -1,9 +1,9 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.SimpleChapter;
-import de.danoeh.antennapod.syndication.handler.HandlerState;
-import de.danoeh.antennapod.syndication.util.SyndDateUtils;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.SimpleChapter;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.syndication.util.SyndDateUtils;
 import org.xml.sax.Attributes;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/Namespace.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/Namespace.java
index 910131feb..cf118d202 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/Namespace.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/Namespace.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
-import de.danoeh.antennapod.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
 import org.xml.sax.Attributes;
 
 
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/SyndElement.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/SyndElement.java
index 187312c9e..8adcd2086 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/SyndElement.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/SyndElement.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.syndication.namespace;
+package de.danoeh.antennapod.core.syndication.namespace;
 
 /** Defines a XML Element that is pushed on the tagstack */
 public class SyndElement {
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java
index 86b80d2ed..43fe0edb7 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java
@@ -1,7 +1,7 @@
-package de.danoeh.antennapod.syndication.namespace.atom;
+package de.danoeh.antennapod.core.syndication.namespace.atom;
 
-import de.danoeh.antennapod.syndication.namespace.Namespace;
-import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.core.syndication.namespace.Namespace;
+import de.danoeh.antennapod.core.syndication.namespace.SyndElement;
 import org.apache.commons.lang3.StringEscapeUtils;
 
 /** Represents Atom Element which contains text (content, title, summary). */
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java
index 2c8e232ff..1547dc222 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java
@@ -1,16 +1,16 @@
-package de.danoeh.antennapod.syndication.namespace.atom;
+package de.danoeh.antennapod.core.syndication.namespace.atom;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.FeedImage;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.syndication.handler.HandlerState;
-import de.danoeh.antennapod.syndication.namespace.NSRSS20;
-import de.danoeh.antennapod.syndication.namespace.Namespace;
-import de.danoeh.antennapod.syndication.namespace.SyndElement;
-import de.danoeh.antennapod.syndication.util.SyndDateUtils;
-import de.danoeh.antennapod.syndication.util.SyndTypeUtils;
+import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.syndication.handler.HandlerState;
+import de.danoeh.antennapod.core.syndication.namespace.NSRSS20;
+import de.danoeh.antennapod.core.syndication.namespace.Namespace;
+import de.danoeh.antennapod.core.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.core.syndication.util.SyndDateUtils;
+import de.danoeh.antennapod.core.syndication.util.SyndTypeUtils;
 import org.xml.sax.Attributes;
 
 public class NSAtom extends Namespace {
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndDateUtils.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/util/SyndDateUtils.java
index 3138f087a..977d92304 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndDateUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/util/SyndDateUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.syndication.util;
+package de.danoeh.antennapod.core.syndication.util;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java b/app/src/main/java/de/danoeh/antennapod/core/syndication/util/SyndTypeUtils.java
index d0fa3a5fc..8d1d8ffde 100644
--- a/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/syndication/util/SyndTypeUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.syndication.util;
+package de.danoeh.antennapod.core.syndication.util;
 
 import android.webkit.MimeTypeMap;
 import org.apache.commons.io.FilenameUtils;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/ChapterUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
index 9e1c50674..d6046026f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/ChapterUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
@@ -1,14 +1,14 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.util.comparator.ChapterStartTimeComparator;
-import de.danoeh.antennapod.util.id3reader.ChapterReader;
-import de.danoeh.antennapod.util.id3reader.ID3ReaderException;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentChapterReader;
-import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentReaderException;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.util.comparator.ChapterStartTimeComparator;
+import de.danoeh.antennapod.core.util.id3reader.ChapterReader;
+import de.danoeh.antennapod.core.util.id3reader.ID3ReaderException;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.vorbiscommentreader.VorbisCommentChapterReader;
+import de.danoeh.antennapod.core.util.vorbiscommentreader.VorbisCommentReaderException;
 import org.apache.commons.io.IOUtils;
 
 import java.io.*;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/Converter.java b/app/src/main/java/de/danoeh/antennapod/core/util/Converter.java
index f4c2b2f66..a0b514bd6 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/Converter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/Converter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/DownloadError.java b/app/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
index 1a64991a6..447e7d256 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/DownloadError.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.content.Context;
 import de.danoeh.antennapod.R;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/DuckType.java b/app/src/main/java/de/danoeh/antennapod/core/util/DuckType.java
index 163110418..5d2803b84 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/DuckType.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/DuckType.java
@@ -1,6 +1,6 @@
 /* Adapted from: http://thinking-in-code.blogspot.com/2008/11/duck-typing-in-java-using-dynamic.html */
 
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/EpisodeFilter.java b/app/src/main/java/de/danoeh/antennapod/core/util/EpisodeFilter.java
index 115913bca..4c23b161b 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/EpisodeFilter.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/EpisodeFilter.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/FeedtitleComparator.java b/app/src/main/java/de/danoeh/antennapod/core/util/FeedtitleComparator.java
index 112b6678d..bf14cd23e 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/FeedtitleComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/FeedtitleComparator.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
-import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.core.feed.Feed;
 
 import java.util.Comparator;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/FileNameGenerator.java b/app/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java
index 702df62b8..00c023b64 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/FileNameGenerator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/InvalidFeedException.java b/app/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java
index 50adae216..c98c2d82a 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/InvalidFeedException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 /** Thrown if a feed has invalid attribute values. */
 public class InvalidFeedException extends Exception {
diff --git a/app/src/main/java/de/danoeh/antennapod/util/LangUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
index e6e1d8399..07432d28a 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/LangUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import java.nio.charset.Charset;
 import java.util.HashMap;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/NetworkUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
index 0c8065e94..89bba290c 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/NetworkUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -7,7 +7,7 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/QueueAccess.java b/app/src/main/java/de/danoeh/antennapod/core/util/QueueAccess.java
index 7a1c7fef2..8e40ae184 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/QueueAccess.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/QueueAccess.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/ShareUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
index 941fc62ae..85f32ed50 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/ShareUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
@@ -1,9 +1,9 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.content.Context;
 import android.content.Intent;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 /** Utility methods for sharing data */
 public class ShareUtils {
diff --git a/app/src/main/java/de/danoeh/antennapod/util/ShownotesProvider.java b/app/src/main/java/de/danoeh/antennapod/core/util/ShownotesProvider.java
index 8345ca34d..7e7c6c08b 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/ShownotesProvider.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/ShownotesProvider.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import java.util.concurrent.Callable;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/StorageUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/StorageUtils.java
index ff0bde280..f899c211f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/StorageUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/StorageUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,7 @@ import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.activity.StorageErrorActivity;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.io.File;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/ThemeUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
index 8e593f3fb..72d73138d 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/ThemeUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
@@ -1,8 +1,8 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.util.Log;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 public class ThemeUtils {
 	private static final String TAG = "ThemeUtils";
diff --git a/app/src/main/java/de/danoeh/antennapod/util/URIUtil.java b/app/src/main/java/de/danoeh/antennapod/core/util/URIUtil.java
index 5af40d591..c614abbc1 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/URIUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/URIUtil.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/URLChecker.java b/app/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
index 9997daaf7..c707e55bc 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/URLChecker.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/UndoBarController.java b/app/src/main/java/de/danoeh/antennapod/core/util/UndoBarController.java
index 332cc22e0..d0721ac23 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/UndoBarController.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/UndoBarController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danoeh.antennapod.util;
+package de.danoeh.antennapod.core.util;
 
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/ChapterStartTimeComparator.java
index bfc2fd057..5274ffc9e 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/ChapterStartTimeComparator.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util.comparator;
+package de.danoeh.antennapod.core.util.comparator;
 
-import de.danoeh.antennapod.feed.Chapter;
+import de.danoeh.antennapod.core.feed.Chapter;
 
 import java.util.Comparator;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/DownloadStatusComparator.java
index 14b8f1194..ebdbfe2a5 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/DownloadStatusComparator.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util.comparator;
+package de.danoeh.antennapod.core.util.comparator;
 
-import de.danoeh.antennapod.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
 
 import java.util.Comparator;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/FeedItemPubdateComparator.java
index f92c23d05..a1f3ec699 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/FeedItemPubdateComparator.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util.comparator;
+package de.danoeh.antennapod.core.util.comparator;
 
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 import java.util.Comparator;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/PlaybackCompletionDateComparator.java
index 0147e0cdc..84d244660 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/PlaybackCompletionDateComparator.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util.comparator;
+package de.danoeh.antennapod.core.util.comparator;
 
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 import java.util.Comparator;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/SearchResultValueComparator.java
index 02b084a01..b16e0949d 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/comparator/SearchResultValueComparator.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util.comparator;
+package de.danoeh.antennapod.core.util.comparator;
 
-import de.danoeh.antennapod.feed.SearchResult;
+import de.danoeh.antennapod.core.feed.SearchResult;
 
 import java.util.Comparator;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java b/app/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java
index 4586cea87..287fe1100 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java
@@ -1,6 +1,6 @@
-package de.danoeh.antennapod.util.exception;
+package de.danoeh.antennapod.core.util.exception;
 
-import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.FeedMedia;
 
 public class MediaFileNotFoundException extends Exception {
 	private static final long serialVersionUID = 1L;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrServiceCreator.java
index eda83b7aa..5a7cfa47f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrServiceCreator.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.flattr;
+package de.danoeh.antennapod.core.util.flattr;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrStatus.java b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrStatus.java
index a1d6d3bc4..d82171d1a 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrStatus.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrStatus.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.flattr;
+package de.danoeh.antennapod.core.util.flattr;
 
 import java.util.Calendar;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrThing.java b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrThing.java
index f17ef1d83..515028ab6 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrThing.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrThing.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.flattr;
+package de.danoeh.antennapod.core.util.flattr;
 
 public interface FlattrThing {
 	public String getTitle();
diff --git a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
index 3e2ea3132..e07ed11e9 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.flattr;
+package de.danoeh.antennapod.core.util.flattr;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -30,8 +30,8 @@ import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.FlattrAuthActivity;
-import de.danoeh.antennapod.asynctask.FlattrTokenFetcher;
-import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.core.asynctask.FlattrTokenFetcher;
+import de.danoeh.antennapod.core.storage.DBWriter;
 
 /**
  * Utility methods for doing something with flattr.
diff --git a/app/src/main/java/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/SimpleFlattrThing.java
index 296610871..2c178496e 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/flattr/SimpleFlattrThing.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.flattr;
+package de.danoeh.antennapod.core.util.flattr;
 
 /* SimpleFlattrThing is a trivial implementation of the FlattrThing interface */
 public class SimpleFlattrThing implements FlattrThing {
diff --git a/app/src/main/java/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java b/app/src/main/java/de/danoeh/antennapod/core/util/gui/FeedItemUndoToken.java
index b920559db..17581d3e9 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/gui/FeedItemUndoToken.java
@@ -1,8 +1,8 @@
-package de.danoeh.antennapod.util.gui;
+package de.danoeh.antennapod.core.util.gui;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedItem;
 
 /**
  * Used by an UndoBarController for saving a removed FeedItem
diff --git a/app/src/main/java/de/danoeh/antennapod/util/id3reader/ChapterReader.java b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/ChapterReader.java
index 257635129..a0bce1c79 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/id3reader/ChapterReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/ChapterReader.java
@@ -1,11 +1,11 @@
-package de.danoeh.antennapod.util.id3reader;
+package de.danoeh.antennapod.core.util.id3reader;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.ID3Chapter;
-import de.danoeh.antennapod.util.id3reader.model.FrameHeader;
-import de.danoeh.antennapod.util.id3reader.model.TagHeader;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.ID3Chapter;
+import de.danoeh.antennapod.core.util.id3reader.model.FrameHeader;
+import de.danoeh.antennapod.core.util.id3reader.model.TagHeader;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3Reader.java b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
index 252d64107..a238c11e9 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3Reader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
@@ -1,7 +1,7 @@
-package de.danoeh.antennapod.util.id3reader;
+package de.danoeh.antennapod.core.util.id3reader;
 
-import de.danoeh.antennapod.util.id3reader.model.FrameHeader;
-import de.danoeh.antennapod.util.id3reader.model.TagHeader;
+import de.danoeh.antennapod.core.util.id3reader.model.FrameHeader;
+import de.danoeh.antennapod.core.util.id3reader.model.TagHeader;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java
index c458540ee..0c746d7e5 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.id3reader;
+package de.danoeh.antennapod.core.util.id3reader;
 
 public class ID3ReaderException extends Exception {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/FrameHeader.java
index df73393a5..89eab1398 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/FrameHeader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.id3reader.model;
+package de.danoeh.antennapod.core.util.id3reader.model;
 
 public class FrameHeader extends Header {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/Header.java b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/Header.java
index 22d5b6376..346e2893f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/Header.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/Header.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.id3reader.model;
+package de.danoeh.antennapod.core.util.id3reader.model;
 
 public abstract class Header {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/TagHeader.java b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/TagHeader.java
index ec99ef14e..0a6b8357f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/TagHeader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/TagHeader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.id3reader.model;
+package de.danoeh.antennapod.core.util.id3reader.model;
 
 public class TagHeader extends Header {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/FeedItemMenuHandler.java
index 2c7a7f074..f85ac412d 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/FeedItemMenuHandler.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.menuhandler;
+package de.danoeh.antennapod.core.util.menuhandler;
 
 import android.content.Context;
 import android.content.Intent;
@@ -6,14 +6,14 @@ import android.net.Uri;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.ShareUtils;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.ShareUtils;
 
 /**
  * Handles interactions with the FeedItemMenu.
diff --git a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/FeedMenuHandler.java
index a3adec66d..757cc5f56 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/FeedMenuHandler.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.menuhandler;
+package de.danoeh.antennapod.core.util.menuhandler;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,14 +9,13 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.FeedInfoActivity;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.service.download.DownloadService;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.ShareUtils;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.service.download.DownloadService;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.ShareUtils;
 
 /** Handles interactions with the FeedItemMenu. */
 public class FeedMenuHandler {
diff --git a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/MenuItemUtils.java
index 7aa04d24c..4258c4d22 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/MenuItemUtils.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.menuhandler;
+package de.danoeh.antennapod.core.util.menuhandler;
 
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.widget.SearchView;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/NavDrawerActivity.java
index 9c611a452..61bf9960f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/menuhandler/NavDrawerActivity.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.menuhandler;
+package de.danoeh.antennapod.core.util.menuhandler;
 
 /**
  * Defines useful methods for activities that have a navigation drawer
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/AudioPlayer.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
index bd49b0d18..aafcea307 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/AudioPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/ExternalMedia.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
index 3f6e6ae0a..49769f4f0 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/ExternalMedia.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -6,12 +6,10 @@ import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.util.ChapterUtils;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.util.ChapterUtils;
 
-import java.io.File;
-import java.io.InputStream;
 import java.util.List;
 import java.util.concurrent.Callable;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/IPlayer.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
index 2d4551b13..147c7848d 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/IPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.view.SurfaceHolder;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/MediaPlayerError.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/MediaPlayerError.java
index 23ead581f..a3a907e48 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/MediaPlayerError.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/MediaPlayerError.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/Playable.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
index 004ae56bb..7ebd580f7 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/Playable.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -7,12 +7,12 @@ import android.util.Log;
 
 import java.util.List;
 
-import de.danoeh.antennapod.asynctask.PicassoImageResource;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.ShownotesProvider;
+import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.ShownotesProvider;
 
 /**
  * Interface for objects that can be played by the PlaybackService.
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/PlaybackController.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 64dbf4868..35bd27057 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/PlaybackController.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.app.Activity;
 import android.content.*;
@@ -21,17 +21,17 @@ import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.service.playback.PlaybackServiceMediaPlayer;
-import de.danoeh.antennapod.service.playback.PlayerStatus;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.playback.Playable.PlayableUtils;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.playback.Playable.PlayableUtils;
 
 import java.util.concurrent.*;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/Timeline.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
index ceed68183..5177bbca3 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/Timeline.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -15,8 +15,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.ShownotesProvider;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.ShownotesProvider;
 
 /**
  * Connects chapter information and shownotes of a shownotesProvider, for example by making it possible to use the
diff --git a/app/src/main/java/de/danoeh/antennapod/util/playback/VideoPlayer.java b/app/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
index ea9c692ab..dc5270d8f 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/playback/VideoPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.playback;
+package de.danoeh.antennapod.core.util.playback;
 
 import android.media.MediaPlayer;
 import android.util.Log;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java b/app/src/main/java/de/danoeh/antennapod/core/util/syndication/FeedDiscoverer.java
index ac38ec876..9588265b8 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/syndication/FeedDiscoverer.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.syndication;
+package de.danoeh.antennapod.core.util.syndication;
 
 import android.net.Uri;
 import org.apache.commons.lang3.StringUtils;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/OggInputStream.java
index 767034ed2..4799d3881 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/OggInputStream.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.vorbiscommentreader;
+package de.danoeh.antennapod.core.util.vorbiscommentreader;
 
 import org.apache.commons.io.IOUtils;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentChapterReader.java
index b2f149ddd..a6934c60e 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentChapterReader.java
@@ -1,9 +1,9 @@
-package de.danoeh.antennapod.util.vorbiscommentreader;
+package de.danoeh.antennapod.core.util.vorbiscommentreader;
 
 import android.util.Log;
 import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.VorbisCommentChapter;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.feed.VorbisCommentChapter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentHeader.java
index 8c47393c9..5f9dd0faf 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentHeader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.vorbiscommentreader;
+package de.danoeh.antennapod.core.util.vorbiscommentreader;
 public class VorbisCommentHeader {
 	private String vendorString;
 	private long userCommentLength;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReader.java
index 718a4f30f..9639b9c42 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReader.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.vorbiscommentreader;
+package de.danoeh.antennapod.core.util.vorbiscommentreader;
 
 import org.apache.commons.io.EndianUtils;
 import org.apache.commons.io.IOUtils;
diff --git a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java
index 574373241..89ab20db0 100644
--- a/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java
+++ b/app/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.util.vorbiscommentreader;
+package de.danoeh.antennapod.core.util.vorbiscommentreader;
 public class VorbisCommentReaderException extends Exception {
 
 	public VorbisCommentReaderException() {
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
index d1ed795dc..1585f9b86 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * Creates a new AlertDialog that displays preferences for auto-flattring to the user.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
index 7384463de..e62daa08b 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
@@ -33,16 +33,16 @@ import java.util.concurrent.Callable;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.ShownotesProvider;
-import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.ShownotesProvider;
+import de.danoeh.antennapod.core.util.menuhandler.FeedItemMenuHandler;
 
 /**
  * Shows information about a specific FeedItem and provides actions like playing, downloading, etc.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
index a9c596d2e..16fb77f2a 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
@@ -10,8 +10,8 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 
 /**
  * Creates a dialog that lets the user change the hostname for the gpodder.net service.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index b009e76a7..8eba51540 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -7,7 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index 082fe93fc..21e4cbd80 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -9,11 +9,11 @@ import android.view.View;
 import android.widget.ListView;
 import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter;
 import de.danoeh.antennapod.dialog.FeedItemDialog;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.QueueAccess;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.QueueAccess;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index ffce518bf..69bd2b099 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -12,8 +12,8 @@ import android.widget.ImageView;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.util.playback.Playable;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.util.playback.Playable;
 
 /**
  * Displays the cover and the title of a FeedItem.
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index d81ba4b86..9c7fade67 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -6,9 +6,9 @@ import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.view.View;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.service.download.DownloadStatus;
-import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.storage.DBReader;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 985673dd3..99320cffa 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -13,11 +13,11 @@ import android.widget.TextView;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.service.playback.PlaybackService;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.playback.PlaybackController;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
 
 /**
  * Fragment which is supposed to be displayed outside of the MediaplayerActivity
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 04c7fbf8e..f0e73a372 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -28,15 +28,15 @@ import android.widget.Toast;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.ShareUtils;
-import de.danoeh.antennapod.util.ShownotesProvider;
-import de.danoeh.antennapod.util.playback.Playable;
-import de.danoeh.antennapod.util.playback.PlaybackController;
-import de.danoeh.antennapod.util.playback.Timeline;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.ShareUtils;
+import de.danoeh.antennapod.core.util.ShownotesProvider;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
+import de.danoeh.antennapod.core.util.playback.Timeline;
 
 /**
  * Displays the description of a Playable object in a Webview.
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 909774467..b16e4f930 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -32,25 +32,25 @@ import de.danoeh.antennapod.activity.FeedInfoActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
-import de.danoeh.antennapod.asynctask.DownloadObserver;
-import de.danoeh.antennapod.asynctask.FeedRemover;
-import de.danoeh.antennapod.asynctask.PicassoProvider;
-import de.danoeh.antennapod.dialog.ConfirmationDialog;
-import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.core.asynctask.DownloadObserver;
+import de.danoeh.antennapod.core.asynctask.FeedRemover;
+import de.danoeh.antennapod.core.asynctask.PicassoProvider;
+import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
+import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.dialog.FeedItemDialog;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.service.download.DownloadService;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.service.download.DownloadService;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.menuhandler.FeedMenuHandler;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 /**
  * Displays a list of FeedItems.
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index fe995256b..4f37f4613 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -19,22 +19,22 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.NewEpisodesListAdapter;
-import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.core.asynctask.DownloadObserver;
 import de.danoeh.antennapod.dialog.FeedItemDialog;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.download.DownloadService;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.download.DownloadService;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index 470186180..61e4ae1bb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -16,17 +16,17 @@ import android.widget.ListView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
-import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.core.asynctask.DownloadObserver;
 import de.danoeh.antennapod.dialog.FeedItemDialog;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 2f322f75b..c1191d933 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -28,17 +28,17 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.QueueListAdapter;
-import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.core.asynctask.DownloadObserver;
 import de.danoeh.antennapod.dialog.FeedItemDialog;
-import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 /**
  * Shows all items in the queue
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
index 89c30e34b..514b05efd 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
@@ -5,9 +5,9 @@ import android.os.Handler;
 import android.support.v4.app.ListFragment;
 import android.view.View;
 import de.danoeh.antennapod.adapter.DownloadlistAdapter;
-import de.danoeh.antennapod.asynctask.DownloadObserver;
-import de.danoeh.antennapod.service.download.Downloader;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.asynctask.DownloadObserver;
+import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
index b3ade4d70..23cc1d0b8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
@@ -16,12 +16,12 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.SearchlistAdapter;
 import de.danoeh.antennapod.dialog.FeedItemDialog;
-import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.FeedSearcher;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.feed.*;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.FeedSearcher;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 1b4616207..14b3a9c40 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -5,23 +5,21 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.widget.*;
 import android.util.Log;
 import android.view.*;
 import android.widget.*;
-import android.widget.SearchView;
+
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
 import de.danoeh.antennapod.adapter.gpodnet.PodcastListAdapter;
-import de.danoeh.antennapod.fragment.SearchFragment;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
index 5717a74e7..33a35fa90 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
@@ -1,8 +1,8 @@
 package de.danoeh.antennapod.fragment.gpodnet;
 
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
index 801024787..b099953a8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
@@ -10,11 +10,11 @@ import org.apache.commons.lang3.Validate;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 /**
  * Performs a search on the gpodder.net directory and displays the results.
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java
index 45fe25580..133bb0281 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java
@@ -1,9 +1,9 @@
 package de.danoeh.antennapod.fragment.gpodnet;
 
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
index 204dda992..7e02b647f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
@@ -5,10 +5,10 @@ import android.os.Bundle;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetTag;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
index a7e1033df..819a28c2d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
@@ -18,11 +18,11 @@ import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
-import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.util.menuhandler.NavDrawerActivity;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.core.gpoddernet.model.GpodnetTag;
+import de.danoeh.antennapod.core.util.menuhandler.MenuItemUtils;
+import de.danoeh.antennapod.core.util.menuhandler.NavDrawerActivity;
 
 public class TagListFragment extends ListFragment {
     private static final String TAG = "TagListFragment";
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
index b0430d170..359a546f6 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
@@ -7,9 +7,9 @@ import android.util.Log;
 import android.widget.Toast;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;