diff --git a/VitamioDemo/.gitignore b/VitamioDemo/.gitignore
deleted file mode 100644
index 1e3e304..0000000
--- a/VitamioDemo/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-obj/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Eclipse project files
-.classpath
-.project
diff --git a/VitamioDemo/.settings/org.eclipse.jdt.core.prefs b/VitamioDemo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6..0000000
--- a/VitamioDemo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/VitamioDemo/AndroidManifest.xml b/VitamioDemo/AndroidManifest.xml
deleted file mode 100644
index 060fd8c..0000000
--- a/VitamioDemo/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.vov.vitamio.demo"
-    android:versionCode="1"
-    android:versionName="0.0.1" >
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="16" />
-
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/vitamio_demo_name" >
-        <activity
-            android:name=".VideoViewDemo"
-            android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="io.vov.vitamio.activity.InitActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:windowSoftInputMode="stateAlwaysHidden" />
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/VitamioDemo/README.md b/VitamioDemo/README.md
deleted file mode 100644
index 7046028..0000000
--- a/VitamioDemo/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-VitamioDemo
-===========
-
-Demo of Vitamio for Android
\ No newline at end of file
diff --git a/VitamioDemo/build.xml b/VitamioDemo/build.xml
deleted file mode 100644
index fe75f3c..0000000
--- a/VitamioDemo/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="VitamioDemo" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/VitamioDemo/ic_launcher-web.png b/VitamioDemo/ic_launcher-web.png
deleted file mode 100644
index 6b45524..0000000
--- a/VitamioDemo/ic_launcher-web.png
+++ /dev/null
diff --git a/VitamioDemo/proguard-project.txt b/VitamioDemo/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/VitamioDemo/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/VitamioDemo/project.properties b/VitamioDemo/project.properties
deleted file mode 100644
index d05ba13..0000000
--- a/VitamioDemo/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=Google Inc.:Google APIs:16
-android.library.reference.1=../VitamioBundle
diff --git a/VitamioDemo/res/drawable-hdpi/ic_launcher.png b/VitamioDemo/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index c6ba88c..0000000
--- a/VitamioDemo/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/VitamioDemo/res/drawable-xhdpi/ic_launcher.png b/VitamioDemo/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5add9b7..0000000
--- a/VitamioDemo/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/VitamioDemo/res/layout/videoview.xml b/VitamioDemo/res/layout/videoview.xml
deleted file mode 100644
index f23fc27..0000000
--- a/VitamioDemo/res/layout/videoview.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <io.vov.vitamio.widget.CenterLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-
-        <io.vov.vitamio.widget.VideoView
-            android:id="@+id/surface_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true" />
-    </io.vov.vitamio.widget.CenterLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/VitamioDemo/res/values/strings.xml b/VitamioDemo/res/values/strings.xml
deleted file mode 100644
index 1d17505..0000000
--- a/VitamioDemo/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="vitamio_demo_name">VitamioDemo</string>
-
-</resources>
\ No newline at end of file
diff --git a/VitamioDemo/src/io/vov/vitamio/demo/VideoViewDemo.java b/VitamioDemo/src/io/vov/vitamio/demo/VideoViewDemo.java
deleted file mode 100644
index 1671be4..0000000
--- a/VitamioDemo/src/io/vov/vitamio/demo/VideoViewDemo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2012 YIXIA.COM
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.vov.vitamio.demo;
-
-import io.vov.vitamio.MediaPlayer;
-import io.vov.vitamio.widget.MediaController;
-import io.vov.vitamio.widget.VideoView;
-import android.app.Activity;
-import android.content.res.Configuration;
-import android.os.Bundle;
-
-public class VideoViewDemo extends Activity {
-
-	private String path = "http://devimages.apple.com/iphone/samples/bipbop/gear1/prog_index.m3u8";
-	private VideoView mVideoView;
-
-	@Override
-	public void onCreate(Bundle icicle) {
-		super.onCreate(icicle);
-		if (!io.vov.vitamio.LibsChecker.checkVitamioLibs(this))
-			return;
-
-		setContentView(R.layout.videoview);
-		mVideoView = (VideoView) findViewById(R.id.surface_view);
-		mVideoView.setVideoPath(path);
-		mVideoView.setVideoQuality(MediaPlayer.VIDEOQUALITY_HIGH);
-		mVideoView.setMediaController(new MediaController(this));
-	}
-
-	@Override
-	public void onConfigurationChanged(Configuration newConfig) {
-		if (mVideoView != null)
-			mVideoView.setVideoLayout(VideoView.VIDEO_LAYOUT_SCALE, 0);
-		super.onConfigurationChanged(newConfig);
-	}
-}
diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 16e2edf..d51d519 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -1,97 +1,97 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.upc.pbe.upcnews;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int Black=0x7f050002;
-        public static final int Blue=0x7f050004;
-        public static final int BlueAndroid=0x7f050005;
-        public static final int Gay=0x7f050007;
-        public static final int Gray=0x7f05000a;
-        public static final int Green=0x7f050009;
-        public static final int Orange=0x7f050003;
-        public static final int Red=0x7f050008;
-        public static final int White=0x7f050006;
-        public static final int Whyte_POwaH=0x7f050001;
-        public static final int backgroundmain=0x7f050000;
-    }
-    public static final class dimen {
-        public static final int TitleSize=0x7f060000;
-        public static final int lesize=0x7f060001;
-    }
-    public static final class drawable {
-        public static final int ic_action_search=0x7f020000;
-        public static final int ic_launcher=0x7f020001;
-        public static final int ic_ledarklogo=0x7f020002;
-        public static final int ic_menu_name=0x7f020003;
-        public static final int ic_startbutton=0x7f020004;
-        public static final int selectedonlist=0x7f020005;
-        public static final int selectedonlist2=0x7f020006;
-        public static final int startbuttontoggle=0x7f020007;
-    }
-    public static final class id {
-        public static final int LinearLayout1=0x7f0a0001;
-        public static final int RelativeLayout1=0x7f0a0006;
-        public static final int button=0x7f0a0007;
-        public static final int itemhelp=0x7f0a000d;
-        public static final int itemprefs=0x7f0a000c;
-        public static final int listView1=0x7f0a0003;
-        public static final int menu_settings=0x7f0a000b;
-        public static final int rowTextView=0x7f0a000a;
-        public static final int textView1=0x7f0a0004;
-        public static final int textView2=0x7f0a0005;
-        public static final int textViewTitle=0x7f0a0002;
-        public static final int textViewUrl=0x7f0a0009;
-        public static final int textViewXml=0x7f0a0008;
-        public static final int videoView1=0x7f0a0000;
-    }
-    public static final class layout {
-        public static final int activity_video=0x7f030000;
-        public static final int dirs=0x7f030001;
-        public static final int help=0x7f030002;
-        public static final int main_activity=0x7f030003;
-        public static final int rowlayout=0x7f030004;
-    }
-    public static final class menu {
-        public static final int activity_main=0x7f090000;
-        public static final int activity_video=0x7f090001;
-        public static final int menu=0x7f090002;
-    }
-    public static final class string {
-        public static final int app_name=0x7f070000;
-        public static final int button=0x7f07000c;
-        public static final int button1=0x7f07000d;
-        public static final int defaultURL=0x7f070013;
-        public static final int desc=0x7f070009;
-        public static final int descarregar=0x7f070003;
-        public static final int dir=0x7f07000a;
-        public static final int directoris=0x7f07000b;
-        public static final int hello_world=0x7f070010;
-        public static final int help=0x7f070008;
-        public static final int helpText=0x7f070012;
-        public static final int hint=0x7f070004;
-        public static final int menu_settings=0x7f070001;
-        public static final int prefs=0x7f070007;
-        public static final int startbuttondescription=0x7f07000f;
-        public static final int title=0x7f07000e;
-        public static final int title_activity_main=0x7f070002;
-        public static final int title_activity_video=0x7f070011;
-        public static final int url=0x7f070005;
-        public static final int urlhint=0x7f070006;
-    }
-    public static final class style {
-        public static final int AppTheme=0x7f080000;
-        public static final int leBoldText=0x7f080001;
-    }
-    public static final class xml {
-        public static final int prefs=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.upc.pbe.upcnews;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int Black=0x7f050002;
+        public static final int Blue=0x7f050004;
+        public static final int BlueAndroid=0x7f050005;
+        public static final int Gay=0x7f050007;
+        public static final int Gray=0x7f05000a;
+        public static final int Green=0x7f050009;
+        public static final int Orange=0x7f050003;
+        public static final int Red=0x7f050008;
+        public static final int White=0x7f050006;
+        public static final int Whyte_POwaH=0x7f050001;
+        public static final int backgroundmain=0x7f050000;
+    }
+    public static final class dimen {
+        public static final int TitleSize=0x7f060000;
+        public static final int lesize=0x7f060001;
+    }
+    public static final class drawable {
+        public static final int ic_action_search=0x7f020000;
+        public static final int ic_launcher=0x7f020001;
+        public static final int ic_ledarklogo=0x7f020002;
+        public static final int ic_menu_name=0x7f020003;
+        public static final int ic_startbutton=0x7f020004;
+        public static final int selectedonlist=0x7f020005;
+        public static final int selectedonlist2=0x7f020006;
+        public static final int startbuttontoggle=0x7f020007;
+    }
+    public static final class id {
+        public static final int LinearLayout1=0x7f0a0001;
+        public static final int RelativeLayout1=0x7f0a0006;
+        public static final int button=0x7f0a0007;
+        public static final int itemhelp=0x7f0a000d;
+        public static final int itemprefs=0x7f0a000c;
+        public static final int listView1=0x7f0a0003;
+        public static final int menu_settings=0x7f0a000b;
+        public static final int rowTextView=0x7f0a000a;
+        public static final int textView1=0x7f0a0004;
+        public static final int textView2=0x7f0a0005;
+        public static final int textViewTitle=0x7f0a0002;
+        public static final int textViewUrl=0x7f0a0009;
+        public static final int textViewXml=0x7f0a0008;
+        public static final int videoView1=0x7f0a0000;
+    }
+    public static final class layout {
+        public static final int activity_video=0x7f030000;
+        public static final int dirs=0x7f030001;
+        public static final int help=0x7f030002;
+        public static final int main_activity=0x7f030003;
+        public static final int rowlayout=0x7f030004;
+    }
+    public static final class menu {
+        public static final int activity_main=0x7f090000;
+        public static final int activity_video=0x7f090001;
+        public static final int menu=0x7f090002;
+    }
+    public static final class string {
+        public static final int app_name=0x7f070000;
+        public static final int button=0x7f07000c;
+        public static final int button1=0x7f07000d;
+        public static final int defaultURL=0x7f070013;
+        public static final int desc=0x7f070009;
+        public static final int descarregar=0x7f070003;
+        public static final int dir=0x7f07000a;
+        public static final int directoris=0x7f07000b;
+        public static final int hello_world=0x7f070010;
+        public static final int help=0x7f070008;
+        public static final int helpText=0x7f070012;
+        public static final int hint=0x7f070004;
+        public static final int menu_settings=0x7f070001;
+        public static final int prefs=0x7f070007;
+        public static final int startbuttondescription=0x7f07000f;
+        public static final int title=0x7f07000e;
+        public static final int title_activity_main=0x7f070002;
+        public static final int title_activity_video=0x7f070011;
+        public static final int url=0x7f070005;
+        public static final int urlhint=0x7f070006;
+    }
+    public static final class style {
+        public static final int AppTheme=0x7f080000;
+        public static final int leBoldText=0x7f080001;
+    }
+    public static final class xml {
+        public static final int prefs=0x7f040000;
+    }
+}