71 files changed, 370 insertions, 370 deletions

diff --git a/src/de/podfetcher/PodcastApp.java b/src/de/danoeh/antennapod/PodcastApp.java
index b8175f77c..a82356663 100644
--- a/src/de/podfetcher/PodcastApp.java
+++ b/src/de/danoeh/antennapod/PodcastApp.java
@@ -1,4 +1,4 @@
-package de.podfetcher;
+package de.danoeh.antennapod;
 
 import java.util.concurrent.TimeUnit;
 
@@ -10,16 +10,16 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import de.podfetcher.asynctask.FeedImageLoader;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.receiver.FeedUpdateReceiver;
-import de.podfetcher.util.StorageUtils;
+import de.danoeh.antennapod.asynctask.FeedImageLoader;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.receiver.FeedUpdateReceiver;
+import de.danoeh.antennapod.util.StorageUtils;
 
 public class PodcastApp extends Application implements
 		SharedPreferences.OnSharedPreferenceChangeListener {
 
 	private static final String TAG = "PodcastApp";
-	public static final String PREF_NAME = "PodfetcherPrefs";
+	public static final String PREF_NAME = "AntennapodPrefs";
 
 	public static final String PREF_PAUSE_ON_HEADSET_DISCONNECT = "prefPauseOnHeadsetDisconnect";
 	public static final String PREF_FOLLOW_QUEUE = "prefFollowQueue";
diff --git a/src/de/podfetcher/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
index 994a8f102..433f8c2c3 100644
--- a/src/de/podfetcher/activity/AddFeedActivity.java
+++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.os.Bundle;
 import android.widget.Button;
@@ -12,18 +12,17 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.util.Log;
-import de.podfetcher.R;
-import de.podfetcher.asynctask.DownloadObserver;
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.util.ConnectionTester;
-import de.podfetcher.util.DownloadError;
-import de.podfetcher.util.StorageUtils;
-import de.podfetcher.util.URLChecker;
-import de.podfetcher.service.DownloadService;
-
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.ConnectionTester;
+import de.danoeh.antennapod.util.DownloadError;
+import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.util.URLChecker;
 import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
diff --git a/src/de/podfetcher/activity/DownloadActivity.java b/src/de/danoeh/antennapod/activity/DownloadActivity.java
index 0bfa0cbae..180a1b643 100644
--- a/src/de/podfetcher/activity/DownloadActivity.java
+++ b/src/de/danoeh/antennapod/activity/DownloadActivity.java
@@ -1,13 +1,13 @@
-package de.podfetcher.activity;
-
-import de.podfetcher.R;
-import de.podfetcher.service.DownloadService;
-import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.adapter.DownloadlistAdapter;
-import de.podfetcher.asynctask.DownloadObserver;
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.feed.FeedFile;
+package de.danoeh.antennapod.activity;
+
+import de.danoeh.antennapod.adapter.DownloadlistAdapter;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.feed.FeedFile;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.R;
 import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
diff --git a/src/de/podfetcher/activity/DownloadLogActivity.java b/src/de/danoeh/antennapod/activity/DownloadLogActivity.java
index 661f9d476..66240a3a7 100644
--- a/src/de/podfetcher/activity/DownloadLogActivity.java
+++ b/src/de/danoeh/antennapod/activity/DownloadLogActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.os.Bundle;
 
@@ -6,8 +6,8 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.adapter.DownloadLogAdapter;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.adapter.DownloadLogAdapter;
+import de.danoeh.antennapod.feed.FeedManager;
 
 public class DownloadLogActivity extends SherlockListActivity {
 	private static final String TAG = "DownloadLogActivity";
diff --git a/src/de/podfetcher/activity/FeedInfoActivity.java b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 3dcc9ec1a..2d0528e22 100644
--- a/src/de/podfetcher/activity/FeedInfoActivity.java
+++ b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -9,16 +9,16 @@ import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.asynctask.FeedImageLoader;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.asynctask.FeedImageLoader;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.R;
 
 /** Displays information about a feed. */
 public class FeedInfoActivity extends SherlockActivity {
 	private static final String TAG = "FeedInfoActivity";
 
-	public static final String EXTRA_FEED_ID = "de.podfetcher.extra.feedId";
+	public static final String EXTRA_FEED_ID = "de.danoeh.antennapod.extra.feedId";
 
 	private ImageView imgvCover;
 	private TextView txtvTitle;
diff --git a/src/de/podfetcher/activity/FeedItemlistActivity.java b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
index e6e673ac6..5e0971473 100644
--- a/src/de/podfetcher/activity/FeedItemlistActivity.java
+++ b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
@@ -13,14 +13,14 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 
-import de.podfetcher.R;
-import de.podfetcher.asynctask.FeedRemover;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.fragment.ItemlistFragment;
-import de.podfetcher.fragment.FeedlistFragment;
-import de.podfetcher.util.FeedMenuHandler;
-import de.podfetcher.util.StorageUtils;
+import de.danoeh.antennapod.asynctask.FeedRemover;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.fragment.FeedlistFragment;
+import de.danoeh.antennapod.fragment.ItemlistFragment;
+import de.danoeh.antennapod.util.FeedMenuHandler;
+import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.R;
 
 /** Displays a List of FeedItems */
 public class FeedItemlistActivity extends SherlockFragmentActivity {
diff --git a/src/de/podfetcher/activity/FlattrAuthActivity.java b/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index 72f4ce716..26773ae60 100644
--- a/src/de/podfetcher/activity/FlattrAuthActivity.java
+++ b/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import org.shredzone.flattr4j.exception.FlattrException;
 
@@ -15,8 +15,8 @@ import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.util.FlattrUtils;
+import de.danoeh.antennapod.util.FlattrUtils;
+import de.danoeh.antennapod.R;
 
 /** Guides the user through the authentication process */
 public class FlattrAuthActivity extends SherlockActivity {
@@ -40,7 +40,7 @@ public class FlattrAuthActivity extends SherlockActivity {
 			@Override
 			public void onClick(View v) {
 				startActivity(new Intent(FlattrAuthActivity.this,
-						PodfetcherActivity.class));
+						MainActivity.class));
 			}
 		});
 		
diff --git a/src/de/podfetcher/activity/ItemviewActivity.java b/src/de/danoeh/antennapod/activity/ItemviewActivity.java
index 931ba9f7c..2e071134c 100644
--- a/src/de/podfetcher/activity/ItemviewActivity.java
+++ b/src/de/danoeh/antennapod/activity/ItemviewActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import java.text.DateFormat;
 
@@ -16,15 +16,15 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 
-import de.podfetcher.R;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.fragment.FeedlistFragment;
-import de.podfetcher.fragment.ItemDescriptionFragment;
-import de.podfetcher.fragment.ItemlistFragment;
-import de.podfetcher.util.FeedItemMenuHandler;
-import de.podfetcher.util.StorageUtils;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.fragment.FeedlistFragment;
+import de.danoeh.antennapod.fragment.ItemDescriptionFragment;
+import de.danoeh.antennapod.fragment.ItemlistFragment;
+import de.danoeh.antennapod.util.FeedItemMenuHandler;
+import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.R;
 
 /** Displays a single FeedItem and provides various actions */
 public class ItemviewActivity extends SherlockFragmentActivity {
diff --git a/src/de/podfetcher/activity/PodfetcherActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java
index 3f67836fb..8ef7a1a62 100644
--- a/src/de/podfetcher/activity/PodfetcherActivity.java
+++ b/src/de/danoeh/antennapod/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -18,17 +18,17 @@ import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.viewpagerindicator.TabPageIndicator;
 
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.fragment.FeedlistFragment;
-import de.podfetcher.fragment.QueueFragment;
-import de.podfetcher.fragment.UnreadItemlistFragment;
-import de.podfetcher.service.DownloadService;
-import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.util.StorageUtils;
-
-public class PodfetcherActivity extends SherlockFragmentActivity {
-	private static final String TAG = "PodfetcherActivity";
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.fragment.FeedlistFragment;
+import de.danoeh.antennapod.fragment.QueueFragment;
+import de.danoeh.antennapod.fragment.UnreadItemlistFragment;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.R;
+
+public class MainActivity extends SherlockFragmentActivity {
+	private static final String TAG = "MainActivity";
 
 	private FeedManager manager;
 	private ViewPager viewpager;
diff --git a/src/de/podfetcher/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 655a12182..6b1cd60e2 100644
--- a/src/de/podfetcher/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -44,18 +44,18 @@ import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.viewpagerindicator.TabPageIndicator;
 
-import de.podfetcher.PodcastApp;
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.fragment.CoverFragment;
-import de.podfetcher.fragment.ItemDescriptionFragment;
-import de.podfetcher.service.PlaybackService;
-import de.podfetcher.service.PlayerStatus;
-import de.podfetcher.util.Converter;
-import de.podfetcher.util.DownloadError;
-import de.podfetcher.util.MediaPlayerError;
-import de.podfetcher.util.StorageUtils;
+import de.danoeh.antennapod.PodcastApp;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.fragment.CoverFragment;
+import de.danoeh.antennapod.fragment.ItemDescriptionFragment;
+import de.danoeh.antennapod.service.PlaybackService;
+import de.danoeh.antennapod.service.PlayerStatus;
+import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.util.DownloadError;
+import de.danoeh.antennapod.util.MediaPlayerError;
+import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.R;
 
 public class MediaplayerActivity extends SherlockFragmentActivity implements
 		SurfaceHolder.Callback {
diff --git a/src/de/podfetcher/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
index 4d1c4314b..374443103 100644
--- a/src/de/podfetcher/activity/PreferenceActivity.java
+++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.os.Bundle;
 import android.preference.Preference;
@@ -9,8 +9,8 @@ import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.util.FlattrUtils;
+import de.danoeh.antennapod.util.FlattrUtils;
+import de.danoeh.antennapod.R;
 
 public class PreferenceActivity extends SherlockPreferenceActivity {
 	private static final String TAG = "PreferenceActivity";
diff --git a/src/de/podfetcher/activity/StorageErrorActivity.java b/src/de/danoeh/antennapod/activity/StorageErrorActivity.java
index 0ffd01457..6e2d1b0cf 100644
--- a/src/de/podfetcher/activity/StorageErrorActivity.java
+++ b/src/de/danoeh/antennapod/activity/StorageErrorActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.activity;
+package de.danoeh.antennapod.activity;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -9,8 +9,8 @@ import android.util.Log;
 
 import com.actionbarsherlock.app.SherlockActivity;
 
-import de.podfetcher.R;
-import de.podfetcher.util.StorageUtils;
+import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.R;
 
 public class StorageErrorActivity extends SherlockActivity {
 	private static final String TAG = "StorageErrorActivity";
@@ -44,7 +44,7 @@ public class StorageErrorActivity extends SherlockActivity {
 	
 	private void leaveErrorState() {
 		finish();
-		startActivity(new Intent(this, PodfetcherActivity.class));
+		startActivity(new Intent(this, MainActivity.class));
 	}
 
 	private BroadcastReceiver mediaUpdate = new BroadcastReceiver() {
diff --git a/src/de/podfetcher/adapter/DownloadLogAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index c77a85c54..98948617c 100644
--- a/src/de/podfetcher/adapter/DownloadLogAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -1,4 +1,4 @@
-package de.podfetcher.adapter;
+package de.danoeh.antennapod.adapter;
 
 import java.text.DateFormat;
 import java.util.List;
@@ -11,13 +11,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
-import de.podfetcher.R;
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedFile;
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.util.DownloadError;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedFile;
+import de.danoeh.antennapod.feed.FeedImage;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.util.DownloadError;
+import de.danoeh.antennapod.R;
 
 /** Displays a list of DownloadStatus entries. */
 public class DownloadLogAdapter extends ArrayAdapter<DownloadStatus> {
diff --git a/src/de/podfetcher/adapter/DownloadlistAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 91060562d..380ba32be 100644
--- a/src/de/podfetcher/adapter/DownloadlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -1,4 +1,4 @@
-package de.podfetcher.adapter;
+package de.danoeh.antennapod.adapter;
 
 import java.util.List;
 
@@ -9,13 +9,13 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import de.podfetcher.R;
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedFile;
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.util.Converter;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedFile;
+import de.danoeh.antennapod.feed.FeedImage;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.R;
 
 public class DownloadlistAdapter extends ArrayAdapter<DownloadStatus> {
 	private int selectedItemIndex;
diff --git a/src/de/podfetcher/adapter/FeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 29283e9e0..5f068f590 100644
--- a/src/de/podfetcher/adapter/FeedItemlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -1,12 +1,12 @@
-package de.podfetcher.adapter;
+package de.danoeh.antennapod.adapter;
 
 import java.text.DateFormat;
 import java.util.List;
 
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.util.Converter;
-import de.podfetcher.R;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.R;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
diff --git a/src/de/podfetcher/adapter/FeedlistAdapter.java b/src/de/danoeh/antennapod/adapter/FeedlistAdapter.java
index 7ad98be1b..aeb0fede7 100644
--- a/src/de/podfetcher/adapter/FeedlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/FeedlistAdapter.java
@@ -1,13 +1,13 @@
-package de.podfetcher.adapter;
+package de.danoeh.antennapod.adapter;
 
 import java.io.File;
 import java.text.DateFormat;
 import java.util.List;
 
-import de.podfetcher.R;
-import de.podfetcher.asynctask.FeedImageLoader;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.storage.DownloadRequester;
+import de.danoeh.antennapod.asynctask.FeedImageLoader;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.R;
 import android.content.Context;
 import android.net.Uri;
 import android.text.format.DateUtils;
diff --git a/src/de/podfetcher/asynctask/DownloadObserver.java b/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
index 9234539ef..1aca934ed 100644
--- a/src/de/podfetcher/asynctask/DownloadObserver.java
+++ b/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
@@ -1,4 +1,4 @@
-package de.podfetcher.asynctask;
+package de.danoeh.antennapod.asynctask;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,9 +9,9 @@ import android.content.Context;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.util.Log;
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedFile;
-import de.podfetcher.storage.DownloadRequester;
+import de.danoeh.antennapod.feed.FeedFile;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.R;
 
 /** Observes the status of a specific Download */
 public class DownloadObserver extends AsyncTask<Void, Void, Void> {
diff --git a/src/de/podfetcher/asynctask/DownloadStatus.java b/src/de/danoeh/antennapod/asynctask/DownloadStatus.java
index e95c0708a..67cf4a6d8 100644
--- a/src/de/podfetcher/asynctask/DownloadStatus.java
+++ b/src/de/danoeh/antennapod/asynctask/DownloadStatus.java
@@ -1,8 +1,8 @@
-package de.podfetcher.asynctask;
+package de.danoeh.antennapod.asynctask;
 
 import java.util.Date;
 
-import de.podfetcher.feed.FeedFile;
+import de.danoeh.antennapod.feed.FeedFile;
 
 /** Contains status attributes for one download */
 public class DownloadStatus {
diff --git a/src/de/podfetcher/asynctask/FeedImageLoader.java b/src/de/danoeh/antennapod/asynctask/FeedImageLoader.java
index ce18aca50..7d411a329 100644
--- a/src/de/podfetcher/asynctask/FeedImageLoader.java
+++ b/src/de/danoeh/antennapod/asynctask/FeedImageLoader.java
@@ -1,12 +1,12 @@
-package de.podfetcher.asynctask;
+package de.danoeh.antennapod.asynctask;
 
 import java.io.File;
 
-import de.podfetcher.PodcastApp;
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.storage.DownloadRequester;
+import de.danoeh.antennapod.PodcastApp;
+import de.danoeh.antennapod.feed.FeedImage;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.R;
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.content.Context;
diff --git a/src/de/podfetcher/asynctask/FeedRemover.java b/src/de/danoeh/antennapod/asynctask/FeedRemover.java
index 504de95c0..7802b5677 100644
--- a/src/de/podfetcher/asynctask/FeedRemover.java
+++ b/src/de/danoeh/antennapod/asynctask/FeedRemover.java
@@ -1,7 +1,7 @@
-package de.podfetcher.asynctask;
+package de.danoeh.antennapod.asynctask;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedManager;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
diff --git a/src/de/podfetcher/feed/Feed.java b/src/de/danoeh/antennapod/feed/Feed.java
index ff4fc4c08..9d732a81f 100644
--- a/src/de/podfetcher/feed/Feed.java
+++ b/src/de/danoeh/antennapod/feed/Feed.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/de/podfetcher/feed/FeedCategory.java b/src/de/danoeh/antennapod/feed/FeedCategory.java
index fce4b1231..fc3d8d79b 100644
--- a/src/de/podfetcher/feed/FeedCategory.java
+++ b/src/de/danoeh/antennapod/feed/FeedCategory.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 public class FeedCategory extends FeedComponent{
 	protected String name;
diff --git a/src/de/podfetcher/feed/FeedComponent.java b/src/de/danoeh/antennapod/feed/FeedComponent.java
index 4070eb161..a192f4bc8 100644
--- a/src/de/podfetcher/feed/FeedComponent.java
+++ b/src/de/danoeh/antennapod/feed/FeedComponent.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 /**
  * Represents every possible component of a feed
diff --git a/src/de/podfetcher/feed/FeedFile.java b/src/de/danoeh/antennapod/feed/FeedFile.java
index 2a1c4eb2a..c7a9b7bc1 100644
--- a/src/de/podfetcher/feed/FeedFile.java
+++ b/src/de/danoeh/antennapod/feed/FeedFile.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 /** Represents a component of a Feed that has to be downloaded*/
 public abstract class FeedFile extends FeedComponent {
diff --git a/src/de/podfetcher/feed/FeedImage.java b/src/de/danoeh/antennapod/feed/FeedImage.java
index 918e6b78b..4b53f3da4 100644
--- a/src/de/podfetcher/feed/FeedImage.java
+++ b/src/de/danoeh/antennapod/feed/FeedImage.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 
 public class FeedImage extends FeedFile {
diff --git a/src/de/podfetcher/feed/FeedItem.java b/src/de/danoeh/antennapod/feed/FeedItem.java
index 2c127d570..732c61380 100644
--- a/src/de/podfetcher/feed/FeedItem.java
+++ b/src/de/danoeh/antennapod/feed/FeedItem.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/de/podfetcher/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index 549fbd4c9..26a3ffa77 100644
--- a/src/de/podfetcher/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -1,16 +1,16 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 
-import de.podfetcher.activity.MediaplayerActivity;
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.service.PlaybackService;
-import de.podfetcher.storage.*;
-import de.podfetcher.util.FeedItemPubdateComparator;
-import de.podfetcher.util.FeedtitleComparator;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.service.PlaybackService;
+import de.danoeh.antennapod.storage.*;
+import de.danoeh.antennapod.util.FeedItemPubdateComparator;
+import de.danoeh.antennapod.util.FeedtitleComparator;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -25,10 +25,10 @@ import android.util.Log;
 public class FeedManager {
 	private static final String TAG = "FeedManager";
 
-	public static final String ACTION_UNREAD_ITEMS_UPDATE = "de.podfetcher.action.feed.unreadItemsUpdate";
-	public static final String ACTION_QUEUE_UPDATE = "de.podfetcher.action.feed.queueUpdate";
-	public static final String EXTRA_FEED_ITEM_ID = "de.podfetcher.extra.feed.feedItemId";
-	public static final String EXTRA_FEED_ID = "de.podfetcher.extra.feed.feedId";
+	public static final String ACTION_UNREAD_ITEMS_UPDATE = "de.danoeh.antennapod.action.feed.unreadItemsUpdate";
+	public static final String ACTION_QUEUE_UPDATE = "de.danoeh.antennapod.action.feed.queueUpdate";
+	public static final String EXTRA_FEED_ITEM_ID = "de.danoeh.antennapod.extra.feed.feedItemId";
+	public static final String EXTRA_FEED_ID = "de.danoeh.antennapod.extra.feed.feedId";
 
 	/** Number of completed Download status entries to store. */
 	private static final int DOWNLOAD_LOG_SIZE = 25;
diff --git a/src/de/podfetcher/feed/FeedMedia.java b/src/de/danoeh/antennapod/feed/FeedMedia.java
index 44926e6cf..92059b712 100644
--- a/src/de/podfetcher/feed/FeedMedia.java
+++ b/src/de/danoeh/antennapod/feed/FeedMedia.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 public class FeedMedia extends FeedFile{
 	private int duration;
diff --git a/src/de/podfetcher/feed/SimpleChapter.java b/src/de/danoeh/antennapod/feed/SimpleChapter.java
index c6c489bf2..5e43bfeb6 100644
--- a/src/de/podfetcher/feed/SimpleChapter.java
+++ b/src/de/danoeh/antennapod/feed/SimpleChapter.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.danoeh.antennapod.feed;
 
 public class SimpleChapter extends FeedComponent {
 	public long getStart() {
diff --git a/src/de/podfetcher/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java
index 144147fe4..779fe7e3d 100644
--- a/src/de/podfetcher/fragment/CoverFragment.java
+++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -1,4 +1,4 @@
-package de.podfetcher.fragment;
+package de.danoeh.antennapod.fragment;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -10,12 +10,12 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
-import de.podfetcher.R;
-import de.podfetcher.asynctask.FeedImageLoader;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.feed.FeedMedia;
+import de.danoeh.antennapod.asynctask.FeedImageLoader;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.R;
 
 /** Displays the cover and the title of a FeedItem. */
 public class CoverFragment extends SherlockFragment {
diff --git a/src/de/podfetcher/fragment/FeedlistFragment.java b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
index 4eb2c96b2..b09e411ec 100644
--- a/src/de/podfetcher/fragment/FeedlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
@@ -1,13 +1,13 @@
-package de.podfetcher.fragment;
-
-import de.podfetcher.R;
-import de.podfetcher.feed.*;
-import de.podfetcher.activity.*;
-import de.podfetcher.adapter.FeedlistAdapter;
-import de.podfetcher.asynctask.FeedRemover;
-import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.service.DownloadService;
-import de.podfetcher.util.FeedMenuHandler;
+package de.danoeh.antennapod.fragment;
+
+import de.danoeh.antennapod.activity.*;
+import de.danoeh.antennapod.adapter.FeedlistAdapter;
+import de.danoeh.antennapod.asynctask.FeedRemover;
+import de.danoeh.antennapod.feed.*;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.FeedMenuHandler;
+import de.danoeh.antennapod.R;
 import android.os.Bundle;
 import android.app.Activity;
 import android.view.View;
@@ -31,7 +31,7 @@ import android.util.Log;
 public class FeedlistFragment extends SherlockListFragment implements
 		ActionMode.Callback {
 	private static final String TAG = "FeedlistFragment";
-	public static final String EXTRA_SELECTED_FEED = "extra.de.podfetcher.activity.selected_feed";
+	public static final String EXTRA_SELECTED_FEED = "extra.de.danoeh.antennapod.activity.selected_feed";
 
 	private FeedManager manager;
 	private FeedlistAdapter fla;
diff --git a/src/de/podfetcher/fragment/ItemDescriptionFragment.java b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index ea565854c..2e13b5ba0 100644
--- a/src/de/podfetcher/fragment/ItemDescriptionFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -1,4 +1,4 @@
-package de.podfetcher.fragment;
+package de.danoeh.antennapod.fragment;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -16,9 +16,9 @@ import android.webkit.WebView;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
 
 /** Displays the description of a FeedItem in a Webview. */
 public class ItemDescriptionFragment extends SherlockFragment {
diff --git a/src/de/podfetcher/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
index a4870c3dd..fa25eacab 100644
--- a/src/de/podfetcher/fragment/ItemlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -1,4 +1,4 @@
-package de.podfetcher.fragment;
+package de.danoeh.antennapod.fragment;
 
 import java.util.ArrayList;
 
@@ -18,23 +18,23 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.activity.ItemviewActivity;
-import de.podfetcher.adapter.FeedItemlistAdapter;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.service.DownloadService;
-import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.util.FeedItemMenuHandler;
+import de.danoeh.antennapod.activity.ItemviewActivity;
+import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.FeedItemMenuHandler;
+import de.danoeh.antennapod.R;
 
 /** Displays a list of FeedItems. */
 public class ItemlistFragment extends SherlockListFragment implements
 		ActionMode.Callback {
 
 	private static final String TAG = "ItemlistFragment";
-	public static final String EXTRA_SELECTED_FEEDITEM = "extra.de.podfetcher.activity.selected_feeditem";
-	public static final String ARGUMENT_FEED_ID = "argument.de.podfetcher.feed_id";
+	public static final String EXTRA_SELECTED_FEEDITEM = "extra.de.danoeh.antennapod.activity.selected_feeditem";
+	public static final String ARGUMENT_FEED_ID = "argument.de.danoeh.antennapod.feed_id";
 	protected FeedItemlistAdapter fila;
 	protected FeedManager manager;
 	protected DownloadRequester requester;
diff --git a/src/de/podfetcher/fragment/QueueFragment.java b/src/de/danoeh/antennapod/fragment/QueueFragment.java
index 6144e50c4..ff2a682ad 100644
--- a/src/de/podfetcher/fragment/QueueFragment.java
+++ b/src/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -1,4 +1,4 @@
-package de.podfetcher.fragment;
+package de.danoeh.antennapod.fragment;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -11,8 +11,8 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.R;
 
 public class QueueFragment extends ItemlistFragment {
 
diff --git a/src/de/podfetcher/fragment/UnreadItemlistFragment.java b/src/de/danoeh/antennapod/fragment/UnreadItemlistFragment.java
index becb3ec53..8914f781a 100644
--- a/src/de/podfetcher/fragment/UnreadItemlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/UnreadItemlistFragment.java
@@ -1,4 +1,4 @@
-package de.podfetcher.fragment;
+package de.danoeh.antennapod.fragment;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
@@ -9,8 +9,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.R;
 
 /** Contains all unread items. */
 public class UnreadItemlistFragment extends ItemlistFragment {
diff --git a/src/de/podfetcher/receiver/FeedUpdateReceiver.java b/src/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java
index 50b2b0ab5..d4ce74db3 100644
--- a/src/de/podfetcher/receiver/FeedUpdateReceiver.java
+++ b/src/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java
@@ -1,7 +1,7 @@
-package de.podfetcher.receiver;
+package de.danoeh.antennapod.receiver;
 
-import de.podfetcher.PodcastApp;
-import de.podfetcher.feed.FeedManager;
+import de.danoeh.antennapod.PodcastApp;
+import de.danoeh.antennapod.feed.FeedManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -13,7 +13,7 @@ import android.util.Log;
 /** Refreshes all feeds when it receives an intent */
 public class FeedUpdateReceiver extends BroadcastReceiver {
 	private static final String TAG = "FeedUpdateReceiver";
-	public static final String ACTION_REFRESH_FEEDS = "de.podfetcher.feedupdatereceiver.refreshFeeds";
+	public static final String ACTION_REFRESH_FEEDS = "de.danoeh.antennapod.feedupdatereceiver.refreshFeeds";
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
diff --git a/src/de/podfetcher/receiver/MediaButtonReceiver.java b/src/de/danoeh/antennapod/receiver/MediaButtonReceiver.java
index 40defba10..003f9434b 100644
--- a/src/de/podfetcher/receiver/MediaButtonReceiver.java
+++ b/src/de/danoeh/antennapod/receiver/MediaButtonReceiver.java
@@ -1,6 +1,6 @@
-package de.podfetcher.receiver;
+package de.danoeh.antennapod.receiver;
 
-import de.podfetcher.service.PlaybackService;
+import de.danoeh.antennapod.service.PlaybackService;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -13,9 +13,9 @@ import android.view.KeyEvent;
 /** Receives media button events. */
 public class MediaButtonReceiver extends BroadcastReceiver {
 	private static final String TAG = "MediaButtonReceiver";
-	public static final String EXTRA_KEYCODE = "de.podfetcher.service.extra.MediaButtonReceiver.KEYCODE";
+	public static final String EXTRA_KEYCODE = "de.danoeh.antennapod.service.extra.MediaButtonReceiver.KEYCODE";
 
-	public static final String NOTIFY_BUTTON_RECEIVER = "de.podfetcher.NOTIFY_BUTTON_RECEIVER";
+	public static final String NOTIFY_BUTTON_RECEIVER = "de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER";
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
diff --git a/src/de/podfetcher/receiver/PlayerWidget.java b/src/de/danoeh/antennapod/receiver/PlayerWidget.java
index 85083734d..328e14c63 100644
--- a/src/de/podfetcher/receiver/PlayerWidget.java
+++ b/src/de/danoeh/antennapod/receiver/PlayerWidget.java
@@ -1,6 +1,6 @@
-package de.podfetcher.receiver;
+package de.danoeh.antennapod.receiver;
 
-import de.podfetcher.service.PlayerWidgetService;
+import de.danoeh.antennapod.service.PlayerWidgetService;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
@@ -9,7 +9,7 @@ import android.util.Log;
 
 public class PlayerWidget extends AppWidgetProvider {
 	private static final String TAG = "PlayerWidget";
-	public static final String FORCE_WIDGET_UPDATE = "de.podfetcher.FORCE_WIDGET_UPDATE";
+	public static final String FORCE_WIDGET_UPDATE = "de.danoeh.antennapod.FORCE_WIDGET_UPDATE";
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
diff --git a/src/de/podfetcher/service/DownloadService.java b/src/de/danoeh/antennapod/service/DownloadService.java
index e3e844a02..99e868bff 100644
--- a/src/de/podfetcher/service/DownloadService.java
+++ b/src/de/danoeh/antennapod/service/DownloadService.java
@@ -3,7 +3,7 @@
  * to complete, then stops
  * */
 
-package de.podfetcher.service;
+package de.danoeh.antennapod.service;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,17 +16,17 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.SAXException;
 
-import de.podfetcher.activity.DownloadActivity;
-import de.podfetcher.activity.MediaplayerActivity;
-import de.podfetcher.activity.PodfetcherActivity;
-import de.podfetcher.asynctask.DownloadObserver;
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.feed.*;
-import de.podfetcher.service.PlaybackService.LocalBinder;
-import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.syndication.handler.FeedHandler;
-import de.podfetcher.syndication.handler.UnsupportedFeedtypeException;
-import de.podfetcher.util.DownloadError;
+import de.danoeh.antennapod.activity.DownloadActivity;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.feed.*;
+import de.danoeh.antennapod.service.PlaybackService.LocalBinder;
+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.DownloadError;
 import android.R;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -53,16 +53,16 @@ import android.os.Messenger;
 public class DownloadService extends Service {
 	private static final String TAG = "DownloadService";
 
-	public static String ACTION_ALL_FEED_DOWNLOADS_COMPLETED = "action.de.podfetcher.storage.all_feed_downloads_completed";
-	public static final String ACTION_FEED_SYNC_COMPLETED = "action.de.podfetcher.service.feed_sync_completed";
+	public static String ACTION_ALL_FEED_DOWNLOADS_COMPLETED = "action.de.danoeh.antennapod.storage.all_feed_downloads_completed";
+	public static final String ACTION_FEED_SYNC_COMPLETED = "action.de.danoeh.antennapod.service.feed_sync_completed";
 
-	public static final String ACTION_DOWNLOAD_HANDLED = "action.de.podfetcher.service.download_handled";
+	public static final String ACTION_DOWNLOAD_HANDLED = "action.de.danoeh.antennapod.service.download_handled";
 	/** True if handled feed has an image. */
-	public static final String EXTRA_FEED_HAS_IMAGE = "extra.de.podfetcher.service.feed_has_image";
+	public static final String EXTRA_FEED_HAS_IMAGE = "extra.de.danoeh.antennapod.service.feed_has_image";
 	/** ID of DownloadStatus. */
-	public static final String EXTRA_STATUS_ID = "extra.de.podfetcher.service.feedfile_id";
-	public static final String EXTRA_DOWNLOAD_ID = "extra.de.podfetcher.service.download_id";
-	public static final String EXTRA_IMAGE_DOWNLOAD_ID = "extra.de.podfetcher.service.image_download_id";
+	public static final String EXTRA_STATUS_ID = "extra.de.danoeh.antennapod.service.feedfile_id";
+	public static final String EXTRA_DOWNLOAD_ID = "extra.de.danoeh.antennapod.service.download_id";
+	public static final String EXTRA_IMAGE_DOWNLOAD_ID = "extra.de.danoeh.antennapod.service.image_download_id";
 
 	private ArrayList<DownloadStatus> completedDownloads;
 
@@ -289,9 +289,9 @@ public class DownloadService extends Service {
 			// create notification object
 			Notification notification = new NotificationCompat.Builder(this)
 					.setTicker(
-							getString(de.podfetcher.R.string.download_report_title))
+							getString(de.danoeh.antennapod.R.string.download_report_title))
 					.setContentTitle(
-							getString(de.podfetcher.R.string.download_report_title))
+							getString(de.danoeh.antennapod.R.string.download_report_title))
 					.setContentText(
 							successfulDownloads + " Downloads succeeded, "
 									+ failedDownloads + " failed")
@@ -301,7 +301,7 @@ public class DownloadService extends Service {
 									R.drawable.stat_notify_sync))
 					.setContentIntent(
 							PendingIntent.getActivity(this, 0, new Intent(this,
-									PodfetcherActivity.class), 0))
+									MainActivity.class), 0))
 					.setAutoCancel(true).getNotification();
 			NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 			nm.notify(REPORT_ID, notification);
diff --git a/src/de/podfetcher/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index 12effb324..07193ce7f 100644
--- a/src/de/podfetcher/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -1,4 +1,4 @@
-package de.podfetcher.service;
+package de.danoeh.antennapod.service;
 
 import java.io.IOException;
 
@@ -24,14 +24,14 @@ import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.SurfaceHolder;
-import de.podfetcher.PodcastApp;
-import de.podfetcher.activity.MediaplayerActivity;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.receiver.MediaButtonReceiver;
-import de.podfetcher.receiver.PlayerWidget;
+import de.danoeh.antennapod.PodcastApp;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.receiver.PlayerWidget;
 
 /** Controls the MediaPlayer that plays a FeedMedia-file */
 public class PlaybackService extends Service {
@@ -39,29 +39,29 @@ public class PlaybackService extends Service {
 	private static final String TAG = "PlaybackService";
 
 	/** Contains the id of the media that was played last. */
-	public static final String PREF_LAST_PLAYED_ID = "de.podfetcher.preferences.lastPlayedId";
+	public static final String PREF_LAST_PLAYED_ID = "de.danoeh.antennapod.preferences.lastPlayedId";
 	/** Contains the feed id of the last played item. */
-	public static final String PREF_LAST_PLAYED_FEED_ID = "de.podfetcher.preferences.lastPlayedFeedId";
+	public static final String PREF_LAST_PLAYED_FEED_ID = "de.danoeh.antennapod.preferences.lastPlayedFeedId";
 	/** True if last played media was streamed. */
-	public static final String PREF_LAST_IS_STREAM = "de.podfetcher.preferences.lastIsStream";
+	public static final String PREF_LAST_IS_STREAM = "de.danoeh.antennapod.preferences.lastIsStream";
 
 	/** Contains the id of the FeedMedia object. */
-	public static final String EXTRA_MEDIA_ID = "extra.de.podfetcher.service.mediaId";
+	public static final String EXTRA_MEDIA_ID = "extra.de.danoeh.antennapod.service.mediaId";
 	/** Contains the id of the Feed object of the FeedMedia. */
-	public static final String EXTRA_FEED_ID = "extra.de.podfetcher.service.feedId";
+	public static final String EXTRA_FEED_ID = "extra.de.danoeh.antennapod.service.feedId";
 	/** True if media should be streamed. */
-	public static final String EXTRA_SHOULD_STREAM = "extra.de.podfetcher.service.shouldStream";
+	public static final String EXTRA_SHOULD_STREAM = "extra.de.danoeh.antennapod.service.shouldStream";
 	/**
 	 * True if playback should be started immediately after media has been
 	 * prepared.
 	 */
-	public static final String EXTRA_START_WHEN_PREPARED = "extra.de.podfetcher.service.startWhenPrepared";
+	public static final String EXTRA_START_WHEN_PREPARED = "extra.de.danoeh.antennapod.service.startWhenPrepared";
 
-	public static final String ACTION_PLAYER_STATUS_CHANGED = "action.de.podfetcher.service.playerStatusChanged";
+	public static final String ACTION_PLAYER_STATUS_CHANGED = "action.de.danoeh.antennapod.service.playerStatusChanged";
 
-	public static final String ACTION_PLAYER_NOTIFICATION = "action.de.podfetcher.service.playerNotification";
-	public static final String EXTRA_NOTIFICATION_CODE = "extra.de.podfetcher.service.notificationCode";
-	public static final String EXTRA_NOTIFICATION_TYPE = "extra.de.podfetcher.service.notificationType";
+	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 int NOTIFICATION_TYPE_ERROR = 0;
 	public static final int NOTIFICATION_TYPE_INFO = 1;
diff --git a/src/de/podfetcher/service/PlayerStatus.java b/src/de/danoeh/antennapod/service/PlayerStatus.java
index 678ef111e..c1c047e2b 100644
--- a/src/de/podfetcher/service/PlayerStatus.java
+++ b/src/de/danoeh/antennapod/service/PlayerStatus.java
@@ -1,4 +1,4 @@
-package de.podfetcher.service;
+package de.danoeh.antennapod.service;
 
 public enum PlayerStatus {
 	ERROR, PREPARING, PAUSED, PLAYING, STOPPED, PREPARED, SEEKING, AWAITING_VIDEO_SURFACE
diff --git a/src/de/podfetcher/service/PlayerWidgetService.java b/src/de/danoeh/antennapod/service/PlayerWidgetService.java
index 23975c34e..e68395062 100644
--- a/src/de/podfetcher/service/PlayerWidgetService.java
+++ b/src/de/danoeh/antennapod/service/PlayerWidgetService.java
@@ -1,4 +1,4 @@
-package de.podfetcher.service;
+package de.danoeh.antennapod.service;
 
 import android.app.PendingIntent;
 import android.app.Service;
@@ -12,12 +12,12 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.RemoteViews;
-import de.podfetcher.R;
-import de.podfetcher.activity.MediaplayerActivity;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.receiver.MediaButtonReceiver;
-import de.podfetcher.receiver.PlayerWidget;
-import de.podfetcher.util.Converter;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.receiver.PlayerWidget;
+import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.R;
 
 /** Updates the state of the player widget */
 public class PlayerWidgetService extends Service {
diff --git a/src/de/podfetcher/storage/DownloadRequester.java b/src/de/danoeh/antennapod/storage/DownloadRequester.java
index 06e125df8..6aaabafaa 100644
--- a/src/de/podfetcher/storage/DownloadRequester.java
+++ b/src/de/danoeh/antennapod/storage/DownloadRequester.java
@@ -1,13 +1,13 @@
-package de.podfetcher.storage;
+package de.danoeh.antennapod.storage;
 
 import java.util.ArrayList;
 import java.io.File;
 import java.util.concurrent.Callable;
 
-import de.podfetcher.feed.*;
-import de.podfetcher.service.DownloadService;
-import de.podfetcher.util.NumberGenerator;
-import de.podfetcher.R;
+import de.danoeh.antennapod.feed.*;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.util.NumberGenerator;
+import de.danoeh.antennapod.R;
 
 import android.util.Log;
 import android.database.Cursor;
@@ -28,10 +28,10 @@ public class DownloadRequester {
 	private static final String TAG = "DownloadRequester";
 	private static final int currentApi = android.os.Build.VERSION.SDK_INT;
 
-	public static String EXTRA_DOWNLOAD_ID = "extra.de.podfetcher.storage.download_id";
-	public static String EXTRA_ITEM_ID = "extra.de.podfetcher.storage.item_id";
+	public static String EXTRA_DOWNLOAD_ID = "extra.de.danoeh.antennapod.storage.download_id";
+	public static String EXTRA_ITEM_ID = "extra.de.danoeh.antennapod.storage.item_id";
 
-	public static String ACTION_DOWNLOAD_QUEUED = "action.de.podfetcher.storage.downloadQueued";
+	public static String ACTION_DOWNLOAD_QUEUED = "action.de.danoeh.antennapod.storage.downloadQueued";
 	
 
 	private static boolean STORE_ON_SD = true;
diff --git a/src/de/podfetcher/storage/PodDBAdapter.java b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
index 4a798b289..c9a68717d 100644
--- a/src/de/podfetcher/storage/PodDBAdapter.java
+++ b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
@@ -1,14 +1,14 @@
-package de.podfetcher.storage;
+package de.danoeh.antennapod.storage;
 
 import java.util.ArrayList;
 
-import de.podfetcher.asynctask.DownloadStatus;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedCategory;
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.feed.SimpleChapter;
+import de.danoeh.antennapod.asynctask.DownloadStatus;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedCategory;
+import de.danoeh.antennapod.feed.FeedImage;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.feed.SimpleChapter;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -24,7 +24,7 @@ import android.util.Log;
 public class PodDBAdapter {
 	private static final String TAG = "PodDBAdapter";
 	private static final int DATABASE_VERSION = 1;
-	private static final String DATABASE_NAME = "Podfetcher.db";
+	private static final String DATABASE_NAME = "Antennapod.db";
 
 	// Key-constants
 	public static final String KEY_ID = "id";
@@ -547,7 +547,7 @@ public class PodDBAdapter {
 		return image;
 	}
 
-	/** Helper class for opening the Podfetcher database. */
+	/** Helper class for opening the Antennapod database. */
 	private static class PodDBHelper extends SQLiteOpenHelper {
 
 		/**
diff --git a/src/de/podfetcher/syndication/handler/FeedHandler.java b/src/de/danoeh/antennapod/syndication/handler/FeedHandler.java
index f52dcbdec..dfcfcf98d 100644
--- a/src/de/podfetcher/syndication/handler/FeedHandler.java
+++ b/src/de/danoeh/antennapod/syndication/handler/FeedHandler.java
@@ -1,4 +1,4 @@
-package de.podfetcher.syndication.handler;
+package de.danoeh.antennapod.syndication.handler;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.xml.sax.SAXException;
 
-import de.podfetcher.feed.Feed;
+import de.danoeh.antennapod.feed.Feed;
 
 public class FeedHandler {
 
diff --git a/src/de/podfetcher/syndication/handler/HandlerState.java b/src/de/danoeh/antennapod/syndication/handler/HandlerState.java
index 4488fd8fa..1d81d0fb1 100644
--- a/src/de/podfetcher/syndication/handler/HandlerState.java
+++ b/src/de/danoeh/antennapod/syndication/handler/HandlerState.java
@@ -1,13 +1,13 @@
-package de.podfetcher.syndication.handler;
+package de.danoeh.antennapod.syndication.handler;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Stack;
 
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
+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;
 
 /** Contains all relevant information to describe the current state of a SyndHandler.*/
 public class HandlerState {
diff --git a/src/de/podfetcher/syndication/handler/SyndHandler.java b/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
index 5b8cbd01a..396f170c5 100644
--- a/src/de/podfetcher/syndication/handler/SyndHandler.java
+++ b/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
@@ -1,4 +1,4 @@
-package de.podfetcher.syndication.handler;
+package de.danoeh.antennapod.syndication.handler;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -6,14 +6,14 @@ import org.xml.sax.helpers.DefaultHandler;
 
 import android.util.Log;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
-import de.podfetcher.syndication.namespace.atom.NSAtom;
-import de.podfetcher.syndication.namespace.content.NSContent;
-import de.podfetcher.syndication.namespace.itunes.NSITunes;
-import de.podfetcher.syndication.namespace.rss20.NSRSS20;
-import de.podfetcher.syndication.namespace.simplechapters.NSSimpleChapters;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.syndication.namespace.atom.NSAtom;
+import de.danoeh.antennapod.syndication.namespace.content.NSContent;
+import de.danoeh.antennapod.syndication.namespace.itunes.NSITunes;
+import de.danoeh.antennapod.syndication.namespace.rss20.NSRSS20;
+import de.danoeh.antennapod.syndication.namespace.simplechapters.NSSimpleChapters;
 
 /** Superclass for all SAX Handlers which process Syndication formats */
 public class SyndHandler extends DefaultHandler {
diff --git a/src/de/podfetcher/syndication/handler/TypeGetter.java b/src/de/danoeh/antennapod/syndication/handler/TypeGetter.java
index 82bd371de..7e346ca5c 100644
--- a/src/de/podfetcher/syndication/handler/TypeGetter.java
+++ b/src/de/danoeh/antennapod/syndication/handler/TypeGetter.java
@@ -1,4 +1,4 @@
-package de.podfetcher.syndication.handler;
+package de.danoeh.antennapod.syndication.handler;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -12,7 +12,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
 
 import android.util.Log;
 
-import de.podfetcher.feed.Feed;
+import de.danoeh.antennapod.feed.Feed;
 
 /** Gets the type of a specific feed by reading the root element. */
 public class TypeGetter {
diff --git a/src/de/podfetcher/syndication/handler/UnsupportedFeedtypeException.java b/src/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java
index 2ca6f02b0..67fbc9cc9 100644
--- a/src/de/podfetcher/syndication/handler/UnsupportedFeedtypeException.java
+++ b/src/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java
@@ -1,6 +1,6 @@
-package de.podfetcher.syndication.handler;
+package de.danoeh.antennapod.syndication.handler;
 
-import de.podfetcher.syndication.handler.TypeGetter.Type;
+import de.danoeh.antennapod.syndication.handler.TypeGetter.Type;
 
 public class UnsupportedFeedtypeException extends Exception {
 	private static final long serialVersionUID = 9105878964928170669L;
diff --git a/src/de/podfetcher/syndication/namespace/Namespace.java b/src/de/danoeh/antennapod/syndication/namespace/Namespace.java
index 5d34250dc..496d314a9 100644
--- a/src/de/podfetcher/syndication/namespace/Namespace.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/Namespace.java
@@ -1,9 +1,9 @@
-package de.podfetcher.syndication.namespace;
+package de.danoeh.antennapod.syndication.namespace;
 
 import org.xml.sax.Attributes;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.syndication.handler.HandlerState;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.syndication.handler.HandlerState;
 
 
 public abstract class Namespace {
diff --git a/src/de/podfetcher/syndication/namespace/SyndElement.java b/src/de/danoeh/antennapod/syndication/namespace/SyndElement.java
index 2dd4e7062..187312c9e 100644
--- a/src/de/podfetcher/syndication/namespace/SyndElement.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/SyndElement.java
@@ -1,4 +1,4 @@
-package de.podfetcher.syndication.namespace;
+package de.danoeh.antennapod.syndication.namespace;
 
 /** Defines a XML Element that is pushed on the tagstack */
 public class SyndElement {
diff --git a/src/de/podfetcher/syndication/namespace/atom/AtomText.java b/src/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java
index 3669fc758..16beb277b 100644
--- a/src/de/podfetcher/syndication/namespace/atom/AtomText.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java
@@ -1,9 +1,9 @@
-package de.podfetcher.syndication.namespace.atom;
+package de.danoeh.antennapod.syndication.namespace.atom;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
 
 /** Represents Atom Element which contains text (content, title, summary). */
 public class AtomText extends SyndElement {
diff --git a/src/de/podfetcher/syndication/namespace/atom/NSAtom.java b/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java
index 5597f787f..dbe1334b6 100644
--- a/src/de/podfetcher/syndication/namespace/atom/NSAtom.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java
@@ -1,18 +1,18 @@
-package de.podfetcher.syndication.namespace.atom;
+package de.danoeh.antennapod.syndication.namespace.atom;
 
 import org.xml.sax.Attributes;
 
 import android.util.Log;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.syndication.handler.HandlerState;
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
-import de.podfetcher.syndication.namespace.rss20.NSRSS20;
-import de.podfetcher.syndication.util.SyndDateUtils;
+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.syndication.handler.HandlerState;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.syndication.namespace.rss20.NSRSS20;
+import de.danoeh.antennapod.syndication.util.SyndDateUtils;
 
 public class NSAtom extends Namespace {
 	private static final String TAG = "NSAtom";
diff --git a/src/de/podfetcher/syndication/namespace/content/NSContent.java b/src/de/danoeh/antennapod/syndication/namespace/content/NSContent.java
index 3cfdedac3..7713eb9c3 100644
--- a/src/de/podfetcher/syndication/namespace/content/NSContent.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/content/NSContent.java
@@ -1,11 +1,12 @@
-package de.podfetcher.syndication.namespace.content;
+package de.danoeh.antennapod.syndication.namespace.content;
 
 import org.xml.sax.Attributes;
 
-import de.podfetcher.syndication.handler.HandlerState;
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
-import de.podfetcher.syndication.namespace.rss20.NSRSS20;
+import de.danoeh.antennapod.syndication.handler.HandlerState;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.syndication.namespace.rss20.NSRSS20;
+
 import org.apache.commons.lang3.StringEscapeUtils;
 
 public class NSContent extends Namespace {
diff --git a/src/de/podfetcher/syndication/namespace/itunes/NSITunes.java b/src/de/danoeh/antennapod/syndication/namespace/itunes/NSITunes.java
index db78c73c3..92f25f15c 100644
--- a/src/de/podfetcher/syndication/namespace/itunes/NSITunes.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/itunes/NSITunes.java
@@ -1,11 +1,11 @@
-package de.podfetcher.syndication.namespace.itunes;
+package de.danoeh.antennapod.syndication.namespace.itunes;
 
 import org.xml.sax.Attributes;
 
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.syndication.handler.HandlerState;
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.feed.FeedImage;
+import de.danoeh.antennapod.syndication.handler.HandlerState;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
 
 public class NSITunes extends Namespace{
 	public static final String NSTAG = "itunes";
diff --git a/src/de/podfetcher/syndication/namespace/rss20/NSRSS20.java b/src/de/danoeh/antennapod/syndication/namespace/rss20/NSRSS20.java
index dfae49b7d..6dcd8daa0 100644
--- a/src/de/podfetcher/syndication/namespace/rss20/NSRSS20.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/rss20/NSRSS20.java
@@ -1,17 +1,17 @@
-package de.podfetcher.syndication.namespace.rss20;
+package de.danoeh.antennapod.syndication.namespace.rss20;
 
 import java.util.ArrayList;
 import java.util.Date;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedImage;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedMedia;
-import de.podfetcher.syndication.handler.HandlerState;
-import de.podfetcher.syndication.handler.SyndHandler;
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
-import de.podfetcher.syndication.util.SyndDateUtils;
+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.syndication.handler.HandlerState;
+import de.danoeh.antennapod.syndication.handler.SyndHandler;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.syndication.util.SyndDateUtils;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff --git a/src/de/podfetcher/syndication/namespace/simplechapters/NSSimpleChapters.java b/src/de/danoeh/antennapod/syndication/namespace/simplechapters/NSSimpleChapters.java
index 4b3a69cbe..3c7853304 100644
--- a/src/de/podfetcher/syndication/namespace/simplechapters/NSSimpleChapters.java
+++ b/src/de/danoeh/antennapod/syndication/namespace/simplechapters/NSSimpleChapters.java
@@ -1,14 +1,14 @@
-package de.podfetcher.syndication.namespace.simplechapters;
+package de.danoeh.antennapod.syndication.namespace.simplechapters;
 
 import java.util.ArrayList;
 
 import org.xml.sax.Attributes;
 
-import de.podfetcher.feed.SimpleChapter;
-import de.podfetcher.syndication.handler.HandlerState;
-import de.podfetcher.syndication.namespace.Namespace;
-import de.podfetcher.syndication.namespace.SyndElement;
-import de.podfetcher.syndication.util.SyndDateUtils;
+import de.danoeh.antennapod.feed.SimpleChapter;
+import de.danoeh.antennapod.syndication.handler.HandlerState;
+import de.danoeh.antennapod.syndication.namespace.Namespace;
+import de.danoeh.antennapod.syndication.namespace.SyndElement;
+import de.danoeh.antennapod.syndication.util.SyndDateUtils;
 
 public class NSSimpleChapters extends Namespace {
 	public static final String NSTAG = "sc";
diff --git a/src/de/podfetcher/syndication/util/SyndDateUtils.java b/src/de/danoeh/antennapod/syndication/util/SyndDateUtils.java
index 3f8fcbfd3..226a79721 100644
--- a/src/de/podfetcher/syndication/util/SyndDateUtils.java
+++ b/src/de/danoeh/antennapod/syndication/util/SyndDateUtils.java
@@ -1,4 +1,4 @@
-package de.podfetcher.syndication.util;
+package de.danoeh.antennapod.syndication.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/src/de/podfetcher/util/ConnectionTester.java b/src/de/danoeh/antennapod/util/ConnectionTester.java
index 80370292f..d50e63f00 100644
--- a/src/de/podfetcher/util/ConnectionTester.java
+++ b/src/de/danoeh/antennapod/util/ConnectionTester.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
diff --git a/src/de/podfetcher/util/Converter.java b/src/de/danoeh/antennapod/util/Converter.java
index 46fddb152..f02e8ea69 100644
--- a/src/de/podfetcher/util/Converter.java
+++ b/src/de/danoeh/antennapod/util/Converter.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import android.util.Log;
 
diff --git a/src/de/podfetcher/util/DownloadError.java b/src/de/danoeh/antennapod/util/DownloadError.java
index 366bb3d3f..b2f43a8dd 100644
--- a/src/de/podfetcher/util/DownloadError.java
+++ b/src/de/danoeh/antennapod/util/DownloadError.java
@@ -1,6 +1,6 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
-import de.podfetcher.R;
+import de.danoeh.antennapod.R;
 import android.app.DownloadManager;
 import android.content.Context;
 
diff --git a/src/de/podfetcher/util/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java
index 2b54db490..b97bf35b3 100644
--- a/src/de/podfetcher/util/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,10 +8,10 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.storage.DownloadRequester;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.R;
 
 /** Handles interactions with the FeedItemMenu. */
 public class FeedItemMenuHandler {
diff --git a/src/de/podfetcher/util/FeedItemPubdateComparator.java b/src/de/danoeh/antennapod/util/FeedItemPubdateComparator.java
index f58c229c2..bfeaf59e8 100644
--- a/src/de/podfetcher/util/FeedItemPubdateComparator.java
+++ b/src/de/danoeh/antennapod/util/FeedItemPubdateComparator.java
@@ -1,8 +1,8 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import java.util.Comparator;
 
-import de.podfetcher.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedItem;
 
 /** Compares the pubDate of two FeedItems for sorting*/
 public class FeedItemPubdateComparator implements Comparator<FeedItem> {
diff --git a/src/de/podfetcher/util/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/FeedMenuHandler.java
index b1e8bfef8..10afc687c 100644
--- a/src/de/podfetcher/util/FeedMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/FeedMenuHandler.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,13 +10,13 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import de.podfetcher.R;
-import de.podfetcher.activity.FeedInfoActivity;
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.service.DownloadService;
-import de.podfetcher.storage.DownloadRequester;
+import de.danoeh.antennapod.activity.FeedInfoActivity;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.service.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.R;
 
 /** Handles interactions with the FeedItemMenu. */
 public class FeedMenuHandler {
diff --git a/src/de/podfetcher/util/FeedtitleComparator.java b/src/de/danoeh/antennapod/util/FeedtitleComparator.java
index d840b6a9f..39a258b62 100644
--- a/src/de/podfetcher/util/FeedtitleComparator.java
+++ b/src/de/danoeh/antennapod/util/FeedtitleComparator.java
@@ -1,8 +1,8 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import java.util.Comparator;
 
-import de.podfetcher.feed.Feed;
+import de.danoeh.antennapod.feed.Feed;
 
 /** Compares the title of two feeds for sorting. */
 public class FeedtitleComparator implements Comparator<Feed> {
diff --git a/src/de/podfetcher/util/FlattrUtils.java b/src/de/danoeh/antennapod/util/FlattrUtils.java
index 01f0ca4f9..b8f1d02bc 100644
--- a/src/de/podfetcher/util/FlattrUtils.java
+++ b/src/de/danoeh/antennapod/util/FlattrUtils.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import java.util.EnumSet;
 
@@ -20,9 +20,9 @@ import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
-import de.podfetcher.PodcastApp;
-import de.podfetcher.R;
-import de.podfetcher.activity.FlattrAuthActivity;
+import de.danoeh.antennapod.PodcastApp;
+import de.danoeh.antennapod.activity.FlattrAuthActivity;
+import de.danoeh.antennapod.R;
 
 /** Utility methods for doing something with flattr. */
 public class FlattrUtils {
diff --git a/src/de/podfetcher/util/MediaPlayerError.java b/src/de/danoeh/antennapod/util/MediaPlayerError.java
index 6b39762a6..0ce95fe65 100644
--- a/src/de/podfetcher/util/MediaPlayerError.java
+++ b/src/de/danoeh/antennapod/util/MediaPlayerError.java
@@ -1,6 +1,6 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
-import de.podfetcher.R;
+import de.danoeh.antennapod.R;
 import android.content.Context;
 import android.media.MediaPlayer;
 
diff --git a/src/de/podfetcher/util/NumberGenerator.java b/src/de/danoeh/antennapod/util/NumberGenerator.java
index 172b87a39..6f9ac2e78 100644
--- a/src/de/podfetcher/util/NumberGenerator.java
+++ b/src/de/danoeh/antennapod/util/NumberGenerator.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import java.util.Random;
 import android.util.Log;
diff --git a/src/de/podfetcher/util/ShareUtils.java b/src/de/danoeh/antennapod/util/ShareUtils.java
index f9230b311..2d6dee138 100644
--- a/src/de/podfetcher/util/ShareUtils.java
+++ b/src/de/danoeh/antennapod/util/ShareUtils.java
@@ -1,7 +1,7 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
-import de.podfetcher.feed.Feed;
-import de.podfetcher.feed.FeedItem;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
 import android.content.Context;
 import android.content.Intent;
 
diff --git a/src/de/podfetcher/util/StorageUtils.java b/src/de/danoeh/antennapod/util/StorageUtils.java
index 6f2c44e26..942c333fb 100644
--- a/src/de/podfetcher/util/StorageUtils.java
+++ b/src/de/danoeh/antennapod/util/StorageUtils.java
@@ -1,6 +1,6 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
-import de.podfetcher.activity.StorageErrorActivity;
+import de.danoeh.antennapod.activity.StorageErrorActivity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Environment;
diff --git a/src/de/podfetcher/util/URLChecker.java b/src/de/danoeh/antennapod/util/URLChecker.java
index 7a5d65180..f5e202946 100644
--- a/src/de/podfetcher/util/URLChecker.java
+++ b/src/de/danoeh/antennapod/util/URLChecker.java
@@ -1,4 +1,4 @@
-package de.podfetcher.util;
+package de.danoeh.antennapod.util;
 
 import android.util.Log;