diff --git a/.gitignore b/.gitignore
index 3010acc..58c3a45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ atlassian-ide-plugin.xml
 .fbprefs
 bin
 gen
+libs
 .settings/*
 
 # Automatically generated by WTP
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..a74cbe4
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.xwiki.android.core"
+    android:versionCode="1"
+    android:versionName="1.0" >
+    <uses-sdk android:minSdkVersion="7" />
+    <application ></application>   
+</manifest>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7fde442..42fc77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,21 +24,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
+  <!-- <parent>
     <groupId>org.xwiki.commons</groupId>
     <artifactId>xwiki-commons</artifactId>
     <version>4.2-SNAPSHOT</version>
-  </parent>
+  </parent> -->
   <groupId>org.xwiki.android</groupId>
   <artifactId>xwiki-android</artifactId>
   <version>1.0-SNAPSHOT</version>
   <name>XWiki Android - Parent POM</name>
   <packaging>pom</packaging>
   <description>XWiki Android - Parent POM</description>
-  <properties>
+ <properties>
     <xwiki.clirr.skip>true</xwiki.clirr.skip>
-    <!-- Force accessing banned dependancy junit since android-test artifact 
-      uses it -->
+    Force accessing banned dependancy junit since android-test artifact 
+      uses it
     <xwiki.enforcer.skip>true</xwiki.enforcer.skip>
   </properties>
 
@@ -48,93 +48,48 @@
     <module>xwiki-android-core</module>
     <module>xwiki-android-components</module>    
     <module>xwiki-android-client</module>    
-    <module>xwiki-android-test-rest</module>
-    <module>xwiki-android-tests-instrumentation</module>
-  </modules>
-
-  <dependencies>
+   <module>xwiki-android-test-rest</module>
+   <module>xwiki-android-tests-instrumentation</module>
+  </modules>     
+   
+   <dependencies>
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android</artifactId>
       <version>2.2.1</version>
       <scope>provided</scope>
-    </dependency>
-   
-    <dependency>
-        <groupId>com.j256.ormlite</groupId>
-        <artifactId>ormlite-core</artifactId>
-        <type>jar</type>
-        <version>4.40</version> 
-        <scope>compile</scope>  
-      </dependency>
-      
-     <dependency>
-       <groupId>com.j256.ormlite</groupId>
-       <artifactId>ormlite-android</artifactId>
-       <type>jar</type>
-       <version>4.40</version>
-       <scope>compile</scope>
-     </dependency>
-     
-     <dependency>
-       <groupId>org.simpleframework</groupId>
-       <artifactId>simple-xml</artifactId>     
-       <version>2.6.4</version>
-       <type>jar</type>
-       <scope>compile</scope>
-       <exclusions>
-           <!-- StAX is not available on Android -->
-           <exclusion>
-               <artifactId>stax</artifactId>
-               <groupId>stax</groupId>
-           </exclusion>
-           <exclusion>
-               <artifactId>stax-api</artifactId>
-               <groupId>stax</groupId>
-           </exclusion>
-           <!-- Provided by Android -->
-           <exclusion>
-               <artifactId>xpp3</artifactId>
-               <groupId>xpp3</groupId>
-           </exclusion>
-       </exclusions>
-    </dependency>  
-              
-    
-    
-    
-  </dependencies>
+    </dependency> 
+ 	</dependencies>
 
   <build>
                  
+	    <sourceDirectory>src</sourceDirectory>       
+       
 	    <plugins>
-         
-           <plugin>
-             <artifactId>maven-compiler-plugin</artifactId>
-             <version>2.3</version>
-             <configuration>
-               <source>1.6</source>
-               <target>1.6</target>
-             </configuration>
-           </plugin>
-         
             <plugin>
-              <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-              <artifactId>android-maven-plugin</artifactId>
-              <version>3.2.0</version>
-              <configuration>
-                <sdk>
-                  <platform>7</platform>
-                </sdk>
-                <emulator>
-                  <avd>android-7</avd>
-                </emulator>
-                <undeployBeforeDeploy>true</undeployBeforeDeploy>
-                <coreLibrary>true</coreLibrary>
-              </configuration>
-              <extensions>true</extensions>
-            </plugin>	        	      
-	    </plugins>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<artifactId>maven-android-plugin</artifactId>
+				<version>2.9.0-beta-5</version>
+                <configuration>
+					<sdk>
+						<platform>2.1</platform>
+					</sdk>
+					<emulator>
+						<avd>android-7</avd>
+					</emulator>
+					<deleteConflictingFiles>true</deleteConflictingFiles>
+					<undeployBeforeDeploy>true</undeployBeforeDeploy>
+					<coreLibrary>true</coreLibrary>
+				</configuration>
+				<extensions>true</extensions>                
+            </plugin>         
+            
+            
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+            </plugin>            
+        </plugins>
     
   </build>
 </project>
diff --git a/xwiki-android-client/default.properties b/xwiki-android-client/default.properties
new file mode 100644
index 0000000..1dfaa5b
--- /dev/null
+++ b/xwiki-android-client/default.properties
@@ -0,0 +1,12 @@
+# 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 use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-7
+
diff --git a/xwiki-android-client/project.properties b/xwiki-android-client/project.properties
index e206d00..465f60c 100644
--- a/xwiki-android-client/project.properties
+++ b/xwiki-android-client/project.properties
@@ -12,6 +12,7 @@
 
 # Project target.
 target=android-7
-android.library.reference.3=../xwiki-android-core
+
 android.library.reference.1=../xwiki-android-rest
 android.library.reference.2=../xwiki-android-components
+android.library.reference.3=../xwiki-android-core
\ No newline at end of file
diff --git a/xwiki-android-client/src/demo_tutorials/remove package from production b/xwiki-android-client/src/demo_tutorials/remove package from production
deleted file mode 100644
index e69de29..0000000
diff --git a/xwiki-android-core/.gitignore b/xwiki-android-core/.gitignore
deleted file mode 100644
index 13fbc9a..0000000
--- a/xwiki-android-core/.gitignore
+++ /dev/null
@@ -1,55 +0,0 @@
-# Build
-target
-*/target
-target-eclipse
-
-# IDEA
-*.iml
-*.ipr
-*.iws
-.idea
-atlassian-ide-plugin.xml
-
-# Eclipse
-.classpath
-.project
-.settings
-.checkstyle
-.fbprefs
-bin
-gen
-#eclipse submodule projects
-*/gen
-*/.classpath
-*/.project
-*/.settings
-*/.checkstyle
-*/.fbprefs
-
-
-/*/*/gen
-/*/*/.classpath
-/*/*/.project
-/*/*/.settings
-/*/*/.checkstyle
-/*/*/.fbprefs
-
-
-
-
-# Automatically generated by WTP
-/*/src/main/java/META-INF/
-/*/*/src/main/java/META-INF/
-/*/*/*/src/main/java/META-INF/
-/*/*/*/*/src/main/java/META-INF/
-/*/*/*/*/*/src/main/java/META-INF/
-/*/*/*/*/*/*/src/main/java/META-INF/
-
-# NetBeans
-nbproject
-
-# Other
-*.log.*
-*.log
-.sonar-ide.properties
-.clover
diff --git a/xwiki-android-howtos/AndroidManifest.xml b/xwiki-android-howtos/AndroidManifest.xml
new file mode 100644
index 0000000..abfc4df
--- /dev/null
+++ b/xwiki-android-howtos/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.xwiki.android.howtos"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="7" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <activity
+            android:name="._00_SampleActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/xwiki-android-howtos/proguard-project.txt b/xwiki-android-howtos/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/xwiki-android-howtos/proguard-project.txt
@@ -0,0 +1,20 @@
+# 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/xwiki-android-howtos/project.properties b/xwiki-android-howtos/project.properties
new file mode 100644
index 0000000..1ebba17
--- /dev/null
+++ b/xwiki-android-howtos/project.properties
@@ -0,0 +1,14 @@
+# 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=android-7
diff --git a/xwiki-android-howtos/res/drawable-hdpi/ic_launcher.png b/xwiki-android-howtos/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/xwiki-android-howtos/res/drawable-hdpi/ic_launcher.png differ
diff --git a/xwiki-android-howtos/res/drawable-ldpi/ic_launcher.png b/xwiki-android-howtos/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..9923872
Binary files /dev/null and b/xwiki-android-howtos/res/drawable-ldpi/ic_launcher.png differ
diff --git a/xwiki-android-howtos/res/drawable-mdpi/ic_launcher.png b/xwiki-android-howtos/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/xwiki-android-howtos/res/drawable-mdpi/ic_launcher.png differ
diff --git a/xwiki-android-howtos/res/drawable-xhdpi/ic_launcher.png b/xwiki-android-howtos/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/xwiki-android-howtos/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/xwiki-android-howtos/res/layout/main.xml b/xwiki-android-howtos/res/layout/main.xml
new file mode 100644
index 0000000..ac9c0ab
--- /dev/null
+++ b/xwiki-android-howtos/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/hello" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xwiki-android-howtos/res/values/strings.xml b/xwiki-android-howtos/res/values/strings.xml
new file mode 100644
index 0000000..6e81fbd
--- /dev/null
+++ b/xwiki-android-howtos/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="hello">Hello World, _00_SampleActivity!</string>
+    <string name="app_name">Xwiki-android-howtos</string>
+
+</resources>
\ No newline at end of file
diff --git a/xwiki-android-howtos/src/org/xwiki/android/howtos/_00_SampleActivity.java b/xwiki-android-howtos/src/org/xwiki/android/howtos/_00_SampleActivity.java
new file mode 100644
index 0000000..0ef8acc
--- /dev/null
+++ b/xwiki-android-howtos/src/org/xwiki/android/howtos/_00_SampleActivity.java
@@ -0,0 +1,13 @@
+package org.xwiki.android.howtos;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class _00_SampleActivity extends Activity {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}
\ No newline at end of file
diff --git a/xwiki-android-client/src/demo_tutorials/_01_CreateDocument.java b/xwiki-android-howtos/src/org/xwiki/android/howtos/_01_CreateDocument.java
similarity index 96%
rename from xwiki-android-client/src/demo_tutorials/_01_CreateDocument.java
rename to xwiki-android-howtos/src/org/xwiki/android/howtos/_01_CreateDocument.java
index b3ed5bc..69aa686 100644
--- a/xwiki-android-client/src/demo_tutorials/_01_CreateDocument.java
+++ b/xwiki-android-howtos/src/org/xwiki/android/howtos/_01_CreateDocument.java
@@ -1,4 +1,4 @@
-package demo_tutorials;
+package org.xwiki.android.howtos;
 
 import org.xwiki.android.blog.xobj.XBlogPost;
 import org.xwiki.android.ral.RaoException;
diff --git a/xwiki-android-client/src/demo_tutorials/_02_AdvancedObjectEditing.java b/xwiki-android-howtos/src/org/xwiki/android/howtos/_02_AdvancedObjectEditing.java
similarity index 94%
rename from xwiki-android-client/src/demo_tutorials/_02_AdvancedObjectEditing.java
rename to xwiki-android-howtos/src/org/xwiki/android/howtos/_02_AdvancedObjectEditing.java
index c13fd63..0b65e17 100644
--- a/xwiki-android-client/src/demo_tutorials/_02_AdvancedObjectEditing.java
+++ b/xwiki-android-howtos/src/org/xwiki/android/howtos/_02_AdvancedObjectEditing.java
@@ -1,4 +1,4 @@
-package demo_tutorials;
+package org.xwiki.android.howtos;
 
 import org.xwiki.android.blog.xobj.XBlogPost;
 import org.xwiki.android.xmodel.entity.Document;
diff --git a/xwiki-android-client/src/demo_tutorials/_03_SaveDocument.java b/xwiki-android-howtos/src/org/xwiki/android/howtos/_03_SaveDocument.java
similarity index 93%
rename from xwiki-android-client/src/demo_tutorials/_03_SaveDocument.java
rename to xwiki-android-howtos/src/org/xwiki/android/howtos/_03_SaveDocument.java
index ed2101d..85cb743 100644
--- a/xwiki-android-client/src/demo_tutorials/_03_SaveDocument.java
+++ b/xwiki-android-howtos/src/org/xwiki/android/howtos/_03_SaveDocument.java
@@ -1,4 +1,4 @@
-package demo_tutorials;
+package org.xwiki.android.howtos;
 
 import org.xwiki.android.xmodel.entity.Document;
 import org.xwiki.android.xmodel.svc.DocumentLocalSvcs;
diff --git a/xwiki-android-client/src/demo_tutorials/_04_SaveDocumentAdv.java b/xwiki-android-howtos/src/org/xwiki/android/howtos/_04_SaveDocumentAdv.java
similarity index 93%
rename from xwiki-android-client/src/demo_tutorials/_04_SaveDocumentAdv.java
rename to xwiki-android-howtos/src/org/xwiki/android/howtos/_04_SaveDocumentAdv.java
index dc9e666..57514fa 100644
--- a/xwiki-android-client/src/demo_tutorials/_04_SaveDocumentAdv.java
+++ b/xwiki-android-howtos/src/org/xwiki/android/howtos/_04_SaveDocumentAdv.java
@@ -1,4 +1,4 @@
-package demo_tutorials;
+package org.xwiki.android.howtos;
 
 import java.io.File;
 
diff --git a/xwiki-android-client/src/demo_tutorials/_05_ListAndLoadDocuments.java b/xwiki-android-howtos/src/org/xwiki/android/howtos/_05_ListAndLoadDocuments.java
similarity index 94%
rename from xwiki-android-client/src/demo_tutorials/_05_ListAndLoadDocuments.java
rename to xwiki-android-howtos/src/org/xwiki/android/howtos/_05_ListAndLoadDocuments.java
index f23305b..ce5377b 100644
--- a/xwiki-android-client/src/demo_tutorials/_05_ListAndLoadDocuments.java
+++ b/xwiki-android-howtos/src/org/xwiki/android/howtos/_05_ListAndLoadDocuments.java
@@ -1,4 +1,4 @@
-package demo_tutorials;
+package org.xwiki.android.howtos;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xwiki-android-rest/pom.xml b/xwiki-android-rest/pom.xml
index 67cd28f..5a6fd96 100644
--- a/xwiki-android-rest/pom.xml
+++ b/xwiki-android-rest/pom.xml
@@ -39,8 +39,9 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.xwiki.android</groupId>
-			<artifactId>xwiki-rest-simplexml-model</artifactId>
+			<artifactId>xwiki-rest-model-simplexml</artifactId>
 			<version>${project.version}</version> 
+			<type>jar</type>
             <scope>compile</scope>
 		</dependency>			
 	</dependencies>