diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ba1c673..c4de4e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -11,7 +11,7 @@
+ android:targetSdkVersion="18" />
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
index 428bdbc..cf12d28 100644
Binary files a/libs/android-support-v4.jar and b/libs/android-support-v4.jar differ
diff --git a/project.properties b/project.properties
index 7b6ccac..970b960 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-17
+target=android-18
android.library.reference.1=../actionbarsherlock
diff --git a/src/com/github/nutomic/controldlna/DeviceArrayAdapter.java b/src/com/github/nutomic/controldlna/DeviceArrayAdapter.java
index c6d0f75..e6b2a7e 100644
--- a/src/com/github/nutomic/controldlna/DeviceArrayAdapter.java
+++ b/src/com/github/nutomic/controldlna/DeviceArrayAdapter.java
@@ -37,6 +37,9 @@ import org.teleal.cling.model.meta.RemoteDevice;
import org.teleal.cling.registry.Registry;
import org.teleal.cling.registry.RegistryListener;
+import com.github.nutomic.controldlna.RemoteImageView;
+
+
import android.app.Activity;
import android.content.Context;
import android.util.Log;
diff --git a/src/com/github/nutomic/controldlna/RemoteImageView.java b/src/com/github/nutomic/controldlna/RemoteImageView.java
index 2587289..eacc065 100644
--- a/src/com/github/nutomic/controldlna/RemoteImageView.java
+++ b/src/com/github/nutomic/controldlna/RemoteImageView.java
@@ -2,6 +2,9 @@ package com.github.nutomic.controldlna;
import java.net.URI;
+import com.github.nutomic.controldlna.LoadImageTask;
+
+
import android.content.Context;
import android.graphics.Bitmap;
import android.util.AttributeSet;
diff --git a/src/com/github/nutomic/controldlna/MainActivity.java b/src/com/github/nutomic/controldlna/gui/MainActivity.java
similarity index 98%
rename from src/com/github/nutomic/controldlna/MainActivity.java
rename to src/com/github/nutomic/controldlna/gui/MainActivity.java
index 73d9d03..2119616 100644
--- a/src/com/github/nutomic/controldlna/MainActivity.java
+++ b/src/com/github/nutomic/controldlna/gui/MainActivity.java
@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package com.github.nutomic.controldlna;
+package com.github.nutomic.controldlna.gui;
import java.util.List;
@@ -41,6 +41,7 @@ import android.view.KeyEvent;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.github.nutomic.controldlna.R;
/**
* Main activity, with tabs for media servers and media renderers.
diff --git a/src/com/github/nutomic/controldlna/RendererFragment.java b/src/com/github/nutomic/controldlna/gui/RendererFragment.java
similarity index 98%
rename from src/com/github/nutomic/controldlna/RendererFragment.java
rename to src/com/github/nutomic/controldlna/gui/RendererFragment.java
index 16c9089..fc2d9db 100644
--- a/src/com/github/nutomic/controldlna/RendererFragment.java
+++ b/src/com/github/nutomic/controldlna/gui/RendererFragment.java
@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package com.github.nutomic.controldlna;
+package com.github.nutomic.controldlna.gui;
import java.util.List;
import java.util.Map;
@@ -78,7 +78,10 @@ import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.Toast;
-import com.github.nutomic.controldlna.MainActivity.OnBackPressedListener;
+import com.github.nutomic.controldlna.DeviceArrayAdapter;
+import com.github.nutomic.controldlna.FileArrayAdapter;
+import com.github.nutomic.controldlna.R;
+import com.github.nutomic.controldlna.gui.MainActivity.OnBackPressedListener;
import com.github.nutomic.controldlna.service.PlayService;
import com.github.nutomic.controldlna.service.PlayServiceBinder;
diff --git a/src/com/github/nutomic/controldlna/ServerFragment.java b/src/com/github/nutomic/controldlna/gui/ServerFragment.java
similarity index 97%
rename from src/com/github/nutomic/controldlna/ServerFragment.java
rename to src/com/github/nutomic/controldlna/gui/ServerFragment.java
index fb05ec1..0c530ff 100644
--- a/src/com/github/nutomic/controldlna/ServerFragment.java
+++ b/src/com/github/nutomic/controldlna/gui/ServerFragment.java
@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package com.github.nutomic.controldlna;
+package com.github.nutomic.controldlna.gui;
import java.util.ArrayList;
import java.util.List;
@@ -56,7 +56,9 @@ import android.util.Log;
import android.view.View;
import android.widget.ListView;
-import com.github.nutomic.controldlna.MainActivity.OnBackPressedListener;
+import com.github.nutomic.controldlna.DeviceArrayAdapter;
+import com.github.nutomic.controldlna.FileArrayAdapter;
+import com.github.nutomic.controldlna.gui.MainActivity.OnBackPressedListener;
/**
* Shows a list of media servers, upon selecting one, allows browsing theur
diff --git a/src/com/github/nutomic/controldlna/service/PlayService.java b/src/com/github/nutomic/controldlna/service/PlayService.java
index 71b69f3..6307162 100644
--- a/src/com/github/nutomic/controldlna/service/PlayService.java
+++ b/src/com/github/nutomic/controldlna/service/PlayService.java
@@ -70,8 +70,8 @@ import android.util.Log;
import android.widget.Toast;
import com.github.nutomic.controldlna.LoadImageTask;
-import com.github.nutomic.controldlna.MainActivity;
import com.github.nutomic.controldlna.R;
+import com.github.nutomic.controldlna.gui.MainActivity;
public class PlayService extends Service {