diff --git a/AndroidAnnotations/androidannotations-api/.gitignore b/AndroidAnnotations/androidannotations-api/.gitignore
deleted file mode 100644
index ce7298f6c7..0000000000
--- a/AndroidAnnotations/androidannotations-api/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.classpath
-.project
-target/
-.settings
diff --git a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF b/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF
deleted file mode 100644
index 1266391f69..0000000000
--- a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: androidannotations-api
-Bundle-SymbolicName: org.androidannotations-api;singleton:=true
-Bundle-Version: 1.0.0
-Export-Package: org.androidannotations.annotations,
- org.androidannotations.annotations.res,
- org.androidannotations.annotations.rest,
- org.androidannotations.annotations.sharedpreferences,
- org.androidannotations.api,
- org.androidannotations.api.builder,
- org.androidannotations.api.bundle,
- org.androidannotations.api.rest,
- org.androidannotations.api.roboguice,
- org.androidannotations.api.sharedpreferences,
- org.androidannotations.api.support.app,
- org.androidannotations.api.support.content,
- org.androidannotations.api.view
-Bundle-Vendor: androidannotations
-Bundle-Activator: org.androidannotations.api.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.jdt.apt.core;bundle-version="3.3.500",
- androidannotations-dependencies;bundle-version="1.0.0"
diff --git a/AndroidAnnotations/androidannotations-api/src/main/eclipse/org/androidannotations/api/Activator.java b/AndroidAnnotations/androidannotations-api/src/main/eclipse/org/androidannotations/api/Activator.java
deleted file mode 100644
index 5621304295..0000000000
--- a/AndroidAnnotations/androidannotations-api/src/main/eclipse/org/androidannotations/api/Activator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.api;
-/**
- * Copyright (C) 2010-2012 eBusiness Information, Excilys Group
- *
- * 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.
- */
-
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-        // The plug-in ID
-        public static final String PLUGIN_ID = "org.androidannotations-api";
-
-        // The shared instance
-        private static Activator plugin;
-        
-        /**
-         * The constructor
-         */
-        public Activator() {
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-         */
-        public void start(BundleContext context) throws Exception {
-                super.start(context);
-                plugin = this;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-         */
-        public void stop(BundleContext context) throws Exception {
-                plugin = null;
-                super.stop(context);
-        }
-
-        /**
-         * Returns the shared instance
-         *
-         * @return the shared instance
-         */
-        public static Activator getDefault() {
-                return plugin;
-        }
-}
diff --git a/AndroidAnnotations/androidannotations-bundle/.gitignore b/AndroidAnnotations/androidannotations-bundle/.gitignore
deleted file mode 100644
index 5e83119b7e..0000000000
--- a/AndroidAnnotations/androidannotations-bundle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.settings
diff --git a/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml b/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml
deleted file mode 100644
index 69cd84b4b3..0000000000
--- a/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
-
-    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
-
-    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.
-
--->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>androidannotations-bundle</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<dependencySets>
-	    <dependencySet>
-	    	<useProjectArtifact>false</useProjectArtifact>
-	        <includes>
-	            <include>org.androidannotations:androidannotations-api</include>
-	        </includes>
-	        <excludes>
-	        	<exclude>org.androidannotations:androidannotations-api:*:javadoc</exclude>
-	        	<exclude>org.androidannotations:androidannotations-api:*:sources</exclude>
-	        </excludes>
-	    </dependencySet>
-	    <dependencySet>
-	    	<useProjectArtifact>false</useProjectArtifact>
-	        <includes>
-	            <include>org.androidannotations:androidannotations-with-codemodel</include>
-	        </includes>
-	        <outputFileNameMapping>androidannotations-${artifact.version}.jar</outputFileNameMapping>
-	    </dependencySet>
-		<dependencySet>
-			<useProjectArtifact>false</useProjectArtifact>
-			<outputDirectory>javadoc</outputDirectory>
-	        <includes>
-	            <include>org.androidannotations:androidannotations-api:*:javadoc</include>
-	            <include>org.androidannotations:androidannotations:*:javadoc</include>
-	        </includes>
-		</dependencySet>
-		<dependencySet>
-			<useProjectArtifact>false</useProjectArtifact>
-			<outputDirectory>sources</outputDirectory>
-	        <includes>
-	            <include>org.androidannotations:androidannotations-api:*:sources</include>
-	            <include>org.androidannotations:androidannotations:*:sources</include>
-	        </includes>
-		</dependencySet>
-	</dependencySets>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/../../</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>LICENSE.txt</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/../src/etc</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>LICENSE.txt</include>
-				<include>HOW-TO.txt</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-api/.gitignore b/AndroidAnnotations/androidannotations-core/androidannotations-api/.gitignore
new file mode 100644
index 0000000000..ad2e3c7455
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/.gitignore
@@ -0,0 +1,4 @@
+.classpath
+.project
+../../androidannotations-api/target/
+.settings
diff --git a/AndroidAnnotations/androidannotations-api/pom.xml b/AndroidAnnotations/androidannotations-core/androidannotations-api/pom.xml
similarity index 74%
rename from AndroidAnnotations/androidannotations-api/pom.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/pom.xml
index fb7b0b2626..6b0b89a022 100644
--- a/AndroidAnnotations/androidannotations-api/pom.xml
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/pom.xml
@@ -20,8 +20,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>androidannotations-parent</artifactId>
 		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-core</artifactId>
 		<version>4.0-SNAPSHOT</version>
 	</parent>
 
@@ -29,27 +29,17 @@
 	<description>The API jar containing the annotations and the runtime helpers</description>
 	<name>AndroidAnnotations API</name>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.google.android</groupId>
 			<artifactId>android</artifactId>
 			<version>2.3.1</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<!-- spring-android-rest-template is required to use the Rest API -->
-			<groupId>org.springframework.android</groupId>
-			<artifactId>spring-android-rest-template</artifactId>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -81,16 +71,6 @@
 				</executions>
 			</plugin>
 		</plugins>
-
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/*.properties</include>
-				</includes>
-			</resource>
-		</resources>
 	</build>
 
 </project>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterExtras.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterExtras.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterExtras.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterExtras.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterPreferences.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterPreferences.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterPreferences.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterPreferences.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/CheckedChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/CheckedChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/CheckedChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/CheckedChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
similarity index 99%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
index f20b254e8e..e99800f33f 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
@@ -94,7 +94,7 @@
 	/**
 	 * The scope of an enhanced bean.
 	 */
-	public enum Scope {
+	enum Scope {
 
 		/**
 		 * A new instance of the bean is created each time it is needed.
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EIntentService.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EIntentService.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EIntentService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EIntentService.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EditorAction.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EditorAction.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EditorAction.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/EditorAction.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FocusChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FocusChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FocusChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FocusChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HierarchyViewerSupport.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/HierarchyViewerSupport.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HierarchyViewerSupport.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/HierarchyViewerSupport.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InjectMenu.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/InjectMenu.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InjectMenu.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/InjectMenu.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceByKey.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceByKey.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceByKey.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceByKey.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceClick.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceClick.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceClick.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceClick.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceHeaders.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceHeaders.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceHeaders.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceHeaders.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceScreen.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceScreen.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceScreen.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceScreen.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java
similarity index 99%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java
index c3434fbb1c..83418e7fba 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java
@@ -128,7 +128,7 @@
 	/**
 	 * Represents event pairs for BroadcastReceiver registration/unregistration.
 	 */
-	public enum RegisterAt {
+	enum RegisterAt {
 		/**
 		 * Register in the onCreate method, unregister in the onDestroy method.
 		 */
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ReceiverAction.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ReceiverAction.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ReceiverAction.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ReceiverAction.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ServiceAction.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ServiceAction.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ServiceAction.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ServiceAction.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
similarity index 98%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
index d7f0ff8e6d..2b4f67cbd7 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
@@ -54,7 +54,6 @@
  * 
  * </blockquote>
  * 
- * @see OrmLiteDao
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
similarity index 99%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
index 4025ac47b0..536d85aacf 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
@@ -147,7 +147,7 @@
 	/**
 	 * Indicates the propagation behavior of the UiThread annotated method.
 	 */
-	public enum Propagation {
+	enum Propagation {
 
 		/**
 		 * The method will always call the Handler.
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewsById.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewsById.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewsById.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewsById.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java
similarity index 98%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java
index b42f61930e..7ec63a2592 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java
@@ -90,7 +90,7 @@
 	 * A convenience wrapper enum for the
 	 * {@link android.os.PowerManager.WakeLock WakeLock} level integer values.
 	 */
-	public enum Level {
+	enum Level {
 		/**
 		 * Represents {@link android.os.PowerManager#FULL_WAKE_LOCK}.
 		 */
@@ -116,7 +116,7 @@ public enum Level {
 	 * A convenience wrapper enum for the
 	 * {@link android.os.PowerManager.WakeLock WakeLock} flag integer values.
 	 */
-	public enum Flag {
+	enum Flag {
 
 		/**
 		 * Represents {@link android.os.PowerManager#ACQUIRE_CAUSES_WAKEUP}.
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultRes.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultRes.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultRes.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultStringSet.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultStringSet.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultStringSet.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultStringSet.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
similarity index 99%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
index 86f16b9127..44e74f48d9 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
@@ -74,7 +74,7 @@
 	/**
 	 * Represents the scope of a SharedPreference.
 	 */
-	public enum Scope {
+	enum Scope {
 		/**
 		 * The default shared SharedPreference.
 		 */
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/UiThreadExecutor.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/UiThreadExecutor.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/UiThreadExecutor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/UiThreadExecutor.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
similarity index 99%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
index 234f79e866..a74ea8381a 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
@@ -574,7 +574,7 @@ private class ViewServerWorker implements Runnable, WindowListener {
 
 		private final Object[] mLock = new Object[0];
 
-		public ViewServerWorker(Socket client) {
+		private ViewServerWorker(Socket client) {
 			mClient = client;
 			mNeedWindowListUpdate = false;
 			mNeedFocusedWindowUpdate = false;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityIntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityIntentBuilder.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityIntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityIntentBuilder.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityStarter.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityStarter.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityStarter.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/ActivityStarter.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/Builder.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/Builder.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/Builder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/Builder.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/FragmentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/FragmentBuilder.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/FragmentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/FragmentBuilder.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/IntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/IntentBuilder.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/IntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/IntentBuilder.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/ServiceIntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/ServiceIntentBuilder.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/ServiceIntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/builder/ServiceIntentBuilder.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/bundle/BundleHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/bundle/BundleHelper.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/bundle/BundleHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/bundle/BundleHelper.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SetXmlSerializer.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SetXmlSerializer.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SetXmlSerializer.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SetXmlSerializer.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefEditorField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefEditorField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefEditorField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefEditorField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefField.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefField.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefField.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringSetPrefField.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/support/app/AbstractIntentService.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/support/app/AbstractIntentService.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/support/app/AbstractIntentService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/support/app/AbstractIntentService.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/support/content/AbstractBroadcastReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/support/content/AbstractBroadcastReceiver.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/support/content/AbstractBroadcastReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/support/content/AbstractBroadcastReceiver.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/view/HasViews.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/HasViews.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/view/HasViews.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/HasViews.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedListener.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedListener.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedListener.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedListener.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java
diff --git a/AndroidAnnotations/androidannotations-api/src/main/resources/androidannotations-api.properties b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/resources/androidannotations-api.properties
similarity index 100%
rename from AndroidAnnotations/androidannotations-api/src/main/resources/androidannotations-api.properties
rename to AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/resources/androidannotations-api.properties
diff --git a/AndroidAnnotations/functional-test-1-5/.gitignore b/AndroidAnnotations/androidannotations-core/androidannotations-test/.gitignore
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/.gitignore
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/.gitignore
diff --git a/AndroidAnnotations/functional-test-1-5/lint.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/lint.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/lint.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/lint.xml
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml
new file mode 100644
index 0000000000..56337c768c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-core</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-test</artifactId>
+	<packaging>apk</packaging>
+	<name>AndroidAnnotations functional test suite</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+		<android-rome-version>1.0.0-r2</android-rome-version>
+		<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>support-v4</artifactId>
+			<version>r7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.robolectric</groupId>
+			<artifactId>robolectric</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easytesting</groupId>
+			<artifactId>fest-reflect</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup</groupId>
+			<artifactId>fest-android</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>bouncycastle</groupId>
+			<artifactId>bcprov-jdk16</artifactId>
+			<version>140</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.simpligility.maven.plugins</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<showWarnings>true</showWarnings>
+					<compilerArgs>
+						<arg>-Atrace=true</arg>
+						<arg>-AlogLevel=WARNING</arg>
+						<arg>-AlogFile=${project.build.directory}/functional-test.log</arg>
+						<arg>-AandroidManifestFile=${project.basedir}/src/main/AndroidManifest.xml</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/AndroidManifest.xml
similarity index 54%
rename from AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/AndroidManifest.xml
index 6a6ecc8e66..b88c744268 100644
--- a/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.androidannotations.test15"
+    package="org.androidannotations.test"
     android:versionCode="1"
     android:versionName="2.1-SNAPSHOT" xmlns:tools="http://schemas.android.com/tools">
 
@@ -29,11 +29,10 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:name="org.androidannotations.test15.roboguice.SampleRoboApplication_"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:debuggable="true" >
-        <activity android:name="org.androidannotations.test15.eviewgroup.CustomFrameLayoutActivity_" >
+        <activity android:name=".eviewgroup.CustomFrameLayoutActivity_" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -52,65 +51,58 @@
         <activity android:name=".ItemClicksHandledActivity_" />
         <activity android:name=".ActivityWithServices_" />
         <activity android:name=".ExtraInjectedActivity_" />
-        <activity android:name=".BackpressedActivity_" />
         <activity android:name=".TransactionalActivity_" />
         <activity android:name=".FromHtmlActivity_" />
-        <activity android:name=".roboguice.MapActivityWithRoboGuice_" />
-        <activity android:name=".roboguice.ActivityWithRoboGuice_" />
-        <activity android:name=".ApplicationInjectedActivity_" />
         <activity android:name=".prefs.PrefsActivity_" />
         <activity android:name=".res.ResActivity_" />
         <activity android:name=".ThreadActivity_" />
-        <activity android:name="org.androidannotations.test15.trace.TracedActivity_" />
+        <activity android:name=".trace.TracedActivity_" />
         <activity android:name=".TextWatchedActivity_" />
 		<activity android:name=".innerclasses.ActivityWithInnerEnhancedClasses_" />
         <activity android:name=".MultiFindViewActivity_" />
-        <activity android:name=".ormlite.OrmLiteActivity_" />
         <activity android:name=".receiver.ActivityWithReceiver_" />
-        <activity android:name="org.androidannotations.test15.menu.OptionsMenuActivity_" />
-        <activity android:name="org.androidannotations.test15.menu.OptionsMenuSubActivity_" />
-        <activity android:name="org.androidannotations.test15.menu.InjectMenuActivity_" />
-        <activity android:name="org.androidannotations.test15.NoTitleFullscreenActivity_" />
-        <activity android:name="org.androidannotations.test15.WindowFeatureActivity_" />
-        <activity android:name="org.androidannotations.test15.ExtendingActivity_" />
-        <activity android:name="org.androidannotations.test15.ebean.BeanInjectedActivity_" />
-        <activity android:name="org.androidannotations.test15.rest.MyServiceActivity_" />
-        <activity android:name="org.androidannotations.test15.instancestate.SaveInstanceStateActivity_" />
-        <activity android:name="org.androidannotations.test15.afterinject.AfterInjectActivity_" />
-        <activity android:name="org.androidannotations.test15.nonconfiguration.NonConfigurationActivity_" />
-        <activity android:name="org.androidannotations.test15.efragment.MyFragmentActivity_" />
-        <activity android:name="org.androidannotations.test15.efragment.MySupportFragmentActivity_" />
-        <activity android:name="org.androidannotations.test15.afterviews.AfterViewsActivity_" />
+        <activity android:name=".menu.OptionsMenuActivity_" />
+        <activity android:name=".menu.OptionsMenuSubActivity_" />
+        <activity android:name=".menu.InjectMenuActivity_" />
+        <activity android:name=".WindowFeatureActivity_" />
+        <activity android:name=".ExtendingActivity_" />
+        <activity android:name=".ebean.BeanInjectedActivity_" />
+        <activity android:name=".instancestate.SaveInstanceStateActivity_" />
+        <activity android:name=".afterinject.AfterInjectActivity_" />
+        <activity android:name=".nonconfiguration.NonConfigurationActivity_" />
+        <activity android:name=".efragment.MyFragmentActivity_" />
+        <activity android:name=".efragment.MySupportFragmentActivity_" />
+        <activity android:name=".afterviews.AfterViewsActivity_" />
         <activity android:name=".SSLConnection_" />
-        <activity android:name="org.androidannotations.test15.SeekBarChangeListenedActivity_" />
-        <activity android:name="org.androidannotations.test15.AwaitingResultActivity_" />
+        <activity android:name=".SeekBarChangeListenedActivity_" />
+        <activity android:name=".AwaitingResultActivity_" />
         <activity android:name=".HierarchyViewerActivity_" />
-        <activity android:name="org.androidannotations.test15.CustomTitleActivity_" android:theme="@android:style/Theme" />
+        <activity android:name=".CustomTitleActivity_" android:theme="@android:style/Theme" />
         <activity android:name=".ActivityWithGenerics_" />
         <activity android:name=".WakeLockActivity_" />
         <activity android:name=".FragmentStartedActivity_" />
 
-        <receiver android:name="org.androidannotations.test15.ereceiver.MyReceiver_" />
+        <receiver android:name=".ereceiver.MyReceiver_" />
 
         <provider
-            android:name="org.androidannotations.test15.eprovider.MyProvider_"
+            android:name=".eprovider.MyProvider_"
             android:authorities=""
             android:exported="false" />
 
         <service
-            android:name="org.androidannotations.test15.eservice.MyService_"
+            android:name=".eservice.MyService_"
             android:exported="false" />
         <service
-            android:name="org.androidannotations.test15.eservice.MySimpleIntentService_"
+            android:name=".eservice.MySimpleIntentService_"
             android:exported="false" />
         <service
-            android:name="org.androidannotations.test15.eintentservice.MyIntentService_"
+            android:name=".eintentservice.MyIntentService_"
             android:exported="false" />
         <service
-            android:name="org.androidannotations.test15.eintentservice.IntentServiceHandledAction_"
+            android:name=".eintentservice.IntentServiceHandledAction_"
             android:exported="false" />
         <service
-                android:name="org.androidannotations.test15.receiver.ServiceWithReceiver_"
+                android:name=".receiver.ServiceWithReceiver_"
                 android:exported="false" />
     </application>
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AbstractActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AbstractActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AbstractActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AbstractActivity.java
index 72c883e2ae..31304b95a4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AbstractActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AbstractActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.ViewById;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithGenerics.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithGenerics.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithGenerics.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithGenerics.java
index 44aa6d1048..211aa11046 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithGenerics.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithGenerics.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.List;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java
index 33717595e0..8ee3783760 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.SystemService;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AwaitingResultActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AwaitingResultActivity.java
index da6511fcb2..54934cf91a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AwaitingResultActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.ArrayList;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AwaitingResultFragment.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AwaitingResultFragment.java
index 8c73b8f3f6..f851aa4c83 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/AwaitingResultFragment.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.ArrayList;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CheckedChangeHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CheckedChangeHandledActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CheckedChangeHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CheckedChangeHandledActivity.java
index 42b1e57c86..38f7774185 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CheckedChangeHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CheckedChangeHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.CheckedChange;
 import org.androidannotations.annotations.EActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ClicksHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ClicksHandledActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ClicksHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ClicksHandledActivity.java
index c02d586e79..bdedb3d02e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ClicksHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ClicksHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomData.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CustomData.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomData.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CustomData.java
index 4281691edb..e69b01256a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomData.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CustomData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomTitleActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CustomTitleActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomTitleActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CustomTitleActivity.java
index af3a9a4554..5ff7611b7b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomTitleActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/CustomTitleActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.CustomTitle;
 import org.androidannotations.annotations.EActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EditorActionsHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EditorActionsHandledActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EditorActionsHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EditorActionsHandledActivity.java
index d2329f027a..11ecb45fee 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EditorActionsHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EditorActionsHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.EditorAction;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithLayout.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EmptyActivityWithLayout.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithLayout.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EmptyActivityWithLayout.java
index 8a427c2861..47d7904142 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithLayout.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EmptyActivityWithLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithoutLayout.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EmptyActivityWithoutLayout.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithoutLayout.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EmptyActivityWithoutLayout.java
index 5ef65010ae..5cbbe612d9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithoutLayout.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EmptyActivityWithoutLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EventsHandledAbstractActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EventsHandledAbstractActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EventsHandledAbstractActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EventsHandledAbstractActivity.java
index 59c9317246..0548a3dc81 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EventsHandledAbstractActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/EventsHandledAbstractActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import android.app.Activity;
 import android.view.View;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtendingActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ExtendingActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtendingActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ExtendingActivity.java
index a93962ede3..e635d6914f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtendingActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ExtendingActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ExtraInjectedActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ExtraInjectedActivity.java
index 78217b2d36..ea36a1faff 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ExtraInjectedActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.ArrayList;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FocusChangeHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FocusChangeHandledActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FocusChangeHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FocusChangeHandledActivity.java
index f4864c5fe6..c7f8229bd0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FocusChangeHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FocusChangeHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.FocusChange;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentArguments.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FragmentArguments.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentArguments.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FragmentArguments.java
index 07e34a5380..bc3d1e15a4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentArguments.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FragmentArguments.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.ArrayList;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.FragmentArg;
-import org.androidannotations.test15.instancestate.MyGenericParcelableBean;
-import org.androidannotations.test15.instancestate.MyGenericSerializableBean;
-import org.androidannotations.test15.instancestate.MyParcelableBean;
-import org.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.test.instancestate.MyGenericParcelableBean;
+import org.androidannotations.test.instancestate.MyGenericSerializableBean;
+import org.androidannotations.test.instancestate.MyParcelableBean;
+import org.androidannotations.test.instancestate.MySerializableBean;
 
 import android.app.Fragment;
 import android.os.Bundle;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentStartedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FragmentStartedActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentStartedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FragmentStartedActivity.java
index e362d6497e..97613efb80 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentStartedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FragmentStartedActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FromHtmlActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FromHtmlActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FromHtmlActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FromHtmlActivity.java
index c37b8c5d4f..90fde0e2a0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FromHtmlActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FromHtmlActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.FromHtml;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FullscreenActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FullscreenActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FullscreenActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FullscreenActivity.java
index 134c1b3264..557a844931 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FullscreenActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/FullscreenActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Fullscreen;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/GenericFragmentArguments.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/GenericFragmentArguments.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java
index df355cd67e..7f5dd54ca6 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/GenericFragmentArguments.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/HierarchyViewerActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/HierarchyViewerActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java
index 05e7d9bfce..24b784d5fc 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/HierarchyViewerActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.HierarchyViewerSupport;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ItemClicksHandledActivity.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ItemClicksHandledActivity.java
index 784423d4dc..417c7f7785 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ItemClicksHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/LongClicksHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/LongClicksHandledActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/LongClicksHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/LongClicksHandledActivity.java
index c3516ab44d..de3b720347 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/LongClicksHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/LongClicksHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.LongClick;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/MultiFindViewActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/MultiFindViewActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/MultiFindViewActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/MultiFindViewActivity.java
index a7ca5596f4..5ee2899526 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/MultiFindViewActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/MultiFindViewActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ParcelableSerializableData.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ParcelableSerializableData.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ParcelableSerializableData.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ParcelableSerializableData.java
index 4a45c7a9bb..60ac42f632 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ParcelableSerializableData.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ParcelableSerializableData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SSLConnection.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SSLConnection.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SSLConnection.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SSLConnection.java
index 830284d170..8784574c73 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SSLConnection.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SSLConnection.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.HttpsClient;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SeekBarChangeListenedActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SeekBarChangeListenedActivity.java
index 33fd91ce17..99d77e763a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SeekBarChangeListenedActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.SeekBarProgressChange;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TextWatchedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TextWatchedActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TextWatchedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TextWatchedActivity.java
index eacc703781..897461d9ca 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TextWatchedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TextWatchedActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.AfterTextChange;
 import org.androidannotations.annotations.BeforeTextChange;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ThreadActivity.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ThreadActivity.java
index c412afe752..48e84d7a4d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ThreadActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.List;
 import java.util.Map;
@@ -24,9 +24,9 @@
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.UiThread.Propagation;
-import org.androidannotations.test15.ebean.GenericBean;
-import org.androidannotations.test15.ebean.SomeBean;
-import org.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.test.ebean.GenericBean;
+import org.androidannotations.test.ebean.SomeBean;
+import org.androidannotations.test.instancestate.MySerializableBean;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TouchesHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TouchesHandledActivity.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TouchesHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TouchesHandledActivity.java
index 77a643a047..e17d3802a2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TouchesHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TouchesHandledActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Touch;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TransactionalActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TransactionalActivity.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TransactionalActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TransactionalActivity.java
index 064526f9e1..bfd08fd8fe 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TransactionalActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/TransactionalActivity.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import java.util.List;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Transactional;
-import org.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.test.instancestate.MySerializableBean;
 
 import android.app.Activity;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ViewsInjectedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ViewsInjectedActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ViewsInjectedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ViewsInjectedActivity.java
index e9f93e3629..4fe27e9de1 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ViewsInjectedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ViewsInjectedActivity.java
@@ -13,18 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
+
+import java.util.List;
 
-import android.app.Activity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.ViewById;
 import org.androidannotations.annotations.ViewsById;
 
-import java.util.List;
+import android.app.Activity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 @EActivity(R.layout.views_injected)
 public class ViewsInjectedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/WakeLockActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/WakeLockActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/WakeLockActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/WakeLockActivity.java
index 49429de296..87da277d20 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/WakeLockActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/WakeLockActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.WakeLock;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/WindowFeatureActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/WindowFeatureActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/WindowFeatureActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/WindowFeatureActivity.java
index f1b6644273..1a0f11e876 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/WindowFeatureActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/WindowFeatureActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Fullscreen;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterextras/AfterExtrasActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterextras/AfterExtrasActivity.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterextras/AfterExtrasActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterextras/AfterExtrasActivity.java
index 226221816c..9a81c9c27e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterextras/AfterExtrasActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterextras/AfterExtrasActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterextras;
+package org.androidannotations.test.afterextras;
 
 import org.androidannotations.annotations.AfterExtras;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Extra;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterinject/AfterInjectActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterinject/AfterInjectActivity.java
index 154d6993e4..4f0572fbc4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterinject/AfterInjectActivity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterinject;
-
-import android.app.Activity;
-import android.app.NotificationManager;
+package org.androidannotations.test.afterinject;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.SystemService;
 
+import android.app.Activity;
+import android.app.NotificationManager;
+
 @EActivity
 public class AfterInjectActivity extends Activity {
 	
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterinject/AfterInjectBean.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterinject/AfterInjectBean.java
index 6af3fd6e5a..0739b1568f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterinject/AfterInjectBean.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterinject;
-
-import android.app.NotificationManager;
+package org.androidannotations.test.afterinject;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.SystemService;
 
+import android.app.NotificationManager;
+
 @EBean
 public class AfterInjectBean {
 	
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterviews/AfterViewBean.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterviews/AfterViewBean.java
index 25f2f751f1..0827f99e11 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterviews/AfterViewBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterviews;
+package org.androidannotations.test.afterviews;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.EBean;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewsActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterviews/AfterViewsActivity.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewsActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterviews/AfterViewsActivity.java
index 7fe080358b..c3df3f8a31 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewsActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/afterviews/AfterViewsActivity.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterviews;
-
-import android.app.Activity;
+package org.androidannotations.test.afterviews;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
+
+import android.app.Activity;
 
 @EActivity(R.layout.main)
 public class AfterViewsActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/AbstractBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/AbstractBean.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/AbstractBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/AbstractBean.java
index 0157b6c34a..6ce064bede 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/AbstractBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/AbstractBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EBean;
@@ -24,7 +24,8 @@
 @EBean
 public abstract class AbstractBean {
 	
-	@RootContext Context context;
+	@RootContext
+	Context context;
 
 	public AbstractBean(String param) {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanInjectedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/BeanInjectedActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanInjectedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/BeanInjectedActivity.java
index 730e65a36c..78c0063fcc 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanInjectedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/BeanInjectedActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
-
-import android.app.Activity;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EActivity;
 
+import android.app.Activity;
+
 @EActivity
 public class BeanInjectedActivity extends Activity {
 	
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanWithView.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/BeanWithView.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanWithView.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/BeanWithView.java
index acbe978003..a6de3cef2f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanWithView.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/BeanWithView.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.ViewById;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ChildBean1.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ChildBean1.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ChildBean1.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ChildBean1.java
index 6a215cea5b..2aaecf0ef7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ChildBean1.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ChildBean1.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ChildBean2.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ChildBean2.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ChildBean2.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ChildBean2.java
index fd25e01ae0..a9a539c34b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ChildBean2.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ChildBean2.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EmptyDependency.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EmptyDependency.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EmptyDependency.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EmptyDependency.java
index a3cc7bfd53..c05bfdc719 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EmptyDependency.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EmptyDependency.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EnhancedClass.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EnhancedClass.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EnhancedClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EnhancedClass.java
index c98b9d08a3..dcf199ca5c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EnhancedClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EnhancedClass.java
@@ -13,17 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.Service;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.widget.TextView;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.AfterInject;
-import org.androidannotations.annotations.App;
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.Click;
@@ -35,8 +27,14 @@
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
 import org.androidannotations.annotations.res.StringRes;
-import org.androidannotations.test15.ThreadActivity;
-import org.androidannotations.test15.roboguice.SampleRoboApplication;
+import org.androidannotations.test.ThreadActivity;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.Service;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.widget.TextView;
 
 /**
  * This class doesn't have any test, currently it's just there to show that
@@ -64,9 +62,6 @@ public class EnhancedClass {
 	@ViewById
 	TextView myTextView;
 
-	@App
-	SampleRoboApplication customApplication;
-
 	@StringRes
 	String hello;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/GenericBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/GenericBean.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/GenericBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/GenericBean.java
index b1b88461c3..df13eb0ae0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/GenericBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/GenericBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 
 public class GenericBean<T> {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SecondDependency.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SecondDependency.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SecondDependency.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SecondDependency.java
index 9dec2b10fe..1303b8a69e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SecondDependency.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SecondDependency.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeArrayAdapter.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeArrayAdapter.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeArrayAdapter.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeArrayAdapter.java
index ca94f88f24..44bd18be96 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeArrayAdapter.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeArrayAdapter.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
+
+import org.androidannotations.annotations.EBean;
 
 import android.content.Context;
 import android.widget.ArrayAdapter;
 
-import org.androidannotations.annotations.EBean;
-
 @EBean
 public class SomeArrayAdapter extends ArrayAdapter<String> {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeBean.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeBean.java
index ececc8a261..3c855f1074 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeBean.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
-
-import android.content.Context;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.RootContext;
 
+import android.content.Context;
+
 @EBean
 public class SomeBean {
 	
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeCyclicSingletonA.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeCyclicSingletonA.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeCyclicSingletonA.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeCyclicSingletonA.java
index f5f3f330fe..7cb2a8cc14 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeCyclicSingletonA.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeCyclicSingletonA.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EBean;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeCyclicSingletonB.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeCyclicSingletonB.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeCyclicSingletonB.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeCyclicSingletonB.java
index 5391c4935b..19f618a515 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeCyclicSingletonB.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeCyclicSingletonB.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EBean;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeImplementation.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeImplementation.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeImplementation.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeImplementation.java
index a53432a77a..8135ac8e1c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeImplementation.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeImplementation.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.EBean;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeInterface.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeInterface.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeInterface.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeInterface.java
index 355975d493..e20d4f7d37 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeInterface.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeInterface.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 public interface SomeInterface {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeSingleton.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeSingleton.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeSingleton.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeSingleton.java
index fe045e25ff..3b873747f4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeSingleton.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SomeSingleton.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EBean;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java
index 1211134371..49a7424a26 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java
@@ -13,16 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
-import com.squareup.otto.Produce;
+import java.util.List;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.UiThread;
 
-import java.util.List;
-
 @EBean
 public class SubtypedGenericBean<S extends List<T>, T extends Number> {
 
@@ -31,7 +29,6 @@ void backgroundMethod(T param, S param2) {
 
 	}
 
-	@Produce
 	public T genericMethod() {
 		return null;
 	}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExt.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExt.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExt.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExt.java
index d3d5631a72..39555ebc13 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExt.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExt.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
-
-import org.androidannotations.annotations.EBean;
+package org.androidannotations.test.ebean;
 
 import java.util.List;
 
+import org.androidannotations.annotations.EBean;
+
 @EBean
 public class SubtypedGenericBeanExt<S extends List<Integer>> extends SubtypedGenericBean<S, Integer> {
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExt2.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExt2.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExt2.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExt2.java
index 08727a06bf..0fd83f3066 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExt2.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExt2.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
-
-import org.androidannotations.annotations.EBean;
+package org.androidannotations.test.ebean;
 
 import java.util.List;
 
+import org.androidannotations.annotations.EBean;
+
 @EBean
 public class SubtypedGenericBeanExt2 extends SubtypedGenericBean<List<Double>, Double> {
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExtExt.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExtExt.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExtExt.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExtExt.java
index 978e66c6da..b1f266507e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SubtypedGenericBeanExtExt.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBeanExtExt.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
-
-import org.androidannotations.annotations.EBean;
+package org.androidannotations.test.ebean;
 
 import java.util.ArrayList;
 
+import org.androidannotations.annotations.EBean;
+
 @EBean
 public class SubtypedGenericBeanExtExt extends SubtypedGenericBeanExt<ArrayList<Integer>> {
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ThreadControlledBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ThreadControlledBean.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ThreadControlledBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ThreadControlledBean.java
index 44df692e31..8f4470c1dc 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/ThreadControlledBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/ThreadControlledBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EBean;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/AbstractFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/AbstractFragment.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/AbstractFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/AbstractFragment.java
index 9f4982c840..5bc720c4a5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/AbstractFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/AbstractFragment.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
-
-import android.app.Fragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EFragment;
-import org.androidannotations.test15.ebean.SomeBean;
+import org.androidannotations.test.ebean.SomeBean;
+
+import android.app.Fragment;
 
 @EFragment
 public abstract class AbstractFragment extends Fragment {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithFragments.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/BeanWithFragments.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithFragments.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/BeanWithFragments.java
index a49dad65ae..9ba2475f20 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithFragments.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/BeanWithFragments.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.FragmentById;
 import org.androidannotations.annotations.FragmentByTag;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 @EBean
 public class BeanWithFragments {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithSupportFragments.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/BeanWithSupportFragments.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithSupportFragments.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/BeanWithSupportFragments.java
index 7463d6eb1c..d838cb91e0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithSupportFragments.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/BeanWithSupportFragments.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.FragmentById;
 import org.androidannotations.annotations.FragmentByTag;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 @EBean
 public class BeanWithSupportFragments {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/ForceLayoutInjectedListFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/ForceLayoutInjectedListFragment.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/ForceLayoutInjectedListFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/ForceLayoutInjectedListFragment.java
index 113d1af950..3d3ec9d05d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/ForceLayoutInjectedListFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/ForceLayoutInjectedListFragment.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.EFragment;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.support.v4.app.ListFragment;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragment.java
similarity index 77%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragment.java
index 6b2b28d706..fbe9cecd3d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragment.java
@@ -13,23 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.AfterViews;
-import org.androidannotations.annotations.App;
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EFragment;
-import org.androidannotations.annotations.OrmLiteDao;
 import org.androidannotations.annotations.SystemService;
 import org.androidannotations.annotations.Trace;
 import org.androidannotations.annotations.Transactional;
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
-import org.androidannotations.test15.R;
-import org.androidannotations.test15.ormlite.DatabaseHelper;
-import org.androidannotations.test15.ormlite.UserDao;
-import org.androidannotations.test15.roboguice.SampleRoboApplication;
+import org.androidannotations.test.R;
 
 import android.app.ActivityManager;
 import android.database.sqlite.SQLiteDatabase;
@@ -41,15 +36,9 @@ public class MyFragment extends AbstractFragment {
 	@ViewById
 	TextView myTextView;
 
-	@App
-	SampleRoboApplication customApplication;
-
 	@SystemService
 	ActivityManager activityManager;
 
-	@OrmLiteDao(helper = DatabaseHelper.class)
-	UserDao userDao;
-
 	@Click
 	void myButton() {
 	}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragmentActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragmentActivity.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragmentActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragmentActivity.java
index 9ba8b3b904..5d376d5259 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragmentActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragmentActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.FragmentById;
 import org.androidannotations.annotations.FragmentByTag;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyListFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyListFragment.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyListFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyListFragment.java
index 2790b913e1..4b9ba2d544 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyListFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyListFragment.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EFragment;
@@ -21,7 +21,7 @@
 import org.androidannotations.annotations.ItemClick;
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragment.java
similarity index 85%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragment.java
index d9903ca1d0..faf0bee09f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragment.java
@@ -13,16 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
-
-import android.app.ActivityManager;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.v4.app.Fragment;
-import android.widget.TextView;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.AfterViews;
-import org.androidannotations.annotations.App;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EFragment;
@@ -31,9 +25,13 @@
 import org.androidannotations.annotations.Transactional;
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
-import org.androidannotations.test15.R;
-import org.androidannotations.test15.ebean.SomeBean;
-import org.androidannotations.test15.roboguice.SampleRoboApplication;
+import org.androidannotations.test.R;
+import org.androidannotations.test.ebean.SomeBean;
+
+import android.app.ActivityManager;
+import android.database.sqlite.SQLiteDatabase;
+import android.support.v4.app.Fragment;
+import android.widget.TextView;
 
 @EFragment(R.layout.injected)
 public class MySupportFragment extends Fragment {
@@ -44,9 +42,6 @@ public class MySupportFragment extends Fragment {
 	@ViewById
 	TextView myTextView;
 
-	@App
-	SampleRoboApplication customApplication;
-
 	@SystemService
 	ActivityManager activityManager;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragmentActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragmentActivity.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragmentActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragmentActivity.java
index e44bcda0f8..923b62d8ac 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragmentActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragmentActivity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
-
-import android.support.v4.app.FragmentActivity;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.FragmentById;
 import org.androidannotations.annotations.FragmentByTag;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
+
+import android.support.v4.app.FragmentActivity;
 
 @EActivity(R.layout.support_fragments)
 public class MySupportFragmentActivity extends FragmentActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/StartActivityFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/StartActivityFragment.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/StartActivityFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/StartActivityFragment.java
index 88e9da5bc7..c59bfd2fde 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/StartActivityFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/StartActivityFragment.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import org.androidannotations.annotations.EFragment;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/StartActivityFragmentSupport.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/StartActivityFragmentSupport.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/StartActivityFragmentSupport.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/StartActivityFragmentSupport.java
index ed965ac08c..e77b25b635 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/StartActivityFragmentSupport.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/StartActivityFragmentSupport.java
@@ -13,11 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
-import android.support.v4.app.Fragment;
 import org.androidannotations.annotations.EFragment;
-import org.androidannotations.test15.ExtraInjectedActivity_;
+import org.androidannotations.test.ExtraInjectedActivity_;
+
+import android.support.v4.app.Fragment;
 
 @EFragment
 public class StartActivityFragmentSupport extends Fragment {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eintentservice/IntentServiceHandledAction.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eintentservice/IntentServiceHandledAction.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eintentservice/IntentServiceHandledAction.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eintentservice/IntentServiceHandledAction.java
index 88397a23bc..839f7439a9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eintentservice/IntentServiceHandledAction.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eintentservice/IntentServiceHandledAction.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eintentservice;
+package org.androidannotations.test.eintentservice;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EIntentService;
 import org.androidannotations.annotations.ServiceAction;
-import org.androidannotations.test15.ebean.EnhancedClass;
+import org.androidannotations.test.ebean.EnhancedClass;
 
 import android.app.IntentService;
 import android.content.Intent;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eintentservice/MyIntentService.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eintentservice/MyIntentService.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eintentservice/MyIntentService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eintentservice/MyIntentService.java
index e9656806c1..69d353cf3b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eintentservice/MyIntentService.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eintentservice/MyIntentService.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eintentservice;
+package org.androidannotations.test.eintentservice;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EIntentService;
 import org.androidannotations.annotations.ServiceAction;
 import org.androidannotations.api.support.app.AbstractIntentService;
-import org.androidannotations.test15.ebean.EnhancedClass;
+import org.androidannotations.test.ebean.EnhancedClass;
 
 @EIntentService
 public class MyIntentService extends AbstractIntentService {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eprovider/MyProvider.java
similarity index 83%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eprovider/MyProvider.java
index 8cba9861f9..08a2301f93 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eprovider/MyProvider.java
@@ -13,21 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eprovider;
+package org.androidannotations.test.eprovider;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EProvider;
-import org.androidannotations.annotations.OrmLiteDao;
 import org.androidannotations.annotations.SystemService;
 import org.androidannotations.annotations.Trace;
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.sharedpreferences.Pref;
-import org.androidannotations.test15.ebean.EnhancedClass;
-import org.androidannotations.test15.eservice.MyService;
-import org.androidannotations.test15.ormlite.DatabaseHelper;
-import org.androidannotations.test15.ormlite.UserDao;
-import org.androidannotations.test15.prefs.SomePrefs_;
+import org.androidannotations.test.ebean.EnhancedClass;
+import org.androidannotations.test.eservice.MyService;
+import org.androidannotations.test.prefs.SomePrefs_;
 
 import android.app.NotificationManager;
 import android.content.ContentProvider;
@@ -46,9 +43,6 @@ public class MyProvider extends ContentProvider {
 	@Bean
 	EnhancedClass dependency;
 
-	@OrmLiteDao(helper = DatabaseHelper.class)
-	UserDao userDao;
-
 	@Pref
 	SomePrefs_ somePrefs;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/MyReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ereceiver/MyReceiver.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/MyReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ereceiver/MyReceiver.java
index 1f2ebb550e..ca76574b91 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/MyReceiver.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ereceiver/MyReceiver.java
@@ -13,14 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ereceiver;
-
-import android.app.NotificationManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-import android.widget.Toast;
+package org.androidannotations.test.ereceiver;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.Bean;
@@ -28,8 +21,15 @@
 import org.androidannotations.annotations.SystemService;
 import org.androidannotations.annotations.Trace;
 import org.androidannotations.annotations.UiThread;
-import org.androidannotations.test15.ebean.EnhancedClass;
-import org.androidannotations.test15.eservice.MyService;
+import org.androidannotations.test.ebean.EnhancedClass;
+import org.androidannotations.test.eservice.MyService;
+
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.widget.Toast;
 
 @EReceiver
 public class MyReceiver extends BroadcastReceiver {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/ReceiverWithActions.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ereceiver/ReceiverWithActions.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/ReceiverWithActions.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ereceiver/ReceiverWithActions.java
index 7fe69a6c9e..72d1d5d164 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/ReceiverWithActions.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ereceiver/ReceiverWithActions.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ereceiver;
+package org.androidannotations.test.ereceiver;
 
 import org.androidannotations.annotations.EReceiver;
 import org.androidannotations.annotations.ReceiverAction;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eservice/MyService.java
similarity index 83%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eservice/MyService.java
index 1b89d0f719..26c5c34d2a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eservice/MyService.java
@@ -13,18 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eservice;
+package org.androidannotations.test.eservice;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EService;
-import org.androidannotations.annotations.OrmLiteDao;
 import org.androidannotations.annotations.SystemService;
 import org.androidannotations.annotations.Trace;
 import org.androidannotations.annotations.UiThread;
-import org.androidannotations.test15.ebean.EnhancedClass;
-import org.androidannotations.test15.ormlite.DatabaseHelper;
-import org.androidannotations.test15.ormlite.UserDao;
+import org.androidannotations.test.ebean.EnhancedClass;
 
 import android.app.IntentService;
 import android.app.NotificationManager;
@@ -41,9 +38,6 @@ public class MyService extends IntentService {
 	@Bean
 	EnhancedClass dependency;
 
-	@OrmLiteDao(helper = DatabaseHelper.class)
-	UserDao userDao;
-
 	public MyService() {
 		super(MyService.class.getSimpleName());
 	}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MySimpleIntentService.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eservice/MySimpleIntentService.java
similarity index 83%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MySimpleIntentService.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eservice/MySimpleIntentService.java
index e7f595a0c9..e5a5da7b56 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MySimpleIntentService.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eservice/MySimpleIntentService.java
@@ -13,24 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eservice;
-
-import android.app.IntentService;
-import android.app.NotificationManager;
-import android.content.Intent;
-import android.util.Log;
-import android.widget.Toast;
+package org.androidannotations.test.eservice;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EService;
-import org.androidannotations.annotations.OrmLiteDao;
 import org.androidannotations.annotations.SystemService;
 import org.androidannotations.annotations.Trace;
 import org.androidannotations.annotations.UiThread;
-import org.androidannotations.test15.ebean.EnhancedClass;
-import org.androidannotations.test15.ormlite.DatabaseHelper;
-import org.androidannotations.test15.ormlite.UserDao;
+import org.androidannotations.test.ebean.EnhancedClass;
+
+import android.app.IntentService;
+import android.app.NotificationManager;
+import android.content.Intent;
+import android.util.Log;
+import android.widget.Toast;
 
 @EService
 public class MySimpleIntentService extends IntentService {
@@ -41,9 +38,6 @@ public class MySimpleIntentService extends IntentService {
 	@Bean
 	EnhancedClass dependency;
 
-	@OrmLiteDao(helper = DatabaseHelper.class)
-	UserDao userDao;
-
 	public MySimpleIntentService() {
 		super(MySimpleIntentService.class.getSimpleName());
 	}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eview/CustomButton.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eview/CustomButton.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eview/CustomButton.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eview/CustomButton.java
index 2e7c64a8c8..68743e8e9e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eview/CustomButton.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eview/CustomButton.java
@@ -13,12 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eview;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.animation.Animation;
-import android.widget.Button;
+package org.androidannotations.test.eview;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Background;
@@ -27,7 +22,12 @@
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.res.AnimationRes;
 import org.androidannotations.annotations.res.StringRes;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.animation.Animation;
+import android.widget.Button;
 
 @EView
 public class CustomButton extends Button {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayout.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eviewgroup/CustomFrameLayout.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayout.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eviewgroup/CustomFrameLayout.java
index e4dc3ce598..10842957e9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayout.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eviewgroup/CustomFrameLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eviewgroup;
+package org.androidannotations.test.eviewgroup;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Background;
@@ -26,7 +26,7 @@
 import org.androidannotations.annotations.ViewById;
 import org.androidannotations.annotations.res.AnimationRes;
 import org.androidannotations.annotations.res.StringRes;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eviewgroup/CustomFrameLayoutActivity.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eviewgroup/CustomFrameLayoutActivity.java
index 0845f60d87..ae94615fb5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/eviewgroup/CustomFrameLayoutActivity.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eviewgroup;
+package org.androidannotations.test.eviewgroup;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/inheritance/Child.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/inheritance/Child.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/inheritance/Child.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/inheritance/Child.java
index 46fc63c859..95a94f3d6a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/inheritance/Child.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/inheritance/Child.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.inheritance;
+package org.androidannotations.test.inheritance;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.AfterViews;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/inheritance/Mother.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/inheritance/Mother.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/inheritance/Mother.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/inheritance/Mother.java
index e6a63d927f..e6b7039cf6 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/inheritance/Mother.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/inheritance/Mother.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.inheritance;
+package org.androidannotations.test.inheritance;
 
 import org.androidannotations.annotations.AfterInject;
 import org.androidannotations.annotations.AfterViews;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/innerclasses/ActivityWithInnerEnhancedClasses.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/innerclasses/ActivityWithInnerEnhancedClasses.java
index 36e8f83e03..d7e2458d69 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/ActivityWithInnerEnhancedClasses.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/innerclasses/ActivityWithInnerEnhancedClasses.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.innerclasses;
+package org.androidannotations.test.innerclasses;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.EViewGroup;
 import org.androidannotations.annotations.ViewById;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/BeanWithInnerEnhancedClasses.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/innerclasses/BeanWithInnerEnhancedClasses.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/BeanWithInnerEnhancedClasses.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/innerclasses/BeanWithInnerEnhancedClasses.java
index 6c2347759c..488654e279 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/innerclasses/BeanWithInnerEnhancedClasses.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/innerclasses/BeanWithInnerEnhancedClasses.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.innerclasses;
+package org.androidannotations.test.innerclasses;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EBean;
@@ -22,8 +22,8 @@
 import org.androidannotations.annotations.sharedpreferences.DefaultRes;
 import org.androidannotations.annotations.sharedpreferences.Pref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
-import org.androidannotations.test15.R;
-import org.androidannotations.test15.ebean.SomeImplementation;
+import org.androidannotations.test.R;
+import org.androidannotations.test.ebean.SomeImplementation;
 
 @EBean
 public class BeanWithInnerEnhancedClasses {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericParcelableBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyGenericParcelableBean.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericParcelableBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyGenericParcelableBean.java
index d8e1c1d7d0..320a0abd14 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericParcelableBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyGenericParcelableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericSerializableBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyGenericSerializableBean.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericSerializableBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyGenericSerializableBean.java
index bba1c38be4..7f39252463 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericSerializableBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyGenericSerializableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyParcelableBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyParcelableBean.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyParcelableBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyParcelableBean.java
index adcea27034..889a821bb3 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyParcelableBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MyParcelableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MySerializableBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MySerializableBean.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MySerializableBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MySerializableBean.java
index 1c4dfb56b1..d09f429af4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MySerializableBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/MySerializableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/SaveInstanceStateActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/SaveInstanceStateActivity.java
index 9256f7edfc..bda1af8152 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/instancestate/SaveInstanceStateActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import java.util.ArrayList;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.InstanceState;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/InjectMenuActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/InjectMenuActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/InjectMenuActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/InjectMenuActivity.java
index 5191382d8e..ca65e5218d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/InjectMenuActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/InjectMenuActivity.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
 
-import android.app.Activity;
-import android.view.Menu;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.InjectMenu;
 
+import android.app.Activity;
+import android.view.Menu;
+
 @EActivity
 public class InjectMenuActivity extends Activity {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuActivity.java
index a897c6c0fd..fae8f272e4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.OptionsItem;
 import org.androidannotations.annotations.OptionsMenu;
 import org.androidannotations.annotations.OptionsMenuItem;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuFragment.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuFragment.java
index da814b4f65..1f7eb1ec3b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuFragment.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
 
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.OptionsItem;
 import org.androidannotations.annotations.OptionsMenu;
 import org.androidannotations.annotations.OptionsMenuItem;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Fragment;
 import android.view.MenuItem;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSubActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuSubActivity.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSubActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuSubActivity.java
index 06325834ad..16bc9777dc 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSubActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuSubActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.OptionsMenu;
 import org.androidannotations.annotations.OptionsMenuItem;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.view.MenuItem;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSupportFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuSupportFragment.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSupportFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuSupportFragment.java
index 7e085c2c25..7aa3962574 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSupportFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/menu/OptionsMenuSupportFragment.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
 
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.OptionsItem;
 import org.androidannotations.annotations.OptionsMenu;
 import org.androidannotations.annotations.OptionsMenuItem;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.support.v4.app.Fragment;
 import android.view.MenuItem;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/nonconfiguration/NonConfigurationActivity.java
similarity index 86%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/nonconfiguration/NonConfigurationActivity.java
index 0ba229faa9..5da51448e4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/nonconfiguration/NonConfigurationActivity.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.nonconfiguration;
+package org.androidannotations.test.nonconfiguration;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.NonConfigurationInstance;
-import org.androidannotations.test15.ebean.EmptyDependency;
-import org.androidannotations.test15.ebean.SomeImplementation;
-import org.androidannotations.test15.ebean.SomeInterface;
+import org.androidannotations.test.ebean.EmptyDependency;
+import org.androidannotations.test.ebean.SomeImplementation;
+import org.androidannotations.test.ebean.SomeInterface;
 
 import android.app.Activity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceAnnotationsFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceAnnotationsFragment.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceAnnotationsFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceAnnotationsFragment.java
index 17e674bcb5..b559b62de1 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceAnnotationsFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceAnnotationsFragment.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import org.androidannotations.annotations.AfterPreferences;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.PreferenceChange;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceEventsHandledActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceEventsHandledActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceEventsHandledActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceEventsHandledActivity.java
index 831a829a48..127ad774f5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceEventsHandledActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceEventsHandledActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.PreferenceChange;
 import org.androidannotations.annotations.PreferenceClick;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceHeadersActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceHeadersActivity.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceHeadersActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceHeadersActivity.java
index c376c7fa06..61c904cddb 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceHeadersActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceHeadersActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import java.util.List;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.PreferenceHeaders;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.preference.PreferenceActivity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceScreenActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceScreenActivity.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceScreenActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceScreenActivity.java
index e786a89ec5..b17543e5d7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceScreenActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceScreenActivity.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.PreferenceScreen;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.preference.PreferenceActivity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceScreenFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceScreenFragment.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceScreenFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceScreenFragment.java
index 0b2acfe5ab..383d546846 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferenceScreenFragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferenceScreenFragment.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.PreferenceScreen;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.preference.PreferenceFragment;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferencesInjectedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferencesInjectedActivity.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferencesInjectedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferencesInjectedActivity.java
index 5e77cb2219..a702cfec88 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/preference/PreferencesInjectedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/preference/PreferencesInjectedActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import org.androidannotations.annotations.AfterPreferences;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.PreferenceByKey;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityDefaultPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ActivityDefaultPrefs.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityDefaultPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ActivityDefaultPrefs.java
index 38aeea2542..c60275c6c0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityDefaultPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ActivityDefaultPrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ActivityPrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ActivityPrefs.java
index 2ee5ef7a26..54293e79bf 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ActivityPrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ApplicationDefaultPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ApplicationDefaultPrefs.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ApplicationDefaultPrefs.java
index fd2f769c42..eddeb7a1d5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/ApplicationDefaultPrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/DefaultPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/DefaultPrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/DefaultPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/DefaultPrefs.java
index ec0f30f44b..ae74577a11 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/DefaultPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/DefaultPrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/InnerPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/InnerPrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/InnerPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/InnerPrefs.java
index 7eea96fc1b..10ee7333fb 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/InnerPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/InnerPrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PrefsActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/PrefsActivity.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PrefsActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/PrefsActivity.java
index 457cd4d43f..750e1dffbf 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PrefsActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/PrefsActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
-
-import android.app.Activity;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.sharedpreferences.Pref;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
+
+import android.app.Activity;
 
 @EActivity(R.layout.main)
 public class PrefsActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PublicPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/PublicPrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PublicPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/PublicPrefs.java
index f8710c226a..4a0d2e43cf 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PublicPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/PublicPrefs.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
-
-import android.content.Context;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
+import android.content.Context;
+
 @SharedPref(mode = Context.MODE_WORLD_WRITEABLE)
 public interface PublicPrefs {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomePrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomePrefs.java
index bd751af1d9..f1432efce9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomePrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import java.util.Set;
 
@@ -24,7 +24,7 @@
 import org.androidannotations.annotations.sharedpreferences.DefaultString;
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 @SharedPref(Scope.UNIQUE)
 public interface SomePrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomeResPrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomeResPrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomeResPrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomeResPrefs.java
index da48f67145..ae0d753c36 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomeResPrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomeResPrefs.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.DefaultRes;
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 @SharedPref(Scope.UNIQUE)
 public interface SomeResPrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/UniquePrefs.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/UniquePrefs.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/UniquePrefs.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/UniquePrefs.java
index e507ea9ff5..9805d547b4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/UniquePrefs.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/prefs/UniquePrefs.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/ActivityWithReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/ActivityWithReceiver.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/ActivityWithReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/ActivityWithReceiver.java
index de7809c9dc..e150ed65e8 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/ActivityWithReceiver.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/ActivityWithReceiver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.receiver;
+package org.androidannotations.test.receiver;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.Receiver;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/FragmentWithReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/FragmentWithReceiver.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/FragmentWithReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/FragmentWithReceiver.java
index c1d6e42b85..a47a0b7a7e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/FragmentWithReceiver.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/FragmentWithReceiver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.receiver;
+package org.androidannotations.test.receiver;
 
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.Receiver;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/ServiceWithReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/ServiceWithReceiver.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/ServiceWithReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/ServiceWithReceiver.java
index e2dd60ed50..82d65b2612 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/receiver/ServiceWithReceiver.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/receiver/ServiceWithReceiver.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.receiver;
+package org.androidannotations.test.receiver;
+
+import org.androidannotations.annotations.EService;
+import org.androidannotations.annotations.Receiver;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import org.androidannotations.annotations.EService;
-import org.androidannotations.annotations.Receiver;
 
 @EService
 public class ServiceWithReceiver extends Service {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/res/ResActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/res/ResActivity.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/res/ResActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/res/ResActivity.java
index 1d17d2d95d..e509348fc7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/res/ResActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/res/ResActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.res;
+package org.androidannotations.test.res;
 
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.res.HtmlRes;
 import org.androidannotations.annotations.res.StringRes;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.app.Activity;
 import android.content.res.XmlResourceParser;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/trace/TracedActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/trace/TracedActivity.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/trace/TracedActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/trace/TracedActivity.java
index 3e1ee777fd..911f97e8d1 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/trace/TracedActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/trace/TracedActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.trace;
+package org.androidannotations.test.trace;
 
 import java.io.IOException;
 import java.util.List;
@@ -25,7 +25,7 @@
 import org.androidannotations.annotations.Trace;
 import org.androidannotations.annotations.Transactional;
 import org.androidannotations.annotations.UiThread;
-import org.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.test.instancestate.MySerializableBean;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/anim/fadein.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/anim/fadein.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/anim/fadein.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/anim/fadein.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/drawable-hdpi/icon.png b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/drawable-hdpi/icon.png
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/drawable-hdpi/icon.png
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/drawable-ldpi/icon.png b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/drawable-ldpi/icon.png
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/drawable-ldpi/icon.png
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/drawable-mdpi/icon.png b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/drawable-mdpi/icon.png
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/drawable-mdpi/icon.png
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/checkable_widgets.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/checkable_widgets.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/checkable_widgets.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/checkable_widgets.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/clickable_widgets.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/clickable_widgets.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/clickable_widgets.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/clickable_widgets.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/component.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/component.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/component.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/component.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/fragments.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/fragments.xml
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/fragments.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/fragments.xml
index acc0231017..d29a6ce060 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/fragments.xml
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/fragments.xml
@@ -24,7 +24,7 @@
     <fragment
         android:id="@+id/myFragment"
         android:tag="myFragmentTag"
-        android:name="org.androidannotations.test15.efragment.MyFragment_"
+        android:name="org.androidannotations.test.efragment.MyFragment_"
         android:layout_width="0dp"
         android:layout_height="fill_parent"
         android:layout_weight="1" />
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/injected.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/injected.xml
new file mode 100644
index 0000000000..6a39a34405
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/injected.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon" />
+
+    <TextView
+        android:id="@+id/injected_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textSize="18sp"
+        android:textStyle="bold|italic" />
+
+</LinearLayout>
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/item_clicks_handled.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/item_clicks_handled.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/item_clicks_handled.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/item_clicks_handled.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/list_fragment.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/list_fragment.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/list_fragment.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/list_fragment.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/main.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/main.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/main.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/main.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/seekbars.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/seekbars.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/seekbars.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/seekbars.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/simple_spinner_item.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/simple_spinner_item.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/simple_spinner_item.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/simple_spinner_item.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/support_fragments.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/support_fragments.xml
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/support_fragments.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/support_fragments.xml
index 1ae02ed70c..966baa7efe 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/support_fragments.xml
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/support_fragments.xml
@@ -24,7 +24,7 @@
     <fragment
         android:id="@+id/mySupportFragment"
         android:tag="mySupportFragmentTag"
-        android:name="org.androidannotations.test15.efragment.MySupportFragment_"
+        android:name="org.androidannotations.test.efragment.MySupportFragment_"
         android:layout_width="0dp"
         android:layout_height="fill_parent"
         android:layout_weight="1" />
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/textviews_injected.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/textviews_injected.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/textviews_injected.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/textviews_injected.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/views_injected.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/views_injected.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/views_injected.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/views_injected.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/menu/my_menu.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/menu/my_menu.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/menu/my_menu.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/menu/my_menu.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/menu/my_menu2.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/menu/my_menu2.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/menu/my_menu2.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/menu/my_menu2.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/menu/my_menu3.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/menu/my_menu3.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/menu/my_menu3.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/menu/my_menu3.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/raw/cacerts.bks b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/raw/cacerts.bks
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/raw/cacerts.bks
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/raw/cacerts.bks
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/values/requests_codes.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/requests_codes.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/values/requests_codes.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/requests_codes.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/values/strings.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/strings.xml
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/values/strings.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/strings.xml
index ee71d89c74..08cd039b9e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/res/values/strings.xml
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/strings.xml
@@ -23,7 +23,6 @@
     </string>
     <string name="app_name">android-functional-test-1-5</string>
     <string name="someView">TextView Text</string>
-    <string name="injected_activity_caption">Roboguice Activity tested with Robolectric</string>
     <string name="injected_string">test</string>
 
     <string-array name="planets_array">
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/values/values.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/values.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/values/values.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/values.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/xml/headers.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/xml/headers.xml
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/xml/headers.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/xml/headers.xml
index c142ae6850..516525e09b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/res/xml/headers.xml
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/xml/headers.xml
@@ -18,7 +18,7 @@
 -->
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
-    <header android:fragment="org.androidannotations.test15.preference.PreferenceScreenFragment_" tools:ignore="UnusedAttribute"
+    <header android:fragment="org.androidannotations.test.preference.PreferenceScreenFragment_" tools:ignore="UnusedAttribute"
         android:title="@string/hello"
         />
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/xml/settings.xml b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/xml/settings.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/xml/settings.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/xml/settings.xml
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AbstractActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AbstractActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AbstractActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AbstractActivityTest.java
index 3b2122e9ef..41b8a11d44 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AbstractActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AbstractActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AwaitingResultActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AwaitingResultActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultActivityTest.java
index 0d6bc1056f..57a7c9a8f4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AwaitingResultActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AwaitingResultFragmentTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultFragmentTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AwaitingResultFragmentTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultFragmentTest.java
index 57a99ea8ab..97fadebe57 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/AwaitingResultFragmentTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultFragmentTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CheckedChangeHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CheckedChangeHandledActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CheckedChangeHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CheckedChangeHandledActivityTest.java
index ab0f365098..e13466c5c2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CheckedChangeHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CheckedChangeHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ClicksHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ClicksHandledActivityTest.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ClicksHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ClicksHandledActivityTest.java
index 520ab2bf81..c67292acb3 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ClicksHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ClicksHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomShadowBundle.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowBundle.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomShadowBundle.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowBundle.java
index 8b4bbf1d75..a6d58c9d9c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomShadowBundle.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowBundle.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.robolectric.Robolectric.directlyOn;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomShadowPowerManager.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowPowerManager.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomShadowPowerManager.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowPowerManager.java
index 7f5b1389e7..eb56c2d838 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomShadowPowerManager.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowPowerManager.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomTitleTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomTitleTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomTitleTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomTitleTest.java
index 3e1ab60977..a8dbd4f9d0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/CustomTitleTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomTitleTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EditorActionsActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EditorActionsActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EditorActionsActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EditorActionsActivityTest.java
index d25de27924..fcbe2010c7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EditorActionsActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EditorActionsActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.fest.reflect.core.Reflection.field;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EmptyActivityWithLayoutTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EmptyActivityWithLayoutTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EmptyActivityWithLayoutTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EmptyActivityWithLayoutTest.java
index 5c6718f8be..5fc1f7480a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EmptyActivityWithLayoutTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EmptyActivityWithLayoutTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EmptyActivityWithoutLayoutTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EmptyActivityWithoutLayoutTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EmptyActivityWithoutLayoutTest.java
index 73804634ac..e72d76a2ab 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/EmptyActivityWithoutLayoutTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FocusChangeHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FocusChangeHandledActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FocusChangeHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FocusChangeHandledActivityTest.java
index e36e78b6c7..b7a9705551 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FocusChangeHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FocusChangeHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FragmentArgsTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FragmentArgsTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FragmentArgsTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FragmentArgsTest.java
index d5332c7dc0..e31b93c22f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FragmentArgsTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FragmentArgsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
@@ -34,7 +34,7 @@ public class FragmentArgsTest {
 	 * This test verifies the Fragment argument gets injected. It does not check
 	 * for different types, because we use the same code for every
 	 * Bundle-related operation and types are already tested in
-	 * {@link org.androidannotations.test15.instancestate.SaveInstanceStateActivityParameterizedTest
+	 * {@link org.androidannotations.test.instancestate.SaveInstanceStateActivityParameterizedTest
 	 * SaveInstanceStateActivityParameterizedTest} .
 	 */
 	@Test
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FromHtmlActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FromHtmlActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FromHtmlActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FromHtmlActivityTest.java
index 3d5181c1c2..fb3ccb237a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/FromHtmlActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FromHtmlActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/GenericFragmentArgsTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/GenericFragmentArgsTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/GenericFragmentArgsTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/GenericFragmentArgsTest.java
index ae2d4cd3cf..986c55971b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/GenericFragmentArgsTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/GenericFragmentArgsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/InjectExtraTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/InjectExtraTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/InjectExtraTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/InjectExtraTest.java
index 1a56796c31..8ec843599d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/InjectExtraTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/InjectExtraTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ItemClicksHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ItemClicksHandledActivityTest.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ItemClicksHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ItemClicksHandledActivityTest.java
index 740c86746a..c3f60d4b74 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ItemClicksHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ItemClicksHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/LongClicksHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/LongClicksHandledActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/LongClicksHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/LongClicksHandledActivityTest.java
index 1ece447a52..12a1b7db41 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/LongClicksHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/LongClicksHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SSLConnectionTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/SSLConnectionTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SSLConnectionTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/SSLConnectionTest.java
index 469e0811ec..9c85d83712 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SSLConnectionTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/SSLConnectionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/SeekBarChangeListenedActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/SeekBarChangeListenedActivityTest.java
index 42f0bacd35..e592bc9392 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/SeekBarChangeListenedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java
index 1b5a8bc944..15bb816c8c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/TestSampleRoboApplication_.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TestApplication.java
similarity index 62%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/TestSampleRoboApplication_.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TestApplication.java
index e8d1b681a8..948b79cd3f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/TestSampleRoboApplication_.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TestApplication.java
@@ -1,4 +1,19 @@
-package org.androidannotations.test15.roboguice;
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.test;
 
 import static org.fest.reflect.core.Reflection.staticField;
 
@@ -9,20 +24,11 @@
 import org.robolectric.TestLifecycleApplication;
 import org.robolectric.shadows.ShadowHandler;
 
-import roboguice.RoboGuice;
 import android.app.Application;
 import android.os.Handler;
 import android.os.Message;
 
-// CHECKSTYLE:OFF
-public class TestSampleRoboApplication_ extends Application implements TestLifecycleApplication {
-
-	@Override
-	public void onCreate() {
-		super.onCreate();
-
-		RoboGuice.overrideApplicationInjector(this, RoboGuice.newDefaultRoboModule(this), new RobolectricSampleModule());
-	}
+public class TestApplication extends Application implements TestLifecycleApplication {
 
 	@Override
 	public void beforeTest(Method method) {
@@ -30,12 +36,6 @@ public void beforeTest(Method method) {
 
 	@Override
 	public void prepareTest(Object test) {
-		TestSampleRoboApplication_ application = (TestSampleRoboApplication_) Robolectric.application;
-
-		RoboGuice.overrideApplicationInjector(application, RoboGuice.newDefaultRoboModule(application), new RobolectricSampleTestModule());
-
-		RoboGuice.getInjector(application).injectMembers(test);
-
 		hackHandler();
 	}
 
@@ -60,4 +60,4 @@ public boolean handleMessage(Message msg) {
 			}
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TextWatchedActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TextWatchedActivityTest.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TextWatchedActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TextWatchedActivityTest.java
index 049ff710c5..b144036370 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TextWatchedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TextWatchedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ThreadActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ThreadActivityTest.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ThreadActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ThreadActivityTest.java
index f411958885..dcbf24fbe6 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ThreadActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ThreadActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.reflect.core.Reflection.staticField;
 import static org.mockito.Mockito.mock;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TouchesHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TouchesHandledActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TouchesHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TouchesHandledActivityTest.java
index e7eef3ea7c..21cb072b71 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TouchesHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TouchesHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TransactionalActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TransactionalActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TransactionalActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TransactionalActivityTest.java
index 39a6d8780c..fafa658cd0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/TransactionalActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TransactionalActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyString;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/UiThreadExecutorTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/UiThreadExecutorTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/UiThreadExecutorTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/UiThreadExecutorTest.java
index 1a0727327b..c03d272cb6 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/UiThreadExecutorTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/UiThreadExecutorTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ViewsInjectedActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ViewsInjectedActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ViewsInjectedActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ViewsInjectedActivityTest.java
index fda9e54654..fb624c8ac4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ViewsInjectedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ViewsInjectedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/WakeLockActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/WakeLockActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/WakeLockActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/WakeLockActivityTest.java
index bd4ef50575..5c847023fe 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/WakeLockActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/WakeLockActivityTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
 import java.io.IOException;
 
-import org.androidannotations.test15.WakeLockActivity.Callback;
+import org.androidannotations.test.WakeLockActivity.Callback;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/WindowFeatureTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/WindowFeatureTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/WindowFeatureTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/WindowFeatureTest.java
index ee18304344..c66d417ab2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/WindowFeatureTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/WindowFeatureTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.test;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterextras/AfterExtrasActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterextras/AfterExtrasActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterextras/AfterExtrasActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterextras/AfterExtrasActivityTest.java
index 38ac7e3308..a3cd79127a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterextras/AfterExtrasActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterextras/AfterExtrasActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterextras;
+package org.androidannotations.test.afterextras;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterinject/AfterInjectActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterinject/AfterInjectActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectActivityTest.java
index a9d6c1ec62..fed2b261b9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterinject/AfterInjectActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterinject;
+package org.androidannotations.test.afterinject;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterinject/AfterInjectBeanTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectBeanTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterinject/AfterInjectBeanTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectBeanTest.java
index 536a6ddec2..adc377eacb 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterinject/AfterInjectBeanTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectBeanTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterinject;
+package org.androidannotations.test.afterinject;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterviews/AfterViewsActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterviews/AfterViewsActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterviews/AfterViewsActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterviews/AfterViewsActivityTest.java
index 9771bf4ae3..7b579d1c45 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/afterviews/AfterViewsActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterviews/AfterViewsActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.afterviews;
+package org.androidannotations.test.afterviews;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/BeanInjectedActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/BeanInjectedActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/BeanInjectedActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/BeanInjectedActivityTest.java
index 8bb4af95d9..dda9f3e57b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/BeanInjectedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/BeanInjectedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/CyclicSingletonTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/CyclicSingletonTest.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/CyclicSingletonTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/CyclicSingletonTest.java
index ab1c82f674..787497f221 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/CyclicSingletonTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/CyclicSingletonTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/SomeBeanTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeBeanTest.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/SomeBeanTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeBeanTest.java
index 616b025f2f..c2b6642872 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/SomeBeanTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeBeanTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/SomeSingletonTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeSingletonTest.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/SomeSingletonTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeSingletonTest.java
index d8d17f5023..37e6c3a809 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ebean/SomeSingletonTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeSingletonTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ebean;
+package org.androidannotations.test.ebean;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -22,7 +22,7 @@
 
 import org.androidannotations.api.view.HasViews;
 import org.androidannotations.api.view.OnViewChangedNotifier;
-import org.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/ForceLayoutInjectedListFragmentTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/ForceLayoutInjectedListFragmentTest.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/ForceLayoutInjectedListFragmentTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/ForceLayoutInjectedListFragmentTest.java
index 2262d68b5f..80fbc0e4a6 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/ForceLayoutInjectedListFragmentTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/ForceLayoutInjectedListFragmentTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.util.FragmentTestUtil.startFragment;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MyFragmentActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MyFragmentActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MyFragmentActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MyFragmentActivityTest.java
index 5aa8f69ca8..08a2350348 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MyFragmentActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MyFragmentActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MyListFragmentTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MyListFragmentTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MyListFragmentTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MyListFragmentTest.java
index cf804ee0ac..f2a4b512ed 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MyListFragmentTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MyListFragmentTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.junit.Assert.assertFalse;
@@ -23,7 +23,7 @@
 
 import org.androidannotations.api.BackgroundExecutor;
 import org.androidannotations.api.UiThreadExecutor;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MySupportFragmentActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MySupportFragmentActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MySupportFragmentActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MySupportFragmentActivityTest.java
index f1899ce7f2..74c8319b16 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/efragment/MySupportFragmentActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/efragment/MySupportFragmentActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.efragment;
+package org.androidannotations.test.efragment;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eintentservice/MyIntentServiceTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eintentservice/MyIntentServiceTest.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eintentservice/MyIntentServiceTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eintentservice/MyIntentServiceTest.java
index 7c98f97d22..5035a50917 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eintentservice/MyIntentServiceTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eintentservice/MyIntentServiceTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eintentservice;
+package org.androidannotations.test.eintentservice;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.EmptyActivityWithoutLayout;
-import org.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test.EmptyActivityWithoutLayout;
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ereceiver/ReceiverWithActionsTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ereceiver/ReceiverWithActionsTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ereceiver/ReceiverWithActionsTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ereceiver/ReceiverWithActionsTest.java
index 5a10225b99..2b82e7f56c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ereceiver/ReceiverWithActionsTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ereceiver/ReceiverWithActionsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ereceiver;
+package org.androidannotations.test.ereceiver;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eview/CustomButtonTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eview/CustomButtonTest.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eview/CustomButtonTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eview/CustomButtonTest.java
index 52008ad8dc..5571051ce5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eview/CustomButtonTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eview/CustomButtonTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eview;
+package org.androidannotations.test.eview;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eviewgroup/CustomFrameLayoutTest.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eviewgroup/CustomFrameLayoutTest.java
index d99d9583db..ec6bd49cd8 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eviewgroup/CustomFrameLayoutTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.eviewgroup;
+package org.androidannotations.test.eviewgroup;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.EmptyActivityWithoutLayout;
-import org.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test.EmptyActivityWithoutLayout;
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/inheritance/InheritanceTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/inheritance/InheritanceTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/inheritance/InheritanceTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/inheritance/InheritanceTest.java
index 59c88678da..fcbf9cce37 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/inheritance/InheritanceTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/inheritance/InheritanceTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.inheritance;
+package org.androidannotations.test.inheritance;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/instancestate/SaveInstanceStateActivityParameterizedTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/instancestate/SaveInstanceStateActivityParameterizedTest.java
index 4772e0420f..61cda29009 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/instancestate/SaveInstanceStateActivityParameterizedTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.androidannotations.test15.CustomShadowBundle;
+import org.androidannotations.test.CustomShadowBundle;
 import org.fest.util.Lists;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/instancestate/SaveInstanceStateActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/instancestate/SaveInstanceStateActivityTest.java
index 66d1a678fd..3ff8a7e5b6 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/instancestate/SaveInstanceStateActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.instancestate;
+package org.androidannotations.test.instancestate;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/menu/InjectMenuActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/menu/InjectMenuActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/menu/InjectMenuActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/menu/InjectMenuActivityTest.java
index 79a26e44d3..4c7593c077 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/menu/InjectMenuActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/menu/InjectMenuActivityTest.java
@@ -13,17 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
-import android.view.Menu;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
+import android.view.Menu;
 
 @RunWith(RobolectricTestRunner.class)
 public class InjectMenuActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/menu/OptionsMenuActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/menu/OptionsMenuActivityTest.java
index f5b33cf523..0413db98c7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/menu/OptionsMenuActivityTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.menu;
+package org.androidannotations.test.menu;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/nonconfiguration/NonConfigurationActivityTest.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/nonconfiguration/NonConfigurationActivityTest.java
index 6aa32beee6..b230f24989 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/nonconfiguration/NonConfigurationActivityTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.nonconfiguration;
+package org.androidannotations.test.nonconfiguration;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.ebean.EmptyDependency;
+import org.androidannotations.test.ebean.EmptyDependency;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceAnnotationsFragmentTestSkipped.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceAnnotationsFragmentTestSkipped.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceAnnotationsFragmentTestSkipped.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceAnnotationsFragmentTestSkipped.java
index f6b819ecf9..f7dad00a63 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceAnnotationsFragmentTestSkipped.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceAnnotationsFragmentTestSkipped.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.robolectric.util.FragmentTestUtil;
 
 import android.preference.Preference;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceEventsHandledActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceEventsHandledActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceEventsHandledActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceEventsHandledActivityTest.java
index ef2d1e7d62..c34e1c8a70 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceEventsHandledActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceEventsHandledActivityTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceHeadersActivityTestSkipped.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceHeadersActivityTestSkipped.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceHeadersActivityTestSkipped.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceHeadersActivityTestSkipped.java
index e113b0211f..fb78b5de99 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceHeadersActivityTestSkipped.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceHeadersActivityTestSkipped.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 
 import android.preference.PreferenceActivity.Header;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceScreenActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceScreenActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceScreenActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceScreenActivityTest.java
index 3cf295bedb..2df164b2b5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceScreenActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceScreenActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceScreenFragmentTestSkipped.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceScreenFragmentTestSkipped.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceScreenFragmentTestSkipped.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceScreenFragmentTestSkipped.java
index 5192a010d2..c9f0b7b987 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferenceScreenFragmentTestSkipped.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferenceScreenFragmentTestSkipped.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferencesInjectedActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferencesInjectedActivityTest.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferencesInjectedActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferencesInjectedActivityTest.java
index a4a5ae10be..5037027ba8 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/preference/PreferencesInjectedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/preference/PreferencesInjectedActivityTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.preference;
+package org.androidannotations.test.preference;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.Robolectric.setupActivity;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/prefs/PrefsActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/prefs/PrefsActivityTest.java
index 332b2ab03e..912615292e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/prefs/PrefsActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.prefs;
+package org.androidannotations.test.prefs;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 import java.util.TreeSet;
 
 import org.androidannotations.api.sharedpreferences.SetXmlSerializer;
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/receiver/ActivityWithReceiverTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/receiver/ActivityWithReceiverTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java
index 7f3853935d..a6d51dd82d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/receiver/ActivityWithReceiverTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.receiver;
+package org.androidannotations.test.receiver;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/receiver/FragmentWithReceiverTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/FragmentWithReceiverTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/receiver/FragmentWithReceiverTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/FragmentWithReceiverTest.java
index 1cf296e3dd..fb2d151715 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/receiver/FragmentWithReceiverTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/FragmentWithReceiverTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.receiver;
+package org.androidannotations.test.receiver;
 
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.util.FragmentTestUtil.startFragment;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/res/ResActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/res/ResActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/res/ResActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/res/ResActivityTest.java
index 555332a35c..1fc114dba5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/res/ResActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/res/ResActivityTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.res;
+package org.androidannotations.test.res;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.androidannotations.test15.R;
+import org.androidannotations.test.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/supposethread/SupposeThreadTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/supposethread/SupposeThreadTest.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/supposethread/SupposeThreadTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/supposethread/SupposeThreadTest.java
index 2eb59acf1d..b99d1f33fe 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/supposethread/SupposeThreadTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/supposethread/SupposeThreadTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.supposethread;
+package org.androidannotations.test.supposethread;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -22,9 +22,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.androidannotations.api.BackgroundExecutor;
-import org.androidannotations.test15.EmptyActivityWithoutLayout;
-import org.androidannotations.test15.ebean.ThreadControlledBean;
-import org.androidannotations.test15.ebean.ThreadControlledBean_;
+import org.androidannotations.test.EmptyActivityWithoutLayout;
+import org.androidannotations.test.ebean.ThreadControlledBean;
+import org.androidannotations.test.ebean.ThreadControlledBean_;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/trace/TracedActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/trace/TracedActivityTest.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/trace/TracedActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/trace/TracedActivityTest.java
index cca926ced5..ef4c9d8044 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/trace/TracedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/trace/TracedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.trace;
+package org.androidannotations.test.trace;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/robolectric/ParameterizedRobolectricTestRunnerWorkaround.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/robolectric/ParameterizedRobolectricTestRunnerWorkaround.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/robolectric/ParameterizedRobolectricTestRunnerWorkaround.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/robolectric/ParameterizedRobolectricTestRunnerWorkaround.java
index eede8e2b9e..1822a6ef7d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/robolectric/ParameterizedRobolectricTestRunnerWorkaround.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/robolectric/ParameterizedRobolectricTestRunnerWorkaround.java
@@ -80,7 +80,7 @@ protected List<Runner> getChildren() {
 
 	private static class ClassLoaderCreatorRobolectricTestRunner extends RobolectricTestRunner {
 
-		public ClassLoaderCreatorRobolectricTestRunner(Class<?> testClass) throws Exception {
+		ClassLoaderCreatorRobolectricTestRunner(Class<?> testClass) throws Exception {
 			super(testClass);
 
 			Map<Class<? extends RobolectricTestRunner>, EnvHolder> envHoldersByTestRunner = field("envHoldersByTestRunner") //
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/resources/org.robolectric.Config.properties b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/resources/org.robolectric.Config.properties
new file mode 100644
index 0000000000..c6975dd80a
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/resources/org.robolectric.Config.properties
@@ -0,0 +1,2 @@
+manifest=src/main/AndroidManifest.xml
+application=org.androidannotations.test.TestApplication
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-testutils/pom.xml b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/pom.xml
new file mode 100644
index 0000000000..879e1b4f40
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-core</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-testutils</artifactId>
+	<name>AndroidAnnotations Common Test Utilities</name>
+	<description>Common test utilities for testing processors</description>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/AAProcessorTestHelper.java
similarity index 61%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/AAProcessorTestHelper.java
index 3b36fc7840..1a197d9efe 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/AAProcessorTestHelper.java
@@ -13,11 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.utils;
-
-import static org.androidannotations.helper.ModelConstants.classSuffix;
+package org.androidannotations.testutils;
 
 import java.io.File;
+import java.lang.reflect.Method;
 
 public class AAProcessorTestHelper extends ProcessorTestHelper {
 
@@ -31,7 +30,7 @@ public void addManifestProcessorParameter(Class<?> classOfPackagingContainingMan
 	}
 
 	public File toGeneratedFile(Class<?> compiledClass) {
-		File output = new File(OUTPUT_DIRECTORY, toPath(compiledClass.getPackage()) + "/" + compiledClass.getSimpleName() + classSuffix() + SOURCE_FILE_SUFFIX);
+		File output = new File(OUTPUT_DIRECTORY, toPath(compiledClass.getPackage()) + "/" + compiledClass.getSimpleName() + getAndroidAnnotationsClassSuffix() + SOURCE_FILE_SUFFIX);
 		return output;
 	}
 
@@ -39,4 +38,20 @@ public String toPath(Class<?> classOfPackagingContainingFile, String filename) {
 		return classOfPackagingContainingFile.getResource(filename).getPath();
 	}
 
+	/**
+	 * This module cannot depend on androidannotations module, because that would introduce a cycle in the dependency graph.
+	 * That is why we cannot directly reference the <code>classSuffix</code> method.
+	 * We still have to use this method, so we call it reflectively.
+	 *
+	 * @return the result of <code>org.androidannotations.helper.ModelConstants.classSuffix()</code>
+	 */
+	private static String getAndroidAnnotationsClassSuffix() {
+		try {
+			Class<?> modelConstantsClazz = Class.forName("org.androidannotations.helper.ModelConstants");
+			Method classSuffixMethod = modelConstantsClazz.getMethod("classSuffix");
+			return (String) classSuffixMethod.invoke(null);
+		} catch (ReflectiveOperationException e) {
+			return "_";
+		}
+	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/ClassFinder.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/ClassFinder.java
index 6673b4f4a9..0372761812 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/ClassFinder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.utils;
+package org.androidannotations.testutils;
 
 import static java.util.Collections.synchronizedList;
 
@@ -57,8 +57,12 @@ public final void refreshLocations() {
 	}
 
 	/**
-	 * @param fqcn
+	 * Finds all classes in a package.
+	 *
+	 * @param packageName
 	 *            Name of superclass/interface on which to search
+	 *
+	 * @return the classes which can be found in the package of the superclass/interface
 	 */
 	public final List<Class<?>> findClassesInPackage(String packageName) {
 		synchronized (classpathLocations) {
@@ -80,6 +84,10 @@ public final List<Throwable> getErrors() {
 	 * query the cache for the location at which the given class was found.
 	 * <code>null</code> will be returned if the given class was not found
 	 * during the last search, or if the result cache has been cleared.
+	 *
+	 * @param cls the class whose location is queried
+	 *
+	 * @return the location where the class is found
 	 */
 	public final URL getLocationOf(Class<?> cls) {
 		if (results != null) {
@@ -92,6 +100,8 @@ public final URL getLocationOf(Class<?> cls) {
 	/**
 	 * Determine every URL location defined by the current classpath, and it's
 	 * associated package name.
+	 *
+	 * @return the locations of the given classpath
 	 */
 	public final Map<URL, String> getClasspathLocations() {
 		Map<URL, String> map = new TreeMap<>(URL_COMPARATOR);
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/ProcessorTestHelper.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/ProcessorTestHelper.java
index ecfd96d474..01a90468bb 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-testutils/src/main/java/org/androidannotations/testutils/ProcessorTestHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.utils;
+package org.androidannotations.testutils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -259,7 +259,6 @@ public String toPath(String packageName) {
 	 *            the classes to compile
 	 * @return the {@link Diagnostic diagnostics} returned by the compilation,
 	 *         as demonstrated in the documentation for {@link JavaCompiler}
-	 * @see #compileFiles(String...)
 	 */
 	public CompileResult compileFiles(Type... compilationUnits) {
 		assert compilationUnits != null;
diff --git a/AndroidAnnotations/androidannotations/.gitignore b/AndroidAnnotations/androidannotations-core/androidannotations/.gitignore
similarity index 70%
rename from AndroidAnnotations/androidannotations/.gitignore
rename to AndroidAnnotations/androidannotations-core/androidannotations/.gitignore
index e17479d685..e1597818fb 100644
--- a/AndroidAnnotations/androidannotations/.gitignore
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/.gitignore
@@ -1,4 +1,4 @@
 .classpath
-.project
+../.project
 target/
 .settings
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/pom.xml b/AndroidAnnotations/androidannotations-core/androidannotations/pom.xml
new file mode 100644
index 0000000000..bbea9dc02b
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-core</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations</artifactId>
+	<name>AndroidAnnotations Annotation Processor</name>
+	<description>The Annotation Processor jar that generates code</description>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.codemodel</groupId>
+			<artifactId>codemodel</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-testutils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgument>-proc:none</compilerArgument>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/sun/codemodel/JSuperWildcard.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/com/sun/codemodel/JSuperWildcard.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/com/sun/codemodel/JSuperWildcard.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/com/sun/codemodel/JSuperWildcard.java
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java
new file mode 100644
index 0000000000..32046bbcbd
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.handler.GeneratingAnnotationHandler;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.model.AnnotationElements;
+import org.androidannotations.internal.process.ProcessHolder;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+import org.androidannotations.rclass.IRClass;
+
+import com.sun.codemodel.JClass;
+import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JDefinedClass;
+
+public interface AndroidAnnotationsEnvironment {
+
+	ProcessingEnvironment getProcessingEnvironment();
+
+	Set<String> getSupportedOptions();
+
+	String getOptionValue(Option option);
+
+	String getOptionValue(String optionKey);
+
+	boolean getOptionBooleanValue(Option option);
+
+	boolean getOptionBooleanValue(String optionKey);
+
+	Set<String> getSupportedAnnotationTypes();
+
+	List<AnnotationHandler<?>> getHandlers();
+
+	List<AnnotationHandler<?>> getDecoratingHandlers();
+
+	List<GeneratingAnnotationHandler<?>> getGeneratingHandlers();
+
+	IRClass getRClass();
+
+	AndroidManifest getAndroidManifest();
+
+	AnnotationElements getValidatedElements();
+
+	JCodeModel getCodeModel();
+
+	JClass getJClass(String fullyQualifiedName);
+
+	JClass getJClass(Class<?> clazz);
+
+	JDefinedClass getDefinedClass(String fullyQualifiedName);
+
+	GeneratedClassHolder getGeneratedClassHolder(Element element);
+
+	ProcessHolder.Classes getClasses();
+
+	List<Class<? extends Annotation>> getGeneratingAnnotations();
+
+	boolean isAndroidAnnotation(String annotationQualifiedName);
+
+	List<AndroidAnnotationsPlugin> getPlugins();
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/ElementValidation.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/ElementValidation.java
new file mode 100644
index 0000000000..466f8b8d08
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/ElementValidation.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+public class ElementValidation {
+
+	private String annotationName;
+	private Element element;
+	private boolean isValid = true;
+	private List<Error> errors = new ArrayList<>();
+	private List<String> warnings = new ArrayList<>();
+
+	public ElementValidation(String annotationName, Element element) {
+		this.annotationName = annotationName;
+		this.element = element;
+	}
+
+	public Element getElement() {
+		return element;
+	}
+
+	public void invalidate() {
+		isValid = false;
+	}
+
+	/**
+	 * Method to call when an annotation is not valid
+	 *
+	 * @param error The message of the message.
+	 *  If it contains %s, it will be replaced by the name of the annotation.
+	 */
+	public void addError(String error) {
+		addError(element, error);
+	}
+
+	public void addError(Element element, String error) {
+		isValid = false;
+		this.errors.add(new Error(element, String.format(error, annotationName)));
+	}
+
+	public boolean isValid() {
+		return isValid;
+	}
+
+	public List<Error> getErrors() {
+		return errors;
+	}
+
+	public void addWarning(String error) {
+		warnings.add(String.format(error, annotationName));
+	}
+
+	public List<String> getWarnings() {
+		return warnings;
+	}
+
+	public String getAnnotationName() {
+		return annotationName;
+	}
+
+	public AnnotationMirror getAnnotationMirror() {
+		List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
+		for (AnnotationMirror annotationMirror : annotationMirrors) {
+			TypeElement annotationElement = (TypeElement) annotationMirror.getAnnotationType().asElement();
+			if (annotationElement.getQualifiedName().toString().equals(annotationName)) {
+				return annotationMirror;
+			}
+		}
+		return null;
+	}
+
+	public static class Error {
+		private Element element;
+		private String message;
+
+		public Error(Element element, String message) {
+			this.element = element;
+			this.message = message;
+		}
+
+		public Element getElement() {
+			return element;
+		}
+
+		public String getMessage() {
+			return message;
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithBackgroundMethod.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/Option.java
similarity index 65%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithBackgroundMethod.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/Option.java
index b449310b6f..42a16d8d95 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithBackgroundMethod.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/Option.java
@@ -13,19 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.generation;
+package org.androidannotations;
 
-import org.androidannotations.annotations.Background;
-import org.androidannotations.annotations.EActivity;
+public class Option {
 
-import android.app.Activity;
+	private final String name;
+	private final String defaultValue;
 
-@EActivity
-public class ActivityWithBackgroundMethod extends Activity {
-
-	@Background
-	public void executingOnBackground() {
+	public Option(String name, String defaultValue) {
+		this.name = name;
+		this.defaultValue = defaultValue;
+	}
 
+	public String getName() {
+		return name;
 	}
 
+	public String getDefaultValue() {
+		return defaultValue;
+	}
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java
new file mode 100644
index 0000000000..1bd2c22b20
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.handler;
+
+import javax.lang.model.element.Element;
+
+import org.androidannotations.ElementValidation;
+import org.androidannotations.holder.GeneratedClassHolder;
+
+public interface AnnotationHandler<T extends GeneratedClassHolder> {
+
+	String getTarget();
+
+	ElementValidation validate(Element element);
+
+	void process(Element element, T holder) throws Exception;
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java
new file mode 100644
index 0000000000..a349dfb4a5
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.handler;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.process.ProcessHolder;
+
+import com.sun.codemodel.JClass;
+import com.sun.codemodel.JCodeModel;
+
+public abstract class BaseAnnotationHandler<T extends GeneratedClassHolder> implements AnnotationHandler<T> {
+
+	private final String target;
+	private AndroidAnnotationsEnvironment environment;
+
+	protected IdAnnotationHelper annotationHelper;
+	protected IdValidatorHelper validatorHelper;
+	protected APTCodeModelHelper codeModelHelper;
+
+	public BaseAnnotationHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		this(targetClass.getCanonicalName(), environment);
+	}
+
+	public BaseAnnotationHandler(String target, AndroidAnnotationsEnvironment environment) {
+		this.target = target;
+		this.environment = environment;
+		annotationHelper = new IdAnnotationHelper(environment, target);
+		validatorHelper = new IdValidatorHelper(annotationHelper);
+		codeModelHelper = new APTCodeModelHelper(environment);
+	}
+
+	@Override
+	public String getTarget() {
+		return target;
+	}
+
+	@Override
+	public ElementValidation validate(Element element) {
+		ElementValidation validation = new ElementValidation(target, element);
+		validate(element, validation);
+		return validation;
+	}
+
+	protected abstract void validate(Element element, ElementValidation validation);
+
+	protected AndroidAnnotationsEnvironment getEnvironment() {
+		return environment;
+	}
+
+	protected ProcessingEnvironment getProcessingEnvironment() {
+		return environment.getProcessingEnvironment();
+	}
+
+	protected ProcessHolder.Classes getClasses() {
+		return environment.getClasses();
+	}
+
+	protected JCodeModel getCodeModel() {
+		return environment.getCodeModel();
+	}
+
+	protected JClass getJClass(String fullyQualifiedClassName) {
+		return environment.getJClass(fullyQualifiedClassName);
+	}
+
+	protected JClass getJClass(Class<?> clazz) {
+		return environment.getJClass(clazz);
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java
index c1a4747caf..240bc8156b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java
@@ -15,26 +15,25 @@
  */
 package org.androidannotations.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 public abstract class BaseGeneratingAnnotationHandler<T extends GeneratedClassHolder> extends BaseAnnotationHandler<T> implements GeneratingAnnotationHandler<T> {
 
-	public BaseGeneratingAnnotationHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public BaseGeneratingAnnotationHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
-	public BaseGeneratingAnnotationHandler(String target, ProcessingEnvironment processingEnvironment) {
-		super(target, processingEnvironment);
+	public BaseGeneratingAnnotationHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	protected void validate(Element element, ElementValidation valid) {
 		validatorHelper.isNotFinal(element, valid);
 
 		if (isInnerClass(element)) {
@@ -43,7 +42,7 @@ protected void validate(Element element, AnnotationElements validatedElements, I
 
 			validatorHelper.isStatic(element, valid);
 
-			validatorHelper.enclosingElementHasAndroidAnnotation(element, validatedElements, valid);
+			validatorHelper.enclosingElementHasAndroidAnnotation(element, valid);
 
 			validatorHelper.enclosingElementIsNotAbstractIfNotAbstract(element, valid);
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/GeneratingAnnotationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/GeneratingAnnotationHandler.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/GeneratingAnnotationHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/GeneratingAnnotationHandler.java
index 907c056ad9..17bd6f8deb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/GeneratingAnnotationHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/GeneratingAnnotationHandler.java
@@ -17,10 +17,10 @@
 
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.process.ProcessHolder;
 
 public interface GeneratingAnnotationHandler<T extends GeneratedClassHolder> extends AnnotationHandler<T> {
 
-	T createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception;
+	T createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception;
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java
new file mode 100644
index 0000000000..78a09a69e8
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.handler;
+
+import org.androidannotations.holder.GeneratedClassHolder;
+
+public interface HasParameterHandlers<T extends GeneratedClassHolder> extends AnnotationHandler<T> {
+
+	Iterable<AnnotationHandler> getParameterHandlers();
+}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
index 6325444d92..64c5051d1a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
@@ -46,10 +46,11 @@
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Types;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.holder.EBeanHolder;
-import org.androidannotations.holder.EComponentHolder;
 import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.helper.AnnotationParamExtractor;
 
 import com.sun.codemodel.JAnnotatable;
 import com.sun.codemodel.JAnnotationArrayMember;
@@ -73,36 +74,42 @@
 
 public class APTCodeModelHelper {
 
-	public JClass typeMirrorToJClass(TypeMirror type, GeneratedClassHolder holder) {
-		return typeMirrorToJClass(type, holder, Collections.<String, TypeMirror> emptyMap());
+	private AndroidAnnotationsEnvironment environment;
+
+	public APTCodeModelHelper(AndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
+	}
+
+	public JClass typeMirrorToJClass(TypeMirror type) {
+		return typeMirrorToJClass(type, Collections.<String, TypeMirror> emptyMap());
 	}
 
-	private JClass typeMirrorToJClass(TypeMirror type, GeneratedClassHolder holder, Map<String, TypeMirror> substitute) {
+	private JClass typeMirrorToJClass(TypeMirror type, Map<String, TypeMirror> substitute) {
 		if (type instanceof DeclaredType) {
-			return typeMirrorToJClass((DeclaredType) type, holder, substitute);
+			return typeMirrorToJClass((DeclaredType) type, substitute);
 		} else if (type instanceof WildcardType) {
-			return typeMirrorToJClass((WildcardType) type, holder, substitute);
+			return typeMirrorToJClass((WildcardType) type, substitute);
 		} else if (type instanceof ArrayType) {
-			return typeMirrorToJClass((ArrayType) type, holder, substitute);
+			return typeMirrorToJClass((ArrayType) type, substitute);
 		} else {
 			TypeMirror substituted = substitute.get(type.toString());
 			if (substituted != null && type != substituted) {
-				return typeMirrorToJClass(substituted, holder, substitute);
+				return typeMirrorToJClass(substituted, substitute);
 			}
-			return holder.refClass(type.toString());
+			return environment.getJClass(type.toString());
 		}
 	}
 
-	private JClass typeMirrorToJClass(DeclaredType declaredType, GeneratedClassHolder holder, Map<String, TypeMirror> substitute) {
+	private JClass typeMirrorToJClass(DeclaredType declaredType, Map<String, TypeMirror> substitute) {
 		String declaredTypeName = declaredType.asElement().toString();
 
-		JClass declaredClass = holder.refClass(declaredTypeName);
+		JClass declaredClass = environment.getJClass(declaredTypeName);
 
 		List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
 
 		List<JClass> typeArgumentJClasses = new ArrayList<>();
 		for (TypeMirror typeArgument : typeArguments) {
-			typeArgumentJClasses.add(typeMirrorToJClass(typeArgument, holder, substitute));
+			typeArgumentJClasses.add(typeMirrorToJClass(typeArgument, substitute));
 		}
 		if (typeArgumentJClasses.size() > 0) {
 			declaredClass = declaredClass.narrow(typeArgumentJClasses);
@@ -111,27 +118,27 @@ private JClass typeMirrorToJClass(DeclaredType declaredType, GeneratedClassHolde
 		return declaredClass;
 	}
 
-	private JClass typeMirrorToJClass(WildcardType wildcardType, GeneratedClassHolder holder, Map<String, TypeMirror> substitute) {
+	private JClass typeMirrorToJClass(WildcardType wildcardType, Map<String, TypeMirror> substitute) {
 		TypeMirror bound = wildcardType.getExtendsBound();
 		if (bound == null) {
 			bound = wildcardType.getSuperBound();
 			if (bound == null) {
-				return holder.classes().OBJECT.wildcard();
+				return environment.getClasses().OBJECT.wildcard();
 			}
-			return new JSuperWildcard(typeMirrorToJClass(bound, holder, substitute));
+			return new JSuperWildcard(typeMirrorToJClass(bound, substitute));
 		}
 
 		TypeMirror extendsBound = wildcardType.getExtendsBound();
 
 		if (extendsBound == null) {
-			return holder.classes().OBJECT.wildcard();
+			return environment.getClasses().OBJECT.wildcard();
 		} else {
-			return typeMirrorToJClass(extendsBound, holder, substitute).wildcard();
+			return typeMirrorToJClass(extendsBound, substitute).wildcard();
 		}
 	}
 
-	private JClass typeMirrorToJClass(ArrayType arrayType, GeneratedClassHolder holder, Map<String, TypeMirror> substitute) {
-		JClass refClass = typeMirrorToJClass(arrayType.getComponentType(), holder, substitute);
+	private JClass typeMirrorToJClass(ArrayType arrayType, Map<String, TypeMirror> substitute) {
+		JClass refClass = typeMirrorToJClass(arrayType.getComponentType(), substitute);
 		return refClass.array();
 	}
 
@@ -157,16 +164,16 @@ private Map<String, TypeMirror> getActualTypes(Types typeUtils, DeclaredType bas
 		return Collections.emptyMap();
 	}
 
-	public JClass typeBoundsToJClass(GeneratedClassHolder holder, List<? extends TypeMirror> bounds) {
-		return typeBoundsToJClass(holder, bounds, Collections.<String, TypeMirror> emptyMap());
+	public JClass typeBoundsToJClass(List<? extends TypeMirror> bounds) {
+		return typeBoundsToJClass(bounds, Collections.<String, TypeMirror>emptyMap());
 	}
 
-	private JClass typeBoundsToJClass(GeneratedClassHolder holder, List<? extends TypeMirror> bounds, Map<String, TypeMirror> actualTypes) {
+	private JClass typeBoundsToJClass(List<? extends TypeMirror> bounds, Map<String, TypeMirror> actualTypes) {
 		if (bounds.isEmpty()) {
-			return holder.classes().OBJECT;
+			return environment.getClasses().OBJECT;
 		} else {
 			// TODO resolve <T extends A&B> bounds
-			return typeMirrorToJClass(bounds.get(0), holder, actualTypes);
+			return typeMirrorToJClass(bounds.get(0), actualTypes);
 		}
 	}
 
@@ -174,14 +181,14 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
 		TypeMirror annotatedClass = holder.getAnnotatedElement().asType();
 		DeclaredType baseClass = (DeclaredType) executableElement.getEnclosingElement().asType();
 
-		Types typeUtils = holder.processingEnvironment().getTypeUtils();
+		Types typeUtils = environment.getProcessingEnvironment().getTypeUtils();
 
 		Map<String, TypeMirror> actualTypes = getActualTypes(typeUtils, baseClass, annotatedClass);
 		Map<String, JClass> methodTypes = new LinkedHashMap<>();
 
 		for (TypeParameterElement typeParameter : executableElement.getTypeParameters()) {
 			List<? extends TypeMirror> bounds = typeParameter.getBounds();
-			JClass jClassBounds = typeBoundsToJClass(holder, bounds, actualTypes);
+			JClass jClassBounds = typeBoundsToJClass(bounds, actualTypes);
 			methodTypes.put(typeParameter.toString(), jClassBounds);
 		}
 
@@ -193,9 +200,9 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
 		}
 
 		String methodName = executableElement.getSimpleName().toString();
-		JClass returnType = typeMirrorToJClass(executableElement.getReturnType(), holder, actualTypes);
+		JClass returnType = typeMirrorToJClass(executableElement.getReturnType(), actualTypes);
 		JMethod method = holder.getGeneratedClass().method(JMod.PUBLIC, returnType, methodName);
-		addNonAAAnotations(method, executableElement.getAnnotationMirrors(), holder);
+		copyNonAAAnnotations(method, executableElement.getAnnotationMirrors());
 
 		if (!hasAnnotation(method, Override.class)) {
 			method.annotate(Override.class);
@@ -206,11 +213,11 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
 		}
 
 		for (VariableElement parameter : executableElement.getParameters()) {
-			addParamToMethod(method, parameter, JMod.FINAL, holder, actualTypes);
+			addParamToMethod(method, parameter, JMod.FINAL, actualTypes);
 		}
 
 		for (TypeMirror superThrownType : executableElement.getThrownTypes()) {
-			JClass thrownType = typeMirrorToJClass(superThrownType, holder, actualTypes);
+			JClass thrownType = typeMirrorToJClass(superThrownType, actualTypes);
 			method._throws(thrownType);
 		}
 
@@ -219,18 +226,18 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
 		return method;
 	}
 
-	public void generifyStaticHelper(GeneratedClassHolder holder, JMethod staticHelper, TypeElement annotatedClass) {
+	public void generifyStaticHelper(JMethod staticHelper, TypeElement annotatedClass) {
 		for (TypeParameterElement param : annotatedClass.getTypeParameters()) {
-			JClass bounds = typeBoundsToJClass(holder, param.getBounds());
+			JClass bounds = typeBoundsToJClass(param.getBounds());
 			staticHelper.generify(param.getSimpleName().toString(), bounds);
 		}
 	}
 
-	public JClass narrowGeneratedClass(JClass generatedClass, TypeMirror fromTypeArguments, GeneratedClassHolder holder) {
+	public JClass narrowGeneratedClass(JClass generatedClass, TypeMirror fromTypeArguments) {
 		DeclaredType type = (DeclaredType) fromTypeArguments;
 
 		for (TypeMirror param : type.getTypeArguments()) {
-			JClass paramClass = typeMirrorToJClass(param, holder);
+			JClass paramClass = typeMirrorToJClass(param);
 			generatedClass = generatedClass.narrow(paramClass);
 		}
 		return generatedClass;
@@ -246,7 +253,7 @@ private JMethod findAlreadyGeneratedMethod(ExecutableElement executableElement,
 			if (method.name().equals(methodName) && method.params().size() == parameters.size()) {
 				int i = 0;
 				for (JVar param : method.params()) {
-					String searchedParamType = typeMirrorToJClass(parameters.get(i).asType(), holder).name();
+					String searchedParamType = typeMirrorToJClass(parameters.get(i).asType()).name();
 					if (!param.type().name().equals(searchedParamType)) {
 						continue method;
 					}
@@ -259,33 +266,33 @@ private JMethod findAlreadyGeneratedMethod(ExecutableElement executableElement,
 		return null;
 	}
 
-	private void addParamToMethod(JMethod method, VariableElement parameter, int mod, GeneratedClassHolder holder, Map<String, TypeMirror> actualTypes) {
+	private void addParamToMethod(JMethod method, VariableElement parameter, int mod, Map<String, TypeMirror> actualTypes) {
 		String parameterName = parameter.getSimpleName().toString();
-		JClass parameterClass = typeMirrorToJClass(parameter.asType(), holder, actualTypes);
+		JClass parameterClass = typeMirrorToJClass(parameter.asType(), actualTypes);
 		JVar param = method.param(mod, parameterClass, parameterName);
-		addNonAAAnotations(param, parameter.getAnnotationMirrors(), holder);
+		copyNonAAAnnotations(param, parameter.getAnnotationMirrors());
 	}
 
-	public void addNonAAAnotations(JAnnotatable annotatable, List<? extends AnnotationMirror> annotationMirrors, GeneratedClassHolder holder) {
+	public void copyNonAAAnnotations(JAnnotatable annotatable, List<? extends AnnotationMirror> annotationMirrors) {
 		for (AnnotationMirror annotationMirror : annotationMirrors) {
 			if (annotationMirror.getAnnotationType().asElement().getAnnotation(Inherited.class) == null) {
-				JClass annotationClass = typeMirrorToJClass(annotationMirror.getAnnotationType(), holder);
-				if (!annotationClass.fullName().startsWith("org.androidannotations")) {
-					addAnnotation(annotatable, annotationMirror, holder);
+				JClass annotationClass = typeMirrorToJClass(annotationMirror.getAnnotationType());
+				if (!environment.isAndroidAnnotation(annotationClass.fullName())) {
+					copyAnnotation(annotatable, annotationMirror);
 				}
 			}
 		}
 	}
 
-	public void addAnnotation(JAnnotatable annotatable, AnnotationMirror annotationMirror, GeneratedClassHolder holder) {
+	public void copyAnnotation(JAnnotatable annotatable, AnnotationMirror annotationMirror) {
 		Map<? extends ExecutableElement, ? extends AnnotationValue> parameters = annotationMirror.getElementValues();
 
 		if (!hasAnnotation(annotatable, annotationMirror)) {
-			JClass annotation = typeMirrorToJClass(annotationMirror.getAnnotationType(), holder);
+			JClass annotation = typeMirrorToJClass(annotationMirror.getAnnotationType());
 			JAnnotationUse annotate = annotatable.annotate(annotation);
 
 			for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> param : parameters.entrySet()) {
-				param.getValue().accept(new AnnotationParamExtractor(annotate, holder, this), param.getKey().getSimpleName().toString());
+				param.getValue().accept(new AnnotationParamExtractor(annotate, this), param.getKey().getSimpleName().toString());
 			}
 		}
 	}
@@ -363,6 +370,19 @@ public void copy(JBlock body, JBlock newBody) {
 		}
 	}
 
+	public void removeBraces(JBlock block) {
+		try {
+			Field bracesRequiredField = JBlock.class.getDeclaredField("bracesRequired");
+			bracesRequiredField.setAccessible(true);
+			bracesRequiredField.set(block, false);
+			Field indentRequiredField = JBlock.class.getDeclaredField("indentRequired");
+			indentRequiredField.setAccessible(true);
+			indentRequiredField.set(block, false);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
 	public void replaceSuperCall(JMethod method, JBlock replacement) {
 		String superCallStart = "super." + method.name() + "(";
 
@@ -408,8 +428,8 @@ public String getIdStringFromIdFieldRef(JFieldRef idRef) {
 		throw new IllegalStateException("Unable to extract target name from JFieldRef");
 	}
 
-	public JDefinedClass createDelegatingAnonymousRunnableClass(EComponentHolder holder, JBlock previousBody) {
-		JCodeModel codeModel = holder.codeModel();
+	public JDefinedClass createDelegatingAnonymousRunnableClass(JBlock previousBody) {
+		JCodeModel codeModel = environment.getCodeModel();
 
 		JDefinedClass anonymousRunnableClass = codeModel.anonymousClass(Runnable.class);
 
@@ -452,7 +472,7 @@ public JMethod implementMethod(GeneratedClassHolder holder, List<ExecutableEleme
 
 		if (method != null) {
 			// Get the return type or VOID if none.
-			JType jcReturnType = returnType.equals(TypeKind.VOID.toString()) ? holder.codeModel().VOID : holder.refClass(returnType);
+			JType jcReturnType = returnType.equals(TypeKind.VOID.toString()) ? environment.getCodeModel().VOID : environment.getJClass(returnType);
 
 			// Create the implementation and annotate it with the Override
 			// annotation.
@@ -463,7 +483,7 @@ public JMethod implementMethod(GeneratedClassHolder holder, List<ExecutableEleme
 			int paramMods = finalParams ? JMod.FINAL : JMod.NONE;
 			for (int i = 0; i < method.getParameters().size(); i++) {
 				VariableElement param = method.getParameters().get(i);
-				jmethod.param(paramMods, holder.refClass(parameterTypes[i]), param.getSimpleName().toString());
+				jmethod.param(paramMods, environment.getJClass(parameterTypes[i]), param.getSimpleName().toString());
 			}
 		}
 
@@ -505,13 +525,13 @@ private ExecutableElement getMethod(List<ExecutableElement> methods, String meth
 		return null;
 	}
 
-	public JInvocation newBeanOrEBean(GeneratedClassHolder holder, DeclaredType beanType, JVar contextVar) {
+	public JInvocation newBeanOrEBean(DeclaredType beanType, JVar contextVar) {
 		if (beanType.asElement().getAnnotation(EBean.class) != null) {
 			String typeQualifiedName = beanType.toString();
-			JClass injectedClass = holder.refClass(typeQualifiedName + classSuffix());
+			JClass injectedClass = environment.getJClass(typeQualifiedName + classSuffix());
 			return injectedClass.staticInvoke(EBeanHolder.GET_INSTANCE_METHOD_NAME).arg(contextVar);
 		} else {
-			return _new(holder.refClass(beanType.toString()));
+			return _new(environment.getJClass(beanType.toString()));
 		}
 	}
 
@@ -531,7 +551,7 @@ public JExpression litObject(Object o) {
 
 	// TODO it would be nice to cache the result map for better performance
 	public TypeMirror getActualType(Element element, GeneratedClassHolder holder) {
-		Types types = holder.processingEnvironment().getTypeUtils();
+		Types types = environment.getProcessingEnvironment().getTypeUtils();
 		DeclaredType typeMirror = (DeclaredType) element.getEnclosingElement().asType();
 		TypeMirror annotatedClass = holder.getAnnotatedElement().asType();
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
index 15e47e38b2..9975ac027b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
@@ -39,16 +39,15 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.OnActivityResult;
 import org.androidannotations.annotations.OptionsItem;
 import org.androidannotations.annotations.ResId;
 import org.androidannotations.annotations.SeekBarTouchStop;
-import org.androidannotations.logger.Level;
+import org.androidannotations.internal.rclass.RInnerClass;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
-import org.androidannotations.process.ProcessHolder;
 import org.androidannotations.rclass.IRInnerClass;
-import org.androidannotations.rclass.RInnerClass;
 
 import com.sun.codemodel.JFieldRef;
 
@@ -59,18 +58,25 @@ public class AnnotationHelper {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(AnnotationHelper.class);
 
-	private final ProcessingEnvironment processingEnv;
+	private final AndroidAnnotationsEnvironment environment;
 
-	public AnnotationHelper(ProcessingEnvironment processingEnv) {
-		this.processingEnv = processingEnv;
+	public AnnotationHelper(AndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
 	}
 
+	public AndroidAnnotationsEnvironment getEnvironment() {
+		return environment;
+	}
+
+	public ProcessingEnvironment getProcessingEnvironment() {
+		return environment.getProcessingEnvironment();
+	}
 	/**
 	 * Tests whether one type is a subtype of another. Any type is considered to
 	 * be a subtype of itself.
 	 */
 	public boolean isSubtype(TypeMirror potentialSubtype, TypeMirror potentialSupertype) {
-		return processingEnv.getTypeUtils().isSubtype(potentialSubtype, potentialSupertype);
+		return getTypeUtils().isSubtype(potentialSubtype, potentialSupertype);
 	}
 
 	public boolean isSubtype(TypeElement t1, TypeElement t2) {
@@ -78,7 +84,7 @@ public boolean isSubtype(TypeElement t1, TypeElement t2) {
 	}
 
 	public List<? extends TypeMirror> directSupertypes(TypeMirror typeMirror) {
-		return processingEnv.getTypeUtils().directSupertypes(typeMirror);
+		return getTypeUtils().directSupertypes(typeMirror);
 	}
 
 	/**
@@ -86,7 +92,7 @@ public List<? extends TypeMirror> directSupertypes(TypeMirror typeMirror) {
 	 * the processor classpath
 	 */
 	public TypeElement typeElementFromQualifiedName(String qualifiedName) {
-		return processingEnv.getElementUtils().getTypeElement(qualifiedName);
+		return getElementUtils().getTypeElement(qualifiedName);
 	}
 
 	public String generatedClassQualifiedNameFromQualifiedName(String qualifiedName) {
@@ -115,27 +121,6 @@ public boolean isAnnotation(TypeElement annotation, String annotationName) {
 		return annotation.getQualifiedName().toString().equals(annotationName);
 	}
 
-	public void printAnnotationError(Element annotatedElement, String annotationName, String message) {
-		printAnnotationMessage(Level.ERROR, annotatedElement, annotationName, message);
-	}
-
-	public void printAnnotationWarning(Element annotatedElement, String annotationName, String message) {
-		printAnnotationMessage(Level.WARN, annotatedElement, annotationName, message);
-	}
-
-	public void printAnnotationMessage(Level level, Element annotatedElement, String annotationName, String message) {
-		AnnotationMirror annotationMirror = findAnnotationMirror(annotatedElement, annotationName);
-		if (annotationMirror != null) {
-			LOGGER.log(level, message, annotatedElement, annotationMirror, null);
-		} else {
-			printError(annotatedElement, message);
-		}
-	}
-
-	public void printError(Element element, String message) {
-		LOGGER.error(message, element);
-	}
-
 	public boolean isPrivate(Element element) {
 		return element.getModifiers().contains(Modifier.PRIVATE);
 	}
@@ -169,11 +154,11 @@ public boolean isSynchronized(Element element) {
 	}
 
 	public Elements getElementUtils() {
-		return processingEnv.getElementUtils();
+		return getProcessingEnvironment().getElementUtils();
 	}
 
 	public Types getTypeUtils() {
-		return processingEnv.getTypeUtils();
+		return getProcessingEnvironment().getTypeUtils();
 	}
 
 	/**
@@ -182,16 +167,16 @@ public Types getTypeUtils() {
 	 *
 	 * @see #extractAnnotationResources(Element, String, IRInnerClass, boolean)
 	 */
-	public List<JFieldRef> extractAnnotationFieldRefs(ProcessHolder holder, Element element, String annotationName, IRInnerClass rInnerClass, boolean useElementName) {
-		return extractAnnotationFieldRefs(holder, element, annotationName, rInnerClass, useElementName, DEFAULT_FIELD_NAME_VALUE, DEFAULT_FIELD_NAME_RESNAME);
+	public List<JFieldRef> extractAnnotationFieldRefs(Element element, String annotationName, IRInnerClass rInnerClass, boolean useElementName) {
+		return extractAnnotationFieldRefs(element, annotationName, rInnerClass, useElementName, DEFAULT_FIELD_NAME_VALUE, DEFAULT_FIELD_NAME_RESNAME);
 	}
 
-	public List<JFieldRef> extractAnnotationFieldRefs(ProcessHolder holder, Element element, String annotationName, IRInnerClass rInnerClass, boolean useElementName, String idFieldName,
+	public List<JFieldRef> extractAnnotationFieldRefs(Element element, String annotationName, IRInnerClass rInnerClass, boolean useElementName, String idFieldName,
 			String resFieldName) {
 		List<JFieldRef> fieldRefs = new ArrayList<>();
 
 		for (String refQualifiedName : extractAnnotationResources(element, annotationName, rInnerClass, useElementName, idFieldName, resFieldName)) {
-			fieldRefs.add(RInnerClass.extractIdStaticRef(holder, refQualifiedName));
+			fieldRefs.add(RInnerClass.extractIdStaticRef(environment, refQualifiedName));
 		}
 
 		return fieldRefs;
@@ -378,6 +363,10 @@ public String actionName(String annotationName) {
 		return annotationSimpleName + "ed";
 	}
 
+	public List<DeclaredType> extractAnnotationClassArrayParameter(Element element, Class<? extends Annotation> annotation, String methodName) {
+		return extractAnnotationClassArrayParameter(element, annotation.getName(), methodName);
+	}
+
 	public List<DeclaredType> extractAnnotationClassArrayParameter(Element element, String annotationName, String methodName) {
 		AnnotationMirror annotationMirror = findAnnotationMirror(element, annotationName);
 
@@ -407,6 +396,10 @@ public List<DeclaredType> extractAnnotationClassArrayParameter(Element element,
 		return null;
 	}
 
+	public DeclaredType extractAnnotationClassParameter(Element element, Class<? extends Annotation> annotation, String methodName) {
+		return extractAnnotationClassParameter(element, annotation.getName(), methodName);
+	}
+
 	public DeclaredType extractAnnotationClassParameter(Element element, String annotationName, String methodName) {
 		AnnotationMirror annotationMirror = findAnnotationMirror(element, annotationName);
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
index 0b01d41b6d..e3c62d8891 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
@@ -29,7 +29,7 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 
-import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JExpr;
@@ -75,8 +75,9 @@ public class BundleHelper {
 		METHOD_SUFFIX_BY_TYPE_NAME.put("java.util.ArrayList<java.lang.String>", "StringArrayList");
 	}
 
+	private AndroidAnnotationsEnvironment environment;
 	private AnnotationHelper annotationHelper;
-	private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
+	private APTCodeModelHelper codeModelHelper;
 
 	private TypeMirror element;
 
@@ -88,8 +89,10 @@ public class BundleHelper {
 
 	private TypeMirror upperBound;
 
-	public BundleHelper(AnnotationHelper helper, TypeMirror element) {
-		annotationHelper = helper;
+	public BundleHelper(AndroidAnnotationsEnvironment environment, TypeMirror element) {
+		this.environment = environment;
+		annotationHelper = new AnnotationHelper(environment);
+		codeModelHelper = new APTCodeModelHelper(environment);
 		this.element = element;
 
 		String typeString = element.toString();
@@ -200,24 +203,24 @@ private boolean hasTypeArguments(TypeMirror type) {
 		return declaredType.getTypeArguments().size() > 0;
 	}
 
-	public JExpression getExpressionToRestoreFromIntentOrBundle(JClass variableClass, JExpression intent, JExpression extras, JExpression extraKey, JMethod method, GeneratedClassHolder holder) {
+	public JExpression getExpressionToRestoreFromIntentOrBundle(JClass variableClass, JExpression intent, JExpression extras, JExpression extraKey, JMethod method) {
 		if ("byte[]".equals(element.toString())) {
 			return intent.invoke("getByteArrayExtra").arg(extraKey);
 		} else {
-			return getExpressionToRestoreFromBundle(variableClass, extras, extraKey, method, holder);
+			return getExpressionToRestoreFromBundle(variableClass, extras, extraKey, method);
 		}
 	}
 
-	public JExpression getExpressionToRestoreFromBundle(JClass variableClass, JExpression bundle, JExpression extraKey, JMethod method, GeneratedClassHolder holder) {
+	public JExpression getExpressionToRestoreFromBundle(JClass variableClass, JExpression bundle, JExpression extraKey, JMethod method) {
 		JExpression expressionToRestore;
 		if (methodNameToRestore.equals("getParcelableArray")) {
 			JClass erasure;
 			if (upperBound != null) {
-				erasure = codeModelHelper.typeMirrorToJClass(upperBound, holder).erasure().array();
+				erasure = codeModelHelper.typeMirrorToJClass(upperBound).erasure().array();
 			} else {
 				erasure = variableClass.elementType().erasure().array();
 			}
-			expressionToRestore = holder.refClass(org.androidannotations.api.bundle.BundleHelper.class).staticInvoke("getParcelableArray").arg(bundle).arg(extraKey).arg(erasure.dotclass());
+			expressionToRestore = environment.getJClass(org.androidannotations.api.bundle.BundleHelper.class).staticInvoke("getParcelableArray").arg(bundle).arg(extraKey).arg(erasure.dotclass());
 		} else {
 			expressionToRestore = JExpr.invoke(bundle, methodNameToRestore).arg(extraKey);
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
index 17822acba8..5ac9290b79 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
@@ -104,7 +104,7 @@ public final class CanonicalNameConstants {
 	public static final String CONTENT_PROVIDER = "android.content.ContentProvider";
 	public static final String SQLITE_DATABASE = "android.database.sqlite.SQLiteDatabase";
 	public static final String KEY_STORE = "java.security.KeyStore";
-	public static final String SQLLITE_OPEN_HELPER = "android.database.sqlite.SQLiteOpenHelper";
+	public static final String SQLITE_OPEN_HELPER = "android.database.sqlite.SQLiteOpenHelper";
 	public static final String VIEW_SERVER = "org.androidannotations.api.ViewServer";
 	public static final String LOOPER = "android.os.Looper";
 	public static final String POWER_MANAGER = "android.os.PowerManager";
@@ -129,59 +129,6 @@ public final class CanonicalNameConstants {
 	public static final String INTERNET_PERMISSION = "android.permission.INTERNET";
 	public static final String WAKELOCK_PERMISSION = "android.permission.WAKE_LOCK";
 
-	/*
-	 * SpringFramework
-	 */
-	public static final String RESPONSE_ENTITY = "org.springframework.http.ResponseEntity";
-	public static final String HTTP_HEADERS = "org.springframework.http.HttpHeaders";
-	public static final String MEDIA_TYPE = "org.springframework.http.MediaType";
-	public static final String HTTP_METHOD = "org.springframework.http.HttpMethod";
-	public static final String HTTP_ENTITY = "org.springframework.http.HttpEntity";
-	public static final String REST_TEMPLATE = "org.springframework.web.client.RestTemplate";
-	public static final String HTTP_MESSAGE_CONVERTER = "org.springframework.http.converter.HttpMessageConverter";
-	public static final String CLIENT_HTTP_REQUEST_INTERCEPTOR = "org.springframework.http.client.ClientHttpRequestInterceptor";
-	public static final String CLIENT_HTTP_REQUEST_FACTORY = "org.springframework.http.client.ClientHttpRequestFactory";
-	public static final String HTTP_AUTHENTICATION = "org.springframework.http.HttpAuthentication";
-	public static final String HTTP_BASIC_AUTHENTICATION = "org.springframework.http.HttpBasicAuthentication";
-	public static final String REST_CLIENT_EXCEPTION = "org.springframework.web.client.RestClientException";
-	public static final String NESTED_RUNTIME_EXCEPTION = "org.springframework.core.NestedRuntimeException";
-
-	/*
-	 * RoboGuice
-	 */
-	public static final String ROBO_APPLICATION = "roboguice.application.RoboApplication";
-	public static final String ON_START_EVENT_OLD = "roboguice.activity.event.OnStartEvent";
-	public static final String ROBO_CONTEXT = "roboguice.util.RoboContext";
-	public static final String ROBO_INJECTOR = "roboguice.inject.RoboInjector";
-	public static final String KEY = "com.google.inject.Key";
-	public static final String CONTENT_VIEW_LISTENER = "roboguice.inject.ContentViewListener";
-	public static final String ON_RESTART_EVENT = "roboguice.activity.event.OnRestartEvent";
-	public static final String ON_START_EVENT = "roboguice.context.event.OnStartEvent";
-	public static final String ON_RESUME_EVENT = "roboguice.activity.event.OnResumeEvent";
-	public static final String ON_PAUSE_EVENT = "roboguice.activity.event.OnPauseEvent";
-	public static final String ON_NEW_INTENT_EVENT = "roboguice.activity.event.OnNewIntentEvent";
-	public static final String EVENT_MANAGER = "roboguice.event.EventManager";
-	public static final String CONTEXT_SCOPE = "roboguice.inject.ContextScope";
-	public static final String VIEW_MEMBERS_INJECTOR = "roboguice.inject.ViewListener.ViewMembersInjector";
-	public static final String ROBO_GUICE = "roboguice.RoboGuice";
-	public static final String INJECT = "com.google.inject.Inject";
-	public static final String ON_STOP_EVENT = "roboguice.activity.event.OnStopEvent";
-	public static final String ON_DESTROY_EVENT = "roboguice.context.event.OnDestroyEvent";
-	public static final String ON_CONFIGURATION_CHANGED_EVENT = "roboguice.context.event.OnConfigurationChangedEvent";
-	public static final String ON_CONTENT_CHANGED_EVENT = "roboguice.activity.event.OnContentChangedEvent";
-	public static final String ON_ACTIVITY_RESULT_EVENT = "roboguice.activity.event.OnActivityResultEvent";
-	public static final String ON_CONTENT_VIEW_AVAILABLE_EVENT = "roboguice.activity.event.OnContentViewAvailableEvent";
-	public static final String ON_CREATE_EVENT = "roboguice.context.event.OnCreateEvent";
-
-	/*
-	 * ORMLite
-	 */
-	public static final String DAO = "com.j256.ormlite.dao.Dao";
-	public static final String DAO_MANAGER = "com.j256.ormlite.dao.DaoManager";
-	public static final String CONNECTION_SOURCE = "com.j256.ormlite.support.ConnectionSource";
-	public static final String OPEN_HELPER_MANAGER = "com.j256.ormlite.android.apptools.OpenHelperManager";
-	public static final String RUNTIME_EXCEPTION_DAO = "com.j256.ormlite.dao.RuntimeExceptionDao";
-
 	/*
 	 * HttpClient
 	 */
@@ -193,12 +140,6 @@ public final class CanonicalNameConstants {
 	public static final String SCHEME_REGISTRY = "org.apache.http.conn.scheme.SchemeRegistry";
 	public static final String SINGLE_CLIENT_CONN_MANAGER = "org.apache.http.impl.conn.SingleClientConnManager";
 
-	/*
-	 * Otto
-	 */
-	public static final String SUBSCRIBE = "com.squareup.otto.Subscribe";
-	public static final String PRODUCE = "com.squareup.otto.Produce";
-
 	private CanonicalNameConstants() {
 	}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
new file mode 100644
index 0000000000..44dee373cc
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.helper;
+
+import java.util.List;
+
+import javax.lang.model.element.Element;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.rclass.IRInnerClass;
+
+import com.sun.codemodel.JFieldRef;
+
+public class IdAnnotationHelper extends TargetAnnotationHelper {
+
+	public IdAnnotationHelper(AndroidAnnotationsEnvironment environment, String annotationName) {
+		super(environment, annotationName);
+	}
+
+	private IRClass getRClass() {
+		return getEnvironment().getRClass();
+	}
+
+	public boolean containsIdValue(Integer idValue, Res res) {
+		IRInnerClass rInnerClass = getRClass().get(res);
+		return rInnerClass.containsIdValue(idValue);
+	}
+
+	public boolean containsField(String name, Res res) {
+		IRInnerClass rInnerClass = getRClass().get(res);
+		return rInnerClass.containsField(name);
+	}
+
+	public List<String> extractAnnotationResources(Element element, Res res, boolean useElementName) {
+		return super.extractAnnotationResources(element, getTarget(), getRClass().get(res), useElementName);
+	}
+
+	public List<JFieldRef> extractAnnotationFieldRefs(Element element, Res res, boolean useElementName) {
+		return extractAnnotationFieldRefs(element, res, useElementName, DEFAULT_FIELD_NAME_VALUE, DEFAULT_FIELD_NAME_RESNAME);
+	}
+
+	public List<JFieldRef> extractAnnotationFieldRefs(Element element, Res res, boolean useElementName, String idFieldName, String resFieldName) {
+		return super.extractAnnotationFieldRefs(element, getTarget(), getRClass().get(res), useElementName, idFieldName, resFieldName);
+	}
+
+	public JFieldRef extractOneAnnotationFieldRef(Element element, Res res, boolean useElementName) {
+		return extractOneAnnotationFieldRef(element, getTarget(), res, useElementName);
+	}
+
+	public JFieldRef extractOneAnnotationFieldRef(Element element, String annotationName, Res res, boolean useElementName) {
+		return extractOneAnnotationFieldRef(element, annotationName, res, useElementName, DEFAULT_FIELD_NAME_VALUE, DEFAULT_FIELD_NAME_RESNAME);
+	}
+
+	public JFieldRef extractOneAnnotationFieldRef(Element element, String annotationName, Res res, boolean useElementName, String idFieldName, String resFieldName) {
+		return extractOneAnnotationFieldRef(element, annotationName, getRClass().get(res), useElementName, idFieldName, resFieldName);
+	}
+
+	public JFieldRef extractOneAnnotationFieldRef(Element element, String annotationName, IRInnerClass rInnerClass, boolean useElementName, String idFieldName,
+			String resFieldName) {
+		List<JFieldRef> jFieldRefs = extractAnnotationFieldRefs(element, annotationName, rInnerClass, useElementName, idFieldName, resFieldName);
+
+		if (jFieldRefs.size() == 1) {
+			return jFieldRefs.get(0);
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
similarity index 66%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
index d0c12faee9..bf9422cd7d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
@@ -20,9 +20,8 @@
 
 import javax.lang.model.element.Element;
 
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ResId;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass.Res;
 
 public class IdValidatorHelper extends ValidatorHelper {
@@ -38,7 +37,7 @@ public enum FallbackStrategy {
 		USE_ELEMENT_NAME, ALLOW_NO_RES_ID, NEED_RES_ID
 	}
 
-	public void resIdsExist(Element element, Res res, FallbackStrategy fallbackStrategy, IsValid valid) {
+	public void resIdsExist(Element element, Res res, FallbackStrategy fallbackStrategy, ElementValidation valid) {
 
 		String annotationName = idAnnotationHelper.getTarget();
 		int[] resIds = idAnnotationHelper.extractAnnotationResIdValueParameter(element, annotationName);
@@ -54,47 +53,41 @@ public void resIdsExist(Element element, Res res, FallbackStrategy fallbackStrat
 					String elementName = idAnnotationHelper.extractElementName(element, annotationName);
 
 					if (!idAnnotationHelper.containsField(elementName, res)) {
-						valid.invalidate();
-						annotationHelper.printAnnotationError(element, "Resource name not found in R." + res.rName() + ": " + elementName);
+						valid.addError("Resource name not found in R." + res.rName() + ": " + elementName);
 					}
 				} else if (fallbackStrategy == FallbackStrategy.NEED_RES_ID) {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "%s needs an annotation value");
+					valid.addError("%s needs an annotation value");
 				}
 			} else {
 				for (String resName : resNames) {
 					if (!idAnnotationHelper.containsField(resName, res)) {
-						valid.invalidate();
-						annotationHelper.printAnnotationError(element, "Resource name not found in R." + res.rName() + ": " + resName);
+						valid.addError("Resource name not found in R." + res.rName() + ": " + resName);
 					}
 				}
 			}
 		} else {
 			for (int resId : resIds) {
 				if (!idAnnotationHelper.containsIdValue(resId, res)) {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "Resource id value not found in R." + res.rName() + ": " + resId);
+					valid.addError("Resource id value not found in R." + res.rName() + ": " + resId);
 				}
 			}
 		}
 	}
 
-	public void annotationParameterIsOptionalValidResId(Element element, Res res, String parameterName, IsValid valid) {
+	public void annotationParameterIsOptionalValidResId(Element element, Res res, String parameterName, ElementValidation valid) {
 		Integer resId = annotationHelper.extractAnnotationParameter(element, parameterName);
 		if (!resId.equals(ResId.DEFAULT_VALUE) && !idAnnotationHelper.containsIdValue(resId, res)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "Id value not found in R." + res.rName() + ": " + resId);
+			valid.addError("Id value not found in R." + res.rName() + ": " + resId);
 		}
 	}
 
-	public void uniqueResourceId(Element element, AnnotationElements validatedElements, Res resourceType, IsValid valid) {
-
+	public void uniqueResourceId(Element element, Res resourceType, ElementValidation valid) {
 		if (valid.isValid()) {
 
 			List<String> annotationQualifiedIds = idAnnotationHelper.extractAnnotationResources(element, resourceType, true);
 
 			Element elementEnclosingElement = element.getEnclosingElement();
-			Set<? extends Element> annotatedElements = validatedElements.getRootAnnotatedElements(annotationHelper.getTarget());
+			Set<? extends Element> annotatedElements = validatedModel().getRootAnnotatedElements(annotationHelper.getTarget());
 
 			for (Element uniqueCheckElement : annotatedElements) {
 				Element uniqueCheckEnclosingElement = uniqueCheckElement.getEnclosingElement();
@@ -107,9 +100,8 @@ public void uniqueResourceId(Element element, AnnotationElements validatedElemen
 						for (String annotationQualifiedId : annotationQualifiedIds) {
 
 							if (annotationQualifiedId.equals(checkQualifiedId)) {
-								valid.invalidate();
 								String annotationSimpleId = annotationQualifiedId.substring(annotationQualifiedId.lastIndexOf('.') + 1);
-								annotationHelper.printAnnotationError(element, "The resource id " + annotationSimpleId + " is already used on the following " + annotationHelper.annotationName()
+								valid.addError("The resource id " + annotationSimpleId + " is already used on the following " + annotationHelper.annotationName()
 										+ " method: " + uniqueCheckElement);
 								return;
 							}
@@ -120,14 +112,13 @@ public void uniqueResourceId(Element element, AnnotationElements validatedElemen
 		}
 	}
 
-	public void uniqueId(Element element, AnnotationElements validatedElements, IsValid valid) {
-		uniqueResourceId(element, validatedElements, Res.ID, valid);
+	public void uniqueId(Element element, ElementValidation valid) {
+		uniqueResourceId(element, Res.ID, valid);
 	}
 
-	public void annotationValuePositiveAndInAShort(Element element, IsValid valid, int value) {
+	public void annotationValuePositiveAndInAShort(int value, ElementValidation valid) {
 		if (value < 0 || value > 0xFFFF) {
-			annotationHelper.printAnnotationError(element, "Due to a restriction in the fragment API, the requestCode has to be a positive integer inferior or equal to 0xFFFF");
-			valid.invalidate();
+			valid.addError("Due to a restriction in the fragment API, the requestCode has to be a positive integer inferior or equal to 0xFFFF");
 		}
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
index bddd254566..d72d22d944 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
@@ -20,9 +20,10 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.SourceVersion;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.EApplication;
 import org.androidannotations.annotations.EBean;
@@ -33,11 +34,11 @@
 import org.androidannotations.annotations.EService;
 import org.androidannotations.annotations.EView;
 import org.androidannotations.annotations.EViewGroup;
-import org.androidannotations.annotations.rest.Rest;
-import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
 public abstract class ModelConstants {
 
+	public static final Option OPTION_CLASS_SUFFIX = new Option("classSuffix", "_");
+
 	private static String generationSuffix = "_";
 	private static String classSuffix;
 
@@ -46,22 +47,18 @@ public abstract class ModelConstants {
 	public static final List<Class<? extends Annotation>> VALID_ENHANCED_COMPONENT_ANNOTATIONS = asList(EApplication.class, EActivity.class, EViewGroup.class, EView.class, EBean.class,
 			EService.class, EIntentService.class, EReceiver.class, EProvider.class, EFragment.class);
 
-	public static final List<Class<? extends Annotation>> VALID_ANDROID_ANNOTATIONS = asList(EApplication.class, EActivity.class, EViewGroup.class, EView.class, EBean.class, EService.class,
-			EReceiver.class, EProvider.class, EFragment.class, SharedPref.class, Rest.class);
-
 	private ModelConstants() {
 	}
 
-	public static void init(ProcessingEnvironment processingEnv) {
-		OptionsHelper optionsHelper = new OptionsHelper(processingEnv);
-		classSuffix = optionsHelper.getClassSuffix().trim();
+	public static void init(AndroidAnnotationsEnvironment environment) {
+		classSuffix = environment.getOptionValue(OPTION_CLASS_SUFFIX).trim();
 
 		if (classSuffix.isEmpty()) {
-			throw new IllegalArgumentException("'" + classSuffix + "' may not be an emtpy string.");
+			throw new IllegalArgumentException("'" + classSuffix + "' may not be an empty string.");
 		}
 
 		if (!SourceVersion.isName(classSuffix) || classSuffix.contains(".")) {
-			throw new IllegalArgumentException("'" + classSuffix + "' is not a valid Java identifier.");
+			throw new IllegalArgumentException("'" + classSuffix + "' may not be a valid Java identifier.");
 		}
 	}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/Pair.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/Pair.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/Pair.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/Pair.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
index 9d97ded87b..c036a10c94 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
@@ -17,16 +17,17 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+
 public class TargetAnnotationHelper extends AnnotationHelper {
 
 	private String annotationName;
 
-	public TargetAnnotationHelper(ProcessingEnvironment processingEnv, String annotationName) {
-		super(processingEnv);
+	public TargetAnnotationHelper(AndroidAnnotationsEnvironment environment, String annotationName) {
+		super(environment);
 		this.annotationName = annotationName;
 	}
 
@@ -63,23 +64,4 @@ public static String annotationName(Class<? extends Annotation> annotation) {
 	public String annotationName() {
 		return annotationName(annotationName);
 	}
-
-	/**
-	 * @param message
-	 *            if the string contains a %s, it will be replaced with the
-	 *            annotation name (ex: @Override)
-	 */
-	public void printAnnotationError(Element annotatedElement, String message) {
-		printAnnotationError(annotatedElement, annotationName, String.format(message, annotationName()));
-	}
-
-	/**
-	 * @param message
-	 *            if the string contains a %s, it will be replaced with the
-	 *            annotation name (ex: @Override)
-	 */
-	public void printAnnotationWarning(Element annotatedElement, String message) {
-		printAnnotationWarning(annotatedElement, annotationName, String.format(message, annotationName()));
-	}
-
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
new file mode 100644
index 0000000000..23279c21c9
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
@@ -0,0 +1,650 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.helper;
+
+import static java.util.Arrays.asList;
+import static org.androidannotations.helper.AndroidConstants.LOG_DEBUG;
+import static org.androidannotations.helper.AndroidConstants.LOG_ERROR;
+import static org.androidannotations.helper.AndroidConstants.LOG_INFO;
+import static org.androidannotations.helper.AndroidConstants.LOG_VERBOSE;
+import static org.androidannotations.helper.AndroidConstants.LOG_WARN;
+import static org.androidannotations.helper.CanonicalNameConstants.INTERNET_PERMISSION;
+import static org.androidannotations.helper.CanonicalNameConstants.WAKELOCK_PERMISSION;
+import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
+import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_VIEW_SUPPORT_ANNOTATIONS;
+import static org.androidannotations.helper.ModelConstants.classSuffix;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.EIntentService;
+import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.annotations.EService;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.ViewById;
+import org.androidannotations.internal.core.model.AndroidSystemServices;
+import org.androidannotations.internal.model.AnnotationElements;
+
+@SuppressWarnings("checkstyle:methodcount")
+public class ValidatorHelper {
+
+	private static final List<String> ANDROID_FRAGMENT_QUALIFIED_NAMES = asList(CanonicalNameConstants.FRAGMENT, CanonicalNameConstants.SUPPORT_V4_FRAGMENT);
+
+	private static final Collection<Integer> VALID_LOG_LEVELS = Arrays.asList(LOG_VERBOSE, LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR);
+
+	private static final List<String> VALID_PREFERENCE_CLASSES = asList(CanonicalNameConstants.PREFERENCE_ACTIVITY, CanonicalNameConstants.PREFERENCE_FRAGMENT,
+			CanonicalNameConstants.SUPPORT_V4_PREFERENCE_FRAGMENT, CanonicalNameConstants.MACHINARIUS_V4_PREFERENCE_FRAGMENT);
+
+	protected final TargetAnnotationHelper annotationHelper;
+
+	public final ValidatorParameterHelper param;
+
+	public ValidatorHelper(TargetAnnotationHelper targetAnnotationHelper) {
+		annotationHelper = targetAnnotationHelper;
+		param = new ValidatorParameterHelper(annotationHelper);
+	}
+
+	protected AndroidAnnotationsEnvironment environment() {
+		return annotationHelper.getEnvironment();
+	}
+
+	protected AnnotationElements validatedModel() {
+		return environment().getValidatedElements();
+	}
+
+	public void isNotFinal(Element element, ElementValidation valid) {
+		if (annotationHelper.isFinal(element)) {
+			valid.addError("%s cannot be used on a final element");
+		}
+	}
+
+	public void isNotSynchronized(Element element, ElementValidation valid) {
+		if (annotationHelper.isSynchronized(element)) {
+			valid.addError("%s cannot be used on a synchronized element. If you think you shall need to use the synchronized keyword for a specific use case, please post on the mailing list.");
+		}
+	}
+
+	public void isInterface(TypeElement element, ElementValidation valid) {
+		if (!annotationHelper.isInterface(element)) {
+			valid.addError("%s can only be used on an interface");
+		}
+	}
+
+	public void isTopLevel(TypeElement element, ElementValidation valid) {
+		if (!annotationHelper.isTopLevel(element)) {
+			valid.addError("%s can only be used on a top level type");
+		}
+	}
+
+	public void doesNotReturnPrimitive(ExecutableElement element, ElementValidation valid) {
+		if (element.getReturnType().getKind().isPrimitive()) {
+			valid.addError("%s cannot return primitive");
+		}
+	}
+
+	public void isNotPrivate(Element element, ElementValidation valid) {
+		if (annotationHelper.isPrivate(element)) {
+			valid.addError("%s cannot be used on a private element");
+		}
+	}
+
+	public void isPublic(Element element, ElementValidation valid) {
+		if (!annotationHelper.isPublic(element)) {
+			valid.addError(element, "%s cannot be used on a non public element");
+		}
+	}
+
+	public void isStatic(Element element, ElementValidation valid) {
+		if (!annotationHelper.isStatic(element)) {
+			valid.addError(element, "%s cannot be used on a non static inner element");
+		}
+	}
+
+	public void enclosingElementIsNotAbstractIfNotAbstract(Element element, ElementValidation validation) {
+		if (!annotationHelper.isAbstract(element) && annotationHelper.isAbstract(element.getEnclosingElement())) {
+			validation.addError("%s cannot be used on a non-abstract inner element whose outer element is abstract");
+		}
+	}
+
+	public void enclosingElementHasEBeanAnnotation(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasClassAnnotation(element, enclosingElement, EBean.class, valid);
+	}
+
+	public void enclosingElementHasEActivity(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasClassAnnotation(element, enclosingElement, EActivity.class, valid);
+	}
+
+	public void enclosingElementHasEActivityOrEFragment(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		List<Class<? extends Annotation>> validAnnotations = asList(EActivity.class, EFragment.class);
+		hasOneOfClassAnnotations(element, enclosingElement, validAnnotations, valid);
+	}
+
+	public void enclosingElementHasEActivityOrEFragmentOrEServiceOrEIntentService(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		List<Class<? extends Annotation>> validAnnotations = asList(EActivity.class, EFragment.class, EService.class, EIntentService.class);
+		hasOneOfClassAnnotations(element, enclosingElement, validAnnotations, valid);
+	}
+
+	public void enclosingElementHasEFragment(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasClassAnnotation(element, enclosingElement, EFragment.class, valid);
+	}
+
+	public void enclosingElementHasEIntentService(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasClassAnnotation(element, enclosingElement, EIntentService.class, valid);
+	}
+
+	public void enclosingElementHasEReceiver(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasClassAnnotation(element, enclosingElement, EReceiver.class, valid);
+	}
+
+	public void hasEActivity(Element element, ElementValidation valid) {
+		hasClassAnnotation(element, element, EActivity.class, valid);
+	}
+
+	public void hasEActivityOrEFragment(Element element, ElementValidation valid) {
+		List<Class<? extends Annotation>> validAnnotations = asList(EActivity.class, EFragment.class);
+		hasOneOfClassAnnotations(element, element, validAnnotations, valid);
+	}
+
+	public void enclosingElementHasEnhancedViewSupportAnnotation(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasOneOfClassAnnotations(element, enclosingElement, VALID_ENHANCED_VIEW_SUPPORT_ANNOTATIONS, valid);
+	}
+
+	public void enclosingElementHasEnhancedComponentAnnotation(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasOneOfClassAnnotations(element, enclosingElement, VALID_ENHANCED_COMPONENT_ANNOTATIONS, valid);
+	}
+
+	public void enclosingElementHasAndroidAnnotation(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		hasOneOfClassAnnotations(element, enclosingElement, environment().getGeneratingAnnotations(), valid);
+	}
+
+	private void hasClassAnnotation(Element reportElement, Element element, Class<? extends Annotation> validAnnotation, ElementValidation valid) {
+		ArrayList<Class<? extends Annotation>> validAnnotations = new ArrayList<>();
+		validAnnotations.add(validAnnotation);
+		hasOneOfClassAnnotations(reportElement, element, validAnnotations, valid);
+	}
+
+	public void hasOneOfClassAnnotations(Element reportElement, Element element, List<Class<? extends Annotation>> validAnnotations, ElementValidation valid) {
+		boolean foundAnnotation = false;
+		for (Class<? extends Annotation> validAnnotation : validAnnotations) {
+			if (element.getAnnotation(validAnnotation) != null) {
+				foundAnnotation = true;
+				break;
+			}
+		}
+		if (!foundAnnotation) {
+			valid.addError(reportElement, "%s can only be used in a class annotated with " + getFormattedValidEnhancedBeanAnnotationTypes(validAnnotations) + ".");
+		}
+	}
+
+	private String getFormattedValidEnhancedBeanAnnotationTypes(List<Class<? extends Annotation>> annotations) {
+		StringBuilder sb = new StringBuilder();
+		if (!annotations.isEmpty()) {
+			sb.append("@" + annotations.get(0).getName());
+
+			for (int i = 1; i < annotations.size(); i++) {
+				sb.append(", ");
+				sb.append("@" + annotations.get(i));
+			}
+		}
+
+		return sb.toString();
+	}
+
+	public void hasViewByIdAnnotation(Element element, ElementValidation valid) {
+		String error = "can only be used with annotation";
+		elementHasAnnotation(ViewById.class, element, valid, error);
+	}
+
+	public void enclosingMethodHasAnnotation(Class<? extends Annotation> annotation, Element element, ElementValidation valid) {
+		String error = "can only be used with a method annotated with";
+		enclosingElementHasAnnotation(annotation, element, valid, error);
+	}
+
+	public void enclosingElementHasAnnotation(Class<? extends Annotation> annotation, Element element, ElementValidation valid, String error) {
+		Element enclosingElement = element.getEnclosingElement();
+		elementHasAnnotation(annotation, enclosingElement, valid, error);
+	}
+
+	public void elementHasAnnotation(Class<? extends Annotation> annotation, Element element, ElementValidation valid, String error) {
+		if (!elementHasAnnotation(annotation, element)) {
+			if (element.getAnnotation(annotation) == null) {
+				valid.addError("%s " + error + " @" + annotation.getName());
+			}
+		}
+	}
+
+	public boolean elementHasAnnotation(Class<? extends Annotation> annotation, Element element) {
+		Set<? extends Element> layoutAnnotatedElements = validatedModel().getRootAnnotatedElements(annotation.getName());
+		return layoutAnnotatedElements.contains(element);
+	}
+
+
+	public void typeHasAnnotation(Class<? extends Annotation> annotation, Element element, ElementValidation valid) {
+		TypeMirror elementType = element.asType();
+		typeHasAnnotation(annotation, elementType, valid);
+	}
+
+	public void typeHasAnnotation(Class<? extends Annotation> annotation, TypeMirror elementType, ElementValidation valid) {
+		Element typeElement = annotationHelper.getTypeUtils().asElement(elementType);
+		if (!elementHasAnnotationSafe(annotation, typeElement)) {
+			valid.addError("%s can only be used on an element annotated with @" + annotation.getName());
+		}
+	}
+
+	public void typeOrTargetValueHasAnnotation(Class<? extends Annotation> annotation, Element element, ElementValidation valid) {
+		DeclaredType targetAnnotationClassValue = annotationHelper.extractAnnotationClassParameter(element);
+
+		if (targetAnnotationClassValue != null) {
+			typeHasAnnotation(annotation, targetAnnotationClassValue, valid);
+
+			if (!annotationHelper.getTypeUtils().isAssignable(targetAnnotationClassValue, element.asType())) {
+				valid.addError("The value of %s must be assignable into the annotated field");
+			}
+		} else {
+			typeHasAnnotation(annotation, element, valid);
+		}
+	}
+
+	private boolean elementHasAnnotationSafe(Class<? extends Annotation> annotation, Element element) {
+		List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
+		for (AnnotationMirror annotationMirror : annotationMirrors) {
+			if (annotationMirror.getAnnotationType().toString().equals(annotation.getName())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void doesntThrowException(Element element, ElementValidation valid) {
+		ExecutableElement executableElement = (ExecutableElement) element;
+		if (executableElement.getThrownTypes().size() > 0) {
+			valid.addError("%s annotated methods should not declare throwing any exception");
+		}
+	}
+
+	public void returnTypeIsVoidOrBoolean(ExecutableElement executableElement, ElementValidation valid) {
+		TypeMirror returnType = executableElement.getReturnType();
+		TypeKind returnKind = returnType.getKind();
+		if (returnKind != TypeKind.BOOLEAN && returnKind != TypeKind.VOID && !returnType.toString().equals(CanonicalNameConstants.BOOLEAN)) {
+			valid.addError("%s can only be used on a method with a boolean or a void return type");
+		}
+	}
+
+	public void returnTypeIsVoid(ExecutableElement executableElement, ElementValidation valid) {
+		TypeMirror returnType = executableElement.getReturnType();
+		if (returnType.getKind() != TypeKind.VOID) {
+			valid.addError("%s can only be used on a method with a void return type");
+		}
+	}
+
+	public void returnTypeIsNotVoid(ExecutableElement executableElement, ElementValidation valid) {
+		TypeMirror returnType = executableElement.getReturnType();
+		if (returnType.getKind() == TypeKind.VOID) {
+			valid.addError("%s can only be used on a method with a return type non void");
+		}
+	}
+
+	public void extendsActivity(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.ACTIVITY, valid);
+	}
+
+	public void extendsFragment(Element element, ElementValidation valid) {
+		extendsOneOfTypes(element, ANDROID_FRAGMENT_QUALIFIED_NAMES, valid);
+	}
+
+	public void extendsService(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.SERVICE, valid);
+	}
+
+	public void extendsIntentService(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.INTENT_SERVICE, valid);
+	}
+
+	public void extendsReceiver(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.BROADCAST_RECEIVER, valid);
+	}
+
+	public void extendsProvider(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.CONTENT_PROVIDER, valid);
+	}
+
+	public void extendsView(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.VIEW, valid);
+	}
+
+	public void extendsTextView(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.TEXT_VIEW, valid);
+	}
+
+	public void extendsViewGroup(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.VIEW_GROUP, valid);
+	}
+
+	public void extendsApplication(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.APPLICATION, valid);
+	}
+
+	public void extendsContext(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.CONTEXT, valid);
+	}
+
+	public void extendsMenuItem(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		String enclosingQualifiedName = enclosingElement.asType().toString();
+		TypeElement enclosingTypeElement = annotationHelper.typeElementFromQualifiedName(enclosingQualifiedName);
+
+		if (enclosingTypeElement != null) {
+			extendsType(element, CanonicalNameConstants.MENU_ITEM, valid);
+		}
+	}
+
+	public void extendsMenu(Element element, ElementValidation validation) {
+		Element enclosingElement = element.getEnclosingElement();
+		String enclosingQualifiedName = enclosingElement.asType().toString();
+		TypeElement enclosingTypeElement = annotationHelper.typeElementFromQualifiedName(enclosingQualifiedName);
+
+		if (enclosingTypeElement != null) {
+			extendsType(element, CanonicalNameConstants.MENU, validation);
+		}
+	}
+
+	public void extendsListOfView(Element element, ElementValidation valid) {
+		DeclaredType elementType = (DeclaredType) element.asType();
+		List<? extends TypeMirror> elementTypeArguments = elementType.getTypeArguments();
+
+		TypeMirror viewType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.VIEW).asType();
+
+		if (!elementType.toString().equals(CanonicalNameConstants.LIST) && elementTypeArguments.size() == 1 && !annotationHelper.isSubtype(elementTypeArguments.get(0), viewType)) {
+			valid.invalidate();
+			valid.addError("%s can only be used on a " + CanonicalNameConstants.LIST + " of elements extending " + CanonicalNameConstants.VIEW);
+		}
+	}
+
+	public void extendsPreference(Element element, ElementValidation validation) {
+		extendsType(element, CanonicalNameConstants.PREFERENCE, validation);
+	}
+
+	public void extendsOneOfTypes(Element element, List<String> typeQualifiedNames, ElementValidation valid) {
+		TypeMirror elementType = element.asType();
+
+		for (String typeQualifiedName : typeQualifiedNames) {
+			TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(typeQualifiedName);
+			if (typeElement != null) {
+				TypeMirror expectedType = typeElement.asType();
+				if (annotationHelper.isSubtype(elementType, expectedType)) {
+					return;
+				}
+			}
+		}
+		valid.addError("%s can only be used on an element that extends one of the following classes: " + typeQualifiedNames);
+	}
+
+	public void extendsType(Element element, String typeQualifiedName, ElementValidation valid) {
+		if (!extendsType(element, typeQualifiedName)) {
+			valid.addError("%s can only be used on an element that extends " + typeQualifiedName);
+		}
+	}
+
+	protected boolean extendsType(Element element, String typeQualifiedName) {
+		TypeMirror elementType = element.asType();
+
+		TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(typeQualifiedName);
+		if (typeElement != null) {
+			TypeMirror expectedType = typeElement.asType();
+			return annotationHelper.isSubtype(elementType, expectedType);
+		}
+		return false;
+	}
+
+	public void allowedType(TypeMirror fieldTypeMirror, List<String> allowedTypes, ElementValidation valid) {
+		String qualifiedName = fieldTypeMirror.toString();
+		if (!allowedTypes.contains(qualifiedName)) {
+			valid.addError("%s can only be used on a field which is a " + allowedTypes.toString() + ", not " + qualifiedName);
+		}
+	}
+
+	public void androidService(Element element, ElementValidation valid) {
+		AndroidSystemServices androidSystemServices = new AndroidSystemServices(environment());
+		TypeMirror serviceType = element.asType();
+		if (!androidSystemServices.contains(serviceType)) {
+			valid.addError("Unknown service type: " + serviceType.toString());
+		}
+	}
+
+	public void isDeclaredType(Element element, ElementValidation valid) {
+		if (!(element.asType() instanceof DeclaredType)) {
+			valid.addError("%s can only be used on a field which is a declared type");
+		}
+	}
+
+	public void notAlreadyValidated(Element element, ElementValidation valid) {
+		if (validatedModel().getAllElements().contains(element)) {
+			valid.addError("%s annotated element cannot be used with the other annotations used on this element.");
+		}
+	}
+
+	public void isAbstractOrHasEmptyOrContextConstructor(Element element, ElementValidation valid) {
+		List<ExecutableElement> constructors = ElementFilter.constructorsIn(element.getEnclosedElements());
+
+		if (!annotationHelper.isAbstract(element)) {
+			if (constructors.size() == 1) {
+				ExecutableElement constructor = constructors.get(0);
+
+				if (!annotationHelper.isPrivate(constructor)) {
+					if (constructor.getParameters().size() > 1) {
+						valid.addError("%s annotated element should have a constructor with one parameter max, of type " + CanonicalNameConstants.CONTEXT);
+					} else if (constructor.getParameters().size() == 1) {
+						VariableElement parameter = constructor.getParameters().get(0);
+						if (!parameter.asType().toString().equals(CanonicalNameConstants.CONTEXT)) {
+							valid.addError("%s annotated element should have a constructor with one parameter max, of type " + CanonicalNameConstants.CONTEXT);
+						}
+					}
+				} else {
+					valid.addError("%s annotated element should not have a private constructor");
+				}
+			} else {
+				valid.addError("%s annotated element should have only one constructor");
+			}
+		}
+	}
+
+	public void isAbstractOrHasEmptyConstructor(Element element, ElementValidation valid) {
+		List<ExecutableElement> constructors = ElementFilter.constructorsIn(element.getEnclosedElements());
+
+		if (!annotationHelper.isAbstract(element)) {
+			if (constructors.size() == 1) {
+				ExecutableElement constructor = constructors.get(0);
+
+				if (!annotationHelper.isPrivate(constructor)) {
+					if (constructor.getParameters().size() != 0) {
+						valid.addError("%s annotated element should have an empty constructor");
+					}
+				} else {
+					valid.addError("%s annotated element should not have a private constructor");
+				}
+			} else {
+				valid.addError("%s annotated element should have only one constructor");
+			}
+		}
+	}
+
+	public void hasValidLogLevel(Element element, ElementValidation valid) {
+
+		Trace annotation = element.getAnnotation(Trace.class);
+		Integer level = annotation.level();
+
+		if (!VALID_LOG_LEVELS.contains(level)) {
+			valid.addError("Unrecognized log level.");
+		}
+
+	}
+
+	public void canBePutInABundle(Element element, ElementValidation valid) {
+		TypeMirror typeMirror = element.asType();
+		String typeString = element.asType().toString();
+
+		if (!isKnownBundleCompatibleType(typeString)) {
+
+			if (typeMirror instanceof ArrayType) {
+				ArrayType arrayType = (ArrayType) element.asType();
+				typeMirror = arrayType.getComponentType();
+			}
+
+			if (typeMirror.getKind() != TypeKind.NONE) {
+				TypeMirror parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE).asType();
+				TypeMirror serializableType = annotationHelper.typeElementFromQualifiedName("java.io.Serializable").asType();
+				if (!annotationHelper.isSubtype(typeMirror, parcelableType) && !annotationHelper.isSubtype(typeMirror, serializableType)) {
+					valid.addError("Unrecognized type. Please let your attribute be primitive or implement Serializable or Parcelable");
+				}
+			}
+		}
+	}
+
+	private boolean isKnownBundleCompatibleType(String type) {
+		return BundleHelper.METHOD_SUFFIX_BY_TYPE_NAME.containsKey(type);
+	}
+
+	public void componentRegistered(Element element, AndroidManifest androidManifest, ElementValidation valid) {
+		componentRegistered(element, androidManifest, true, valid);
+	}
+
+	public void componentRegistered(Element element, AndroidManifest androidManifest, boolean printWarning, ElementValidation valid) {
+		TypeElement typeElement = (TypeElement) element;
+
+		if (typeElement.getModifiers().contains(Modifier.ABSTRACT)) {
+			return;
+		}
+
+		if (androidManifest.isLibraryProject()) {
+			return;
+		}
+
+		String componentQualifiedName = typeElement.getQualifiedName().toString();
+		String generatedComponentQualifiedName = componentQualifiedName + classSuffix();
+
+		List<String> componentQualifiedNames = androidManifest.getComponentQualifiedNames();
+		if (!componentQualifiedNames.contains(generatedComponentQualifiedName)) {
+			String simpleName = typeElement.getSimpleName().toString();
+			String generatedSimpleName = simpleName + classSuffix();
+			if (componentQualifiedNames.contains(componentQualifiedName)) {
+				valid.addError("The AndroidManifest.xml file contains the original component, and not the AndroidAnnotations generated component. Please register "
+						+ generatedSimpleName + " instead of " + simpleName);
+			} else {
+				if (printWarning) {
+					valid.addWarning("The component " + generatedSimpleName + " is not registered in the AndroidManifest.xml file.");
+				}
+			}
+		}
+
+	}
+
+	public void isDebuggable(AndroidManifest androidManifest, ElementValidation valid) {
+		if (!androidManifest.isDebuggable()) {
+			valid.addError("The application must be in debuggable mode. Please set android:debuggable to true in your AndroidManifest.xml file.");
+		}
+	}
+
+	public void hasInternetPermission(AndroidManifest androidManifest, ElementValidation valid) {
+		hasPermission(androidManifest, valid, INTERNET_PERMISSION);
+	}
+
+	public void hasWakeLockPermission(AndroidManifest androidManifest, ElementValidation valid) {
+		hasPermission(androidManifest, valid, WAKELOCK_PERMISSION);
+	}
+
+	public void hasPermission(AndroidManifest androidManifest, ElementValidation valid, String permissionQualifiedName) {
+		List<String> permissionQualifiedNames = androidManifest.getPermissionQualifiedNames();
+		if (!permissionQualifiedNames.contains(permissionQualifiedName)) {
+			if (androidManifest.isLibraryProject()) {
+				valid.addWarning("Your library should require the " + permissionQualifiedName + " permission.");
+			} else {
+				valid.addError("Your application must require the " + permissionQualifiedName + " permission.");
+			}
+		}
+	}
+
+	public void hasNotMultipleAnnotatedMethodWithSameName(Element element, ElementValidation valid, Class<? extends Annotation> annotation) {
+		Set<String> actionNames = new TreeSet<>();
+
+		List<? extends Element> enclosedElements = element.getEnclosedElements();
+		for (Element enclosedElement : enclosedElements) {
+			if (enclosedElement.getKind() != ElementKind.METHOD || !annotationHelper.hasOneOfClassAnnotations(enclosedElement, annotation)) {
+				continue;
+			}
+
+			String enclosedElementName = enclosedElement.getSimpleName().toString();
+			if (actionNames.contains(enclosedElementName)) {
+				valid.addError(enclosedElement, "The " + TargetAnnotationHelper.annotationName(annotation)
+						+ " annotated method must have unique name even if the signature is not the same");
+			} else {
+				actionNames.add(enclosedElementName);
+			}
+		}
+	}
+
+	public void extendsPreferenceActivityOrPreferenceFragment(Element element, ElementValidation valid) {
+		extendsOneOfTypes(element, VALID_PREFERENCE_CLASSES, valid);
+	}
+
+	public void extendsPreferenceActivity(Element element, ElementValidation valid) {
+		extendsType(element, CanonicalNameConstants.PREFERENCE_ACTIVITY, valid);
+	}
+
+	public void enclosingElementExtendsPreferenceActivityOrPreferenceFragment(Element element, ElementValidation valid) {
+		extendsOneOfTypes(element.getEnclosingElement(), VALID_PREFERENCE_CLASSES, valid);
+	}
+
+	public void isPreferenceFragmentClassPresent(Element element, ElementValidation valid) {
+		TypeElement preferenceFragmentElement = annotationHelper.getElementUtils().getTypeElement(CanonicalNameConstants.PREFERENCE_FRAGMENT);
+
+		if (preferenceFragmentElement == null) {
+			valid.addError("The class " + CanonicalNameConstants.PREFERENCE_FRAGMENT + " cannot be found. You have to use at least API 11");
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
index b655211c86..cc117ddb33 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
@@ -26,12 +26,12 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.process.IsValid;
+import org.androidannotations.ElementValidation;
 
 public class ValidatorParameterHelper {
 
 	public interface Validator {
-		void validate(ExecutableElement executableElement, IsValid valid);
+		void validate(ExecutableElement executableElement, ElementValidation validation);
 	}
 
 	public interface ParameterRequirement {
@@ -49,10 +49,9 @@ public interface ParameterRequirement {
 	public class NoParamValidator implements Validator {
 
 		@Override
-		public void validate(ExecutableElement executableElement, IsValid valid) {
+		public void validate(ExecutableElement executableElement, ElementValidation validation) {
 			if (!executableElement.getParameters().isEmpty()) {
-				annotationHelper.printAnnotationError(executableElement, "%s cannot have any parameters");
-				valid.invalidate();
+				validation.addError("%s cannot have any parameters");
 			}
 		}
 	}
@@ -76,41 +75,40 @@ public OneParamValidator multiple() {
 		}
 
 		@Override
-		public void validate(ExecutableElement executableElement, IsValid valid) {
+		public void validate(ExecutableElement executableElement, ElementValidation validation) {
 			List<? extends VariableElement> parameters = executableElement.getParameters();
 			if (!parameterRequirement.multiple()) {
 				if (parameterRequirement.required() && parameters.size() != 1) {
-					invalidate(executableElement, valid);
+					invalidate(validation);
 					return;
 				}
 				if (!parameterRequirement.required() && parameters.size() > 1) {
-					invalidate(executableElement, valid);
+					invalidate(validation);
 					return;
 				}
 			}
 
 			for (VariableElement parameter : parameters) {
 				if (!parameterRequirement.isSatisfied(parameter)) {
-					invalidate(executableElement, valid);
+					invalidate(validation);
 					return;
 				}
 			}
 		}
 
-		protected void invalidate(ExecutableElement element, IsValid valid) {
-			annotationHelper.printAnnotationError(element, "%s can only have the following parameter: " + parameterRequirement);
-			valid.invalidate();
+		protected void invalidate(ElementValidation validation) {
+			validation.addError("%s can only have the following parameter: " + parameterRequirement);
 		}
 	}
 
 	private abstract class BaseParamValidator<V extends BaseParamValidator<?>> implements Validator {
 
 		private List<ParameterRequirement> parameterRequirements = new ArrayList<>();
-		private List<ParameterRequirement> originalparameterRequirements;
+		private List<ParameterRequirement> originalParameterRequirements;
 
 		@Override
-		public void validate(ExecutableElement executableElement, IsValid valid) {
-			originalparameterRequirements = new ArrayList<>(parameterRequirements);
+		public void validate(ExecutableElement executableElement, ElementValidation validation) {
+			originalParameterRequirements = new ArrayList<>(parameterRequirements);
 		}
 
 		public V type(String qualifiedName) {
@@ -163,19 +161,15 @@ private ParameterRequirement lastParam() {
 			return parameterRequirements.get(parameterRequirements.size() - 1);
 		}
 
-		protected void invalidate(ExecutableElement executableElement, IsValid valid) {
-			printMessage(executableElement);
-			valid.invalidate();
+		protected void invalidate(ExecutableElement element, ElementValidation validation) {
+			validation.addError("%s can only have the following parameters: " + createMessage(element));
 		}
 
-		protected final void printMessage(ExecutableElement element) {
-			annotationHelper.printAnnotationError(element, "%s can only have the following parameters: " + createMessage(element));
-		}
 
 		protected String createMessage(ExecutableElement element) {
 			StringBuilder builder = new StringBuilder();
 			builder.append("[ ");
-			for (ParameterRequirement parameterRequirement : originalparameterRequirements) {
+			for (ParameterRequirement parameterRequirement : originalParameterRequirements) {
 				builder.append(parameterRequirement).append(", ");
 			}
 			return builder.append(" ]").toString();
@@ -203,20 +197,20 @@ private void nextParameterRequirement() {
 		}
 
 		@Override
-		public void validate(ExecutableElement executableElement, IsValid valid) {
-			super.validate(executableElement, valid);
+		public void validate(ExecutableElement executableElement, ElementValidation validation) {
+			super.validate(executableElement, validation);
 
 			nextParameterRequirement();
 			for (VariableElement parameter : executableElement.getParameters()) {
 				if (!validate(parameter)) {
-					invalidate(executableElement, valid);
+					invalidate(executableElement, validation);
 					return;
 				}
 			}
 
 			for (ParameterRequirement expectedParameter : getParamRequirements()) {
 				if (expectedParameter.required() && !satisfiedParameterRequirements.contains(expectedParameter)) {
-					invalidate(executableElement, valid);
+					invalidate(executableElement, validation);
 					return;
 				}
 			}
@@ -252,8 +246,8 @@ public class AnyOrderParamValidator extends BaseParamValidator<AnyOrderParamVali
 		private List<ParameterRequirement> satisfiedParameterRequirements = new ArrayList<>();
 
 		@Override
-		public void validate(ExecutableElement executableElement, IsValid valid) {
-			super.validate(executableElement, valid);
+		public void validate(ExecutableElement executableElement, ElementValidation validation) {
+			super.validate(executableElement, validation);
 
 			for (VariableElement parameter : executableElement.getParameters()) {
 				ParameterRequirement foundParameter = null;
@@ -267,7 +261,7 @@ public void validate(ExecutableElement executableElement, IsValid valid) {
 				}
 
 				if (foundParameter == null) {
-					invalidate(executableElement, valid);
+					invalidate(executableElement, validation);
 					return;
 				}
 
@@ -278,7 +272,7 @@ public void validate(ExecutableElement executableElement, IsValid valid) {
 
 			for (ParameterRequirement expectedParameter : getParamRequirements()) {
 				if (expectedParameter.required() && !satisfiedParameterRequirements.contains(expectedParameter)) {
-					invalidate(executableElement, valid);
+					invalidate(executableElement, validation);
 					return;
 				}
 			}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
similarity index 59%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
index efa47a9250..bd5bbf79f0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
@@ -21,15 +21,17 @@
 import static org.androidannotations.helper.ModelConstants.classSuffix;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.internal.process.ProcessHolder;
 
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JClass;
@@ -39,46 +41,48 @@
 
 public abstract class BaseGeneratedClassHolder implements GeneratedClassHolder {
 
-	protected final ProcessHolder processHolder;
+	protected final AndroidAnnotationsEnvironment environment;
 	protected JDefinedClass generatedClass;
 	protected JClass annotatedClass;
 	protected final TypeElement annotatedElement;
 	protected final APTCodeModelHelper codeModelHelper;
 
-	public BaseGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		this.processHolder = processHolder;
+	private Map<Class<?>, Object> pluginHolders = new HashMap<>();
+
+	public BaseGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		this.environment = environment;
 		this.annotatedElement = annotatedElement;
-		codeModelHelper = new APTCodeModelHelper();
+		codeModelHelper = new APTCodeModelHelper(environment);
 		setGeneratedClass();
 	}
 
 	protected void setGeneratedClass() throws Exception {
 		String annotatedComponentQualifiedName = annotatedElement.getQualifiedName().toString();
-		annotatedClass = codeModel().directClass(annotatedElement.asType().toString());
+		annotatedClass = getCodeModel().directClass(annotatedElement.asType().toString());
 
 		if (annotatedElement.getNestingKind().isNested()) {
 			Element enclosingElement = annotatedElement.getEnclosingElement();
-			GeneratedClassHolder enclosingHolder = processHolder.getGeneratedClassHolder(enclosingElement);
+			GeneratedClassHolder enclosingHolder = environment.getGeneratedClassHolder(enclosingElement);
 			String generatedBeanSimpleName = annotatedElement.getSimpleName().toString() + classSuffix();
 			generatedClass = enclosingHolder.getGeneratedClass()._class(PUBLIC | FINAL | STATIC, generatedBeanSimpleName, ClassType.CLASS);
 		} else {
 			String generatedClassQualifiedName = annotatedComponentQualifiedName + classSuffix();
-			generatedClass = codeModel()._class(PUBLIC | FINAL, generatedClassQualifiedName, ClassType.CLASS);
+			generatedClass = getCodeModel()._class(PUBLIC | FINAL, generatedClassQualifiedName, ClassType.CLASS);
 		}
 		for (TypeParameterElement typeParam : annotatedElement.getTypeParameters()) {
-			JClass bound = codeModelHelper.typeBoundsToJClass(this, typeParam.getBounds());
+			JClass bound = codeModelHelper.typeBoundsToJClass(typeParam.getBounds());
 			generatedClass.generify(typeParam.getSimpleName().toString(), bound);
 		}
 		setExtends();
-		codeModelHelper.addNonAAAnotations(generatedClass, annotatedElement.getAnnotationMirrors(), this);
+		codeModelHelper.copyNonAAAnnotations(generatedClass, annotatedElement.getAnnotationMirrors());
 	}
 
-	public JClass getAnnotatedClass() {
+	protected JClass getAnnotatedClass() {
 		return annotatedClass;
 	}
 
 	protected void setExtends() {
-		JClass annotatedComponent = codeModel().directClass(annotatedElement.asType().toString());
+		JClass annotatedComponent = getCodeModel().directClass(annotatedElement.asType().toString());
 		generatedClass._extends(annotatedComponent);
 	}
 
@@ -93,43 +97,44 @@ public TypeElement getAnnotatedElement() {
 	}
 
 	@Override
-	public ProcessingEnvironment processingEnvironment() {
-		return processHolder.processingEnvironment();
+	public AndroidAnnotationsEnvironment getEnvironment() {
+		return environment;
 	}
 
-	@Override
-	public ProcessHolder.Classes classes() {
-		return processHolder.classes();
+	protected ProcessHolder.Classes getClasses() {
+		return environment.getClasses();
 	}
 
-	@Override
-	public JCodeModel codeModel() {
-		return processHolder.codeModel();
+	protected JCodeModel getCodeModel() {
+		return getEnvironment().getCodeModel();
 	}
 
-	@Override
-	public JClass refClass(String fullyQualifiedClassName) {
-		return processHolder.refClass(fullyQualifiedClassName);
+	protected JClass getJClass(String fullyQualifiedClassName) {
+		return getEnvironment().getJClass(fullyQualifiedClassName);
 	}
 
-	@Override
-	public JClass refClass(Class<?> clazz) {
-		return processHolder.refClass(clazz);
-	}
-
-	@Override
-	public JDefinedClass definedClass(String fullyQualifiedClassName) {
-		return processHolder.definedClass(fullyQualifiedClassName);
+	protected JClass getJClass(Class<?> clazz) {
+		return getEnvironment().getJClass(clazz);
 	}
 
 	public JClass narrow(JClass toNarrow) {
-		List<JClass> classes = new ArrayList<JClass>();
+		List<JClass> classes = new ArrayList<>();
 		for (JTypeVar type : generatedClass.typeParams()) {
-			classes.add(codeModel().directClass(type.name()));
+			classes.add(getCodeModel().directClass(type.name()));
 		}
 		if (classes.isEmpty()) {
 			return toNarrow;
 		}
 		return toNarrow.narrow(classes);
 	}
+
+	@SuppressWarnings("unchecked")
+	public <T> T getPluginHolder(T pluginHolder) {
+		T currentPluginHolder = (T) pluginHolders.get(pluginHolder.getClass());
+		if (currentPluginHolder == null) {
+			currentPluginHolder = pluginHolder;
+			pluginHolders.put(pluginHolder.getClass(), pluginHolder);
+		}
+		return currentPluginHolder;
+	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
similarity index 72%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
index 79688e1827..f83cec66d6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
@@ -29,16 +29,14 @@
 import java.util.List;
 
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.helper.ActivityIntentBuilder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.AnnotationHelper;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IntentBuilder;
-import org.androidannotations.helper.OrmLiteHelper;
 import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.internal.core.helper.ActivityIntentBuilder;
+import org.androidannotations.internal.core.helper.IntentBuilder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -57,20 +55,15 @@
 public class EActivityHolder extends EComponentWithViewSupportHolder implements HasIntentBuilder, HasExtras, HasInstanceState, HasOptionsMenu, HasOnActivityResult, HasReceiverRegistration,
 		HasPreferenceHeaders {
 
-	private static final String ON_CONTENT_CHANGED_JAVADOC = "We cannot simply copy the " + "code from RoboActivity, because that can cause classpath issues. "
-			+ "For further details see issue #1116.";
-
 	private ActivityIntentBuilder intentBuilder;
 	private JMethod onCreate;
 	private JMethod setIntent;
-	private JMethod onNewIntentMethod;
 	private JMethod setContentViewLayout;
 	private JVar initSavedInstanceParam;
 	private JDefinedClass intentBuilderClass;
 	private InstanceStateDelegate instanceStateDelegate;
 	private OnActivityResultDelegate onActivityResultDelegate;
 	private ReceiverRegistrationDelegate<EActivityHolder> receiverRegistrationDelegate;
-	private RoboGuiceDelegate roboGuiceDelegate;
 	private PreferenceActivityDelegate preferencesHolder;
 	private JMethod injectExtrasMethod;
 	private JBlock injectExtrasBlock;
@@ -87,15 +80,29 @@ public class EActivityHolder extends EComponentWithViewSupportHolder implements
 	private JMethod getLastNonConfigurationInstance;
 	private JBlock onRetainNonConfigurationInstanceBindBlock;
 	private JVar onRetainNonConfigurationInstance;
-	private JBlock onDestroyBeforeSuperBlock;
-	private JBlock onDestroyAfterSuperBlock;
-	private JBlock onResumeAfterSuperBlock;
+	private JBlock onStartBeforeSuperBlock;
 	private JBlock onStartAfterSuperBlock;
-	private JBlock onStopBeforeSuperBlock;
+	private JBlock onRestartBeforeSuperBlock;
+	private JBlock onRestartAfterSuperBlock;
+	private JBlock onResumeBeforeSuperBlock;
+	private JBlock onResumeAfterSuperBlock;
 	private JBlock onPauseBeforeSuperBlock;
-
-	public EActivityHolder(ProcessHolder processHolder, TypeElement annotatedElement, AndroidManifest androidManifest) throws Exception {
-		super(processHolder, annotatedElement);
+	private JBlock onPauseAfterSuperBlock;
+	private JMethod onStopMethod;
+	private JBlock onStopBeforeSuperBlock;
+	private JMethod onDestroyMethod;
+	private JBlock onDestroyBeforeSuperBlock;
+	private JBlock onDestroyAfterSuperBlock;
+	private JMethod onNewIntentMethod;
+	private JBlock onNewIntentAfterSuperBlock;
+	private JBlock onConfigurationChangedBeforeSuperBlock;
+	private JBlock onConfigurationChangedAfterSuperBlock;
+	private JVar onConfigurationChangedNewConfigParam;
+	private JMethod onContentChanged;
+	private JBlock onContentChangedAfterSuperBlock;
+
+	public EActivityHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement, AndroidManifest androidManifest) throws Exception {
+		super(environment, annotatedElement);
 		instanceStateDelegate = new InstanceStateDelegate(this);
 		onActivityResultDelegate = new OnActivityResultDelegate(this);
 		receiverRegistrationDelegate = new ReceiverRegistrationDelegate<>(this);
@@ -112,8 +119,8 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
-		JClass bundleClass = classes().BUNDLE;
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
+		JClass bundleClass = getClasses().BUNDLE;
 		initSavedInstanceParam = init.param(bundleClass, "savedInstanceState");
 		getOnCreate();
 	}
@@ -132,10 +139,10 @@ public JMethod getSetIntent() {
 		return setIntent;
 	}
 
-	protected void setOnCreate() {
-		onCreate = generatedClass.method(PUBLIC, codeModel().VOID, "onCreate");
+	private void setOnCreate() {
+		onCreate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreate");
 		onCreate.annotate(Override.class);
-		JClass bundleClass = classes().BUNDLE;
+		JClass bundleClass = getClasses().BUNDLE;
 		JVar onCreateSavedInstanceState = onCreate.param(bundleClass, "savedInstanceState");
 		JBlock onCreateBody = onCreate.body();
 		JVar previousNotifier = viewNotifierHelper.replacePreviousNotifier(onCreateBody);
@@ -146,116 +153,168 @@ protected void setOnCreate() {
 
 	// CHECKSTYLE:OFF
 
-	protected void setOnStart() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onStart");
+	private void setOnStart() {
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStart");
 		method.annotate(Override.class);
 		JBlock body = method.body();
-		getRoboGuiceDelegate().onStartBeforeSuperBlock = body.block();
+		onStartBeforeSuperBlock = body.block();
 		body.invoke(_super(), method);
 		onStartAfterSuperBlock = body.block();
 	}
 
-	protected void setOnRestart() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onRestart");
+	public JBlock getOnRestartAfterSuperBlock() {
+		if (onRestartAfterSuperBlock == null) {
+			setOnRestart();
+		}
+		return onRestartAfterSuperBlock;
+	}
+
+	private void setOnRestart() {
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onRestart");
 		method.annotate(Override.class);
 		JBlock body = method.body();
-		getRoboGuiceDelegate().onRestartBeforeSuperBlock = body.block();
+		onRestartBeforeSuperBlock = body.block();
 		body.invoke(_super(), method);
-		getRoboGuiceDelegate().onRestartAfterSuperBlock = body.block();
+		onRestartAfterSuperBlock = body.block();
 	}
 
-	protected void setOnResume() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onResume");
+	private void setOnResume() {
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onResume");
 		method.annotate(Override.class);
 		JBlock body = method.body();
-		getRoboGuiceDelegate().onResumeBeforeSuperBlock = body.block();
+		onResumeBeforeSuperBlock = body.block();
 		body.invoke(_super(), method);
 		onResumeAfterSuperBlock = body.block();
 	}
 
-	protected void setOnPause() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onPause");
+	private void setOnPause() {
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onPause");
 		method.annotate(Override.class);
 		JBlock body = method.body();
 		onPauseBeforeSuperBlock = body.block();
 		body.invoke(_super(), method);
-		getRoboGuiceDelegate().onPauseAfterSuperBlock = body.block();
+		onPauseAfterSuperBlock = body.block();
 	}
 
-	protected void setOnNewIntent() {
-		onNewIntentMethod = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onNewIntent");
+	private void setOnNewIntent() {
+		onNewIntentMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onNewIntent");
 		onNewIntentMethod.annotate(Override.class);
-		JVar intent = onNewIntentMethod.param(classes().INTENT, "intent");
+		JVar intent = onNewIntentMethod.param(getClasses().INTENT, "intent");
 		JBlock body = onNewIntentMethod.body();
 		body.invoke(_super(), onNewIntentMethod).arg(intent);
 		body.invoke(getSetIntent()).arg(intent);
-		getRoboGuiceDelegate().onNewIntentAfterSuperBlock = body.block();
+		onNewIntentAfterSuperBlock = body.block();
 	}
 
 	private void setSetIntent() {
-		setIntent = generatedClass.method(PUBLIC, codeModel().VOID, "setIntent");
+		setIntent = generatedClass.method(PUBLIC, getCodeModel().VOID, "setIntent");
 		setIntent.annotate(Override.class);
-		JVar methodParam = setIntent.param(classes().INTENT, "newIntent");
+		JVar methodParam = setIntent.param(getClasses().INTENT, "newIntent");
 		JBlock setIntentBody = setIntent.body();
 		setIntentBody.invoke(_super(), setIntent).arg(methodParam);
 	}
 
-	protected void setOnStop() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onStop");
-		method.annotate(Override.class);
-		JBlock body = method.body();
+	public JMethod getOnStop() {
+		if (onStopMethod == null) {
+			setOnStop();
+		}
+		return onStopMethod;
+	}
+
+	private void setOnStop() {
+		onStopMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onStop");
+		onStopMethod.annotate(Override.class);
+		JBlock body = onStopMethod.body();
 		onStopBeforeSuperBlock = body.block();
-		body.invoke(_super(), method);
-		getRoboGuiceDelegate().onStop = method;
+		body.invoke(_super(), onStopMethod);
 	}
 
-	protected void setOnDestroy() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onDestroy");
-		method.annotate(Override.class);
-		JBlock body = method.body();
-		getRoboGuiceDelegate().onDestroy = method;
+	public JMethod getOnDestroy() {
+		if (onDestroyMethod == null) {
+			setOnDestroy();
+		}
+		return onDestroyMethod;
+	}
+
+	private void setOnDestroy() {
+		onDestroyMethod = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onDestroy");
+		onDestroyMethod.annotate(Override.class);
+		JBlock body = onDestroyMethod.body();
 		onDestroyBeforeSuperBlock = body.block();
-		body.invoke(_super(), method);
+		body.invoke(_super(), onDestroyMethod);
 		onDestroyAfterSuperBlock = body.block();
 	}
 
-	protected void setOnConfigurationChanged() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onConfigurationChanged");
-		method.annotate(Override.class);
-		JClass configurationClass = classes().CONFIGURATION;
-		JVar newConfig = method.param(configurationClass, "newConfig");
-		getRoboGuiceDelegate().newConfig = newConfig;
-		JBlock body = method.body();
-		getRoboGuiceDelegate().currentConfig = body.decl(configurationClass, "currentConfig", JExpr.invoke("getResources").invoke("getConfiguration"));
-		body.invoke(_super(), method).arg(newConfig);
-		getRoboGuiceDelegate().onConfigurationChangedAfterSuperBlock = body.block();
+	public JBlock getOnConfigurationChangedBeforeSuperBlock() {
+		if (onConfigurationChangedBeforeSuperBlock == null) {
+			setOnConfigurationChanged();
+		}
+		return onConfigurationChangedBeforeSuperBlock;
+	}
+
+	public JBlock getOnConfigurationChangedAfterSuperBlock() {
+		if (onConfigurationChangedAfterSuperBlock == null) {
+			setOnConfigurationChanged();
+		}
+		return onConfigurationChangedAfterSuperBlock;
+	}
+
+	public JVar getOnConfigurationChangedNewConfigParam() {
+		if (onConfigurationChangedNewConfigParam == null) {
+			setOnConfigurationChanged();
+		}
+		return onConfigurationChangedNewConfigParam;
 	}
 
-	protected void setOnContentChanged() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "onContentChanged");
+	private void setOnConfigurationChanged() {
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onConfigurationChanged");
 		method.annotate(Override.class);
-		method.javadoc().append(ON_CONTENT_CHANGED_JAVADOC);
+		JClass configurationClass = getClasses().CONFIGURATION;
+		onConfigurationChangedNewConfigParam = method.param(configurationClass, "newConfig");
 		JBlock body = method.body();
-		body.invoke(_super(), method);
-		getRoboGuiceDelegate().onContentChangedAfterSuperBlock = body.block();
+		onConfigurationChangedBeforeSuperBlock = body.block();
+		body.invoke(_super(), method).arg(onConfigurationChangedNewConfigParam);
+		onConfigurationChangedAfterSuperBlock = body.block();
+	}
+
+	public JMethod getOnContentChanged() {
+		if (onContentChanged == null) {
+			setOnContentChanged();
+		}
+		return onContentChanged;
+	}
+
+	public JBlock getOnContentChangedAfterSuperBlock() {
+		if (onContentChangedAfterSuperBlock == null) {
+			setOnContentChanged();
+		}
+		return onContentChangedAfterSuperBlock;
+	}
+
+	private void setOnContentChanged() {
+		onContentChanged = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "onContentChanged");
+		onContentChanged.annotate(Override.class);
+		JBlock body = onContentChanged.body();
+		body.invoke(_super(), onContentChanged);
+		onContentChangedAfterSuperBlock = body.block();
 	}
 
 	private void setOnCreateOptionsMenu() {
-		JMethod method = generatedClass.method(PUBLIC, codeModel().BOOLEAN, "onCreateOptionsMenu");
+		JMethod method = generatedClass.method(PUBLIC, getCodeModel().BOOLEAN, "onCreateOptionsMenu");
 		method.annotate(Override.class);
 		JBlock methodBody = method.body();
-		onCreateOptionsMenuMenuParam = method.param(classes().MENU, "menu");
-		onCreateOptionsMenuMenuInflaterVar = methodBody.decl(classes().MENU_INFLATER, "menuInflater", invoke("getMenuInflater"));
+		onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
+		onCreateOptionsMenuMenuInflaterVar = methodBody.decl(getClasses().MENU_INFLATER, "menuInflater", invoke("getMenuInflater"));
 		onCreateOptionsMenuMethodBody = methodBody.block();
 		methodBody._return(_super().invoke(method).arg(onCreateOptionsMenuMenuParam));
 	}
 
 	private void setOnOptionsItemSelected() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onOptionsItemSelected");
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onOptionsItemSelected");
 		method.annotate(Override.class);
 		JBlock methodBody = method.body();
-		onOptionsItemSelectedItem = method.param(classes().MENU_ITEM, "item");
-		onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
+		onOptionsItemSelectedItem = method.param(getClasses().MENU_ITEM, "item");
+		onOptionsItemSelectedItemId = methodBody.decl(getCodeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
 		onOptionsItemSelectedMiddleBlock = methodBody.block();
 
 		methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
@@ -263,8 +322,8 @@ private void setOnOptionsItemSelected() {
 
 	@Override
 	protected void setFindNativeFragmentById() {
-		JMethod method = generatedClass.method(PRIVATE, classes().FRAGMENT, "findNativeFragmentById");
-		JVar idParam = method.param(codeModel().INT, "id");
+		JMethod method = generatedClass.method(PRIVATE, getClasses().FRAGMENT, "findNativeFragmentById");
+		JVar idParam = method.param(getCodeModel().INT, "id");
 		JBlock body = method.body();
 		body._return(invoke("getFragmentManager").invoke("findFragmentById").arg(idParam));
 		findNativeFragmentById = method;
@@ -272,8 +331,8 @@ protected void setFindNativeFragmentById() {
 
 	@Override
 	protected void setFindSupportFragmentById() {
-		JMethod method = generatedClass.method(PRIVATE, classes().SUPPORT_V4_FRAGMENT, "findSupportFragmentById");
-		JVar idParam = method.param(codeModel().INT, "id");
+		JMethod method = generatedClass.method(PRIVATE, getClasses().SUPPORT_V4_FRAGMENT, "findSupportFragmentById");
+		JVar idParam = method.param(getCodeModel().INT, "id");
 		JBlock body = method.body();
 		body._return(invoke("getSupportFragmentManager").invoke("findFragmentById").arg(idParam));
 		findSupportFragmentById = method;
@@ -281,8 +340,8 @@ protected void setFindSupportFragmentById() {
 
 	@Override
 	protected void setFindNativeFragmentByTag() {
-		JMethod method = generatedClass.method(PRIVATE, classes().FRAGMENT, "findNativeFragmentByTag");
-		JVar tagParam = method.param(classes().STRING, "tag");
+		JMethod method = generatedClass.method(PRIVATE, getClasses().FRAGMENT, "findNativeFragmentByTag");
+		JVar tagParam = method.param(getClasses().STRING, "tag");
 		JBlock body = method.body();
 		body._return(invoke("getFragmentManager").invoke("findFragmentByTag").arg(tagParam));
 		findNativeFragmentByTag = method;
@@ -290,8 +349,8 @@ protected void setFindNativeFragmentByTag() {
 
 	@Override
 	protected void setFindSupportFragmentByTag() {
-		JMethod method = generatedClass.method(PRIVATE, classes().SUPPORT_V4_FRAGMENT, "findSupportFragmentByTag");
-		JVar tagParam = method.param(classes().STRING, "tag");
+		JMethod method = generatedClass.method(PRIVATE, getClasses().SUPPORT_V4_FRAGMENT, "findSupportFragmentByTag");
+		JVar tagParam = method.param(getClasses().STRING, "tag");
 		JBlock body = method.body();
 		body._return(invoke("getSupportFragmentManager").invoke("findFragmentByTag").arg(tagParam));
 		findSupportFragmentByTag = method;
@@ -307,15 +366,15 @@ public JMethod getSetContentViewLayout() {
 	private void setSetContentView() {
 		getOnCreate();
 
-		JClass layoutParamsClass = classes().VIEW_GROUP_LAYOUT_PARAMS;
+		JClass layoutParamsClass = getClasses().VIEW_GROUP_LAYOUT_PARAMS;
 
-		setContentViewLayout = setContentViewMethod(new JType[] { codeModel().INT }, new String[] { "layoutResID" });
-		setContentViewMethod(new JType[] { classes().VIEW, layoutParamsClass }, new String[] { "view", "params" });
-		setContentViewMethod(new JType[] { classes().VIEW }, new String[] { "view" });
+		setContentViewLayout = setContentViewMethod(new JType[] { getCodeModel().INT }, new String[] { "layoutResID" });
+		setContentViewMethod(new JType[] { getClasses().VIEW, layoutParamsClass }, new String[] { "view", "params" });
+		setContentViewMethod(new JType[] { getClasses().VIEW }, new String[] { "view" });
 	}
 
 	private JMethod setContentViewMethod(JType[] paramTypes, String[] paramNames) {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().VOID, "setContentView");
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().VOID, "setContentView");
 		method.annotate(Override.class);
 
 		List<JVar> params = new ArrayList<>();
@@ -351,34 +410,6 @@ public JDefinedClass getIntentBuilderClass() {
 		return intentBuilderClass;
 	}
 
-	public RoboGuiceDelegate getRoboGuiceDelegate() {
-		if (roboGuiceDelegate == null) {
-			roboGuiceDelegate = new RoboGuiceDelegate(this);
-		}
-		return roboGuiceDelegate;
-	}
-
-	protected void setScopedObjectsField() {
-		JClass keyWildCard = classes().KEY.narrow(codeModel().wildcard());
-		JClass scopedHashMap = classes().HASH_MAP.narrow(keyWildCard, classes().OBJECT);
-
-		getRoboGuiceDelegate().scopedObjects = getGeneratedClass().field(JMod.PROTECTED, scopedHashMap, "scopedObjects" + generationSuffix());
-		getRoboGuiceDelegate().scopedObjects.assign(JExpr._new(scopedHashMap));
-	}
-
-	protected void setEventManagerField() {
-		getRoboGuiceDelegate().eventManager = generatedClass.field(JMod.PROTECTED, classes().EVENT_MANAGER, "eventManager" + generationSuffix());
-	}
-
-	protected void setContentViewListenerField() {
-		getRoboGuiceDelegate().contentViewListenerField = generatedClass.field(JMod.NONE, classes().CONTENT_VIEW_LISTENER, "ignored" + generationSuffix());
-		getRoboGuiceDelegate().contentViewListenerField.annotate(classes().INJECT);
-	}
-
-	protected void setScopeField() {
-		getRoboGuiceDelegate().scope = getGeneratedClass().field(JMod.PRIVATE, classes().CONTEXT_SCOPE, "scope" + generationSuffix());
-	}
-
 	// CHECKSTYLE:ON
 
 	@Override
@@ -406,9 +437,9 @@ public JVar getInjectExtras() {
 	}
 
 	private void setInjectExtras() {
-		injectExtrasMethod = generatedClass.method(PRIVATE, codeModel().VOID, "injectExtras" + generationSuffix());
+		injectExtrasMethod = generatedClass.method(PRIVATE, getCodeModel().VOID, "injectExtras" + generationSuffix());
 		JBlock injectExtrasBody = injectExtrasMethod.body();
-		injectExtras = injectExtrasBody.decl(classes().BUNDLE, "extras_", invoke("getIntent").invoke("getExtras"));
+		injectExtras = injectExtrasBody.decl(getClasses().BUNDLE, "extras_", invoke("getIntent").invoke("getExtras"));
 		injectExtrasBlock = injectExtrasBody._if(injectExtras.ne(_null()))._then();
 
 		getSetIntent().body().invoke(injectExtrasMethod);
@@ -422,6 +453,13 @@ public JMethod getOnNewIntent() {
 		return onNewIntentMethod;
 	}
 
+	public JBlock getOnNewIntentAfterSuperBlock() {
+		if (onNewIntentAfterSuperBlock == null) {
+			setOnNewIntent();
+		}
+		return onNewIntentAfterSuperBlock;
+	}
+
 	@Override
 	public JBlock getSaveStateMethodBody() {
 		return instanceStateDelegate.getSaveStateMethodBody();
@@ -530,7 +568,7 @@ public JMethod getGetLastNonConfigurationInstance() throws JClassAlreadyExistsEx
 	}
 
 	private void setGetLastNonConfigurationInstance() throws JClassAlreadyExistsException {
-		AnnotationHelper annotationHelper = new AnnotationHelper(processingEnvironment());
+		AnnotationHelper annotationHelper = new AnnotationHelper(getEnvironment());
 		TypeElement fragmentActivityTypeElement = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.FRAGMENT_ACTIVITY);
 		TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(generatedClass._extends().fullName());
 		String getLastNonConfigurationInstanceName = "getLastNonConfigurationInstance";
@@ -565,7 +603,7 @@ public JVar getOnRetainNonConfigurationInstance() throws JClassAlreadyExistsExce
 	}
 
 	private void setOnRetainNonConfigurationInstance() throws JClassAlreadyExistsException {
-		AnnotationHelper annotationHelper = new AnnotationHelper(processingEnvironment());
+		AnnotationHelper annotationHelper = new AnnotationHelper(getEnvironment());
 		TypeElement fragmentActivityTypeElement = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.FRAGMENT_ACTIVITY);
 		TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(generatedClass._extends().fullName());
 
@@ -667,6 +705,14 @@ public JBlock getOnPauseBeforeSuperBlock() {
 		return onPauseBeforeSuperBlock;
 	}
 
+	public JBlock getOnPauseAfterSuperBlock() {
+		if (onPauseAfterSuperBlock == null) {
+			setOnPause();
+		}
+		return onPauseAfterSuperBlock;
+	}
+
+
 	@Override
 	public JBlock getOnAttachAfterSuperBlock() {
 		return receiverRegistrationDelegate.getOnAttachAfterSuperBlock();
@@ -687,14 +733,6 @@ public JBlock getIntentFilterInitializationBlock(IntentFilterData intentFilterDa
 		return getInitBody();
 	}
 
-	@Override
-	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
-		JFieldVar databaseHelperRef = super.setDatabaseHelperRef(databaseHelperTypeMirror);
-		OrmLiteHelper.injectReleaseInDestroy(databaseHelperRef, this, classes());
-
-		return databaseHelperRef;
-	}
-
 	@Override
 	public JBlock getPreferenceScreenInitializationBlock() {
 		return getOnCreate().body();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EApplicationHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EApplicationHolder.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EApplicationHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EApplicationHolder.java
index 237caccdef..66fbcc712c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EApplicationHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EApplicationHolder.java
@@ -24,7 +24,7 @@
 
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -39,8 +39,8 @@ public class EApplicationHolder extends EComponentHolder {
 
 	private JFieldVar staticInstanceField;
 
-	public EApplicationHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EApplicationHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		createSingleton();
 		createOnCreate();
 	}
@@ -53,14 +53,14 @@ private void createSingleton() {
 		JMethod getInstance = generatedClass.method(PUBLIC | STATIC, annotatedComponent, GET_APPLICATION_INSTANCE);
 		getInstance.body()._return(staticInstanceField);
 
-		JMethod setInstance = generatedClass.method(PUBLIC | STATIC, codeModel().VOID, "setForTesting");
+		JMethod setInstance = generatedClass.method(PUBLIC | STATIC, getCodeModel().VOID, "setForTesting");
 		setInstance.javadoc().append("Visible for testing purposes");
 		JVar applicationParam = setInstance.param(annotatedComponent, "application");
 		setInstance.body().assign(staticInstanceField, applicationParam);
 	}
 
 	private void createOnCreate() {
-		JMethod onCreate = generatedClass.method(PUBLIC, codeModel().VOID, "onCreate");
+		JMethod onCreate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreate");
 		onCreate.annotate(Override.class);
 		JBlock onCreateBody = onCreate.body();
 		onCreateBody.assign(staticInstanceField, _this());
@@ -75,6 +75,6 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java
index 282d81063f..9f636b792c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java
@@ -28,7 +28,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -43,14 +43,14 @@ public class EBeanHolder extends EComponentWithViewSupportHolder {
 	private JFieldVar contextField;
 	private JMethod constructor;
 
-	public EBeanHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EBeanHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		setConstructor();
 	}
 
 	private void setConstructor() {
 		constructor = generatedClass.constructor(PRIVATE);
-		JVar constructorContextParam = constructor.param(classes().CONTEXT, "context");
+		JVar constructorContextParam = constructor.param(getClasses().CONTEXT, "context");
 		JBlock constructorBody = constructor.body();
 		List<ExecutableElement> constructors = ElementFilter.constructorsIn(annotatedElement.getEnclosedElements());
 		ExecutableElement superConstructor = constructors.get(0);
@@ -62,7 +62,7 @@ private void setConstructor() {
 
 	public JFieldVar getContextField() {
 		if (contextField == null) {
-			contextField = generatedClass.field(PRIVATE, classes().CONTEXT, "context" + generationSuffix());
+			contextField = generatedClass.field(PRIVATE, getClasses().CONTEXT, "context" + generationSuffix());
 		}
 		return contextField;
 	}
@@ -74,7 +74,7 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, processHolder.codeModel().VOID, "init" + generationSuffix());
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
 	}
 
 	public void invokeInitInConstructor() {
@@ -84,13 +84,13 @@ public void invokeInitInConstructor() {
 
 	public void createFactoryMethod(boolean hasSingletonScope) {
 
-		JClass narrowedGeneratedClass = codeModelHelper.narrowGeneratedClass(generatedClass, annotatedElement.asType(), this);
+		JClass narrowedGeneratedClass = codeModelHelper.narrowGeneratedClass(generatedClass, annotatedElement.asType());
 
 		JMethod factoryMethod = generatedClass.method(PUBLIC | STATIC, narrowedGeneratedClass, GET_INSTANCE_METHOD_NAME);
 
-		codeModelHelper.generifyStaticHelper(this, factoryMethod, annotatedElement);
+		codeModelHelper.generifyStaticHelper(factoryMethod, annotatedElement);
 
-		JVar factoryMethodContextParam = factoryMethod.param(classes().CONTEXT, "context");
+		JVar factoryMethodContextParam = factoryMethod.param(getClasses().CONTEXT, "context");
 
 		JBlock factoryMethodBody = factoryMethod.body();
 
@@ -116,8 +116,8 @@ public void createFactoryMethod(boolean hasSingletonScope) {
 	}
 
 	public void createRebindMethod() {
-		JMethod rebindMethod = generatedClass.method(PUBLIC, codeModel().VOID, "rebind");
-		JVar contextParam = rebindMethod.param(classes().CONTEXT, "context");
+		JMethod rebindMethod = generatedClass.method(PUBLIC, getCodeModel().VOID, "rebind");
+		JVar contextParam = rebindMethod.param(getClasses().CONTEXT, "context");
 		JBlock body = rebindMethod.body();
 		body.assign(getContextField(), contextParam);
 		body.invoke(getInit());
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java
similarity index 51%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java
index 5ea5da4a0d..9b6e13b1a9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java
@@ -19,17 +19,11 @@
 import static com.sun.codemodel.JMod.PRIVATE;
 import static org.androidannotations.helper.ModelConstants.generationSuffix;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.helper.CaseHelper;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
-import com.sun.codemodel.JClass;
 import com.sun.codemodel.JExpression;
 import com.sun.codemodel.JFieldRef;
 import com.sun.codemodel.JFieldVar;
@@ -42,10 +36,9 @@ public abstract class EComponentHolder extends BaseGeneratedClassHolder {
 	protected JMethod init;
 	private JVar resourcesRef;
 	private JFieldVar powerManagerRef;
-	private Map<TypeMirror, JFieldVar> databaseHelperRefs = new HashMap<>();
 
-	public EComponentHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EComponentHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 	}
 
 	public JExpression getContextRef() {
@@ -78,7 +71,7 @@ public JVar getResourcesRef() {
 	}
 
 	private void setResourcesRef() {
-		resourcesRef = getInitBody().decl(classes().RESOURCES, "resources" + generationSuffix(), getContextRef().invoke("getResources"));
+		resourcesRef = getInitBody().decl(getClasses().RESOURCES, "resources" + generationSuffix(), getContextRef().invoke("getResources"));
 	}
 
 	public JFieldVar getPowerManagerRef() {
@@ -92,30 +85,8 @@ public JFieldVar getPowerManagerRef() {
 	private void setPowerManagerRef() {
 		JBlock methodBody = getInitBody();
 
-		JFieldRef serviceRef = classes().CONTEXT.staticRef("POWER_SERVICE");
-		powerManagerRef = getGeneratedClass().field(PRIVATE, classes().POWER_MANAGER, "powerManager" + generationSuffix());
-		methodBody.assign(powerManagerRef, cast(classes().POWER_MANAGER, getContextRef().invoke("getSystemService").arg(serviceRef)));
+		JFieldRef serviceRef = getClasses().CONTEXT.staticRef("POWER_SERVICE");
+		powerManagerRef = getGeneratedClass().field(PRIVATE, getClasses().POWER_MANAGER, "powerManager" + generationSuffix());
+		methodBody.assign(powerManagerRef, cast(getClasses().POWER_MANAGER, getContextRef().invoke("getSystemService").arg(serviceRef)));
 	}
-
-	public JFieldVar getDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
-		JFieldVar databaseHelperRef = databaseHelperRefs.get(databaseHelperTypeMirror);
-		if (databaseHelperRef == null) {
-			databaseHelperRef = setDatabaseHelperRef(databaseHelperTypeMirror);
-		}
-		return databaseHelperRef;
-	}
-
-	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
-		JClass databaseHelperClass = refClass(databaseHelperTypeMirror.toString());
-		String fieldName = CaseHelper.lowerCaseFirst(databaseHelperClass.name()) + generationSuffix();
-		JFieldVar databaseHelperRef = generatedClass.field(PRIVATE, databaseHelperClass, fieldName);
-		databaseHelperRefs.put(databaseHelperTypeMirror, databaseHelperRef);
-
-		JExpression dbHelperClass = databaseHelperClass.dotclass();
-		getInitBody().assign(databaseHelperRef, //
-				classes().OPEN_HELPER_MANAGER.staticInvoke("getHelper").arg(getContextRef()).arg(dbHelperClass));
-
-		return databaseHelperRef;
-	}
-
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
similarity index 78%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
index 30a9949193..0c6f8f57cf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
@@ -30,11 +30,11 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.api.view.HasViews;
 import org.androidannotations.api.view.OnViewChangedListener;
 import org.androidannotations.api.view.OnViewChangedNotifier;
-import org.androidannotations.helper.ViewNotifierHelper;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.internal.helper.ViewNotifierHelper;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -61,8 +61,8 @@ public abstract class EComponentWithViewSupportHolder extends EComponentHolder {
 	private Map<String, TextWatcherHolder> textWatcherHolders = new HashMap<>();
 	private Map<String, OnSeekBarChangeListenerHolder> onSeekBarChangeListenerHolders = new HashMap<>();
 
-	public EComponentWithViewSupportHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EComponentWithViewSupportHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		viewNotifierHelper = new ViewNotifierHelper(this);
 	}
 
@@ -89,12 +89,12 @@ public JVar getOnViewChangedHasViewsParam() {
 
 	protected void setOnViewChanged() {
 		getGeneratedClass()._implements(OnViewChangedListener.class);
-		onViewChanged = getGeneratedClass().method(PUBLIC, codeModel().VOID, "onViewChanged");
+		onViewChanged = getGeneratedClass().method(PUBLIC, getCodeModel().VOID, "onViewChanged");
 		onViewChanged.annotate(Override.class);
 		onViewChangedBody = onViewChanged.body();
 		onViewChangedBodyBeforeFindViews = onViewChangedBody.block();
 		onViewChangedHasViewsParam = onViewChanged.param(HasViews.class, "hasViews");
-		JClass notifierClass = refClass(OnViewChangedNotifier.class);
+		JClass notifierClass = getJClass(OnViewChangedNotifier.class);
 		getInitBody().staticInvoke(notifierClass, "registerOnViewChangedListener").arg(_this());
 	}
 
@@ -119,7 +119,7 @@ public void assignFindViewById(JFieldRef idRef, JClass viewClass, JFieldRef fiel
 			assignExpression = foundViewHolder.getOrCastRef(viewClass);
 		} else {
 			assignExpression = findViewById(idRef);
-			if (viewClass != null && viewClass != classes().VIEW) {
+			if (viewClass != null && viewClass != getClasses().VIEW) {
 				assignExpression = cast(viewClass, assignExpression);
 
 				if (viewClass.isParameterized()) {
@@ -147,8 +147,8 @@ protected FoundViewHolder createFoundViewAndIfNotNullBlock(JFieldRef idRef, JCla
 		JBlock block = getOnViewChangedBody().block();
 
 		if (viewClass == null) {
-			viewClass = classes().VIEW;
-		} else if (viewClass != classes().VIEW) {
+			viewClass = getClasses().VIEW;
+		} else if (viewClass != getClasses().VIEW) {
 			findViewExpression = cast(viewClass, findViewExpression);
 		}
 
@@ -164,14 +164,14 @@ public JMethod getFindNativeFragmentById() {
 	}
 
 	protected void setFindNativeFragmentById() {
-		findNativeFragmentById = getGeneratedClass().method(PRIVATE, classes().FRAGMENT, "findNativeFragmentById");
-		JVar idParam = findNativeFragmentById.param(codeModel().INT, "id");
+		findNativeFragmentById = getGeneratedClass().method(PRIVATE, getClasses().FRAGMENT, "findNativeFragmentById");
+		JVar idParam = findNativeFragmentById.param(getCodeModel().INT, "id");
 
 		JBlock body = findNativeFragmentById.body();
 
-		body._if(getContextRef()._instanceof(classes().ACTIVITY).not())._then()._return(_null());
+		body._if(getContextRef()._instanceof(getClasses().ACTIVITY).not())._then()._return(_null());
 
-		JVar activityVar = body.decl(classes().ACTIVITY, "activity_", cast(classes().ACTIVITY, getContextRef()));
+		JVar activityVar = body.decl(getClasses().ACTIVITY, "activity_", cast(getClasses().ACTIVITY, getContextRef()));
 
 		body._return(activityVar.invoke("getFragmentManager").invoke("findFragmentById").arg(idParam));
 	}
@@ -184,14 +184,14 @@ public JMethod getFindSupportFragmentById() {
 	}
 
 	protected void setFindSupportFragmentById() {
-		findSupportFragmentById = getGeneratedClass().method(PRIVATE, classes().SUPPORT_V4_FRAGMENT, "findSupportFragmentById");
-		JVar idParam = findSupportFragmentById.param(codeModel().INT, "id");
+		findSupportFragmentById = getGeneratedClass().method(PRIVATE, getClasses().SUPPORT_V4_FRAGMENT, "findSupportFragmentById");
+		JVar idParam = findSupportFragmentById.param(getCodeModel().INT, "id");
 
 		JBlock body = findSupportFragmentById.body();
 
-		body._if(getContextRef()._instanceof(classes().FRAGMENT_ACTIVITY).not())._then()._return(_null());
+		body._if(getContextRef()._instanceof(getClasses().FRAGMENT_ACTIVITY).not())._then()._return(_null());
 
-		JVar activityVar = body.decl(classes().FRAGMENT_ACTIVITY, "activity_", cast(classes().FRAGMENT_ACTIVITY, getContextRef()));
+		JVar activityVar = body.decl(getClasses().FRAGMENT_ACTIVITY, "activity_", cast(getClasses().FRAGMENT_ACTIVITY, getContextRef()));
 
 		body._return(activityVar.invoke("getSupportFragmentManager").invoke("findFragmentById").arg(idParam));
 	}
@@ -204,14 +204,14 @@ public JMethod getFindNativeFragmentByTag() {
 	}
 
 	protected void setFindNativeFragmentByTag() {
-		findNativeFragmentByTag = getGeneratedClass().method(PRIVATE, classes().FRAGMENT, "findNativeFragmentByTag");
-		JVar tagParam = findNativeFragmentByTag.param(classes().STRING, "tag");
+		findNativeFragmentByTag = getGeneratedClass().method(PRIVATE, getClasses().FRAGMENT, "findNativeFragmentByTag");
+		JVar tagParam = findNativeFragmentByTag.param(getClasses().STRING, "tag");
 
 		JBlock body = findNativeFragmentByTag.body();
 
-		body._if(getContextRef()._instanceof(classes().ACTIVITY).not())._then()._return(_null());
+		body._if(getContextRef()._instanceof(getClasses().ACTIVITY).not())._then()._return(_null());
 
-		JVar activityVar = body.decl(classes().ACTIVITY, "activity_", cast(classes().ACTIVITY, getContextRef()));
+		JVar activityVar = body.decl(getClasses().ACTIVITY, "activity_", cast(getClasses().ACTIVITY, getContextRef()));
 
 		body._return(activityVar.invoke("getFragmentManager").invoke("findFragmentByTag").arg(tagParam));
 	}
@@ -224,14 +224,14 @@ public JMethod getFindSupportFragmentByTag() {
 	}
 
 	protected void setFindSupportFragmentByTag() {
-		findSupportFragmentByTag = getGeneratedClass().method(PRIVATE, classes().SUPPORT_V4_FRAGMENT, "findSupportFragmentByTag");
-		JVar tagParam = findSupportFragmentByTag.param(classes().STRING, "tag");
+		findSupportFragmentByTag = getGeneratedClass().method(PRIVATE, getClasses().SUPPORT_V4_FRAGMENT, "findSupportFragmentByTag");
+		JVar tagParam = findSupportFragmentByTag.param(getClasses().STRING, "tag");
 
 		JBlock body = findSupportFragmentByTag.body();
 
-		body._if(getContextRef()._instanceof(classes().FRAGMENT_ACTIVITY).not())._then()._return(_null());
+		body._if(getContextRef()._instanceof(getClasses().FRAGMENT_ACTIVITY).not())._then()._return(_null());
 
-		JVar activityVar = body.decl(classes().FRAGMENT_ACTIVITY, "activity_", cast(classes().FRAGMENT_ACTIVITY, getContextRef()));
+		JVar activityVar = body.decl(getClasses().FRAGMENT_ACTIVITY, "activity_", cast(getClasses().FRAGMENT_ACTIVITY, getContextRef()));
 
 		body._return(activityVar.invoke("getSupportFragmentManager").invoke("findFragmentByTag").arg(tagParam));
 	}
@@ -247,10 +247,10 @@ public TextWatcherHolder getTextWatcherHolder(JFieldRef idRef, TypeMirror viewPa
 	}
 
 	private TextWatcherHolder createTextWatcherHolder(JFieldRef idRef, TypeMirror viewParameterType) {
-		JDefinedClass onTextChangeListenerClass = codeModel().anonymousClass(classes().TEXT_WATCHER);
-		JClass viewClass = classes().TEXT_VIEW;
+		JDefinedClass onTextChangeListenerClass = getCodeModel().anonymousClass(getClasses().TEXT_WATCHER);
+		JClass viewClass = getClasses().TEXT_VIEW;
 		if (viewParameterType != null) {
-			viewClass = refClass(viewParameterType.toString());
+			viewClass = getJClass(viewParameterType.toString());
 		}
 
 		JBlock onViewChangedBody = getOnViewChangedBody().block();
@@ -272,8 +272,8 @@ public OnSeekBarChangeListenerHolder getOnSeekBarChangeListenerHolder(JFieldRef
 	}
 
 	private OnSeekBarChangeListenerHolder createOnSeekBarChangeListenerHolder(JFieldRef idRef) {
-		JDefinedClass onSeekbarChangeListenerClass = codeModel().anonymousClass(classes().ON_SEEKBAR_CHANGE_LISTENER);
-		JClass viewClass = classes().SEEKBAR;
+		JDefinedClass onSeekbarChangeListenerClass = getCodeModel().anonymousClass(getClasses().ON_SEEKBAR_CHANGE_LISTENER);
+		JClass viewClass = getClasses().SEEKBAR;
 
 		JBlock onViewChangedBody = getOnViewChangedBody().block();
 		JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
index 1a14e1d203..ace04de0e7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
@@ -26,13 +26,11 @@
 import static org.androidannotations.helper.ModelConstants.generationSuffix;
 
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.Receiver.RegisterAt;
-import org.androidannotations.helper.OrmLiteHelper;
 import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
-import org.androidannotations.process.ProcessHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -79,8 +77,8 @@ public class EFragmentHolder extends EComponentWithViewSupportHolder implements
 	private JBlock onDetachBeforeSuperBlock;
 	private JBlock onDestroyViewAfterSuperBlock;
 
-	public EFragmentHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EFragmentHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		instanceStateDelegate = new InstanceStateDelegate(this);
 		onActivityResultDelegate = new OnActivityResultDelegate(this);
 		receiverRegistrationDelegate = new ReceiverRegistrationDelegate<>(this);
@@ -91,9 +89,9 @@ public EFragmentHolder(ProcessHolder processHolder, TypeElement annotatedElement
 	}
 
 	private void setOnCreate() {
-		JMethod onCreate = generatedClass.method(PUBLIC, codeModel().VOID, "onCreate");
+		JMethod onCreate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreate");
 		onCreate.annotate(Override.class);
-		JVar onCreateSavedInstanceState = onCreate.param(classes().BUNDLE, "savedInstanceState");
+		JVar onCreateSavedInstanceState = onCreate.param(getClasses().BUNDLE, "savedInstanceState");
 		JBlock onCreateBody = onCreate.body();
 
 		JVar previousNotifier = viewNotifierHelper.replacePreviousNotifier(onCreateBody);
@@ -105,20 +103,20 @@ private void setOnCreate() {
 	}
 
 	private void setOnViewCreated() {
-		JMethod onViewCreated = generatedClass.method(PUBLIC, codeModel().VOID, "onViewCreated");
+		JMethod onViewCreated = generatedClass.method(PUBLIC, getCodeModel().VOID, "onViewCreated");
 		onViewCreated.annotate(Override.class);
-		JVar view = onViewCreated.param(classes().VIEW, "view");
-		JVar savedInstanceState = onViewCreated.param(classes().BUNDLE, "savedInstanceState");
+		JVar view = onViewCreated.param(getClasses().VIEW, "view");
+		JVar savedInstanceState = onViewCreated.param(getClasses().BUNDLE, "savedInstanceState");
 		JBlock onViewCreatedBody = onViewCreated.body();
 		onViewCreatedBody.invoke(_super(), onViewCreated).arg(view).arg(savedInstanceState);
 		viewNotifierHelper.invokeViewChanged(onViewCreatedBody);
 	}
 
 	private void setFindViewById() {
-		JMethod findViewById = generatedClass.method(PUBLIC, classes().VIEW, "findViewById");
+		JMethod findViewById = generatedClass.method(PUBLIC, getClasses().VIEW, "findViewById");
 		findViewById.annotate(Override.class);
 
-		JVar idParam = findViewById.param(codeModel().INT, "id");
+		JVar idParam = findViewById.param(getCodeModel().INT, "id");
 
 		JBlock body = findViewById.body();
 
@@ -136,7 +134,7 @@ private void setFragmentBuilder() throws JClassAlreadyExistsException {
 		narrowBuilderClass = narrow(fragmentBuilderClass);
 
 		generify(fragmentBuilderClass);
-		JClass superClass = refClass(org.androidannotations.api.builder.FragmentBuilder.class);
+		JClass superClass = getJClass(org.androidannotations.api.builder.FragmentBuilder.class);
 		superClass = superClass.narrow(narrowBuilderClass, getAnnotatedClass());
 		fragmentBuilderClass._extends(superClass);
 		fragmentArgumentsBuilderField = ref("args");
@@ -168,11 +166,11 @@ private void generify(JGenerifiable generifiable) {
 	}
 
 	private void setOnCreateOptionsMenu() {
-		JMethod method = generatedClass.method(PUBLIC, codeModel().VOID, "onCreateOptionsMenu");
+		JMethod method = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreateOptionsMenu");
 		method.annotate(Override.class);
 		JBlock methodBody = method.body();
-		onCreateOptionsMenuMenuParam = method.param(classes().MENU, "menu");
-		onCreateOptionsMenuMenuInflaterVar = method.param(classes().MENU_INFLATER, "inflater");
+		onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
+		onCreateOptionsMenuMenuInflaterVar = method.param(getClasses().MENU_INFLATER, "inflater");
 		onCreateOptionsMenuMethodBody = methodBody.block();
 		methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);
 
@@ -180,11 +178,11 @@ private void setOnCreateOptionsMenu() {
 	}
 
 	private void setOnOptionsItemSelected() {
-		JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onOptionsItemSelected");
+		JMethod method = generatedClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onOptionsItemSelected");
 		method.annotate(Override.class);
 		JBlock methodBody = method.body();
-		onOptionsItemSelectedItem = method.param(classes().MENU_ITEM, "item");
-		onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
+		onOptionsItemSelectedItem = method.param(getClasses().MENU_ITEM, "item");
+		onOptionsItemSelectedItemId = methodBody.decl(getCodeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
 		onOptionsItemSelectedMiddleBlock = methodBody.block();
 
 		methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
@@ -197,8 +195,8 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
-		init.param(classes().BUNDLE, "savedInstanceState");
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
+		init.param(getClasses().BUNDLE, "savedInstanceState");
 	}
 
 	public JFieldVar getContentView() {
@@ -215,17 +213,17 @@ private void setContentViewRelatedMethods() {
 	}
 
 	private void setContentView() {
-		contentView = generatedClass.field(PRIVATE, classes().VIEW, "contentView" + generationSuffix());
+		contentView = generatedClass.field(PRIVATE, getClasses().VIEW, "contentView" + generationSuffix());
 	}
 
 	private void setOnCreateView() {
-		JMethod onCreateView = generatedClass.method(PUBLIC, classes().VIEW, "onCreateView");
+		JMethod onCreateView = generatedClass.method(PUBLIC, getClasses().VIEW, "onCreateView");
 		onCreateView.annotate(Override.class);
 
-		inflater = onCreateView.param(classes().LAYOUT_INFLATER, "inflater");
-		container = onCreateView.param(classes().VIEW_GROUP, "container");
+		inflater = onCreateView.param(getClasses().LAYOUT_INFLATER, "inflater");
+		container = onCreateView.param(getClasses().VIEW_GROUP, "container");
 
-		JVar savedInstanceState = onCreateView.param(classes().BUNDLE, "savedInstanceState");
+		JVar savedInstanceState = onCreateView.param(getClasses().BUNDLE, "savedInstanceState");
 
 		boolean forceInjection = getAnnotatedElement().getAnnotation(EFragment.class).forceLayoutInjection();
 
@@ -241,7 +239,7 @@ private void setOnCreateView() {
 	}
 
 	private void setOnDestroyView() {
-		JMethod onDestroyView = generatedClass.method(PUBLIC, codeModel().VOID, "onDestroyView");
+		JMethod onDestroyView = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroyView");
 		onDestroyView.annotate(Override.class);
 		JBlock body = onDestroyView.body();
 		body.invoke(_super(), onDestroyView);
@@ -268,7 +266,7 @@ private void clearInjectedView(JFieldRef fieldRef) {
 	}
 
 	private void setOnStart() {
-		JMethod onStart = generatedClass.method(PUBLIC, codeModel().VOID, "onStart");
+		JMethod onStart = generatedClass.method(PUBLIC, getCodeModel().VOID, "onStart");
 		onStart.annotate(Override.class);
 		JBlock onStartBody = onStart.body();
 		onStartBody.invoke(_super(), onStart);
@@ -276,16 +274,16 @@ private void setOnStart() {
 	}
 
 	private void setOnAttach() {
-		JMethod onAttach = generatedClass.method(PUBLIC, codeModel().VOID, "onAttach");
+		JMethod onAttach = generatedClass.method(PUBLIC, getCodeModel().VOID, "onAttach");
 		onAttach.annotate(Override.class);
-		JVar activityParam = onAttach.param(classes().ACTIVITY, "activity");
+		JVar activityParam = onAttach.param(getClasses().ACTIVITY, "activity");
 		JBlock onAttachBody = onAttach.body();
 		onAttachBody.invoke(_super(), onAttach).arg(activityParam);
 		onAttachAfterSuperBlock = onAttachBody.block();
 	}
 
 	private void setOnResume() {
-		JMethod onResume = generatedClass.method(PUBLIC, codeModel().VOID, "onResume");
+		JMethod onResume = generatedClass.method(PUBLIC, getCodeModel().VOID, "onResume");
 		onResume.annotate(Override.class);
 		JBlock onResumeBody = onResume.body();
 		onResumeBody.invoke(_super(), onResume);
@@ -293,7 +291,7 @@ private void setOnResume() {
 	}
 
 	private void setOnPause() {
-		JMethod onPause = generatedClass.method(PUBLIC, codeModel().VOID, "onPause");
+		JMethod onPause = generatedClass.method(PUBLIC, getCodeModel().VOID, "onPause");
 		onPause.annotate(Override.class);
 		JBlock onPauseBody = onPause.body();
 		onPauseBeforeSuperBlock = onPauseBody.block();
@@ -301,7 +299,7 @@ private void setOnPause() {
 	}
 
 	private void setOnDetach() {
-		JMethod onDetach = generatedClass.method(PUBLIC, codeModel().VOID, "onDetach");
+		JMethod onDetach = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDetach");
 		onDetach.annotate(Override.class);
 		JBlock onDetachBody = onDetach.body();
 		onDetachBeforeSuperBlock = onDetachBody.block();
@@ -309,7 +307,7 @@ private void setOnDetach() {
 	}
 
 	private void setOnStop() {
-		JMethod onStop = generatedClass.method(PUBLIC, codeModel().VOID, "onStop");
+		JMethod onStop = generatedClass.method(PUBLIC, getCodeModel().VOID, "onStop");
 		onStop.annotate(Override.class);
 		JBlock onStopBody = onStop.body();
 		onStopBeforeSuperBlock = onStopBody.block();
@@ -317,7 +315,7 @@ private void setOnStop() {
 	}
 
 	private void setOnDestroy() {
-		JMethod onDestroy = generatedClass.method(PUBLIC, codeModel().VOID, "onDestroy");
+		JMethod onDestroy = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroy");
 		onDestroy.annotate(Override.class);
 		JBlock onDestroyBody = onDestroy.body();
 		onDestroyBeforeSuperBlock = onDestroyBody.block();
@@ -375,9 +373,9 @@ public JVar getInjectBundleArgs() {
 	}
 
 	private void setInjectArgs() {
-		injectArgsMethod = generatedClass.method(PRIVATE, codeModel().VOID, "injectFragmentArguments" + generationSuffix());
+		injectArgsMethod = generatedClass.method(PRIVATE, getCodeModel().VOID, "injectFragmentArguments" + generationSuffix());
 		JBlock injectExtrasBody = injectArgsMethod.body();
-		injectBundleArgs = injectExtrasBody.decl(classes().BUNDLE, "args_", invoke("getArguments"));
+		injectBundleArgs = injectExtrasBody.decl(getClasses().BUNDLE, "args_", invoke("getArguments"));
 		injectArgsBlock = injectExtrasBody._if(injectBundleArgs.ne(_null()))._then();
 
 		getInitBody().invoke(injectArgsMethod);
@@ -548,14 +546,6 @@ public JBlock getIntentFilterInitializationBlock(IntentFilterData intentFilterDa
 		return getInitBody();
 	}
 
-	@Override
-	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
-		JFieldVar databaseHelperRef = super.setDatabaseHelperRef(databaseHelperTypeMirror);
-		OrmLiteHelper.injectReleaseInDestroy(databaseHelperRef, this, classes());
-
-		return databaseHelperRef;
-	}
-
 	@Override
 	public JBlock getPreferenceScreenInitializationBlock() {
 		return getOnCreateAfterSuperBlock();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java
index 25a358e5e9..891195587e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java
@@ -19,8 +19,8 @@
 
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.process.ProcessHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JExpr;
@@ -35,8 +35,8 @@ public class EIntentServiceHolder extends EServiceHolder {
 	private JBlock onHandleIntentBody;
 	private JVar onHandleIntentIntentAction;
 
-	public EIntentServiceHolder(ProcessHolder processHolder, TypeElement annotatedElement, AndroidManifest androidManifest) throws Exception {
-		super(processHolder, annotatedElement, androidManifest);
+	public EIntentServiceHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement, AndroidManifest androidManifest) throws Exception {
+		super(environment, annotatedElement, androidManifest);
 	}
 
 	public JVar getOnHandleIntentIntent() {
@@ -68,12 +68,12 @@ public JVar getOnHandleIntentIntentAction() {
 	}
 
 	private void createOnHandleIntent() {
-		onHandleIntentMethod = generatedClass.method(PUBLIC, codeModel().VOID, "onHandleIntent");
-		onHandleIntentIntent = onHandleIntentMethod.param(classes().INTENT, "intent");
+		onHandleIntentMethod = generatedClass.method(PUBLIC, getCodeModel().VOID, "onHandleIntent");
+		onHandleIntentIntent = onHandleIntentMethod.param(getClasses().INTENT, "intent");
 		onHandleIntentMethod.annotate(Override.class);
 		onHandleIntentBody = onHandleIntentMethod.body();
 		codeModelHelper.callSuperMethod(onHandleIntentMethod, this, onHandleIntentBody);
 		JInvocation getActionInvocation = JExpr.invoke(onHandleIntentIntent, "getAction");
-		onHandleIntentIntentAction = onHandleIntentBody.decl(classes().STRING, "action", getActionInvocation);
+		onHandleIntentIntentAction = onHandleIntentBody.decl(getClasses().STRING, "action", getActionInvocation);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EProviderHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EProviderHolder.java
similarity index 78%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EProviderHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EProviderHolder.java
index bf8a0648c7..8aaa55488d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EProviderHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EProviderHolder.java
@@ -23,15 +23,15 @@
 
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JMethod;
 
 public class EProviderHolder extends EComponentHolder {
 
-	public EProviderHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EProviderHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 	}
 
 	@Override
@@ -41,12 +41,12 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
 		createOnCreate();
 	}
 
 	private void createOnCreate() {
-		JMethod onCreate = generatedClass.method(PUBLIC, codeModel().BOOLEAN, "onCreate");
+		JMethod onCreate = generatedClass.method(PUBLIC, getCodeModel().BOOLEAN, "onCreate");
 		onCreate.annotate(Override.class);
 		JBlock onCreateBody = onCreate.body();
 		onCreateBody.invoke(getInit());
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java
index 27f73612d5..bf4cba0b46 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java
@@ -21,7 +21,7 @@
 
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JExpr;
@@ -38,8 +38,8 @@ public class EReceiverHolder extends EComponentHolder {
 	private JVar onReceiveContext;
 	private JMethod onReceiveMethod;
 
-	public EReceiverHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EReceiverHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 	}
 
 	@Override
@@ -51,17 +51,17 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
-		contextRef = init.param(classes().CONTEXT, "context");
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
+		contextRef = init.param(getClasses().CONTEXT, "context");
 		if (onReceiveMethod == null) {
 			createOnReceive();
 		}
 	}
 
 	private void createOnReceive() {
-		onReceiveMethod = generatedClass.method(PUBLIC, codeModel().VOID, "onReceive");
-		onReceiveContext = onReceiveMethod.param(classes().CONTEXT, "context");
-		onReceiveIntent = onReceiveMethod.param(classes().INTENT, "intent");
+		onReceiveMethod = generatedClass.method(PUBLIC, getCodeModel().VOID, "onReceive");
+		onReceiveContext = onReceiveMethod.param(getClasses().CONTEXT, "context");
+		onReceiveIntent = onReceiveMethod.param(getClasses().INTENT, "intent");
 		onReceiveMethod.annotate(Override.class);
 		onReceiveBody = onReceiveMethod.body();
 		onReceiveBody.invoke(getInit()).arg(onReceiveContext);
@@ -70,12 +70,12 @@ private void createOnReceive() {
 
 	private void setOnReceiveIntentAction() {
 		JInvocation getActionInvocation = JExpr.invoke(getOnReceiveIntent(), "getAction");
-		onReceiveIntentAction = getOnReceiveBody().decl(classes().STRING, "action", getActionInvocation);
+		onReceiveIntentAction = getOnReceiveBody().decl(getClasses().STRING, "action", getActionInvocation);
 	}
 
 	private void setOnReceiveIntentDataScheme() {
 		JInvocation getDataSchemeInvocation = JExpr.invoke(getOnReceiveIntent(), "getScheme");
-		onReceiveIntentDataScheme = getOnReceiveBody().decl(classes().STRING, "dataScheme", getDataSchemeInvocation);
+		onReceiveIntentDataScheme = getOnReceiveBody().decl(getClasses().STRING, "dataScheme", getDataSchemeInvocation);
 	}
 
 	public JMethod getOnReceiveMethod() {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
index 6c6e35674f..1d0b71abfa 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
@@ -21,14 +21,12 @@
 import static org.androidannotations.helper.ModelConstants.generationSuffix;
 
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IntentBuilder;
-import org.androidannotations.helper.OrmLiteHelper;
-import org.androidannotations.helper.ServiceIntentBuilder;
 import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.internal.core.helper.IntentBuilder;
+import org.androidannotations.internal.core.helper.ServiceIntentBuilder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JDefinedClass;
@@ -43,8 +41,8 @@ public class EServiceHolder extends EComponentHolder implements HasIntentBuilder
 	private ReceiverRegistrationDelegate<EServiceHolder> receiverRegistrationDelegate;
 	private JBlock onDestroyBeforeSuperBlock;
 
-	public EServiceHolder(ProcessHolder processHolder, TypeElement annotatedElement, AndroidManifest androidManifest) throws Exception {
-		super(processHolder, annotatedElement);
+	public EServiceHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement, AndroidManifest androidManifest) throws Exception {
+		super(environment, annotatedElement);
 		receiverRegistrationDelegate = new ReceiverRegistrationDelegate<>(this);
 		intentBuilder = new ServiceIntentBuilder(this, androidManifest);
 		intentBuilder.build();
@@ -62,12 +60,12 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
 		setOnCreate();
 	}
 
 	private void setOnCreate() {
-		JMethod onCreate = generatedClass.method(PUBLIC, codeModel().VOID, "onCreate");
+		JMethod onCreate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onCreate");
 		onCreate.annotate(Override.class);
 		JBlock onCreateBody = onCreate.body();
 		onCreateBody.invoke(getInit());
@@ -75,7 +73,7 @@ private void setOnCreate() {
 	}
 
 	private void setOnDestroy() {
-		JMethod onDestroy = generatedClass.method(PUBLIC, codeModel().VOID, "onDestroy");
+		JMethod onDestroy = generatedClass.method(PUBLIC, getCodeModel().VOID, "onDestroy");
 		onDestroy.annotate(Override.class);
 		JBlock onDestroyBody = onDestroy.body();
 		onDestroyBeforeSuperBlock = onDestroyBody.block();
@@ -144,12 +142,4 @@ public JBlock getOnAttachAfterSuperBlock() {
 	public JBlock getOnDetachBeforeSuperBlock() {
 		return receiverRegistrationDelegate.getOnDetachBeforeSuperBlock();
 	}
-
-	@Override
-	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
-		JFieldVar databaseHelperRef = super.setDatabaseHelperRef(databaseHelperTypeMirror);
-		OrmLiteHelper.injectReleaseInDestroy(databaseHelperRef, this, classes());
-
-		return databaseHelperRef;
-	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EViewGroupHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EViewGroupHolder.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EViewGroupHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EViewGroupHolder.java
index c94ebfec62..2e505e3c34 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EViewGroupHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EViewGroupHolder.java
@@ -19,7 +19,7 @@
 
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JExpr;
@@ -28,12 +28,12 @@ public class EViewGroupHolder extends EViewHolder {
 
 	private JBlock setContentViewBlock;
 
-	public EViewGroupHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EViewGroupHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 	}
 
 	protected void setOnFinishInflate() {
-		onFinishInflate = generatedClass.method(PUBLIC, codeModel().VOID, "onFinishInflate");
+		onFinishInflate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onFinishInflate");
 		onFinishInflate.annotate(Override.class);
 		onFinishInflate.javadoc().append(ALREADY_INFLATED_COMMENT);
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
index 6b2b55dea8..48247d5d89 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
@@ -30,7 +30,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -59,8 +59,8 @@ public class EViewHolder extends EComponentWithViewSupportHolder {
 	protected JMethod onFinishInflate;
 	protected JFieldVar alreadyInflated;
 
-	public EViewHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public EViewHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		addSuppressWarning();
 		createConstructorAndBuilder();
 	}
@@ -83,7 +83,7 @@ private void createConstructorAndBuilder() {
 			JMethod copyConstructor = generatedClass.constructor(PUBLIC);
 			JMethod staticHelper = generatedClass.method(PUBLIC | STATIC, generatedClass._extends(), "build");
 
-			codeModelHelper.generifyStaticHelper(this, staticHelper, getAnnotatedElement());
+			codeModelHelper.generifyStaticHelper(staticHelper, getAnnotatedElement());
 
 			JBlock body = copyConstructor.body();
 			JInvocation superCall = body.invoke("super");
@@ -92,7 +92,7 @@ private void createConstructorAndBuilder() {
 			JInvocation newInvocation = JExpr._new(narrowedGeneratedClass);
 			for (VariableElement param : userConstructor.getParameters()) {
 				String paramName = param.getSimpleName().toString();
-				JClass paramType = codeModelHelper.typeMirrorToJClass(param.asType(), this);
+				JClass paramType = codeModelHelper.typeMirrorToJClass(param.asType());
 				copyConstructor.param(paramType, paramName);
 				staticHelper.param(paramType, paramName);
 				superCall.arg(JExpr.ref(paramName));
@@ -113,7 +113,7 @@ protected void setContextRef() {
 
 	@Override
 	protected void setInit() {
-		init = generatedClass.method(PRIVATE, codeModel().VOID, "init" + generationSuffix());
+		init = generatedClass.method(PRIVATE, getCodeModel().VOID, "init" + generationSuffix());
 		viewNotifierHelper.wrapInitWithNotifier();
 	}
 
@@ -137,7 +137,7 @@ public JMethod getOnFinishInflate() {
 	}
 
 	protected void setOnFinishInflate() {
-		onFinishInflate = generatedClass.method(PUBLIC, codeModel().VOID, "onFinishInflate");
+		onFinishInflate = generatedClass.method(PUBLIC, getCodeModel().VOID, "onFinishInflate");
 		onFinishInflate.annotate(Override.class);
 		onFinishInflate.javadoc().append(ALREADY_INFLATED_COMMENT.replaceAll("alreadyInflated_", "alreadyInflated" + generationSuffix()));
 
@@ -158,6 +158,6 @@ public JFieldVar getAlreadyInflated() {
 	}
 
 	private void setAlreadyInflated() {
-		alreadyInflated = generatedClass.field(PRIVATE, JType.parse(codeModel(), "boolean"), "alreadyInflated" + generationSuffix(), JExpr.FALSE);
+		alreadyInflated = generatedClass.field(PRIVATE, JType.parse(getCodeModel(), "boolean"), "alreadyInflated" + generationSuffix(), JExpr.FALSE);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
index e2fdc8de4c..3a99176a10 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
@@ -18,6 +18,8 @@
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.cast;
 
+import org.androidannotations.internal.process.ProcessHolder;
+
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JExpression;
@@ -63,4 +65,8 @@ public JBlock getIfNotNullBlock() {
 		}
 		return ifNotNullBlock;
 	}
+
+	protected ProcessHolder.Classes getClasses() {
+		return holder.getEnvironment().getClasses();
+	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundPreferenceHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundPreferenceHolder.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundPreferenceHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundPreferenceHolder.java
index a6f4a6f9f6..e762a5f00b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundPreferenceHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundPreferenceHolder.java
@@ -27,7 +27,7 @@ public FoundPreferenceHolder(GeneratedClassHolder holder, JClass type, JExpressi
 
 	@Override
 	protected JClass getBaseType() {
-		return getGeneratedClassHolder().classes().PREFERENCE;
+		return getClasses().PREFERENCE;
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundViewHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundViewHolder.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundViewHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundViewHolder.java
index 3dd8e6f70a..163a2c4936 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/FoundViewHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/FoundViewHolder.java
@@ -27,7 +27,7 @@ public FoundViewHolder(GeneratedClassHolder holder, JClass viewClass, JExpressio
 
 	@Override
 	protected JClass getBaseType() {
-		return getGeneratedClassHolder().classes().VIEW;
+		return getClasses().VIEW;
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java
similarity index 66%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java
index e48d611c46..de41d1c54e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java
@@ -15,29 +15,17 @@
  */
 package org.androidannotations.holder;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
-import com.sun.codemodel.JClass;
-import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JDefinedClass;
 
 public interface GeneratedClassHolder {
+
 	JDefinedClass getGeneratedClass();
 
 	TypeElement getAnnotatedElement();
 
-	ProcessingEnvironment processingEnvironment();
-
-	ProcessHolder.Classes classes();
-
-	JCodeModel codeModel();
-
-	JClass refClass(String fullyQualifiedClassName);
-
-	JClass refClass(Class<?> clazz);
-
-	JDefinedClass definedClass(String fullyQualifiedClassName);
+	AndroidAnnotationsEnvironment getEnvironment();
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
similarity index 63%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
index 2a4f8d1dbf..6ab5be8911 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
@@ -15,10 +15,10 @@
  */
 package org.androidannotations.holder;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.process.ProcessHolder.Classes;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.internal.process.ProcessHolder.Classes;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
@@ -43,32 +43,23 @@ public final TypeElement getAnnotatedElement() {
 	}
 
 	@Override
-	public final ProcessingEnvironment processingEnvironment() {
-		return holder.processingEnvironment();
+	public AndroidAnnotationsEnvironment getEnvironment() {
+		return holder.getEnvironment();
 	}
 
-	@Override
-	public final Classes classes() {
-		return holder.classes();
+	protected final Classes getClasses() {
+		return getEnvironment().getClasses();
 	}
 
-	@Override
-	public final JCodeModel codeModel() {
-		return holder.codeModel();
+	protected final JCodeModel codeModel() {
+		return getEnvironment().getCodeModel();
 	}
 
-	@Override
-	public final JClass refClass(String fullyQualifiedClassName) {
-		return holder.refClass(fullyQualifiedClassName);
+	protected final JClass refClass(String fullyQualifiedClassName) {
+		return getEnvironment().getJClass(fullyQualifiedClassName);
 	}
 
-	@Override
-	public final JClass refClass(Class<?> clazz) {
-		return holder.refClass(clazz);
-	}
-
-	@Override
-	public final JDefinedClass definedClass(String fullyQualifiedClassName) {
-		return holder.definedClass(fullyQualifiedClassName);
+	protected final JClass refClass(Class<?> clazz) {
+		return getEnvironment().getJClass(clazz);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasExtras.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasExtras.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasExtras.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasExtras.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java
index 90fcc2d29d..e71b298eea 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java
@@ -15,7 +15,7 @@
  */
 package org.androidannotations.holder;
 
-import org.androidannotations.helper.IntentBuilder;
+import org.androidannotations.internal.core.helper.IntentBuilder;
 
 import com.sun.codemodel.JDefinedClass;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasLifecycleMethods.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasLifecycleMethods.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasLifecycleMethods.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasLifecycleMethods.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasOnActivityResult.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasOnActivityResult.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasOnActivityResult.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasOnActivityResult.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasOptionsMenu.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasOptionsMenu.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasOptionsMenu.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasOptionsMenu.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasPreferenceHeaders.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasPreferenceHeaders.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasPreferenceHeaders.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasPreferenceHeaders.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasPreferences.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasPreferences.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasPreferences.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasPreferences.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasReceiverRegistration.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasReceiverRegistration.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/HasReceiverRegistration.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasReceiverRegistration.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
index 2cc8e5b8a3..4946ef4318 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
@@ -56,7 +56,7 @@ public JVar getSaveStateBundleParam() {
 	private void setSaveStateMethod() {
 		JMethod method = getGeneratedClass().method(PUBLIC, codeModel().VOID, "onSaveInstanceState");
 		method.annotate(Override.class);
-		saveStateBundleParam = method.param(classes().BUNDLE, "bundle" + generationSuffix());
+		saveStateBundleParam = method.param(getClasses().BUNDLE, "bundle" + generationSuffix());
 
 		saveStateMethodBody = method.body();
 
@@ -81,7 +81,7 @@ public JVar getRestoreStateBundleParam() {
 
 	private void setRestoreStateMethod() {
 		restoreStateMethod = getGeneratedClass().method(PRIVATE, codeModel().VOID, "restoreSavedInstanceState" + generationSuffix());
-		restoreStateBundleParam = restoreStateMethod.param(classes().BUNDLE, "savedInstanceState");
+		restoreStateBundleParam = restoreStateMethod.param(getClasses().BUNDLE, "savedInstanceState");
 		getInit().body().invoke(restoreStateMethod).arg(restoreStateBundleParam);
 
 		restoreStateMethod.body() //
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/NonConfigurationHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/NonConfigurationHolder.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/NonConfigurationHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/NonConfigurationHolder.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java
index 87b444c9c9..1bfa2c8ced 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java
@@ -109,7 +109,7 @@ private void setOnActivityResult() {
 		method.annotate(Override.class);
 		requestCodeParam = method.param(codeModel().INT, "requestCode");
 		resultCodeParam = method.param(codeModel().INT, "resultCode");
-		dataParam = method.param(classes().INTENT, "data");
+		dataParam = method.param(getClasses().INTENT, "data");
 		JBlock body = method.body();
 		body.invoke(_super(), method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam);
 		afterSuperBlock = body.block();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/OnSeekBarChangeListenerHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/OnSeekBarChangeListenerHolder.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/OnSeekBarChangeListenerHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/OnSeekBarChangeListenerHolder.java
index 2529628032..0fd5dcdfe6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/OnSeekBarChangeListenerHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/OnSeekBarChangeListenerHolder.java
@@ -43,26 +43,26 @@ public OnSeekBarChangeListenerHolder(EComponentWithViewSupportHolder holder, JDe
 	}
 
 	private void createOnProgressChanged() {
-		JMethod onProgressChangedMethod = listenerClass.method(JMod.PUBLIC, holder.codeModel().VOID, "onProgressChanged");
+		JMethod onProgressChangedMethod = listenerClass.method(JMod.PUBLIC, holder.getCodeModel().VOID, "onProgressChanged");
 		onProgressChangedMethod.annotate(Override.class);
 		onProgressChangedBody = onProgressChangedMethod.body();
-		onProgressChangedSeekBarParam = onProgressChangedMethod.param(holder.classes().SEEKBAR, "seekBar");
-		onProgressChangedProgressParam = onProgressChangedMethod.param(holder.codeModel().INT, "progress");
-		onProgressChangedFromUserParam = onProgressChangedMethod.param(holder.codeModel().BOOLEAN, "fromUser");
+		onProgressChangedSeekBarParam = onProgressChangedMethod.param(holder.getClasses().SEEKBAR, "seekBar");
+		onProgressChangedProgressParam = onProgressChangedMethod.param(holder.getCodeModel().INT, "progress");
+		onProgressChangedFromUserParam = onProgressChangedMethod.param(holder.getCodeModel().BOOLEAN, "fromUser");
 	}
 
 	private void createOnStartTrackingTouch() {
-		JMethod onStartTrackingTouchMethod = listenerClass.method(JMod.PUBLIC, holder.codeModel().VOID, "onStartTrackingTouch");
+		JMethod onStartTrackingTouchMethod = listenerClass.method(JMod.PUBLIC, holder.getCodeModel().VOID, "onStartTrackingTouch");
 		onStartTrackingTouchMethod.annotate(Override.class);
 		onStartTrackingTouchBody = onStartTrackingTouchMethod.body();
-		onStartTrackingTouchSeekBarParam = onStartTrackingTouchMethod.param(holder.classes().SEEKBAR, "seekBar");
+		onStartTrackingTouchSeekBarParam = onStartTrackingTouchMethod.param(holder.getClasses().SEEKBAR, "seekBar");
 	}
 
 	private void createOnStopTrackingTouch() {
-		JMethod onStopTrackingTouchMethod = listenerClass.method(JMod.PUBLIC, holder.codeModel().VOID, "onStopTrackingTouch");
+		JMethod onStopTrackingTouchMethod = listenerClass.method(JMod.PUBLIC, holder.getCodeModel().VOID, "onStopTrackingTouch");
 		onStopTrackingTouchMethod.annotate(Override.class);
 		onStopTrackingTouchBody = onStopTrackingTouchMethod.body();
-		onStopTrackingTouchSeekBarParam = onStopTrackingTouchMethod.param(holder.classes().SEEKBAR, "seekBar");
+		onStopTrackingTouchSeekBarParam = onStopTrackingTouchMethod.param(holder.getClasses().SEEKBAR, "seekBar");
 	}
 
 	public JBlock getOnProgressChangedBody() {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferenceActivityDelegate.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/PreferenceActivityDelegate.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferenceActivityDelegate.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/PreferenceActivityDelegate.java
index 703157ef71..eda9a6a369 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferenceActivityDelegate.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/PreferenceActivityDelegate.java
@@ -51,7 +51,7 @@ private void setOnBuildHeadersBlock() {
 		JMethod method = getGeneratedClass().method(PUBLIC, codeModel().VOID, "onBuildHeaders");
 		method.annotate(Override.class);
 		onBuildHeadersBlock = method.body();
-		onBuildHeadersTargetParam = method.param(classes().LIST.narrow(classes().PREFERENCE_ACTIVITY_HEADER), "target");
+		onBuildHeadersTargetParam = method.param(getClasses().LIST.narrow(getClasses().PREFERENCE_ACTIVITY_HEADER), "target");
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
index fc2d33b7f4..8c1799c43e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
@@ -33,12 +33,13 @@
 
 public class PreferencesDelegate extends GeneratedClassHolderDelegate<EComponentWithViewSupportHolder> implements HasPreferences {
 
-	private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
+	private APTCodeModelHelper codeModelHelper;
 
 	protected JBlock addPreferencesFromResourceBlock;
 
 	public PreferencesDelegate(EComponentWithViewSupportHolder holder) {
 		super(holder);
+		codeModelHelper = new APTCodeModelHelper(holder.getEnvironment());
 	}
 
 	@Override
@@ -75,7 +76,7 @@ public void assignFindPreferenceByKey(JFieldRef idRef, JClass preferenceClass, J
 			assignExpression = foundViewHolder.getOrCastRef(preferenceClass);
 		} else {
 			assignExpression = findPreferenceByKey(idRef);
-			if (preferenceClass != null && preferenceClass != classes().PREFERENCE) {
+			if (preferenceClass != null && preferenceClass != getClasses().PREFERENCE) {
 				assignExpression = cast(preferenceClass, assignExpression);
 			}
 			holder.foundHolders.put(idRefString, new FoundPreferenceHolder(this, preferenceClass, fieldRef, block));
@@ -100,8 +101,8 @@ private FoundPreferenceHolder createFoundPreferenceAndIfNotNullBlock(JFieldRef i
 		JBlock block = getAddPreferencesFromResourceBlock().block();
 
 		if (preferenceClass == null) {
-			preferenceClass = classes().PREFERENCE;
-		} else if (preferenceClass != classes().PREFERENCE) {
+			preferenceClass = getClasses().PREFERENCE;
+		} else if (preferenceClass != getClasses().PREFERENCE) {
 			findPreferenceExpression = cast(preferenceClass, findPreferenceExpression);
 		}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java
index 5168bd5be4..64ca99c820 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java
@@ -52,8 +52,8 @@ public JFieldVar getIntentFilterField(IntentFilterData intentFilterData) {
 
 	private JFieldVar createIntentFilterField(IntentFilterData intentFilterData) {
 		String intentFilterName = "intentFilter" + (intentFilterFields.size() + 1) + generationSuffix();
-		JExpression newIntentFilterExpr = _new(classes().INTENT_FILTER);
-		JFieldVar intentFilterField = getGeneratedClass().field(PRIVATE | FINAL, classes().INTENT_FILTER, intentFilterName, newIntentFilterExpr);
+		JExpression newIntentFilterExpr = _new(getClasses().INTENT_FILTER);
+		JFieldVar intentFilterField = getGeneratedClass().field(PRIVATE | FINAL, getClasses().INTENT_FILTER, intentFilterName, newIntentFilterExpr);
 
 		JBlock intentFilterTarget = holder.getIntentFilterInitializationBlock(intentFilterData);
 		for (String action : intentFilterData.getActionSet()) {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java
index 6d3be035d2..86cbabe57d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java
@@ -27,6 +27,7 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.api.sharedpreferences.BooleanPrefEditorField;
 import org.androidannotations.api.sharedpreferences.EditorHelper;
 import org.androidannotations.api.sharedpreferences.FloatPrefEditorField;
@@ -36,7 +37,6 @@
 import org.androidannotations.api.sharedpreferences.StringPrefEditorField;
 import org.androidannotations.api.sharedpreferences.StringSetPrefEditorField;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.process.ProcessHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -56,7 +56,7 @@ private static class EditorFieldHolder {
 		public final Class<?> fieldClass;
 		public final String fieldMethodName;
 
-		public EditorFieldHolder(Class<?> fieldClass, String fieldMethodName) {
+		EditorFieldHolder(Class<?> fieldClass, String fieldMethodName) {
 			this.fieldClass = fieldClass;
 			this.fieldMethodName = fieldMethodName;
 		}
@@ -83,8 +83,8 @@ public EditorFieldHolder(Class<?> fieldClass, String fieldMethodName) {
 	private JMethod editorConstructor;
 	private JInvocation editMethodEditorInvocation;
 
-	public SharedPrefHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public SharedPrefHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		createEditorClass();
 		createEditMethod();
 	}
@@ -97,14 +97,14 @@ protected void setExtends() {
 	private void createEditorClass() throws JClassAlreadyExistsException {
 		String interfaceSimpleName = annotatedElement.getSimpleName().toString();
 		editorClass = generatedClass._class(PUBLIC | STATIC | FINAL, interfaceSimpleName + "Editor" + classSuffix());
-		editorClass._extends(processHolder.refClass(EditorHelper.class).narrow(editorClass));
+		editorClass._extends(getJClass(EditorHelper.class).narrow(editorClass));
 
 		createEditorConstructor();
 	}
 
 	private void createEditorConstructor() {
 		editorConstructor = editorClass.constructor(JMod.NONE);
-		JClass sharedPreferencesClass = processHolder.refClass("android.content.SharedPreferences");
+		JClass sharedPreferencesClass = getJClass("android.content.SharedPreferences");
 		JVar sharedPreferencesParam = editorConstructor.param(sharedPreferencesClass, "sharedPreferences");
 		editorConstructor.body().invoke("super").arg(sharedPreferencesParam);
 	}
@@ -123,7 +123,7 @@ public void createFieldMethod(Class<?> prefFieldHelperClass, JExpression keyExpr
 	public void createEditorFieldMethods(ExecutableElement method, JExpression keyExpression) {
 		String returnType = method.getReturnType().toString();
 		EditorFieldHolder editorFieldHolder = EDITOR_FIELD_BY_TYPE.get(returnType);
-		JClass editorFieldClass = processHolder.refClass(editorFieldHolder.fieldClass);
+		JClass editorFieldClass = getJClass(editorFieldHolder.fieldClass);
 		String fieldName = method.getSimpleName().toString();
 		JMethod editorFieldMethod = editorClass.method(PUBLIC, editorFieldClass.narrow(editorClass), fieldName);
 		editorFieldMethod.body()._return(JExpr.invoke(editorFieldHolder.fieldMethodName).arg(keyExpression));
@@ -152,7 +152,7 @@ public JMethod getConstructor() {
 
 	private void setConstructor() {
 		constructor = generatedClass.constructor(PUBLIC);
-		constructorContextParam = constructor.param(classes().CONTEXT, "context");
+		constructorContextParam = constructor.param(getClasses().CONTEXT, "context");
 		JBlock constructorBody = constructor.body();
 		constructorSuperBlock = constructorBody.block();
 	}
@@ -165,7 +165,7 @@ public JFieldVar getContextField() {
 	}
 
 	protected void setContextField() {
-		contextField = generatedClass.field(JMod.PRIVATE, classes().CONTEXT, "context" + generationSuffix());
+		contextField = generatedClass.field(JMod.PRIVATE, getClasses().CONTEXT, "context" + generationSuffix());
 		getConstructor().body().assign(JExpr._this().ref(contextField), getConstructorContextParam());
 	}
 
@@ -177,8 +177,8 @@ public JFieldVar getEditorContextField() {
 	}
 
 	protected void setEditorContextField() {
-		editorContextField = editorClass.field(JMod.PRIVATE, classes().CONTEXT, "context" + generationSuffix());
-		JVar contextParam = editorConstructor.param(classes().CONTEXT, "context");
+		editorContextField = editorClass.field(JMod.PRIVATE, getClasses().CONTEXT, "context" + generationSuffix());
+		JVar contextParam = editorConstructor.param(getClasses().CONTEXT, "context");
 		editorConstructor.body().assign(JExpr._this().ref(editorContextField), contextParam);
 		editMethodEditorInvocation.arg(getContextField());
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/TextWatcherHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/TextWatcherHolder.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/TextWatcherHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/TextWatcherHolder.java
index b0a3a39ad4..51ef5b8826 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/TextWatcherHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/TextWatcherHolder.java
@@ -50,32 +50,32 @@ public TextWatcherHolder(EComponentWithViewSupportHolder holder, JVar viewVariab
 	}
 
 	private void createBeforeTextChanged() {
-		JPrimitiveType intClass = holder.codeModel().INT;
-		JMethod beforeTextChangedMethod = listenerClass.method(JMod.PUBLIC, holder.codeModel().VOID, "beforeTextChanged");
+		JPrimitiveType intClass = holder.getCodeModel().INT;
+		JMethod beforeTextChangedMethod = listenerClass.method(JMod.PUBLIC, holder.getCodeModel().VOID, "beforeTextChanged");
 		beforeTextChangedMethod.annotate(Override.class);
 		beforeTextChangedBody = beforeTextChangedMethod.body();
-		beforeTextChangedCharSequenceParam = beforeTextChangedMethod.param(holder.classes().CHAR_SEQUENCE, "s");
+		beforeTextChangedCharSequenceParam = beforeTextChangedMethod.param(holder.getClasses().CHAR_SEQUENCE, "s");
 		beforeTextChangedStartParam = beforeTextChangedMethod.param(intClass, "start");
 		beforeTextChangedCountParam = beforeTextChangedMethod.param(intClass, "count");
 		beforeTextChangedAfterParam = beforeTextChangedMethod.param(intClass, "after");
 	}
 
 	private void createOnTextChanged() {
-		JPrimitiveType intClass = holder.codeModel().INT;
-		JMethod onTextChangedMethod = listenerClass.method(JMod.PUBLIC, holder.codeModel().VOID, "onTextChanged");
+		JPrimitiveType intClass = holder.getCodeModel().INT;
+		JMethod onTextChangedMethod = listenerClass.method(JMod.PUBLIC, holder.getCodeModel().VOID, "onTextChanged");
 		onTextChangedMethod.annotate(Override.class);
 		onTextChangedBody = onTextChangedMethod.body();
-		onTextChangedCharSequenceParam = onTextChangedMethod.param(holder.classes().CHAR_SEQUENCE, "s");
+		onTextChangedCharSequenceParam = onTextChangedMethod.param(holder.getClasses().CHAR_SEQUENCE, "s");
 		onTextChangedStartParam = onTextChangedMethod.param(intClass, "start");
 		onTextChangedBeforeParam = onTextChangedMethod.param(intClass, "before");
 		onTextChangedCountParam = onTextChangedMethod.param(intClass, "count");
 	}
 
 	private void createAfterTextChanged() {
-		JMethod afterTextChangedMethod = listenerClass.method(JMod.PUBLIC, holder.codeModel().VOID, "afterTextChanged");
+		JMethod afterTextChangedMethod = listenerClass.method(JMod.PUBLIC, holder.getCodeModel().VOID, "afterTextChanged");
 		afterTextChangedMethod.annotate(Override.class);
 		afterTextChangedBody = afterTextChangedMethod.body();
-		afterTextChangedEditableParam = afterTextChangedMethod.param(holder.classes().EDITABLE, "s");
+		afterTextChangedEditableParam = afterTextChangedMethod.param(holder.getClasses().EDITABLE, "s");
 	}
 
 	public JVar getTextViewVariable() {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java
similarity index 51%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java
index 32b9c6c494..3be9686f98 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java
@@ -13,13 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations;
+package org.androidannotations.internal;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
-import java.util.Properties;
+import java.util.List;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 import javax.annotation.processing.AbstractProcessor;
@@ -29,73 +31,82 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.annotations.EActivity;
-import org.androidannotations.exception.ProcessingException;
-import org.androidannotations.exception.VersionMismatchException;
-import org.androidannotations.generation.CodeModelGenerator;
-import org.androidannotations.handler.AnnotationHandlers;
 import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.AndroidManifestFinder;
-import org.androidannotations.helper.ErrorHelper;
 import org.androidannotations.helper.ModelConstants;
-import org.androidannotations.helper.Option;
-import org.androidannotations.helper.OptionsHelper;
+import org.androidannotations.internal.core.CorePlugin;
+import org.androidannotations.internal.exception.AndroidManifestNotFoundException;
+import org.androidannotations.internal.exception.ProcessingException;
+import org.androidannotations.internal.exception.RClassNotFoundException;
+import org.androidannotations.internal.exception.ValidationException;
+import org.androidannotations.internal.exception.VersionMismatchException;
+import org.androidannotations.internal.exception.VersionNotFoundException;
+import org.androidannotations.internal.generation.CodeModelGenerator;
+import org.androidannotations.internal.helper.AndroidManifestFinder;
+import org.androidannotations.internal.helper.ErrorHelper;
+import org.androidannotations.internal.model.AnnotationElements;
+import org.androidannotations.internal.model.AnnotationElementsHolder;
+import org.androidannotations.internal.model.ModelExtractor;
+import org.androidannotations.internal.process.ModelProcessor;
+import org.androidannotations.internal.process.ModelValidator;
+import org.androidannotations.internal.process.TimeStats;
+import org.androidannotations.internal.rclass.AndroidRClassFinder;
+import org.androidannotations.internal.rclass.CompoundRClass;
+import org.androidannotations.internal.rclass.ProjectRClassFinder;
 import org.androidannotations.logger.Level;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerContext;
 import org.androidannotations.logger.LoggerFactory;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.model.AnnotationElementsHolder;
-import org.androidannotations.model.ModelExtractor;
-import org.androidannotations.process.ModelProcessor;
-import org.androidannotations.process.ModelValidator;
-import org.androidannotations.process.TimeStats;
-import org.androidannotations.rclass.AndroidRClassFinder;
-import org.androidannotations.rclass.CoumpoundRClass;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
 import org.androidannotations.rclass.IRClass;
-import org.androidannotations.rclass.ProjectRClassFinder;
 
 public class AndroidAnnotationProcessor extends AbstractProcessor {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(AndroidAnnotationProcessor.class);
 
-	private final Properties properties = new Properties();
-	private final Properties propertiesApi = new Properties();
+	private String coreVersion;
+
 	private final TimeStats timeStats = new TimeStats();
 	private final ErrorHelper errorHelper = new ErrorHelper();
-	private AnnotationHandlers annotationHandlers;
+	private InternalAndroidAnnotationsEnvironment androidAnnotationsEnv;
 
 	@Override
 	public synchronized void init(ProcessingEnvironment processingEnv) {
 		super.init(processingEnv);
+		androidAnnotationsEnv = new InternalAndroidAnnotationsEnvironment(processingEnv);
 
-		ModelConstants.init(processingEnv);
+		ModelConstants.init(androidAnnotationsEnv);
 
 		// Configure Logger
 		LoggerContext loggerContext = LoggerContext.getInstance();
-		loggerContext.setProcessingEnv(processingEnv);
+		loggerContext.setEnvironment(androidAnnotationsEnv);
 
 		try {
-			loadPropertyFile();
-			loadApiPropertyFile();
-		} catch (Exception e) {
-			LOGGER.error("Can't load API or core properties files", e);
-		}
+			AndroidAnnotationsPlugin corePlugin = new CorePlugin();
+			corePlugin.loadVersion();
+			coreVersion = corePlugin.getVersion();
 
-		LOGGER.info("Initialize AndroidAnnotations {} with options {}", getAAProcessorVersion(), processingEnv.getOptions());
+			LOGGER.info("Initialize AndroidAnnotations {} with options {}", coreVersion, processingEnv.getOptions());
 
-		annotationHandlers = new AnnotationHandlers(processingEnv);
+			List<AndroidAnnotationsPlugin> plugins = loadPlugins();
+			plugins.add(0, corePlugin);
+			androidAnnotationsEnv.setPlugins(plugins);
+		} catch (Exception e) {
+			LOGGER.error("Can't load plugins", e);
+		}
 	}
 
-	private void checkApiAndCoreVersions() throws VersionMismatchException {
-		String apiVersion = getAAApiVersion();
-		String coreVersion = getAAProcessorVersion();
+	private List<AndroidAnnotationsPlugin> loadPlugins() throws FileNotFoundException, VersionNotFoundException {
+		ServiceLoader<AndroidAnnotationsPlugin> serviceLoader = ServiceLoader.load(AndroidAnnotationsPlugin.class, AndroidAnnotationsPlugin.class.getClassLoader());
+		List<AndroidAnnotationsPlugin> plugins = new ArrayList<>();
+		for (AndroidAnnotationsPlugin plugin : serviceLoader) {
+			plugins.add(plugin);
 
-		if (!apiVersion.equals(coreVersion)) {
-			LOGGER.error("AndroidAnnotations version for API ({}) and core ({}) doesn't match. Please check your classpath", apiVersion, coreVersion);
-			throw new VersionMismatchException("AndroidAnnotations version for API (" + apiVersion + ") and core (" + coreVersion + ") doesn't match. Please check your classpath");
+			if (plugin.shouldCheckApiAndProcessorVersions()) {
+				plugin.loadVersion();
+			}
 		}
+		LOGGER.info("Plugins loaded: {}", Arrays.toString(plugins.toArray()));
+		return plugins;
 	}
 
 	@Override
@@ -111,8 +122,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 		}
 
 		try {
-			checkApiAndCoreVersions();
+			checkApiAndProcessorVersions();
 			processThrowing(annotations, roundEnv);
+		} catch (ValidationException e) {
+			// We do nothing, errors have been printed by ModelValidator
 		} catch (ProcessingException e) {
 			handleException(annotations, roundEnv, e);
 		} catch (Exception e) {
@@ -127,62 +140,38 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 		return true;
 	}
 
-	private void loadPropertyFile() throws FileNotFoundException {
-		String filename = "androidannotations.properties";
-		try {
-			URL url = getClass().getClassLoader().getResource(filename);
-			properties.load(url.openStream());
-		} catch (Exception e) {
-			LOGGER.error("Core property file {} couldn't be parsed");
-			throw new FileNotFoundException("Core property file " + filename + " couldn't be parsed.");
+	private void checkApiAndProcessorVersions() throws VersionMismatchException {
+		for (AndroidAnnotationsPlugin plugin : androidAnnotationsEnv.getPlugins()) {
+			if (plugin.shouldCheckApiAndProcessorVersions() && !plugin.getApiVersion().equals(plugin.getVersion())) {
+				LOGGER.error("{} version for API ({}) and processor ({}) don't match. Please check your classpath", plugin.getName(), plugin.getApiVersion(), plugin.getVersion());
+				throw new VersionMismatchException(plugin.getName() + "version for API (" + plugin.getApiVersion() + ") and core (" + plugin.getVersion()
+						+ ") don't match. Please check your classpath");
+			}
 		}
 	}
 
-	private void loadApiPropertyFile() throws FileNotFoundException {
-		String filename = "androidannotations-api.properties";
-		try {
-			URL url = EActivity.class.getClassLoader().getResource(filename);
-			propertiesApi.load(url.openStream());
-		} catch (Exception e) {
-			LOGGER.error("API property file {} couldn't be parsed");
-			throw new FileNotFoundException("API property file " + filename + " couldn't be parsed. Please check your classpath and verify that AA-API's version is at least 3.0");
-		}
-	}
-
-	private String getAAProcessorVersion() {
-		return properties.getProperty("version", "3.0+");
-	}
-
-	private String getAAApiVersion() {
-		return propertiesApi.getProperty("version", "unknown");
-	}
-
-	private void processThrowing(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) throws ProcessingException, Exception {
+	private void processThrowing(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) throws Exception {
 		if (nothingToDo(annotations, roundEnv)) {
 			return;
 		}
 
 		AnnotationElementsHolder extractedModel = extractAnnotations(annotations, roundEnv);
+		AnnotationElementsHolder validatingHolder = extractedModel.validatingHolder();
+		androidAnnotationsEnv.setValidatedElements(validatingHolder);
 
-		Option<AndroidManifest> androidManifestOption = extractAndroidManifest();
-		if (androidManifestOption.isAbsent()) {
-			return;
-		}
-		AndroidManifest androidManifest = androidManifestOption.get();
+		try {
+			AndroidManifest androidManifest = extractAndroidManifest();
+			LOGGER.info("AndroidManifest.xml found: {}", androidManifest);
 
-		LOGGER.info("AndroidManifest.xml found: {}", androidManifest);
+			IRClass rClass = findRClasses(androidManifest);
 
-		Option<IRClass> rClassOption = findRClasses(androidManifest);
-		if (rClassOption.isAbsent()) {
+			androidAnnotationsEnv.setAndroidEnvironment(rClass, androidManifest);
+
+		} catch (Exception e) {
 			return;
 		}
-		IRClass rClass = rClassOption.get();
 
-		AndroidSystemServices androidSystemServices = new AndroidSystemServices();
-
-		annotationHandlers.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-
-		AnnotationElements validatedModel = validateAnnotations(extractedModel);
+		AnnotationElements validatedModel = validateAnnotations(extractedModel, validatingHolder);
 
 		ModelProcessor.ProcessResult processResult = processAnnotations(validatedModel);
 
@@ -201,47 +190,37 @@ private AnnotationElementsHolder extractAnnotations(Set<? extends TypeElement> a
 		return extractedModel;
 	}
 
-	private Option<AndroidManifest> extractAndroidManifest() {
-		timeStats.start("Extract Manifest");
-		AndroidManifestFinder finder = new AndroidManifestFinder(processingEnv);
-		Option<AndroidManifest> manifest = finder.extractAndroidManifest();
-		timeStats.stop("Extract Manifest");
-		return manifest;
+	private AndroidManifest extractAndroidManifest() throws AndroidManifestNotFoundException {
+		try {
+			timeStats.start("Extract Manifest");
+			return new AndroidManifestFinder(androidAnnotationsEnv).extractAndroidManifest();
+		} finally {
+			timeStats.stop("Extract Manifest");
+		}
 	}
 
-	private Option<IRClass> findRClasses(AndroidManifest androidManifest) throws IOException {
-		timeStats.start("Find R Classes");
-		ProjectRClassFinder rClassFinder = new ProjectRClassFinder(processingEnv);
-
-		Option<IRClass> rClass = rClassFinder.find(androidManifest);
-
-		AndroidRClassFinder androidRClassFinder = new AndroidRClassFinder(processingEnv);
-
-		Option<IRClass> androidRClass = androidRClassFinder.find();
-
-		if (rClass.isAbsent() || androidRClass.isAbsent()) {
-			return Option.absent();
+	private IRClass findRClasses(AndroidManifest androidManifest) throws RClassNotFoundException {
+		try {
+			timeStats.start("Find R Classes");
+			IRClass rClass = new ProjectRClassFinder(androidAnnotationsEnv).find(androidManifest);
+			IRClass androidRClass = new AndroidRClassFinder(processingEnv).find();
+			return new CompoundRClass(rClass, androidRClass);
+		} finally {
+			timeStats.stop("Find R Classes");
 		}
-
-		IRClass coumpoundRClass = new CoumpoundRClass(rClass.get(), androidRClass.get());
-
-		timeStats.stop("Find R Classes");
-
-		return Option.of(coumpoundRClass);
 	}
 
-	private AnnotationElements validateAnnotations(AnnotationElementsHolder extractedModel) throws ProcessingException, Exception {
+	private AnnotationElements validateAnnotations(AnnotationElements extractedModel, AnnotationElementsHolder validatingHolder) throws ValidationException {
 		timeStats.start("Validate Annotations");
-		ModelValidator modelValidator = new ModelValidator(annotationHandlers);
-		AnnotationElements validatedAnnotations = modelValidator.validate(extractedModel);
+		ModelValidator modelValidator = new ModelValidator(androidAnnotationsEnv);
+		AnnotationElements validatedAnnotations = modelValidator.validate(extractedModel, validatingHolder);
 		timeStats.stop("Validate Annotations");
 		return validatedAnnotations;
 	}
 
 	private ModelProcessor.ProcessResult processAnnotations(AnnotationElements validatedModel) throws Exception {
 		timeStats.start("Process Annotations");
-		annotationHandlers.setValidatedModel(validatedModel);
-		ModelProcessor modelProcessor = new ModelProcessor(processingEnv, annotationHandlers);
+		ModelProcessor modelProcessor = new ModelProcessor(androidAnnotationsEnv);
 		ModelProcessor.ProcessResult processResult = modelProcessor.process(validatedModel);
 		timeStats.stop("Process Annotations");
 		return processResult;
@@ -250,13 +229,13 @@ private ModelProcessor.ProcessResult processAnnotations(AnnotationElements valid
 	private void generateSources(ModelProcessor.ProcessResult processResult) throws IOException {
 		timeStats.start("Generate Sources");
 		LOGGER.info("Number of files generated by AndroidAnnotations: {}", processResult.codeModel.countArtifacts());
-		CodeModelGenerator modelGenerator = new CodeModelGenerator(processingEnv.getFiler(), getAAProcessorVersion());
+		CodeModelGenerator modelGenerator = new CodeModelGenerator(processingEnv.getFiler(), coreVersion);
 		modelGenerator.generate(processResult);
 		timeStats.stop("Generate Sources");
 	}
 
 	private void handleException(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv, ProcessingException e) {
-		String errorMessage = errorHelper.getErrorMessage(processingEnv, e, getAAProcessorVersion());
+		String errorMessage = errorHelper.getErrorMessage(processingEnv, e, coreVersion);
 
 		/*
 		 * Printing exception as an error on a random element. The exception is
@@ -275,12 +254,12 @@ private void handleException(Set<? extends TypeElement> annotations, RoundEnviro
 
 	@Override
 	public Set<String> getSupportedAnnotationTypes() {
-		return annotationHandlers.getSupportedAnnotationTypes();
+		return androidAnnotationsEnv.getSupportedAnnotationTypes();
 	}
 
 	@Override
 	public Set<String> getSupportedOptions() {
-		return OptionsHelper.getOptionsConstants();
+		return androidAnnotationsEnv.getSupportedOptions();
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AnnotationHandlers.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AnnotationHandlers.java
new file mode 100644
index 0000000000..42a15e1a00
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AnnotationHandlers.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.handler.GeneratingAnnotationHandler;
+import org.androidannotations.handler.HasParameterHandlers;
+
+public class AnnotationHandlers {
+
+	private List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
+	private List<GeneratingAnnotationHandler<?>> generatingAnnotationHandlers = new ArrayList<>();
+	private List<AnnotationHandler<?>> decoratingAnnotationHandlers = new ArrayList<>();
+	private Set<String> supportedAnnotationNames;
+
+	public AnnotationHandlers() {
+	}
+
+	public void add(AnnotationHandler<?> annotationHandler) {
+		annotationHandlers.add(annotationHandler);
+		if (annotationHandler instanceof GeneratingAnnotationHandler) {
+			generatingAnnotationHandlers.add((GeneratingAnnotationHandler) annotationHandler);
+		} else {
+			decoratingAnnotationHandlers.add(annotationHandler);
+		}
+		addParameterHandlers(annotationHandler);
+	}
+
+	private void addParameterHandlers(AnnotationHandler<?> annotationHandler) {
+		if (annotationHandler instanceof HasParameterHandlers) {
+			HasParameterHandlers<?> hasParameterHandlers = (HasParameterHandlers<?>) annotationHandler;
+			for (AnnotationHandler<?> parameterHandler : hasParameterHandlers.getParameterHandlers()) {
+				add(parameterHandler);
+			}
+		}
+	}
+
+	public List<AnnotationHandler<?>> get() {
+		return annotationHandlers;
+	}
+
+	public List<GeneratingAnnotationHandler<?>> getGenerating() {
+		return generatingAnnotationHandlers;
+	}
+
+	public List<AnnotationHandler<?>> getDecorating() {
+		return decoratingAnnotationHandlers;
+	}
+
+	public Set<String> getSupportedAnnotationTypes() {
+		if (supportedAnnotationNames == null) {
+			Set<String> annotationNames = new HashSet<>();
+			for (AnnotationHandler annotationHandler : annotationHandlers) {
+				annotationNames.add(annotationHandler.getTarget());
+			}
+			supportedAnnotationNames = Collections.unmodifiableSet(annotationNames);
+		}
+		return supportedAnnotationNames;
+	}
+
+	@SuppressWarnings("unchecked")
+	public List<Class<? extends Annotation>> getGeneratingAnnotations() {
+		List<Class<? extends Annotation>> generatingAnnotations = new ArrayList<>();
+		for (GeneratingAnnotationHandler generatingAnnotationHandler : getGenerating()) {
+			try {
+				generatingAnnotations.add((Class<? extends Annotation>) Class.forName(generatingAnnotationHandler.getTarget()));
+			} catch (ClassNotFoundException | ClassCastException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		return generatingAnnotations;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/InternalAndroidAnnotationsEnvironment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/InternalAndroidAnnotationsEnvironment.java
new file mode 100644
index 0000000000..4e6fd17346
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/InternalAndroidAnnotationsEnvironment.java
@@ -0,0 +1,193 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.handler.GeneratingAnnotationHandler;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.model.AnnotationElements;
+import org.androidannotations.internal.process.ProcessHolder;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+import org.androidannotations.rclass.IRClass;
+
+import com.sun.codemodel.JClass;
+import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JDefinedClass;
+
+public class InternalAndroidAnnotationsEnvironment implements AndroidAnnotationsEnvironment {
+
+	private final ProcessingEnvironment processingEnvironment;
+	private final Options options;
+	private final AnnotationHandlers annotationHandlers;
+
+	private List<AndroidAnnotationsPlugin> plugins;
+
+	private IRClass rClass;
+	private AndroidManifest androidManifest;
+
+	private AnnotationElements validatedElements;
+
+	private ProcessHolder processHolder;
+
+	InternalAndroidAnnotationsEnvironment(ProcessingEnvironment processingEnvironment) {
+		this.processingEnvironment = processingEnvironment;
+		options = new Options(processingEnvironment);
+		annotationHandlers = new AnnotationHandlers();
+	}
+
+	public void setPlugins(List<AndroidAnnotationsPlugin> plugins) {
+		this.plugins = plugins;
+		for (AndroidAnnotationsPlugin plugin : plugins) {
+			options.addAllSupportedOptions(plugin.getSupportedOptions());
+			for (AnnotationHandler<?> annotationHandler : plugin.getHandlers(this)) {
+				annotationHandlers.add(annotationHandler);
+			}
+		}
+	}
+
+	public void setAndroidEnvironment(IRClass rClass, AndroidManifest androidManifest) {
+		this.rClass = rClass;
+		this.androidManifest = androidManifest;
+	}
+
+	public void setValidatedElements(AnnotationElements validatedElements) {
+		this.validatedElements = validatedElements;
+	}
+
+	public void setProcessHolder(ProcessHolder processHolder) {
+		this.processHolder = processHolder;
+	}
+
+	@Override
+	public ProcessingEnvironment getProcessingEnvironment() {
+		return processingEnvironment;
+	}
+
+	@Override
+	public Set<String> getSupportedOptions() {
+		return options.getSupportedOptions();
+	}
+
+	@Override
+	public String getOptionValue(Option option) {
+		return options.get(option);
+	}
+
+	@Override
+	public String getOptionValue(String optionKey) {
+		return options.get(optionKey);
+	}
+
+	@Override
+	public boolean getOptionBooleanValue(Option option) {
+		return options.getBoolean(option);
+	}
+
+	@Override
+	public boolean getOptionBooleanValue(String optionKey) {
+		return options.getBoolean(optionKey);
+	}
+
+	@Override
+	public Set<String> getSupportedAnnotationTypes() {
+		return annotationHandlers.getSupportedAnnotationTypes();
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getHandlers() {
+		return annotationHandlers.get();
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getDecoratingHandlers() {
+		return annotationHandlers.getDecorating();
+	}
+
+	@Override
+	public List<GeneratingAnnotationHandler<?>> getGeneratingHandlers() {
+		return annotationHandlers.getGenerating();
+	}
+
+	@Override
+	public IRClass getRClass() {
+		return rClass;
+	}
+
+	@Override
+	public AndroidManifest getAndroidManifest() {
+		return androidManifest;
+	}
+
+	@Override
+	public AnnotationElements getValidatedElements() {
+		return validatedElements;
+	}
+
+	@Override
+	public JCodeModel getCodeModel() {
+		return processHolder.codeModel();
+	}
+
+	@Override
+	public JClass getJClass(String fullyQualifiedName) {
+		return processHolder.refClass(fullyQualifiedName);
+	}
+
+	@Override
+	public JClass getJClass(Class<?> clazz) {
+		return processHolder.refClass(clazz);
+	}
+
+	@Override
+	public JDefinedClass getDefinedClass(String fullyQualifiedName) {
+		return processHolder.definedClass(fullyQualifiedName);
+	}
+
+	@Override
+	public GeneratedClassHolder getGeneratedClassHolder(Element element) {
+		return processHolder.getGeneratedClassHolder(element);
+	}
+
+	@Override
+	public ProcessHolder.Classes getClasses() {
+		return processHolder.classes();
+	}
+
+	@Override
+	public List<Class<? extends Annotation>> getGeneratingAnnotations() {
+		return annotationHandlers.getGeneratingAnnotations();
+	}
+
+	@Override
+	public boolean isAndroidAnnotation(String annotationQualifiedName) {
+		return getSupportedAnnotationTypes().contains(annotationQualifiedName);
+	}
+
+	@Override
+	public List<AndroidAnnotationsPlugin> getPlugins() {
+		return plugins;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java
new file mode 100644
index 0000000000..2d2fd97a3e
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.processing.ProcessingEnvironment;
+
+import org.androidannotations.Option;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.internal.helper.AndroidManifestFinder;
+import org.androidannotations.internal.rclass.ProjectRClassFinder;
+import org.androidannotations.logger.LoggerContext;
+import org.androidannotations.logger.appender.FileAppender;
+
+public class Options {
+
+	private final Map<String, Option> supportedOptions = new HashMap<>();
+	private final Map<String, String> options;
+
+	public Options(ProcessingEnvironment processingEnvironment) {
+		options = processingEnvironment.getOptions();
+		addSupportedOption(AndroidManifestFinder.OPTION_MANIFEST);
+		addSupportedOption(ProjectRClassFinder.OPTION_RESOURCE_PACKAGE_NAME);
+		addSupportedOption(ModelConstants.OPTION_CLASS_SUFFIX);
+		addSupportedOption(FileAppender.OPTION_LOG_FILE);
+		addSupportedOption(LoggerContext.OPTION_LOG_LEVEL);
+		addSupportedOption(LoggerContext.OPTION_LOG_APPENDER_CONSOLE);
+		addSupportedOption(LoggerContext.OPTION_LOG_APPENDER_FILE);
+	}
+
+	public void addAllSupportedOptions(List<Option> options) {
+		for (Option option : options) {
+			addSupportedOption(option);
+		}
+	}
+
+	private void addSupportedOption(Option option) {
+		supportedOptions.put(option.getName(), option);
+	}
+
+	public String get(Option option) {
+		String value = options.get(option.getName());
+		return value != null ? value : option.getDefaultValue();
+	}
+
+	public String get(String optionKey) {
+		Option option = supportedOptions.get(optionKey);
+		if (option != null) {
+			return get(option);
+		} else {
+			return options.get(optionKey);
+		}
+	}
+
+	public boolean getBoolean(Option option) {
+		return Boolean.valueOf(get(option));
+	}
+
+	public boolean getBoolean(String optionKey) {
+		return Boolean.valueOf(get(optionKey));
+	}
+
+	public Set<String> getSupportedOptions() {
+		return supportedOptions.keySet();
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/CorePlugin.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/CorePlugin.java
new file mode 100644
index 0000000000..1292b8816d
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/CorePlugin.java
@@ -0,0 +1,233 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.internal.core.handler.AfterExtrasHandler;
+import org.androidannotations.internal.core.handler.AfterInjectHandler;
+import org.androidannotations.internal.core.handler.AfterPreferencesHandler;
+import org.androidannotations.internal.core.handler.AfterTextChangeHandler;
+import org.androidannotations.internal.core.handler.AfterViewsHandler;
+import org.androidannotations.internal.core.handler.AnimationResHandler;
+import org.androidannotations.internal.core.handler.AppHandler;
+import org.androidannotations.internal.core.handler.BackgroundHandler;
+import org.androidannotations.internal.core.handler.BeanHandler;
+import org.androidannotations.internal.core.handler.BeforeTextChangeHandler;
+import org.androidannotations.internal.core.handler.CheckedChangeHandler;
+import org.androidannotations.internal.core.handler.ClickHandler;
+import org.androidannotations.internal.core.handler.CustomTitleHandler;
+import org.androidannotations.internal.core.handler.DefaultResHandler;
+import org.androidannotations.internal.core.handler.DrawableResHandler;
+import org.androidannotations.internal.core.handler.EActivityHandler;
+import org.androidannotations.internal.core.handler.EApplicationHandler;
+import org.androidannotations.internal.core.handler.EBeanHandler;
+import org.androidannotations.internal.core.handler.EFragmentHandler;
+import org.androidannotations.internal.core.handler.EIntentServiceHandler;
+import org.androidannotations.internal.core.handler.EProviderHandler;
+import org.androidannotations.internal.core.handler.EReceiverHandler;
+import org.androidannotations.internal.core.handler.EServiceHandler;
+import org.androidannotations.internal.core.handler.EViewGroupHandler;
+import org.androidannotations.internal.core.handler.EViewHandler;
+import org.androidannotations.internal.core.handler.EditorActionHandler;
+import org.androidannotations.internal.core.handler.ExtraHandler;
+import org.androidannotations.internal.core.handler.FocusChangeHandler;
+import org.androidannotations.internal.core.handler.FragmentArgHandler;
+import org.androidannotations.internal.core.handler.FragmentByIdHandler;
+import org.androidannotations.internal.core.handler.FragmentByTagHandler;
+import org.androidannotations.internal.core.handler.FromHtmlHandler;
+import org.androidannotations.internal.core.handler.FullscreenHandler;
+import org.androidannotations.internal.core.handler.HierarchyViewerSupportHandler;
+import org.androidannotations.internal.core.handler.HtmlResHandler;
+import org.androidannotations.internal.core.handler.HttpsClientHandler;
+import org.androidannotations.internal.core.handler.IgnoredWhenDetachedHandler;
+import org.androidannotations.internal.core.handler.InjectMenuHandler;
+import org.androidannotations.internal.core.handler.InstanceStateHandler;
+import org.androidannotations.internal.core.handler.ItemClickHandler;
+import org.androidannotations.internal.core.handler.ItemLongClickHandler;
+import org.androidannotations.internal.core.handler.ItemSelectHandler;
+import org.androidannotations.internal.core.handler.LongClickHandler;
+import org.androidannotations.internal.core.handler.NonConfigurationInstanceHandler;
+import org.androidannotations.internal.core.handler.OnActivityResultHandler;
+import org.androidannotations.internal.core.handler.OptionsItemHandler;
+import org.androidannotations.internal.core.handler.OptionsMenuHandler;
+import org.androidannotations.internal.core.handler.OptionsMenuItemHandler;
+import org.androidannotations.internal.core.handler.PrefHandler;
+import org.androidannotations.internal.core.handler.PreferenceByKeyHandler;
+import org.androidannotations.internal.core.handler.PreferenceChangeHandler;
+import org.androidannotations.internal.core.handler.PreferenceClickHandler;
+import org.androidannotations.internal.core.handler.PreferenceHeadersHandler;
+import org.androidannotations.internal.core.handler.PreferenceScreenHandler;
+import org.androidannotations.internal.core.handler.ReceiverActionHandler;
+import org.androidannotations.internal.core.handler.ReceiverHandler;
+import org.androidannotations.internal.core.handler.RootContextHandler;
+import org.androidannotations.internal.core.handler.SeekBarProgressChangeHandler;
+import org.androidannotations.internal.core.handler.SeekBarTouchStartHandler;
+import org.androidannotations.internal.core.handler.SeekBarTouchStopHandler;
+import org.androidannotations.internal.core.handler.ServiceActionHandler;
+import org.androidannotations.internal.core.handler.SharedPrefHandler;
+import org.androidannotations.internal.core.handler.SupposeBackgroundHandler;
+import org.androidannotations.internal.core.handler.SupposeUiThreadHandler;
+import org.androidannotations.internal.core.handler.SystemServiceHandler;
+import org.androidannotations.internal.core.handler.TextChangeHandler;
+import org.androidannotations.internal.core.handler.TouchHandler;
+import org.androidannotations.internal.core.handler.TraceHandler;
+import org.androidannotations.internal.core.handler.TransactionalHandler;
+import org.androidannotations.internal.core.handler.UiThreadHandler;
+import org.androidannotations.internal.core.handler.ViewByIdHandler;
+import org.androidannotations.internal.core.handler.ViewsByIdHandler;
+import org.androidannotations.internal.core.handler.WakeLockHandler;
+import org.androidannotations.internal.core.handler.WindowFeatureHandler;
+import org.androidannotations.internal.core.model.AndroidRes;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+
+public class CorePlugin extends AndroidAnnotationsPlugin {
+
+	private static final String NAME = "AndroidAnnotations";
+
+	private static final Option OPTION_TRACE = new Option("trace", "false");
+	private static final Option OPTION_THREAD_CONTROL = new Option("threadControl", "true");
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	public List<Option> getSupportedOptions() {
+		return Arrays.asList(OPTION_TRACE, OPTION_THREAD_CONTROL);
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
+		List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
+		annotationHandlers.add(new EApplicationHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EActivityHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EProviderHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EReceiverHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EServiceHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EIntentServiceHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EFragmentHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EBeanHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EViewGroupHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EViewHandler(androidAnnotationEnv));
+		annotationHandlers.add(new SharedPrefHandler(androidAnnotationEnv));
+		annotationHandlers.add(new PrefHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ViewByIdHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ViewsByIdHandler(androidAnnotationEnv));
+		annotationHandlers.add(new FragmentByIdHandler(androidAnnotationEnv));
+		annotationHandlers.add(new FragmentByTagHandler(androidAnnotationEnv));
+		annotationHandlers.add(new FromHtmlHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ClickHandler(androidAnnotationEnv));
+		annotationHandlers.add(new LongClickHandler(androidAnnotationEnv));
+		annotationHandlers.add(new TouchHandler(androidAnnotationEnv));
+		annotationHandlers.add(new FocusChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new CheckedChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ItemClickHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ItemSelectHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ItemLongClickHandler(androidAnnotationEnv));
+		annotationHandlers.add(new EditorActionHandler(androidAnnotationEnv));
+		for (AndroidRes androidRes : AndroidRes.values()) {
+			if (androidRes == AndroidRes.ANIMATION) {
+				annotationHandlers.add(new AnimationResHandler(androidAnnotationEnv));
+			} else if (androidRes == AndroidRes.DRAWABLE) {
+				annotationHandlers.add(new DrawableResHandler(androidAnnotationEnv));
+			} else if (androidRes == AndroidRes.HTML) {
+				annotationHandlers.add(new HtmlResHandler(androidAnnotationEnv));
+			} else {
+				annotationHandlers.add(new DefaultResHandler(androidRes, androidAnnotationEnv));
+			}
+		}
+		annotationHandlers.add(new TransactionalHandler(androidAnnotationEnv));
+		annotationHandlers.add(new FragmentArgHandler(androidAnnotationEnv));
+		annotationHandlers.add(new SystemServiceHandler(androidAnnotationEnv));
+
+		annotationHandlers.add(new AppHandler(androidAnnotationEnv));
+		annotationHandlers.add(new BeanHandler(androidAnnotationEnv));
+		annotationHandlers.add(new InjectMenuHandler(androidAnnotationEnv));
+		annotationHandlers.add(new OptionsMenuHandler(androidAnnotationEnv));
+		annotationHandlers.add(new OptionsMenuItemHandler(androidAnnotationEnv));
+		annotationHandlers.add(new OptionsItemHandler(androidAnnotationEnv));
+		annotationHandlers.add(new CustomTitleHandler(androidAnnotationEnv));
+		annotationHandlers.add(new FullscreenHandler(androidAnnotationEnv));
+		annotationHandlers.add(new RootContextHandler(androidAnnotationEnv));
+		annotationHandlers.add(new NonConfigurationInstanceHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ExtraHandler(androidAnnotationEnv));
+		annotationHandlers.add(new BeforeTextChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new TextChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new AfterTextChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new SeekBarProgressChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new SeekBarTouchStartHandler(androidAnnotationEnv));
+		annotationHandlers.add(new SeekBarTouchStopHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ServiceActionHandler(androidAnnotationEnv));
+		annotationHandlers.add(new InstanceStateHandler(androidAnnotationEnv));
+		annotationHandlers.add(new HttpsClientHandler(androidAnnotationEnv));
+		annotationHandlers.add(new HierarchyViewerSupportHandler(androidAnnotationEnv));
+		annotationHandlers.add(new WindowFeatureHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ReceiverHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ReceiverActionHandler(androidAnnotationEnv));
+		annotationHandlers.add(new OnActivityResultHandler(androidAnnotationEnv));
+
+		annotationHandlers.add(new IgnoredWhenDetachedHandler(androidAnnotationEnv));
+		/* After injection methods must be after injections */
+		annotationHandlers.add(new AfterInjectHandler(androidAnnotationEnv));
+		annotationHandlers.add(new AfterExtrasHandler(androidAnnotationEnv));
+		annotationHandlers.add(new AfterViewsHandler(androidAnnotationEnv));
+
+		/* preference screen handler must be after injections */
+		annotationHandlers.add(new PreferenceScreenHandler(androidAnnotationEnv));
+		annotationHandlers.add(new PreferenceHeadersHandler(androidAnnotationEnv));
+		/* Preference injections must be after preference screen handler */
+		annotationHandlers.add(new PreferenceByKeyHandler(androidAnnotationEnv));
+		annotationHandlers.add(new PreferenceChangeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new PreferenceClickHandler(androidAnnotationEnv));
+		/* After preference injection methods must be after preference injections */
+		annotationHandlers.add(new AfterPreferencesHandler(androidAnnotationEnv));
+
+		if (androidAnnotationEnv.getOptionBooleanValue(OPTION_TRACE)) {
+			annotationHandlers.add(new TraceHandler(androidAnnotationEnv));
+		}
+
+		/*
+		 * WakeLockHandler must be after TraceHandler but before UiThreadHandler
+		 * and BackgroundHandler
+		 */
+		annotationHandlers.add(new WakeLockHandler(androidAnnotationEnv));
+
+		/*
+		 * UIThreadHandler and BackgroundHandler must be after TraceHandler and
+		 * IgnoredWhenDetached
+		 */
+		annotationHandlers.add(new UiThreadHandler(androidAnnotationEnv));
+		annotationHandlers.add(new BackgroundHandler(androidAnnotationEnv));
+
+		/*
+		 * SupposeUiThreadHandler and SupposeBackgroundHandler must be after all
+		 * handlers that modifies generated method body
+		 */
+		if (androidAnnotationEnv.getOptionBooleanValue(OPTION_THREAD_CONTROL)) {
+			annotationHandlers.add(new SupposeUiThreadHandler(androidAnnotationEnv));
+			annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv));
+		}
+
+		return annotationHandlers;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractListenerHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java
similarity index 69%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractListenerHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java
index 9203b00d76..42ed3ee971 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractListenerHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java
@@ -13,26 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.invoke;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -47,33 +44,28 @@
 
 public abstract class AbstractListenerHandler<T extends GeneratedClassHolder> extends BaseAnnotationHandler<T> {
 
-	private IdAnnotationHelper helper;
 	private T holder;
 	private String methodName;
 
-	public AbstractListenerHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public AbstractListenerHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
-	public AbstractListenerHandler(String target, ProcessingEnvironment processingEnvironment) {
-		super(target, processingEnvironment);
+	public AbstractListenerHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
 	}
 
 	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		helper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
-	}
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.resIdsExist(element, getResourceType(), IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, getResourceType(), IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.uniqueResourceId(element, validatedElements, getResourceType(), valid);
+		validatorHelper.uniqueResourceId(element, getResourceType(), validation);
 	}
 
 	@Override
@@ -85,9 +77,9 @@ public void process(Element element, T holder) {
 		List<? extends VariableElement> parameters = executableElement.getParameters();
 		TypeMirror returnType = executableElement.getReturnType();
 
-		List<JFieldRef> idsRefs = helper.extractAnnotationFieldRefs(processHolder, element, getResourceType(), true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, getResourceType(), true);
 
-		JDefinedClass listenerAnonymousClass = codeModel().anonymousClass(getListenerClass());
+		JDefinedClass listenerAnonymousClass = getCodeModel().anonymousClass(getListenerClass());
 		JMethod listenerMethod = createListenerMethod(listenerAnonymousClass);
 		listenerMethod.annotate(Override.class);
 
@@ -107,7 +99,7 @@ protected final JExpression castArgumentIfNecessary(T holder, String baseType, J
 		JExpression argument = param;
 		TypeMirror typeMirror = element.asType();
 		if (!baseType.equals(typeMirror.toString())) {
-			JClass typeMirrorToJClass = codeModelHelper.typeMirrorToJClass(typeMirror, holder);
+			JClass typeMirrorToJClass = codeModelHelper.typeMirrorToJClass(typeMirror);
 			argument = JExpr.cast(typeMirrorToJClass, param);
 		}
 		return argument;
@@ -115,8 +107,8 @@ protected final JExpression castArgumentIfNecessary(T holder, String baseType, J
 
 	protected final boolean isTypeOrSubclass(String baseType, Element element) {
 		TypeMirror typeMirror = element.asType();
-		TypeElement typeElement = helper.typeElementFromQualifiedName(baseType);
-		return helper.isSubtype(typeMirror, typeElement.asType());
+		TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(baseType);
+		return annotationHelper.isSubtype(typeMirror, typeElement.asType());
 	}
 
 	protected abstract void assignListeners(T holder, List<JFieldRef> idsRefs, JDefinedClass listenerAnonymousClass);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractPreferenceListenerHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractPreferenceListenerHandler.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractPreferenceListenerHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractPreferenceListenerHandler.java
index d3e74d1948..0f7b3783ea 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractPreferenceListenerHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractPreferenceListenerHandler.java
@@ -13,19 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.holder.FoundPreferenceHolder;
 import org.androidannotations.holder.HasPreferences;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass.Res;
 
 import com.sun.codemodel.JClass;
@@ -34,23 +33,23 @@
 
 public abstract class AbstractPreferenceListenerHandler extends AbstractListenerHandler<HasPreferences> {
 
-	public AbstractPreferenceListenerHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public AbstractPreferenceListenerHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
-	public AbstractPreferenceListenerHandler(String target, ProcessingEnvironment processingEnvironment) {
-		super(target, processingEnvironment);
+	public AbstractPreferenceListenerHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, valid);
 	}
 
 	@Override
 	protected final JClass getListenerTargetClass() {
-		return classes().PREFERENCE;
+		return getClasses().PREFERENCE;
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractResHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java
similarity index 57%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractResHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java
index 11a05d8e0d..816ce33682 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractResHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java
@@ -13,20 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AndroidRes;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.internal.core.model.AndroidRes;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -35,30 +32,23 @@
 public abstract class AbstractResHandler extends BaseAnnotationHandler<EComponentHolder> {
 
 	protected AndroidRes androidRes;
-	private IdAnnotationHelper annotationHelper;
 
-	public AbstractResHandler(AndroidRes androidRes, ProcessingEnvironment processingEnvironment) {
-		super(androidRes.getAnnotationClass(), processingEnvironment);
+	public AbstractResHandler(AndroidRes androidRes, AndroidAnnotationsEnvironment environment) {
+		super(androidRes.getAnnotationClass(), environment);
 		this.androidRes = androidRes;
 	}
 
 	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
-	}
-
-	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
 		TypeMirror fieldTypeMirror = element.asType();
 
-		validatorHelper.allowedType(element, valid, fieldTypeMirror, androidRes.getAllowedTypes());
+		validatorHelper.allowedType(fieldTypeMirror, androidRes.getAllowedTypes(), validation);
 
-		validatorHelper.resIdsExist(element, androidRes.getRInnerClass(), IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, androidRes.getRInnerClass(), IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -67,7 +57,7 @@ public void process(Element element, EComponentHolder holder) {
 
 		IRClass.Res resInnerClass = androidRes.getRInnerClass();
 
-		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, resInnerClass, true);
+		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(element, resInnerClass, true);
 
 		JBlock methodBody = holder.getInitBody();
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractRunnableHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractRunnableHandler.java
similarity index 52%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractRunnableHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractRunnableHandler.java
index 2993fda55f..5e94dc047e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractRunnableHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractRunnableHandler.java
@@ -13,36 +13,35 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
-public abstract class AbstractRunnableHandler extends BaseAnnotationHandler<EComponentHolder> {
+public abstract class AbstractRunnableHandler extends CoreBaseAnnotationHandler<EComponentHolder> {
 
-	public AbstractRunnableHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public AbstractRunnableHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(executableElement, valid);
+		validatorHelper.doesntThrowException(executableElement, validation);
 
-		validatorHelper.isNotFinal(element, valid);
+		validatorHelper.isNotFinal(element, validation);
 
-		validatorHelper.isNotSynchronized(element, valid);
+		validatorHelper.isNotSynchronized(element, validation);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractSeekBarTouchHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractSeekBarTouchHandler.java
similarity index 64%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractSeekBarTouchHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractSeekBarTouchHandler.java
index 7022f0b495..7e17f2ff82 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractSeekBarTouchHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractSeekBarTouchHandler.java
@@ -13,24 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.OnSeekBarChangeListenerHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -39,42 +35,34 @@
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JVar;
 
-public abstract class AbstractSeekBarTouchHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+public abstract class AbstractSeekBarTouchHandler extends CoreBaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public AbstractSeekBarTouchHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public AbstractSeekBarTouchHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
-		validatorHelper.hasSeekBarTouchTrackingMethodParameters((ExecutableElement) element, valid);
+		coreValidatorHelper.hasSeekBarTouchTrackingMethodParameters((ExecutableElement) element, validation);
 
-		validatorHelper.param.type(CanonicalNameConstants.SEEKBAR).optional().validate((ExecutableElement) element, valid);
+		validatorHelper.param.type(CanonicalNameConstants.SEEKBAR).optional().validate((ExecutableElement) element, validation);
 	}
 
 	@Override
 	public void process(Element element, EComponentWithViewSupportHolder holder) throws Exception {
 		String methodName = element.getSimpleName().toString();
 
-		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 
 		for (JFieldRef idRef : idsRefs) {
 			OnSeekBarChangeListenerHolder onSeekBarChangeListenerHolder = holder.getOnSeekBarChangeListenerHolder(idRef);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractViewListenerHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractViewListenerHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractViewListenerHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractViewListenerHandler.java
index 4a99470f62..dde10e5260 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AbstractViewListenerHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractViewListenerHandler.java
@@ -13,19 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.FoundViewHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass.Res;
 
 import com.sun.codemodel.JClass;
@@ -34,18 +33,18 @@
 
 public abstract class AbstractViewListenerHandler extends AbstractListenerHandler<EComponentWithViewSupportHolder> {
 
-	public AbstractViewListenerHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public AbstractViewListenerHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
-	public AbstractViewListenerHandler(String target, ProcessingEnvironment processingEnvironment) {
-		super(target, processingEnvironment);
+	public AbstractViewListenerHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, valid);
 	}
 
 	@Override
@@ -58,7 +57,7 @@ protected final void assignListeners(EComponentWithViewSupportHolder holder, Lis
 
 	@Override
 	protected JClass getListenerTargetClass() {
-		return classes().VIEW;
+		return getClasses().VIEW;
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterExtrasHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterExtrasHandler.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterExtrasHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterExtrasHandler.java
index f569e43bc3..cba52de992 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterExtrasHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterExtrasHandler.java
@@ -13,26 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.AfterExtras;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 public class AfterExtrasHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	public AfterExtrasHandler(ProcessingEnvironment processingEnvironment) {
-		super(AfterExtras.class, processingEnvironment);
+	public AfterExtrasHandler(AndroidAnnotationsEnvironment environment) {
+		super(AfterExtras.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEActivity(element, valid);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterInjectHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterInjectHandler.java
similarity index 67%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterInjectHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterInjectHandler.java
index 1fbd47eef6..2af6a205da 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterInjectHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterInjectHandler.java
@@ -13,36 +13,36 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.AfterInject;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 public class AfterInjectHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public AfterInjectHandler(ProcessingEnvironment processingEnvironment) {
-		super(AfterInject.class, processingEnvironment);
+	public AfterInjectHandler(AndroidAnnotationsEnvironment environment) {
+		super(AfterInject.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(executableElement, valid);
+		validatorHelper.doesntThrowException(executableElement, validation);
 
-		validatorHelper.param.noParam().validate(executableElement, valid);
+		validatorHelper.param.noParam().validate(executableElement, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterPreferencesHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterPreferencesHandler.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterPreferencesHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterPreferencesHandler.java
index baf86d98dc..a3d1fcd68e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterPreferencesHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterPreferencesHandler.java
@@ -13,26 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.AfterPreferences;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.HasPreferences;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 public class AfterPreferencesHandler extends BaseAnnotationHandler<HasPreferences> {
 
-	public AfterPreferencesHandler(ProcessingEnvironment processingEnvironment) {
-		super(AfterPreferences.class, processingEnvironment);
+	public AfterPreferencesHandler(AndroidAnnotationsEnvironment environment) {
+		super(AfterPreferences.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, valid);
 		validatorHelper.enclosingElementExtendsPreferenceActivityOrPreferenceFragment(element, valid);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterTextChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterTextChangeHandler.java
similarity index 65%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterTextChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterTextChangeHandler.java
index 20eadb00c9..03bd55a3f3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterTextChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterTextChangeHandler.java
@@ -13,26 +13,22 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.AfterTextChange;
-import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.TextWatcherHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -41,35 +37,27 @@
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JVar;
 
-public class AfterTextChangeHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+public class AfterTextChangeHandler extends CoreBaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper idAnnotationHelper;
-
-	public AfterTextChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(AfterTextChange.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		idAnnotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public AfterTextChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(AfterTextChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
-		validatorHelper.hasAfterTextChangedMethodParameters((ExecutableElement) element, valid);
+		coreValidatorHelper.hasAfterTextChangedMethodParameters((ExecutableElement) element, validation);
 
-		validatorHelper.param.anyOrder().type(CanonicalNameConstants.TEXT_VIEW).optional().type(CanonicalNameConstants.EDITABLE).optional().validate((ExecutableElement) element, valid);
+		validatorHelper.param.anyOrder().type(CanonicalNameConstants.TEXT_VIEW).optional().type(CanonicalNameConstants.EDITABLE).optional().validate((ExecutableElement) element, validation);
 	}
 
 	@Override
@@ -90,15 +78,15 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
 			if (CanonicalNameConstants.EDITABLE.equals(parameterType.toString())) {
 				editableParameterPosition = i;
 			} else {
-				TypeMirror textViewType = idAnnotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
-				if (idAnnotationHelper.isSubtype(parameterType, textViewType)) {
+				TypeMirror textViewType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
+				if (annotationHelper.isSubtype(parameterType, textViewType)) {
 					viewParameterPosition = i;
 					viewParameterType = parameterType;
 				}
 			}
 		}
 
-		List<JFieldRef> idsRefs = idAnnotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 
 		for (JFieldRef idRef : idsRefs) {
 			TextWatcherHolder textWatcherHolder = holder.getTextWatcherHolder(idRef, viewParameterType);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterViewsHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterViewsHandler.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterViewsHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterViewsHandler.java
index 92efbfb124..414887ead4 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterViewsHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AfterViewsHandler.java
@@ -13,36 +13,36 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 public class AfterViewsHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	public AfterViewsHandler(ProcessingEnvironment processingEnvironment) {
-		super(AfterViews.class, processingEnvironment);
+	public AfterViewsHandler(AndroidAnnotationsEnvironment environment) {
+		super(AfterViews.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(executableElement, valid);
+		validatorHelper.doesntThrowException(executableElement, validation);
 
-		validatorHelper.param.noParam().validate(executableElement, valid);
+		validatorHelper.param.noParam().validate(executableElement, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnimationResHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AnimationResHandler.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnimationResHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AnimationResHandler.java
index fb9748b2e7..dee02bcc83 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnimationResHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AnimationResHandler.java
@@ -13,26 +13,25 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
-
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AndroidRes;
+import org.androidannotations.internal.core.model.AndroidRes;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JFieldRef;
 
 public class AnimationResHandler extends AbstractResHandler {
 
-	public AnimationResHandler(ProcessingEnvironment processingEnvironment) {
-		super(AndroidRes.ANIMATION, processingEnvironment);
+	public AnimationResHandler(AndroidAnnotationsEnvironment environmentEnvironment) {
+		super(AndroidRes.ANIMATION, environmentEnvironment);
 	}
 
 	@Override
 	protected void makeCall(String fieldName, EComponentHolder holder, JBlock methodBody, JFieldRef idRef) {
-		methodBody.assign(ref(fieldName), classes().ANIMATION_UTILS.staticInvoke("loadAnimation").arg(holder.getContextRef()).arg(idRef));
+		methodBody.assign(ref(fieldName), getClasses().ANIMATION_UTILS.staticInvoke("loadAnimation").arg(holder.getContextRef()).arg(idRef));
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AppHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java
similarity index 73%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AppHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java
index 6b7530779c..1d20d4e949 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AppHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java
@@ -13,43 +13,43 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.ref;
 import static org.androidannotations.helper.ModelConstants.classSuffix;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.App;
 import org.androidannotations.annotations.EApplication;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EApplicationHolder;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JClass;
 
 public class AppHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public AppHandler(ProcessingEnvironment processingEnvironment) {
-		super(App.class, processingEnvironment);
+	public AppHandler(AndroidAnnotationsEnvironment environment) {
+		super(App.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.typeHasAnnotation(EApplication.class, element, valid);
+		validatorHelper.typeHasAnnotation(EApplication.class, element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
 	public void process(Element element, EComponentHolder holder) {
 		String fieldName = element.getSimpleName().toString();
 		String applicationQualifiedName = element.asType().toString();
-		JClass applicationClass = refClass(applicationQualifiedName + classSuffix());
+		JClass applicationClass = getJClass(applicationQualifiedName + classSuffix());
 
 		holder.getInitBody().assign(ref(fieldName), applicationClass.staticInvoke(EApplicationHolder.GET_APPLICATION_INSTANCE));
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BackgroundHandler.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BackgroundHandler.java
index efd9574e48..e4f8a80cf6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BackgroundHandler.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.lit;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.Background;
 import org.androidannotations.api.BackgroundExecutor;
 import org.androidannotations.holder.EComponentHolder;
@@ -39,8 +39,8 @@
 
 public class BackgroundHandler extends AbstractRunnableHandler {
 
-	public BackgroundHandler(ProcessingEnvironment processingEnvironment) {
-		super(Background.class, processingEnvironment);
+	public BackgroundHandler(AndroidAnnotationsEnvironment environment) {
+		super(Background.class, environment);
 	}
 
 	@Override
@@ -51,20 +51,20 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 
 		JBlock previousMethodBody = codeModelHelper.removeBody(delegatingMethod);
 
-		JDefinedClass anonymousTaskClass = codeModel().anonymousClass(BackgroundExecutor.Task.class);
+		JDefinedClass anonymousTaskClass = getCodeModel().anonymousClass(BackgroundExecutor.Task.class);
 
-		JMethod executeMethod = anonymousTaskClass.method(JMod.PUBLIC, codeModel().VOID, "execute");
+		JMethod executeMethod = anonymousTaskClass.method(JMod.PUBLIC, getCodeModel().VOID, "execute");
 		executeMethod.annotate(Override.class);
 
 		// Catch exception in user code
 		JTryBlock tryBlock = executeMethod.body()._try();
 		tryBlock.body().add(previousMethodBody);
-		JCatchBlock catchBlock = tryBlock._catch(holder.classes().THROWABLE);
+		JCatchBlock catchBlock = tryBlock._catch(getClasses().THROWABLE);
 		JVar caughtException = catchBlock.param("e");
-		JStatement uncaughtExceptionCall = holder.classes().THREAD //
+		JStatement uncaughtExceptionCall = getClasses().THREAD //
 				.staticInvoke("getDefaultUncaughtExceptionHandler") //
 				.invoke("uncaughtException") //
-				.arg(holder.classes().THREAD.staticInvoke("currentThread")) //
+				.arg(getClasses().THREAD.staticInvoke("currentThread")) //
 				.arg(caughtException);
 		catchBlock.body().add(uncaughtExceptionCall);
 
@@ -73,7 +73,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 		int delay = annotation.delay();
 		String serial = annotation.serial();
 
-		JClass backgroundExecutorClass = refClass(BackgroundExecutor.class);
+		JClass backgroundExecutorClass = getJClass(BackgroundExecutor.class);
 		JInvocation newTask = _new(anonymousTaskClass).arg(lit(id)).arg(lit(delay)).arg(lit(serial));
 		JInvocation executeCall = backgroundExecutorClass.staticInvoke("execute").arg(newTask);
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BeanHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BeanHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java
index 99ab2b1536..1850579572 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BeanHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java
@@ -13,23 +13,22 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EBean;
 import org.androidannotations.annotations.NonConfigurationInstance;
-import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EBeanHolder;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -38,20 +37,17 @@
 
 public class BeanHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	private final TargetAnnotationHelper annotationHelper;
-
-	public BeanHandler(ProcessingEnvironment processingEnvironment) {
-		super(Bean.class, processingEnvironment);
-		annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
+	public BeanHandler(AndroidAnnotationsEnvironment environment) {
+		super(Bean.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.typeOrTargetValueHasAnnotation(EBean.class, element, valid);
+		validatorHelper.typeOrTargetValueHasAnnotation(EBean.class, element, validation);
 	}
 
 	@Override
@@ -59,11 +55,11 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 		TypeMirror typeMirror = annotationHelper.extractAnnotationClassParameter(element);
 		if (typeMirror == null) {
 			typeMirror = element.asType();
-			typeMirror = holder.processingEnvironment().getTypeUtils().erasure(typeMirror);
+			typeMirror = getProcessingEnvironment().getTypeUtils().erasure(typeMirror);
 		}
 
 		String typeQualifiedName = typeMirror.toString();
-		JClass injectedClass = refClass(annotationHelper.generatedClassQualifiedNameFromQualifiedName(typeQualifiedName));
+		JClass injectedClass = getJClass(annotationHelper.generatedClassQualifiedNameFromQualifiedName(typeQualifiedName));
 
 		String fieldName = element.getSimpleName().toString();
 		JFieldRef beanField = ref(fieldName);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BeforeTextChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeforeTextChangeHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BeforeTextChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeforeTextChangeHandler.java
index 4be0f68dfc..b8d8413bf0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BeforeTextChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeforeTextChangeHandler.java
@@ -13,27 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.BeforeTextChange;
-import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.TextWatcherHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -42,33 +38,25 @@
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JVar;
 
-public class BeforeTextChangeHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+public class BeforeTextChangeHandler extends CoreBaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper idAnnotationHelper;
-
-	public BeforeTextChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(BeforeTextChange.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		idAnnotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public BeforeTextChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(BeforeTextChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
-		validatorHelper.hasBeforeTextChangedMethodParameters((ExecutableElement) element, valid);
+		coreValidatorHelper.hasBeforeTextChangedMethodParameters((ExecutableElement) element, validation);
 	}
 
 	@Override
@@ -101,15 +89,15 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
 					afterParameterPosition = i;
 				}
 			} else {
-				TypeMirror textViewType = idAnnotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
-				if (idAnnotationHelper.isSubtype(parameterType, textViewType)) {
+				TypeMirror textViewType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
+				if (annotationHelper.isSubtype(parameterType, textViewType)) {
 					viewParameterPosition = i;
 					viewParameterType = parameterType;
 				}
 			}
 		}
 
-		List<JFieldRef> idsRefs = idAnnotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 
 		for (JFieldRef idRef : idsRefs) {
 			TextWatcherHolder textWatcherHolder = holder.getTextWatcherHolder(idRef, viewParameterType);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CheckedChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CheckedChangeHandler.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CheckedChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CheckedChangeHandler.java
index 66ea9dffe5..a3fe31ca1a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CheckedChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CheckedChangeHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.CheckedChange;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -40,21 +39,21 @@
 
 public class CheckedChangeHandler extends AbstractViewListenerHandler {
 
-	public CheckedChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(CheckedChange.class, processingEnvironment);
+	public CheckedChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(CheckedChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
 		validatorHelper.param.anyOrder() //
 				.extendsType(CanonicalNameConstants.COMPOUND_BUTTON).optional() //
 				.primitiveOrWrapper(TypeKind.BOOLEAN).optional() //
-				.validate(executableElement, valid);
+				.validate(executableElement, validation);
 	}
 
 	@Override
@@ -64,8 +63,8 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
-		JVar btnParam = listenerMethod.param(classes().COMPOUND_BUTTON, "buttonView");
-		JVar isCheckedParam = listenerMethod.param(codeModel().BOOLEAN, "isChecked");
+		JVar btnParam = listenerMethod.param(getClasses().COMPOUND_BUTTON, "buttonView");
+		JVar isCheckedParam = listenerMethod.param(getCodeModel().BOOLEAN, "isChecked");
 
 		for (VariableElement parameter : parameters) {
 			String parameterType = parameter.asType().toString();
@@ -79,7 +78,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().VOID, "onCheckedChanged");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().VOID, "onCheckedChanged");
 	}
 
 	@Override
@@ -89,11 +88,11 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().COMPOUND_BUTTON_ON_CHECKED_CHANGE_LISTENER;
+		return getClasses().COMPOUND_BUTTON_ON_CHECKED_CHANGE_LISTENER;
 	}
 
 	@Override
 	protected JClass getListenerTargetClass() {
-		return classes().COMPOUND_BUTTON;
+		return getClasses().COMPOUND_BUTTON;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ClickHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ClickHandler.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ClickHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ClickHandler.java
index 1b5e9d0175..15f8c1f389 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ClickHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ClickHandler.java
@@ -13,21 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Click;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -39,19 +38,19 @@
 
 public class ClickHandler extends AbstractViewListenerHandler {
 
-	public ClickHandler(ProcessingEnvironment processingEnvironment) {
-		super(Click.class, processingEnvironment);
+	public ClickHandler(AndroidAnnotationsEnvironment environment) {
+		super(Click.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
-		validatorHelper.param.extendsType(CanonicalNameConstants.VIEW).optional().validate(executableElement, valid);
+		validatorHelper.param.extendsType(CanonicalNameConstants.VIEW).optional().validate(executableElement, validation);
 	}
 
 	@Override
@@ -63,7 +62,7 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
 		boolean hasItemParameter = parameters.size() == 1;
 
-		JVar viewParam = listenerMethod.param(classes().VIEW, "view");
+		JVar viewParam = listenerMethod.param(getClasses().VIEW, "view");
 
 		if (hasItemParameter) {
 			call.arg(castArgumentIfNecessary(holder, CanonicalNameConstants.VIEW, viewParam, parameters.get(0)));
@@ -72,7 +71,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().VOID, "onClick");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().VOID, "onClick");
 	}
 
 	@Override
@@ -82,7 +81,7 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().VIEW_ON_CLICK_LISTENER;
+		return getClasses().VIEW_ON_CLICK_LISTENER;
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CoreBaseAnnotationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CoreBaseAnnotationHandler.java
new file mode 100644
index 0000000000..6c0cdedcd7
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CoreBaseAnnotationHandler.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal.core.handler;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.handler.BaseAnnotationHandler;
+import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.core.helper.CoreValidatorHelper;
+
+public abstract class CoreBaseAnnotationHandler<T extends GeneratedClassHolder> extends BaseAnnotationHandler<T> {
+
+	protected final CoreValidatorHelper coreValidatorHelper;
+
+	public CoreBaseAnnotationHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		this(targetClass.getCanonicalName(), environment);
+	}
+
+	public CoreBaseAnnotationHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
+		coreValidatorHelper = new CoreValidatorHelper(annotationHelper);
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CoreBaseGeneratingAnnotationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CoreBaseGeneratingAnnotationHandler.java
new file mode 100644
index 0000000000..df96c13c07
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CoreBaseGeneratingAnnotationHandler.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal.core.handler;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
+import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.core.helper.CoreValidatorHelper;
+
+public abstract class CoreBaseGeneratingAnnotationHandler<T extends GeneratedClassHolder> extends BaseGeneratingAnnotationHandler<T> {
+
+	protected final CoreValidatorHelper coreValidatorHelper;
+
+	public CoreBaseGeneratingAnnotationHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		this(targetClass.getCanonicalName(), environment);
+	}
+
+	public CoreBaseGeneratingAnnotationHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
+		coreValidatorHelper = new CoreValidatorHelper(annotationHelper);
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CustomTitleHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CustomTitleHandler.java
similarity index 63%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CustomTitleHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CustomTitleHandler.java
index 253a6196c3..1287facdde 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CustomTitleHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/CustomTitleHandler.java
@@ -13,17 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.CustomTitle;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -31,27 +30,24 @@
 
 public class CustomTitleHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	private final AnnotationHelper annotationHelper;
-
-	public CustomTitleHandler(ProcessingEnvironment processingEnvironment) {
-		super(CustomTitle.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
+	public CustomTitleHandler(AndroidAnnotationsEnvironment environment) {
+		super(CustomTitle.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.hasEActivity(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, validation);
 	}
 
 	@Override
 	public void process(Element element, EActivityHolder holder) {
 		JBlock onViewChangedBody = holder.getOnViewChangedBody();
 
-		JFieldRef contentViewId = annotationHelper.extractAnnotationFieldRefs(processHolder, element, getTarget(), rClass.get(IRClass.Res.LAYOUT), false).get(0);
+		JFieldRef contentViewId = annotationHelper.extractAnnotationFieldRefs(element, getTarget(), getEnvironment().getRClass().get(IRClass.Res.LAYOUT), false).get(0);
 
-		JFieldRef customTitleFeature = classes().WINDOW.staticRef("FEATURE_CUSTOM_TITLE");
+		JFieldRef customTitleFeature = getClasses().WINDOW.staticRef("FEATURE_CUSTOM_TITLE");
 		holder.getInitBody().invoke("requestWindowFeature").arg(customTitleFeature);
 		onViewChangedBody.add(holder.getContextRef().invoke("getWindow").invoke("setFeatureInt").arg(customTitleFeature).arg(contentViewId));
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/DefaultResHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/DefaultResHandler.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/DefaultResHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/DefaultResHandler.java
index 1089a2d927..36f193b0dd 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/DefaultResHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/DefaultResHandler.java
@@ -13,23 +13,22 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
-
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AndroidRes;
+import org.androidannotations.internal.core.model.AndroidRes;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JFieldRef;
 
 public class DefaultResHandler extends AbstractResHandler {
 
-	public DefaultResHandler(AndroidRes androidRes, ProcessingEnvironment processingEnvironment) {
-		super(androidRes, processingEnvironment);
+	public DefaultResHandler(AndroidRes androidRes, AndroidAnnotationsEnvironment environment) {
+		super(androidRes, environment);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/DrawableResHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/DrawableResHandler.java
similarity index 73%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/DrawableResHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/DrawableResHandler.java
index 5967e4be02..003129ebcc 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/DrawableResHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/DrawableResHandler.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.ref;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AndroidRes;
+import org.androidannotations.internal.core.model.AndroidRes;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JConditional;
@@ -39,15 +39,15 @@ public class DrawableResHandler extends AbstractResHandler {
 
 	private static final int MIN_SDK_WITH_CONTEXT_GET_DRAWABLE = 21;
 
-	public DrawableResHandler(ProcessingEnvironment processingEnvironment) {
-		super(AndroidRes.DRAWABLE, processingEnvironment);
+	public DrawableResHandler(AndroidAnnotationsEnvironment environment) {
+		super(AndroidRes.DRAWABLE, environment);
 	}
 
 	@Override
 	protected void makeCall(String fieldName, EComponentHolder holder, JBlock methodBody, JFieldRef idRef) {
 		JFieldRef ref = ref(fieldName);
 		if (hasContextCompatInClasspath()) {
-			methodBody.assign(ref, classes().CONTEXT_COMPAT.staticInvoke("getDrawable").arg(holder.getContextRef()).arg(idRef));
+			methodBody.assign(ref, getClasses().CONTEXT_COMPAT.staticInvoke("getDrawable").arg(holder.getContextRef()).arg(idRef));
 		} else if (shouldUseContextGetDrawableMethod() && !hasContextCompatInClasspath()) {
 			methodBody.assign(ref, holder.getContextRef().invoke("getDrawable").arg(idRef));
 		} else if (!shouldUseContextGetDrawableMethod() && hasGetDrawableInContext() && !hasContextCompatInClasspath()) {
@@ -58,22 +58,22 @@ protected void makeCall(String fieldName, EComponentHolder holder, JBlock method
 	}
 
 	private boolean hasContextCompatInClasspath() {
-		return processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT_COMPAT) != null;
+		return getProcessingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT_COMPAT) != null;
 	}
 
 	private boolean shouldUseContextGetDrawableMethod() {
-		return androidManifest.getMinSdkVersion() >= MIN_SDK_WITH_CONTEXT_GET_DRAWABLE;
+		return getEnvironment().getAndroidManifest().getMinSdkVersion() >= MIN_SDK_WITH_CONTEXT_GET_DRAWABLE;
 	}
 
 	private boolean hasGetDrawableInContext() {
-		TypeElement context = processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT);
+		TypeElement context = getProcessingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT);
 
 		return hasGetDrawable(context);
 	}
 
 	private void createCallWithIfGuard(EComponentHolder holder, JFieldRef ref, JBlock methodBody, JFieldRef idRef) {
 		JVar resourcesRef = holder.getResourcesRef();
-		JConditional guardIf = methodBody._if(holder.classes().BUILD_VERSION.staticRef("SDK_INT").gte(holder.classes().BUILD_VERSION_CODES.staticRef("LOLLIPOP")));
+		JConditional guardIf = methodBody._if(getClasses().BUILD_VERSION.staticRef("SDK_INT").gte(getClasses().BUILD_VERSION_CODES.staticRef("LOLLIPOP")));
 		JBlock ifBlock = guardIf._then();
 		ifBlock.assign(ref, holder.getContextRef().invoke("getDrawable").arg(idRef));
 
@@ -86,7 +86,7 @@ private boolean hasGetDrawable(TypeElement type) {
 			return false;
 		}
 
-		List<? extends Element> allMembers = processingEnvironment().getElementUtils().getAllMembers(type);
+		List<? extends Element> allMembers = getProcessingEnvironment().getElementUtils().getAllMembers(type);
 		for (ExecutableElement element : ElementFilter.methodsIn(allMembers)) {
 			if (element.getSimpleName().contentEquals("getDrawable")) {
 				return true;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EActivityHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EActivityHandler.java
similarity index 63%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EActivityHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EActivityHandler.java
index ab1b9b3730..6a5fb19b9a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EActivityHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EActivityHandler.java
@@ -13,21 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -36,33 +34,30 @@
 
 public class EActivityHandler extends BaseGeneratingAnnotationHandler<EActivityHolder> {
 
-	private AnnotationHelper annotationHelper;
-
-	public EActivityHandler(ProcessingEnvironment processingEnvironment) {
-		super(EActivity.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
+	public EActivityHandler(AndroidAnnotationsEnvironment environment) {
+		super(EActivity.class, environment);
 	}
 
 	@Override
-	public EActivityHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EActivityHolder(processHolder, annotatedElement, androidManifest);
+	public EActivityHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EActivityHolder(environment, annotatedElement, getEnvironment().getAndroidManifest());
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
 
 		validatorHelper.extendsActivity(element, valid);
 
 		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.ALLOW_NO_RES_ID, valid);
 
-		validatorHelper.componentRegistered(element, androidManifest, valid);
+		validatorHelper.componentRegistered(element, getEnvironment().getAndroidManifest(), valid);
 	}
 
 	@Override
 	public void process(Element element, EActivityHolder holder) {
 
-		List<JFieldRef> fieldRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, getTarget(), rClass.get(IRClass.Res.LAYOUT), false);
+		List<JFieldRef> fieldRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.LAYOUT, false);
 
 		JFieldRef contentViewId = null;
 		if (fieldRefs.size() == 1) {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EApplicationHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EApplicationHandler.java
similarity index 53%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EApplicationHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EApplicationHandler.java
index 721d2f939c..5f2d8b1bbd 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EApplicationHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EApplicationHandler.java
@@ -13,36 +13,34 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EApplication;
 import org.androidannotations.holder.EApplicationHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
-public class EApplicationHandler extends BaseGeneratingAnnotationHandler<EApplicationHolder> {
+public class EApplicationHandler extends CoreBaseGeneratingAnnotationHandler<EApplicationHolder> {
 
-	public EApplicationHandler(ProcessingEnvironment processingEnvironment) {
-		super(EApplication.class, processingEnvironment);
+	public EApplicationHandler(AndroidAnnotationsEnvironment environment) {
+		super(EApplication.class, environment);
 	}
 
 	@Override
-	public EApplicationHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EApplicationHolder(processHolder, annotatedElement);
+	public EApplicationHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EApplicationHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
 
 		validatorHelper.extendsApplication(element, valid);
 
-		validatorHelper.applicationRegistered(element, androidManifest, valid);
+		coreValidatorHelper.applicationRegistered(element, getEnvironment().getAndroidManifest(), valid);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EBeanHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EBeanHandler.java
similarity index 67%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EBeanHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EBeanHandler.java
index 128b427b76..5604d0a997 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EBeanHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EBeanHandler.java
@@ -13,32 +13,31 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EBean;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.holder.EBeanHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
 public class EBeanHandler extends BaseGeneratingAnnotationHandler<EBeanHolder> {
 
-	public EBeanHandler(ProcessingEnvironment processingEnvironment) {
-		super(EBean.class, processingEnvironment);
+	public EBeanHandler(AndroidAnnotationsEnvironment environment) {
+		super(EBean.class, environment);
 	}
 
 	@Override
-	public EBeanHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedComponent) throws Exception {
-		return new EBeanHolder(processHolder, annotatedComponent);
+	public EBeanHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedComponent) throws Exception {
+		return new EBeanHolder(environment, annotatedComponent);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
 
 		validatorHelper.isNotPrivate(element, valid);
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EFragmentHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EFragmentHandler.java
similarity index 64%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EFragmentHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EFragmentHandler.java
index 0a3cc87b62..7a56e821ae 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EFragmentHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EFragmentHandler.java
@@ -13,22 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.FALSE;
 import static com.sun.codemodel.JExpr._null;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EFragment;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EFragmentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -38,34 +36,32 @@
 
 public class EFragmentHandler extends BaseGeneratingAnnotationHandler<EFragmentHolder> {
 
-	public EFragmentHandler(ProcessingEnvironment processingEnvironment) {
-		super(EFragment.class, processingEnvironment);
+	public EFragmentHandler(AndroidAnnotationsEnvironment environment) {
+		super(EFragment.class, environment);
 	}
 
 	@Override
-	public EFragmentHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EFragmentHolder(processHolder, annotatedElement);
+	public EFragmentHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EFragmentHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.ALLOW_NO_RES_ID, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.ALLOW_NO_RES_ID, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.isAbstractOrHasEmptyConstructor(element, valid);
+		validatorHelper.isAbstractOrHasEmptyConstructor(element, validation);
 
-		validatorHelper.extendsFragment(element, valid);
+		validatorHelper.extendsFragment(element, validation);
 	}
 
 	@Override
 	public void process(Element element, EFragmentHolder holder) {
 
-		IdAnnotationHelper idAnnotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
-
-		JFieldRef contentViewId = idAnnotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.LAYOUT, false);
+		JFieldRef contentViewId = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.LAYOUT, false);
 
 		if (contentViewId != null) {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EIntentServiceHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EIntentServiceHandler.java
similarity index 56%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EIntentServiceHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EIntentServiceHandler.java
index 5a22563219..8f94d9c236 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EIntentServiceHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EIntentServiceHandler.java
@@ -13,41 +13,41 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EIntentService;
 import org.androidannotations.annotations.ServiceAction;
+import org.androidannotations.handler.BaseAnnotationHandler;
+import org.androidannotations.handler.GeneratingAnnotationHandler;
 import org.androidannotations.holder.EIntentServiceHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
 public class EIntentServiceHandler extends BaseAnnotationHandler<EIntentServiceHolder> implements GeneratingAnnotationHandler<EIntentServiceHolder> {
 
-	public EIntentServiceHandler(ProcessingEnvironment processingEnvironment) {
-		super(EIntentService.class, processingEnvironment);
+	public EIntentServiceHandler(AndroidAnnotationsEnvironment environment) {
+		super(EIntentService.class, environment);
 	}
 
 	@Override
-	public EIntentServiceHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EIntentServiceHolder(processHolder, annotatedElement, androidManifest);
+	public EIntentServiceHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EIntentServiceHolder(environment, annotatedElement, getEnvironment().getAndroidManifest());
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.extendsIntentService(element, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.extendsIntentService(element, validation);
 
-		validatorHelper.hasNotMultipleAnnotatedMethodWithSameName(element, valid, ServiceAction.class);
+		validatorHelper.hasNotMultipleAnnotatedMethodWithSameName(element, validation, ServiceAction.class);
 
-		validatorHelper.isNotFinal(element, valid);
+		validatorHelper.isNotFinal(element, validation);
 
-		validatorHelper.componentRegistered(element, androidManifest, valid);
+		validatorHelper.componentRegistered(element, getEnvironment().getAndroidManifest(), validation);
 
-		validatorHelper.isAbstractOrHasEmptyConstructor(element, valid);
+		validatorHelper.isAbstractOrHasEmptyConstructor(element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EProviderHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EProviderHandler.java
similarity index 55%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EProviderHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EProviderHandler.java
index 1747bf1840..8ce532e11e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EProviderHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EProviderHandler.java
@@ -13,36 +13,35 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EProvider;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.holder.EProviderHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
 public class EProviderHandler extends BaseGeneratingAnnotationHandler<EProviderHolder> {
 
-	public EProviderHandler(ProcessingEnvironment processingEnvironment) {
-		super(EProvider.class, processingEnvironment);
+	public EProviderHandler(AndroidAnnotationsEnvironment environment) {
+		super(EProvider.class, environment);
 	}
 
 	@Override
-	public EProviderHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EProviderHolder(processHolder, annotatedElement);
+	public EProviderHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EProviderHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.extendsProvider(element, valid);
+		validatorHelper.extendsProvider(element, validation);
 
-		validatorHelper.componentRegistered(element, androidManifest, valid);
+		validatorHelper.componentRegistered(element, getEnvironment().getAndroidManifest(), validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EReceiverHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EReceiverHandler.java
similarity index 56%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EReceiverHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EReceiverHandler.java
index 8cf08863b3..f0982ec127 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EReceiverHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EReceiverHandler.java
@@ -13,37 +13,36 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.holder.EReceiverHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
 public class EReceiverHandler extends BaseGeneratingAnnotationHandler<EReceiverHolder> {
 
-	public EReceiverHandler(ProcessingEnvironment processingEnvironment) {
-		super(EReceiver.class, processingEnvironment);
+	public EReceiverHandler(AndroidAnnotationsEnvironment environment) {
+		super(EReceiver.class, environment);
 	}
 
 	@Override
-	public EReceiverHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EReceiverHolder(processHolder, annotatedElement);
+	public EReceiverHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EReceiverHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.extendsReceiver(element, valid);
+		validatorHelper.extendsReceiver(element, validation);
 
 		final boolean NO_WARNING = false;
-		validatorHelper.componentRegistered(element, androidManifest, NO_WARNING, valid);
+		validatorHelper.componentRegistered(element, getEnvironment().getAndroidManifest(), NO_WARNING, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EServiceHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EServiceHandler.java
similarity index 55%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EServiceHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EServiceHandler.java
index 6e3519a8ca..3ed0238daf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EServiceHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EServiceHandler.java
@@ -13,36 +13,35 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EService;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.holder.EServiceHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
 public class EServiceHandler extends BaseGeneratingAnnotationHandler<EServiceHolder> {
 
-	public EServiceHandler(ProcessingEnvironment processingEnvironment) {
-		super(EService.class, processingEnvironment);
+	public EServiceHandler(AndroidAnnotationsEnvironment environment) {
+		super(EService.class, environment);
 	}
 
 	@Override
-	public EServiceHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EServiceHolder(processHolder, annotatedElement, androidManifest);
+	public EServiceHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EServiceHolder(environment, annotatedElement, getEnvironment().getAndroidManifest());
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.extendsService(element, valid);
+		validatorHelper.extendsService(element, validation);
 
-		validatorHelper.componentRegistered(element, androidManifest, valid);
+		validatorHelper.componentRegistered(element, getEnvironment().getAndroidManifest(), validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EViewGroupHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EViewGroupHandler.java
similarity index 51%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EViewGroupHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EViewGroupHandler.java
index 3e7a4fe247..fa6850972f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EViewGroupHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EViewGroupHandler.java
@@ -13,21 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EViewGroup;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EViewGroupHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JExpr;
@@ -35,35 +31,27 @@
 
 public class EViewGroupHandler extends BaseGeneratingAnnotationHandler<EViewGroupHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public EViewGroupHandler(ProcessingEnvironment processingEnvironment) {
-		super(EViewGroup.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public EViewGroupHandler(AndroidAnnotationsEnvironment environment) {
+		super(EViewGroup.class, environment);
 	}
 
 	@Override
-	public EViewGroupHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EViewGroupHolder(processHolder, annotatedElement);
+	public EViewGroupHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EViewGroupHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.extendsViewGroup(element, valid);
+		validatorHelper.extendsViewGroup(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.ALLOW_NO_RES_ID, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.LAYOUT, IdValidatorHelper.FallbackStrategy.ALLOW_NO_RES_ID, validation);
 	}
 
 	@Override
 	public void process(Element element, EViewGroupHolder holder) {
-		JFieldRef contentViewId = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.LAYOUT, false);
+		JFieldRef contentViewId = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.LAYOUT, false);
 		if (contentViewId != null) {
 			holder.getSetContentViewBlock().invoke("inflate").arg(holder.getContextRef()).arg(contentViewId).arg(JExpr._this());
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EViewHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EViewHandler.java
similarity index 57%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EViewHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EViewHandler.java
index 4eae86d43b..5b4eb16bc8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EViewHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EViewHandler.java
@@ -13,34 +13,33 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EView;
+import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
 import org.androidannotations.holder.EViewHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 
 public class EViewHandler extends BaseGeneratingAnnotationHandler<EViewHolder> {
 
-	public EViewHandler(ProcessingEnvironment processingEnvironment) {
-		super(EView.class, processingEnvironment);
+	public EViewHandler(AndroidAnnotationsEnvironment environment) {
+		super(EView.class, environment);
 	}
 
 	@Override
-	public EViewHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new EViewHolder(processHolder, annotatedElement);
+	public EViewHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new EViewHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.extendsView(element, valid);
+		validatorHelper.extendsView(element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EditorActionHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EditorActionHandler.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EditorActionHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EditorActionHandler.java
index 02977a8836..59c922f4cf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EditorActionHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/EditorActionHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.EditorAction;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -41,23 +40,23 @@
 
 public class EditorActionHandler extends AbstractViewListenerHandler {
 
-	public EditorActionHandler(ProcessingEnvironment processingEnvironment) {
-		super(EditorAction.class, processingEnvironment);
+	public EditorActionHandler(AndroidAnnotationsEnvironment environment) {
+		super(EditorAction.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
+		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, validation);
 
 		validatorHelper.param.anyOrder() //
 				.extendsType(CanonicalNameConstants.TEXT_VIEW).optional() //
 				.primitiveOrWrapper(TypeKind.INT).optional() //
 				.type(CanonicalNameConstants.KEY_EVENT).optional() //
-				.validate(executableElement, valid);
+				.validate(executableElement, validation);
 	}
 
 	@Override
@@ -74,15 +73,15 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> userParameters) {
-		JVar textView = listenerMethod.param(classes().TEXT_VIEW, "textView");
-		JVar actionId = listenerMethod.param(codeModel().INT, "actionId");
-		JVar event = listenerMethod.param(classes().KEY_EVENT, "event");
+		JVar textView = listenerMethod.param(getClasses().TEXT_VIEW, "textView");
+		JVar actionId = listenerMethod.param(getCodeModel().INT, "actionId");
+		JVar event = listenerMethod.param(getClasses().KEY_EVENT, "event");
 
 		for (VariableElement param : userParameters) {
 			String paramClassQualifiedName = param.asType().toString();
 			if (isTypeOrSubclass(CanonicalNameConstants.TEXT_VIEW, param)) {
 				call.arg(castArgumentIfNecessary(holder, CanonicalNameConstants.TEXT_VIEW, textView, param));
-			} else if (paramClassQualifiedName.equals(CanonicalNameConstants.INTEGER) || paramClassQualifiedName.equals(codeModel().INT.fullName())) {
+			} else if (paramClassQualifiedName.equals(CanonicalNameConstants.INTEGER) || paramClassQualifiedName.equals(getCodeModel().INT.fullName())) {
 				call.arg(actionId);
 			} else if (paramClassQualifiedName.equals(CanonicalNameConstants.KEY_EVENT)) {
 				call.arg(event);
@@ -92,7 +91,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onEditorAction");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onEditorAction");
 	}
 
 	@Override
@@ -102,11 +101,11 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().TEXT_VIEW_ON_EDITOR_ACTION_LISTENER;
+		return getClasses().TEXT_VIEW_ON_EDITOR_ACTION_LISTENER;
 	}
 
 	@Override
 	protected JClass getListenerTargetClass() {
-		return classes().TEXT_VIEW;
+		return getClasses().TEXT_VIEW;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java
index 527e90315a..b30e31340a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.lit;
@@ -21,18 +21,17 @@
 import static com.sun.codemodel.JMod.PUBLIC;
 import static com.sun.codemodel.JMod.STATIC;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Extra;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.BundleHelper;
 import org.androidannotations.helper.CaseHelper;
 import org.androidannotations.holder.HasExtras;
 import org.androidannotations.holder.HasIntentBuilder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -45,25 +44,22 @@
 
 public class ExtraHandler extends BaseAnnotationHandler<HasExtras> {
 
-	private final AnnotationHelper annotationHelper;
-
-	public ExtraHandler(ProcessingEnvironment processingEnvironment) {
-		super(Extra.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
+	public ExtraHandler(AndroidAnnotationsEnvironment environment) {
+		super(Extra.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	public void validate(Element element, ElementValidation validation) {
 		/*
 		 * TODO since we override setIntent(), we should check that the
 		 * setIntent() method can be overridden
 		 */
 
-		validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
+		validatorHelper.enclosingElementHasEActivity(element,  validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.canBePutInABundle(element, valid);
+		validatorHelper.canBePutInABundle(element, validation);
 	}
 
 	@Override
@@ -87,7 +83,7 @@ private JFieldVar createStaticExtraField(HasExtras holder, String extraKey, Stri
 		String staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(null, fieldName, "Extra");
 		JFieldVar staticExtraField = holder.getGeneratedClass().fields().get(staticFieldName);
 		if (staticExtraField == null) {
-			staticExtraField = holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, classes().STRING, staticFieldName, lit(extraKey));
+			staticExtraField = holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, getClasses().STRING, staticFieldName, lit(extraKey));
 		}
 		return staticExtraField;
 	}
@@ -98,14 +94,14 @@ private void injectExtraInComponent(Element element, HasExtras hasExtras, JField
 		JBlock injectExtrasBlock = hasExtras.getInjectExtrasBlock();
 
 		TypeMirror type = codeModelHelper.getActualType(element, hasExtras);
-		JClass elementClass = codeModelHelper.typeMirrorToJClass(element.asType(), hasExtras);
-		BundleHelper bundleHelper = new BundleHelper(annotationHelper, type);
+		JClass elementClass = codeModelHelper.typeMirrorToJClass(element.asType());
+		BundleHelper bundleHelper = new BundleHelper(getEnvironment(), type);
 
 		JFieldRef extraField = JExpr.ref(fieldName);
 		JExpression intent = invoke("getIntent");
 		JBlock ifContainsKey = injectExtrasBlock._if(JExpr.invoke(extras, "containsKey").arg(extraKeyStaticField))._then();
 
-		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromIntentOrBundle(elementClass, intent, extras, extraKeyStaticField, injectExtrasMethod, hasExtras);
+		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromIntentOrBundle(elementClass, intent, extras, extraKeyStaticField, injectExtrasMethod);
 		ifContainsKey.assign(extraField, restoreMethodCall);
 	}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraParameterHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraParameterHandler.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraParameterHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraParameterHandler.java
index 6bcde99c43..2e9d38a181 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraParameterHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraParameterHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.lit;
 import static com.sun.codemodel.JMod.FINAL;
@@ -22,16 +22,15 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.VariableElement;
 
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.BundleHelper;
 import org.androidannotations.helper.CaseHelper;
 import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -44,17 +43,15 @@
 public abstract class ExtraParameterHandler extends BaseAnnotationHandler<GeneratedClassHolder> {
 
 	private Class<? extends Annotation> methodAnnotationClass;
-	private AnnotationHelper annotationHelper;
 
-	public ExtraParameterHandler(Class<? extends Annotation> targetClass, Class<? extends Annotation> methodAnnotationClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public ExtraParameterHandler(Class<? extends Annotation> targetClass, Class<? extends Annotation> methodAnnotationClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 		this.methodAnnotationClass = methodAnnotationClass;
-		annotationHelper = new AnnotationHelper(processingEnv);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingMethodHasAnnotation(methodAnnotationClass, element, validatedElements, valid);
+	protected void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingMethodHasAnnotation(methodAnnotationClass, element, valid);
 
 		validatorHelper.canBePutInABundle(element, valid);
 	}
@@ -65,30 +62,29 @@ public void process(Element element, GeneratedClassHolder holder) throws Excepti
 	}
 
 	public JExpression getExtraValue(VariableElement parameter, JVar intent, JVar extras, JBlock block, JMethod annotatedMethod, GeneratedClassHolder holder) {
-		return getExtraValue(parameter, intent, extras, block, annotatedMethod, holder.getGeneratedClass(), holder);
+		return getExtraValue(parameter, intent, extras, block, annotatedMethod, holder.getGeneratedClass());
 	}
 
-	public JExpression getExtraValue(VariableElement parameter, JVar intent, JVar extras, JBlock block, JMethod annotatedMethod, JDefinedClass generatedClass, GeneratedClassHolder holder) {
+	public JExpression getExtraValue(VariableElement parameter, JVar intent, JVar extras, JBlock block, JMethod annotatedMethod, JDefinedClass generatedClass) {
 		String parameterName = parameter.getSimpleName().toString();
-		JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameter.asType(), holder);
+		JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameter.asType());
 
 		String extraKey = getAnnotationValue(parameter);
 		if (extraKey == null || extraKey.isEmpty()) {
 			extraKey = parameterName;
 		}
 
-		BundleHelper bundleHelper = new BundleHelper(annotationHelper, parameter.asType());
-		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromIntentOrBundle(parameterClass, intent, extras, getStaticExtraField(generatedClass, extraKey, holder), annotatedMethod,
-				holder);
+		BundleHelper bundleHelper = new BundleHelper(getEnvironment(), parameter.asType());
+		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromIntentOrBundle(parameterClass, intent, extras, getStaticExtraField(generatedClass, extraKey), annotatedMethod);
 
 		return block.decl(parameterClass, parameterName, restoreMethodCall);
 	}
 
-	private JFieldVar getStaticExtraField(JDefinedClass generatedClass, String extraName, GeneratedClassHolder holder) {
+	private JFieldVar getStaticExtraField(JDefinedClass generatedClass, String extraName) {
 		String staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(null, extraName, "Extra");
 		JFieldVar staticExtraField = generatedClass.fields().get(staticFieldName);
 		if (staticExtraField == null) {
-			staticExtraField = generatedClass.field(PUBLIC | STATIC | FINAL, holder.classes().STRING, staticFieldName, lit(extraName));
+			staticExtraField = generatedClass.field(PUBLIC | STATIC | FINAL, getClasses().STRING, staticFieldName, lit(extraName));
 		}
 		return staticExtraField;
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FocusChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FocusChangeHandler.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FocusChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FocusChangeHandler.java
index d75ff74605..d270252fbb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FocusChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FocusChangeHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.FocusChange;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -40,22 +39,22 @@
 
 public class FocusChangeHandler extends AbstractViewListenerHandler {
 
-	public FocusChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(FocusChange.class, processingEnvironment);
+	public FocusChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(FocusChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
 		validatorHelper.param.anyOrder() //
 				.extendsType(CanonicalNameConstants.VIEW).optional() //
 				.primitiveOrWrapper(TypeKind.BOOLEAN).optional() //
-				.validate(executableElement, valid);
+				.validate(executableElement, validation);
 	}
 
 	@Override
@@ -65,8 +64,8 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
-		JVar viewParam = listenerMethod.param(classes().VIEW, "view");
-		JVar hasFocusParam = listenerMethod.param(codeModel().BOOLEAN, "hasFocus");
+		JVar viewParam = listenerMethod.param(getClasses().VIEW, "view");
+		JVar hasFocusParam = listenerMethod.param(getCodeModel().BOOLEAN, "hasFocus");
 
 		for (VariableElement parameter : parameters) {
 			String parameterType = parameter.asType().toString();
@@ -80,7 +79,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().VOID, "onFocusChange");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().VOID, "onFocusChange");
 	}
 
 	@Override
@@ -90,6 +89,6 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().VIEW_ON_FOCUS_CHANGE_LISTENER;
+		return getClasses().VIEW_ON_FOCUS_CHANGE_LISTENER;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentArgHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentArgHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java
index 56071d5796..e4599e1585 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentArgHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JExpr.lit;
@@ -21,17 +21,16 @@
 import static com.sun.codemodel.JMod.PUBLIC;
 import static com.sun.codemodel.JMod.STATIC;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.FragmentArg;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.BundleHelper;
 import org.androidannotations.helper.CaseHelper;
 import org.androidannotations.holder.EFragmentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -45,20 +44,17 @@
 
 public class FragmentArgHandler extends BaseAnnotationHandler<EFragmentHolder> {
 
-	private final AnnotationHelper annotationHelper;
-
-	public FragmentArgHandler(ProcessingEnvironment processingEnvironment) {
-		super(FragmentArg.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
+	public FragmentArgHandler(AndroidAnnotationsEnvironment environment) {
+		super(FragmentArg.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEFragment(element,  validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.canBePutInABundle(element, valid);
+		validatorHelper.canBePutInABundle(element, validation);
 	}
 
 	@Override
@@ -73,7 +69,7 @@ public void process(Element element, EFragmentHolder holder) {
 
 		TypeMirror actualType = codeModelHelper.getActualType(element, holder);
 
-		BundleHelper bundleHelper = new BundleHelper(annotationHelper, actualType);
+		BundleHelper bundleHelper = new BundleHelper(getEnvironment(), actualType);
 		JFieldVar argKeyStaticField = createStaticArgField(holder, argKey, fieldName);
 		injectArgInComponent(element, holder, bundleHelper, argKeyStaticField, fieldName);
 		createBuilderInjectionMethod(element, holder, bundleHelper, argKeyStaticField, fieldName);
@@ -86,12 +82,12 @@ private JFieldVar createStaticArgField(EFragmentHolder holder, String argKey, St
 		} else {
 			staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(fieldName + "Arg");
 		}
-		return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, classes().STRING, staticFieldName, lit(argKey));
+		return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, getClasses().STRING, staticFieldName, lit(argKey));
 	}
 
 	private void injectArgInComponent(Element element, EFragmentHolder holder, BundleHelper bundleHelper, JFieldVar extraKeyStaticField, String fieldName) {
 		TypeMirror elementType = codeModelHelper.getActualType(element, holder);
-		JClass elementClass = codeModelHelper.typeMirrorToJClass(elementType, holder);
+		JClass elementClass = codeModelHelper.typeMirrorToJClass(elementType);
 
 		JVar bundle = holder.getInjectBundleArgs();
 		JBlock injectExtrasBlock = holder.getInjectArgsBlock();
@@ -99,7 +95,7 @@ private void injectArgInComponent(Element element, EFragmentHolder holder, Bundl
 		JFieldRef extraField = JExpr.ref(fieldName);
 
 		JBlock ifContainsKey = injectExtrasBlock._if(JExpr.invoke(bundle, "containsKey").arg(extraKeyStaticField))._then();
-		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromBundle(elementClass, bundle, extraKeyStaticField, injectExtrasMethod, holder);
+		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromBundle(elementClass, bundle, extraKeyStaticField, injectExtrasMethod);
 		ifContainsKey.assign(extraField, restoreMethodCall);
 	}
 
@@ -107,7 +103,7 @@ private void createBuilderInjectionMethod(Element element, EFragmentHolder holde
 		JDefinedClass builderClass = holder.getBuilderClass();
 		JFieldRef builderArgsField = holder.getBuilderArgsField();
 		TypeMirror type = codeModelHelper.getActualType(element, holder);
-		JClass paramClass = codeModelHelper.typeMirrorToJClass(type, holder);
+		JClass paramClass = codeModelHelper.typeMirrorToJClass(type);
 
 		JMethod method = builderClass.method(PUBLIC, holder.narrow(builderClass), fieldName);
 		JVar arg = method.param(paramClass, fieldName);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentByIdHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentByIdHandler.java
similarity index 64%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentByIdHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentByIdHandler.java
index 7fc98a096a..8bf79bd9b6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentByIdHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentByIdHandler.java
@@ -13,26 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.FragmentById;
-import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -41,27 +38,19 @@
 
 public class FragmentByIdHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public FragmentByIdHandler(ProcessingEnvironment processingEnvironment) {
-		super(FragmentById.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public FragmentByIdHandler(AndroidAnnotationsEnvironment environment) {
+		super(FragmentById.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element,  validation);
 
-		validatorHelper.extendsFragment(element, valid);
+		validatorHelper.extendsFragment(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -81,11 +70,11 @@ public void process(Element element, EComponentWithViewSupportHolder holder) {
 
 		String fieldName = element.getSimpleName().toString();
 
-		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.ID, true);
+		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.ID, true);
 
 		JBlock methodBody = holder.getOnViewChangedBody();
 
-		methodBody.assign(ref(fieldName), cast(refClass(typeQualifiedName), invoke(findFragmentById).arg(idRef)));
+		methodBody.assign(ref(fieldName), cast(getJClass(typeQualifiedName), invoke(findFragmentById).arg(idRef)));
 
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentByTagHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentByTagHandler.java
similarity index 63%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentByTagHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentByTagHandler.java
index 382eade4fe..bad57dfb02 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentByTagHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentByTagHandler.java
@@ -13,51 +13,39 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.lit;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.FragmentByTag;
-import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JMethod;
 
 public class FragmentByTagHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public FragmentByTagHandler(ProcessingEnvironment processingEnvironment) {
-		super(FragmentByTag.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public FragmentByTagHandler(AndroidAnnotationsEnvironment environment) {
+		super(FragmentByTag.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element,  validation);
 
-		validatorHelper.extendsFragment(element, valid);
+		validatorHelper.extendsFragment(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -83,6 +71,6 @@ public void process(Element element, EComponentWithViewSupportHolder holder) {
 		}
 
 		JBlock methodBody = holder.getOnViewChangedBody();
-		methodBody.assign(ref(fieldName), cast(refClass(typeQualifiedName), invoke(findFragmentByTag).arg(lit(tagValue))));
+		methodBody.assign(ref(fieldName), cast(getJClass(typeQualifiedName), invoke(findFragmentByTag).arg(lit(tagValue))));
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FromHtmlHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FromHtmlHandler.java
similarity index 54%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FromHtmlHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FromHtmlHandler.java
index a706a560af..98f871fd9e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FromHtmlHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FromHtmlHandler.java
@@ -13,22 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.FromHtml;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -36,39 +33,31 @@
 
 public class FromHtmlHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public FromHtmlHandler(ProcessingEnvironment processingEnvironment) {
-		super(FromHtml.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public FromHtmlHandler(AndroidAnnotationsEnvironment environment) {
+		super(FromHtml.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element,  validation);
 
-		validatorHelper.hasViewByIdAnnotation(element, validatedElements, valid);
+		validatorHelper.hasViewByIdAnnotation(element, validation);
 
-		validatorHelper.extendsTextView(element, valid);
+		validatorHelper.extendsTextView(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.STRING, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.STRING, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 	}
 
 	@Override
 	public void process(Element element, EComponentWithViewSupportHolder holder) {
 		String fieldName = element.getSimpleName().toString();
 
-		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.STRING, true);
+		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.STRING, true);
 
 		JBlock methodBody = holder.getOnViewChangedBody();
 		methodBody //
 				._if(ref(fieldName).ne(_null())) //
 				._then() //
-				.invoke(ref(fieldName), "setText").arg(classes().HTML.staticInvoke("fromHtml").arg(holder.getContextRef().invoke("getString").arg(idRef)));
+				.invoke(ref(fieldName), "setText").arg(getClasses().HTML.staticInvoke("fromHtml").arg(holder.getContextRef().invoke("getString").arg(idRef)));
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FullscreenHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FullscreenHandler.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FullscreenHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FullscreenHandler.java
index 24f0b16617..c6b3737f1c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FullscreenHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FullscreenHandler.java
@@ -13,35 +13,35 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.invoke;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Fullscreen;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JFieldRef;
 import com.sun.codemodel.JInvocation;
 
 public class FullscreenHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	public FullscreenHandler(ProcessingEnvironment processingEnvironment) {
-		super(Fullscreen.class, processingEnvironment);
+	public FullscreenHandler(AndroidAnnotationsEnvironment environment) {
+		super(Fullscreen.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.hasEActivity(element, validation);
 	}
 
 	@Override
 	public void process(Element element, EActivityHolder holder) {
-		JFieldRef fullScreen = classes().WINDOW_MANAGER_LAYOUT_PARAMS.staticRef("FLAG_FULLSCREEN");
+		JFieldRef fullScreen = getClasses().WINDOW_MANAGER_LAYOUT_PARAMS.staticRef("FLAG_FULLSCREEN");
 		JInvocation setFlagsInvocation = invoke(invoke("getWindow"), "setFlags").arg(fullScreen).arg(fullScreen);
 		holder.getInitBody().add(setFlagsInvocation);
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HierarchyViewerSupportHandler.java
similarity index 64%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HierarchyViewerSupportHandler.java
index 7909d46cd8..c4e9e17041 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HierarchyViewerSupportHandler.java
@@ -13,38 +13,38 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._this;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.HierarchyViewerSupport;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JInvocation;
 
 public class HierarchyViewerSupportHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	public HierarchyViewerSupportHandler(ProcessingEnvironment processingEnvironment) {
-		super(HierarchyViewerSupport.class, processingEnvironment);
+	public HierarchyViewerSupportHandler(AndroidAnnotationsEnvironment environment) {
+		super(HierarchyViewerSupport.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.hasEActivity(element, validation);
 
-		validatorHelper.isDebuggable(element, androidManifest, valid);
+		validatorHelper.isDebuggable(getEnvironment().getAndroidManifest(), validation);
 
-		validatorHelper.hasInternetPermission(element, androidManifest, valid);
+		validatorHelper.hasInternetPermission(getEnvironment().getAndroidManifest(), validation);
 	}
 
 	@Override
 	public void process(Element element, EActivityHolder holder) throws Exception {
-		JInvocation viewServerInvocation = classes().VIEW_SERVER.staticInvoke("get").arg(_this());
+		JInvocation viewServerInvocation = getClasses().VIEW_SERVER.staticInvoke("get").arg(_this());
 
 		holder.getOnViewChangedBody().invoke(viewServerInvocation, "addWindow").arg(_this());
 		holder.getOnDestroyAfterSuperBlock().invoke(viewServerInvocation, "removeWindow").arg(_this());
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HtmlResHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HtmlResHandler.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HtmlResHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HtmlResHandler.java
index affc002aca..4d1ea71ff4 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HtmlResHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HtmlResHandler.java
@@ -13,26 +13,25 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
-
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AndroidRes;
+import org.androidannotations.internal.core.model.AndroidRes;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JFieldRef;
 
 public class HtmlResHandler extends AbstractResHandler {
 
-	public HtmlResHandler(ProcessingEnvironment processingEnvironment) {
-		super(AndroidRes.HTML, processingEnvironment);
+	public HtmlResHandler(AndroidAnnotationsEnvironment environment) {
+		super(AndroidRes.HTML, environment);
 	}
 
 	@Override
 	protected void makeCall(String fieldName, EComponentHolder holder, JBlock methodBody, JFieldRef idRef) {
-		methodBody.assign(ref(fieldName), classes().HTML.staticInvoke("fromHtml").arg(holder.getResourcesRef().invoke(AndroidRes.HTML.getResourceMethodName()).arg(idRef)));
+		methodBody.assign(ref(fieldName), getClasses().HTML.staticInvoke("fromHtml").arg(holder.getResourcesRef().invoke(AndroidRes.HTML.getResourceMethodName()).arg(idRef)));
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HttpsClientHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HttpsClientHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java
index 4f3d98a015..603187e38d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HttpsClientHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -23,17 +23,14 @@
 import static com.sun.codemodel.JExpr.lit;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.HttpsClient;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.internal.process.ProcessHolder;
 import org.androidannotations.rclass.IRClass;
 import org.androidannotations.rclass.IRInnerClass;
 
@@ -50,34 +47,26 @@
 
 public class HttpsClientHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public HttpsClientHandler(ProcessingEnvironment processingEnvironment) {
-		super(HttpsClient.class, processingEnvironment);
+	public HttpsClientHandler(AndroidAnnotationsEnvironment environment) {
+		super(HttpsClient.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
-
-		validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "keyStore", valid);
-		validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "trustStore", valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
-	}
+		validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "keyStore", validation);
+		validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "trustStore", validation);
 
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
 	public void process(Element element, EComponentHolder holder) throws Exception {
-		IRInnerClass rInnerClass = rClass.get(IRClass.Res.RAW);
+		IRInnerClass rInnerClass = getEnvironment().getRClass().get(IRClass.Res.RAW);
 		HttpsClient annotation = element.getAnnotation(HttpsClient.class);
-		JFieldRef trustStoreRawIdRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, getTarget(), rInnerClass, false, "trustStore", "trustStoreResName");
-		JFieldRef keyStoreRawIdRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, getTarget(), rInnerClass, false, "keyStore", "keyStoreResName");
+		JFieldRef trustStoreRawIdRef = annotationHelper.extractOneAnnotationFieldRef(element, getTarget(), rInnerClass, false, "trustStore", "trustStoreResName");
+		JFieldRef keyStoreRawIdRef = annotationHelper.extractOneAnnotationFieldRef(element, getTarget(), rInnerClass, false, "keyStore", "keyStoreResName");
 		String trustStorePwd = annotation.trustStorePwd();
 		String keyStorePwd = annotation.keyStorePwd();
 
@@ -88,9 +77,9 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 		String fieldName = element.getSimpleName().toString();
 		JBlock methodBody = holder.getInitBody();
 
-		ProcessHolder.Classes classes = classes();
+		ProcessHolder.Classes classes = getClasses();
 
-		JDefinedClass jAnonClass = codeModel().anonymousClass(classes.DEFAULT_HTTP_CLIENT);
+		JDefinedClass jAnonClass = getCodeModel().anonymousClass(classes.DEFAULT_HTTP_CLIENT);
 
 		JMethod method = jAnonClass.method(JMod.PROTECTED, classes.CLIENT_CONNECTION_MANAGER, "createClientConnectionManager");
 		method.annotate(Override.class);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/IgnoredWhenDetachedHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/IgnoredWhenDetachedHandler.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/IgnoredWhenDetachedHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/IgnoredWhenDetachedHandler.java
index aefd9006a6..4810a787d5 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/IgnoredWhenDetachedHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/IgnoredWhenDetachedHandler.java
@@ -13,35 +13,38 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.invoke;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.IgnoredWhenDetached;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EFragmentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JMethod;
 
 public class IgnoredWhenDetachedHandler extends BaseAnnotationHandler<EFragmentHolder> {
 
-	public IgnoredWhenDetachedHandler(ProcessingEnvironment processingEnvironment) {
-		super(IgnoredWhenDetached.class, processingEnvironment);
+	public IgnoredWhenDetachedHandler(AndroidAnnotationsEnvironment environment) {
+		super(IgnoredWhenDetached.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	public void validate(Element element, ElementValidation valid) {
 		validatorHelper.isNotPrivate(element, valid);
+
 		validatorHelper.isNotFinal(element, valid);
+
 		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
-		validatorHelper.enclosingElementHasEFragment(element, validatedElements, valid);
+
+		validatorHelper.enclosingElementHasEFragment(element, valid);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/InjectMenuHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java
similarity index 76%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/InjectMenuHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java
index 02162278ba..4b6f723fbb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/InjectMenuHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java
@@ -13,29 +13,29 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
+import javax.lang.model.element.Element;
 
-import com.sun.codemodel.JBlock;
-import com.sun.codemodel.JExpr;
-import com.sun.codemodel.JVar;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.InjectMenu;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.HasOptionsMenu;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Element;
+import com.sun.codemodel.JBlock;
+import com.sun.codemodel.JExpr;
+import com.sun.codemodel.JVar;
 
 public class InjectMenuHandler extends BaseAnnotationHandler<HasOptionsMenu> {
 
-	public InjectMenuHandler(ProcessingEnvironment processingEnvironment) {
-		super(InjectMenu.class, processingEnvironment);
+	public InjectMenuHandler(AndroidAnnotationsEnvironment environment) {
+		super(InjectMenu.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, valid);
 
 		validatorHelper.isDeclaredType(element, valid);
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/InstanceStateHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InstanceStateHandler.java
similarity index 72%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/InstanceStateHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InstanceStateHandler.java
index cbf3cdd720..5fa3ded4bc 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/InstanceStateHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InstanceStateHandler.java
@@ -13,20 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.InstanceState;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.BundleHelper;
 import org.androidannotations.holder.HasInstanceState;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -38,25 +37,22 @@
 
 public class InstanceStateHandler extends BaseAnnotationHandler<HasInstanceState> {
 
-	private AnnotationHelper annotationHelper;
-
-	public InstanceStateHandler(ProcessingEnvironment processingEnvironment) {
-		super(InstanceState.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
+	public InstanceStateHandler(AndroidAnnotationsEnvironment environment) {
+		super(InstanceState.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.canBePutInABundle(element, valid);
+		validatorHelper.canBePutInABundle(element, validation);
 	}
 
 	@Override
 	public void process(Element element, HasInstanceState holder) {
-		JClass elementClass = codeModelHelper.typeMirrorToJClass(element.asType(), holder);
+		JClass elementClass = codeModelHelper.typeMirrorToJClass(element.asType());
 		String fieldName = element.getSimpleName().toString();
 
 		JBlock saveStateBody = holder.getSaveStateMethodBody();
@@ -67,12 +63,12 @@ public void process(Element element, HasInstanceState holder) {
 
 		TypeMirror type = codeModelHelper.getActualType(element, holder);
 
-		BundleHelper bundleHelper = new BundleHelper(annotationHelper, type);
+		BundleHelper bundleHelper = new BundleHelper(getEnvironment(), type);
 
 		JFieldRef ref = ref(fieldName);
 		saveStateBody.invoke(saveStateBundleParam, bundleHelper.getMethodNameToSave()).arg(fieldName).arg(ref);
 
-		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromBundle(elementClass, restoreStateBundleParam, JExpr.lit(fieldName), restoreStateMethod, holder);
+		JExpression restoreMethodCall = bundleHelper.getExpressionToRestoreFromBundle(elementClass, restoreStateBundleParam, JExpr.lit(fieldName), restoreStateMethod);
 		restoreStateBody.assign(ref, restoreMethodCall);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemClickHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemClickHandler.java
similarity index 73%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemClickHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemClickHandler.java
index 8e54205bf2..fc1f0aba5b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemClickHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemClickHandler.java
@@ -13,24 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.invoke;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ItemClick;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -42,19 +41,19 @@
 
 public class ItemClickHandler extends AbstractViewListenerHandler {
 
-	public ItemClickHandler(ProcessingEnvironment processingEnvironment) {
-		super(ItemClick.class, processingEnvironment);
+	public ItemClickHandler(AndroidAnnotationsEnvironment environment) {
+		super(ItemClick.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
-		validatorHelper.param.anyType().optional().validate(executableElement, valid);
+		validatorHelper.param.anyType().optional().validate(executableElement, validation);
 	}
 
 	@Override
@@ -66,11 +65,11 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
 		boolean hasItemParameter = parameters.size() == 1;
 
-		JClass narrowAdapterViewClass = classes().ADAPTER_VIEW.narrow(codeModel().wildcard());
+		JClass narrowAdapterViewClass = getClasses().ADAPTER_VIEW.narrow(getCodeModel().wildcard());
 		JVar onItemClickParentParam = listenerMethod.param(narrowAdapterViewClass, "parent");
-		listenerMethod.param(classes().VIEW, "view");
-		JVar onItemClickPositionParam = listenerMethod.param(codeModel().INT, "position");
-		listenerMethod.param(codeModel().LONG, "id");
+		listenerMethod.param(getClasses().VIEW, "view");
+		JVar onItemClickPositionParam = listenerMethod.param(getCodeModel().INT, "position");
+		listenerMethod.param(getCodeModel().LONG, "id");
 
 		if (hasItemParameter) {
 			VariableElement parameter = parameters.get(0);
@@ -79,7 +78,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 			if (parameterType.getKind() == TypeKind.INT) {
 				call.arg(onItemClickPositionParam);
 			} else {
-				JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameterType, getHolder());
+				JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameterType);
 				call.arg(cast(parameterClass, invoke(onItemClickParentParam, "getAdapter").invoke("getItem").arg(onItemClickPositionParam)));
 
 				if (parameterClass.isParameterized()) {
@@ -91,7 +90,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().VOID, "onItemClick");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().VOID, "onItemClick");
 	}
 
 	@Override
@@ -101,11 +100,11 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().ON_ITEM_CLICK_LISTENER;
+		return getClasses().ON_ITEM_CLICK_LISTENER;
 	}
 
 	@Override
 	protected JClass getListenerTargetClass() {
-		return classes().ADAPTER_VIEW.narrow(codeModel().wildcard());
+		return getClasses().ADAPTER_VIEW.narrow(getCodeModel().wildcard());
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemLongClickHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemLongClickHandler.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemLongClickHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemLongClickHandler.java
index da1944322b..8666a871c9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemLongClickHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemLongClickHandler.java
@@ -13,24 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.invoke;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ItemLongClick;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -43,19 +42,19 @@
 
 public class ItemLongClickHandler extends AbstractViewListenerHandler {
 
-	public ItemLongClickHandler(ProcessingEnvironment processingEnvironment) {
-		super(ItemLongClick.class, processingEnvironment);
+	public ItemLongClickHandler(AndroidAnnotationsEnvironment environment) {
+		super(ItemLongClick.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
+		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, validation);
 
-		validatorHelper.param.anyType().optional().validate(executableElement, valid);
+		validatorHelper.param.anyType().optional().validate(executableElement, validation);
 	}
 
 	@Override
@@ -73,11 +72,11 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
 		boolean hasItemParameter = parameters.size() == 1;
 
-		JClass narrowAdapterViewClass = classes().ADAPTER_VIEW.narrow(codeModel().wildcard());
+		JClass narrowAdapterViewClass = getClasses().ADAPTER_VIEW.narrow(getCodeModel().wildcard());
 		JVar onItemClickParentParam = listenerMethod.param(narrowAdapterViewClass, "parent");
-		listenerMethod.param(classes().VIEW, "view");
-		JVar onItemClickPositionParam = listenerMethod.param(codeModel().INT, "position");
-		listenerMethod.param(codeModel().LONG, "id");
+		listenerMethod.param(getClasses().VIEW, "view");
+		JVar onItemClickPositionParam = listenerMethod.param(getCodeModel().INT, "position");
+		listenerMethod.param(getCodeModel().LONG, "id");
 
 		if (hasItemParameter) {
 			VariableElement parameter = parameters.get(0);
@@ -86,7 +85,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 			if (parameterType.getKind() == TypeKind.INT) {
 				call.arg(onItemClickPositionParam);
 			} else {
-				JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameterType, getHolder());
+				JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameterType);
 				call.arg(cast(parameterClass, invoke(onItemClickParentParam, "getAdapter").invoke("getItem").arg(onItemClickPositionParam)));
 
 				if (parameterClass.isParameterized()) {
@@ -98,7 +97,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onItemLongClick");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onItemLongClick");
 	}
 
 	@Override
@@ -108,11 +107,11 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().ON_ITEM_LONG_CLICK_LISTENER;
+		return getClasses().ON_ITEM_LONG_CLICK_LISTENER;
 	}
 
 	@Override
 	protected JClass getListenerTargetClass() {
-		return classes().ADAPTER_VIEW.narrow(codeModel().wildcard());
+		return getClasses().ADAPTER_VIEW.narrow(getCodeModel().wildcard());
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemSelectHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemSelectHandler.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemSelectHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemSelectHandler.java
index ba8a40fcbf..4ce09e8091 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemSelectHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ItemSelectHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.invoke;
@@ -21,17 +21,16 @@
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ItemSelect;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -47,22 +46,22 @@ public class ItemSelectHandler extends AbstractViewListenerHandler {
 
 	private JMethod onNothingSelectedMethod;
 
-	public ItemSelectHandler(ProcessingEnvironment processingEnvironment) {
-		super(ItemSelect.class, processingEnvironment);
+	public ItemSelectHandler(AndroidAnnotationsEnvironment environment) {
+		super(ItemSelect.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
 		validatorHelper.param.inOrder() //
 				.primitiveOrWrapper(TypeKind.BOOLEAN) //
 				.anyType().optional() //
-				.validate(executableElement, valid);
+				.validate(executableElement, validation);
 	}
 
 	@Override
@@ -72,11 +71,11 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation itemSelectedCall, List<? extends VariableElement> parameters) {
-		JClass narrowAdapterViewClass = classes().ADAPTER_VIEW.narrow(codeModel().wildcard());
+		JClass narrowAdapterViewClass = getClasses().ADAPTER_VIEW.narrow(getCodeModel().wildcard());
 		JVar onItemClickParentParam = listenerMethod.param(narrowAdapterViewClass, "parent");
-		listenerMethod.param(classes().VIEW, "view");
-		JVar onItemClickPositionParam = listenerMethod.param(codeModel().INT, "position");
-		listenerMethod.param(codeModel().LONG, "id");
+		listenerMethod.param(getClasses().VIEW, "view");
+		JVar onItemClickPositionParam = listenerMethod.param(getCodeModel().INT, "position");
+		listenerMethod.param(getCodeModel().LONG, "id");
 
 		itemSelectedCall.arg(JExpr.TRUE);
 		boolean hasItemParameter = parameters.size() == 2;
@@ -94,7 +93,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 			if (secondParameterIsInt) {
 				itemSelectedCall.arg(onItemClickPositionParam);
 			} else {
-				itemSelectedCall.arg(JExpr.cast(refClass(secondParameterQualifiedName), invoke(onItemClickParentParam, "getAdapter").invoke("getItem").arg(onItemClickPositionParam)));
+				itemSelectedCall.arg(JExpr.cast(getJClass(secondParameterQualifiedName), invoke(onItemClickParentParam, "getAdapter").invoke("getItem").arg(onItemClickPositionParam)));
 			}
 		}
 
@@ -115,9 +114,9 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		onNothingSelectedMethod = listenerAnonymousClass.method(JMod.PUBLIC, codeModel().VOID, "onNothingSelected");
+		onNothingSelectedMethod = listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().VOID, "onNothingSelected");
 		onNothingSelectedMethod.annotate(Override.class);
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().VOID, "onItemSelected");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().VOID, "onItemSelected");
 	}
 
 	@Override
@@ -127,12 +126,12 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().ON_ITEM_SELECTED_LISTENER;
+		return getClasses().ON_ITEM_SELECTED_LISTENER;
 	}
 
 	@Override
 	protected JClass getListenerTargetClass() {
-		return classes().ADAPTER_VIEW.narrow(codeModel().wildcard());
+		return getClasses().ADAPTER_VIEW.narrow(getCodeModel().wildcard());
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/LongClickHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/LongClickHandler.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/LongClickHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/LongClickHandler.java
index 3d280448e6..f6a92f251a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/LongClickHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/LongClickHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.LongClick;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -41,19 +40,19 @@
 
 public class LongClickHandler extends AbstractViewListenerHandler {
 
-	public LongClickHandler(ProcessingEnvironment processingEnvironment) {
-		super(LongClick.class, processingEnvironment);
+	public LongClickHandler(AndroidAnnotationsEnvironment environment) {
+		super(LongClick.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
+		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, validation);
 
-		validatorHelper.param.extendsType(CanonicalNameConstants.VIEW).optional().validate(executableElement, valid);
+		validatorHelper.param.extendsType(CanonicalNameConstants.VIEW).optional().validate(executableElement, validation);
 	}
 
 	@Override
@@ -70,7 +69,7 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 	@Override
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
 		boolean hasViewParameter = parameters.size() == 1;
-		JVar viewParam = listenerMethod.param(classes().VIEW, "view");
+		JVar viewParam = listenerMethod.param(getClasses().VIEW, "view");
 		if (hasViewParameter) {
 			call.arg(castArgumentIfNecessary(holder, CanonicalNameConstants.VIEW, viewParam, parameters.get(0)));
 		}
@@ -78,7 +77,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onLongClick");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onLongClick");
 	}
 
 	@Override
@@ -88,6 +87,6 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().VIEW_ON_LONG_CLICK_LISTENER;
+		return getClasses().VIEW_ON_LONG_CLICK_LISTENER;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NonConfigurationInstanceHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/NonConfigurationInstanceHandler.java
similarity index 78%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NonConfigurationInstanceHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/NonConfigurationInstanceHandler.java
index 58f8312dca..613633127e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NonConfigurationInstanceHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/NonConfigurationInstanceHandler.java
@@ -13,25 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
 import static org.androidannotations.helper.ModelConstants.classSuffix;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.NonConfigurationInstance;
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EActivityHolder;
 import org.androidannotations.holder.NonConfigurationHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -41,25 +39,21 @@
 
 public class NonConfigurationInstanceHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	private final AnnotationHelper annotationHelper;
-
-	public NonConfigurationInstanceHandler(ProcessingEnvironment processingEnvironment) {
-		super(NonConfigurationInstance.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
-		codeModelHelper = new APTCodeModelHelper();
+	public NonConfigurationInstanceHandler(AndroidAnnotationsEnvironment environment) {
+		super(NonConfigurationInstance.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEActivity(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
 	public void process(Element element, EActivityHolder holder) throws JClassAlreadyExistsException {
 		String fieldName = element.getSimpleName().toString();
-		JClass fieldType = codeModelHelper.typeMirrorToJClass(element.asType(), holder);
+		JClass fieldType = codeModelHelper.typeMirrorToJClass(element.asType());
 
 		NonConfigurationHolder ncHolder = holder.getNonConfigurationHolder();
 		JFieldVar ncHolderField = ncHolder.createField(fieldName, fieldType);
@@ -90,7 +84,7 @@ private void rebindContextIfBean(Element element, JBlock initIfNonConfigurationN
 				elementType = element.asType();
 			}
 			String typeQualifiedName = elementType.toString();
-			JClass fieldGeneratedBeanClass = refClass(typeQualifiedName + classSuffix());
+			JClass fieldGeneratedBeanClass = getJClass(typeQualifiedName + classSuffix());
 
 			initIfNonConfigurationNotNullBlock.invoke(cast(fieldGeneratedBeanClass, field), "rebind").arg(_this());
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OnActivityResultHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OnActivityResultHandler.java
similarity index 72%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OnActivityResultHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OnActivityResultHandler.java
index 6bcd5c9a7f..a306a1b02b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OnActivityResultHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OnActivityResultHandler.java
@@ -13,25 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
 
+import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.handler.BaseAnnotationHandler;
+import org.androidannotations.handler.HasParameterHandlers;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.HasOnActivityResult;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JExpr;
@@ -40,40 +43,39 @@
 import com.sun.codemodel.JOp;
 import com.sun.codemodel.JVar;
 
-public class OnActivityResultHandler extends BaseAnnotationHandler<HasOnActivityResult> {
+public class OnActivityResultHandler extends BaseAnnotationHandler<HasOnActivityResult> implements HasParameterHandlers<HasOnActivityResult> {
 
 	private ExtraHandler extraHandler;
 
-	public OnActivityResultHandler(ProcessingEnvironment processingEnvironment) {
-		super(OnActivityResult.class, processingEnvironment);
-		extraHandler = new ExtraHandler(processingEnvironment);
+	public OnActivityResultHandler(AndroidAnnotationsEnvironment environment) {
+		super(OnActivityResult.class, environment);
+		extraHandler = new ExtraHandler(environment);
 	}
 
-	public void register(AnnotationHandlers annotationHandlers) {
-		annotationHandlers.add(this);
-		annotationHandlers.add(extraHandler);
+	@Override
+	public Iterable<AnnotationHandler> getParameterHandlers() {
+		return Collections.<AnnotationHandler> singleton(extraHandler);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
 		OnActivityResult onResultAnnotation = element.getAnnotation(OnActivityResult.class);
-		validatorHelper.annotationValuePositiveAndInAShort(element, valid, onResultAnnotation.value());
+		validatorHelper.annotationValuePositiveAndInAShort(onResultAnnotation.value(), validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
-
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
 
 		validatorHelper.param.anyOrder() //
 				.type(CanonicalNameConstants.INTENT).optional() //
 				.primitiveOrWrapper(TypeKind.INT).optional() //
 				.annotatedWith(OnActivityResult.Extra.class).multiple().optional() //
-				.validate((ExecutableElement) element, valid); //
+				.validate((ExecutableElement) element, validation); //
 	}
 
 	@Override
@@ -96,8 +98,8 @@ public void process(Element element, HasOnActivityResult holder) throws Exceptio
 			TypeMirror parameterType = parameter.asType();
 			if (parameter.getAnnotation(OnActivityResult.Extra.class) != null) {
 				if (extras == null) {
-					extras = onResultBlock.decl(classes().BUNDLE, "extras_",
-							JOp.cond(intent.ne(_null()).cand(intent.invoke("getExtras").ne(_null())), intent.invoke("getExtras"), _new(classes().BUNDLE)));
+					extras = onResultBlock.decl(getClasses().BUNDLE, "extras_",
+							JOp.cond(intent.ne(_null()).cand(intent.invoke("getExtras").ne(_null())), intent.invoke("getExtras"), _new(getClasses().BUNDLE)));
 				}
 				JExpression extraParameter = extraHandler.getExtraValue(parameter, extras, onResultBlock, holder);
 				onResultInvocation.arg(extraParameter);
@@ -113,8 +115,8 @@ public void process(Element element, HasOnActivityResult holder) throws Exceptio
 
 	private static class ExtraHandler extends ExtraParameterHandler {
 
-		public ExtraHandler(ProcessingEnvironment processingEnvironment) {
-			super(OnActivityResult.Extra.class, OnActivityResult.class, processingEnvironment);
+		ExtraHandler(AndroidAnnotationsEnvironment environment) {
+			super(OnActivityResult.Extra.class, OnActivityResult.class, environment);
 		}
 
 		@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsItemHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsItemHandler.java
similarity index 69%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsItemHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsItemHandler.java
index 7db3af4aea..29b37e3741 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsItemHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsItemHandler.java
@@ -13,29 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.TRUE;
 import static com.sun.codemodel.JExpr.invoke;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.OptionsItem;
-import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.HasOptionsMenu;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -45,35 +42,27 @@
 
 public class OptionsItemHandler extends BaseAnnotationHandler<HasOptionsMenu> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public OptionsItemHandler(ProcessingEnvironment processingEnvironment) {
-		super(OptionsItem.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public OptionsItemHandler(AndroidAnnotationsEnvironment environment) {
+		super(OptionsItem.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.uniqueId(element, validatedElements, valid);
+		validatorHelper.uniqueId(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
+		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, validation);
 
-		validatorHelper.param.type(CanonicalNameConstants.MENU_ITEM).optional().validate(executableElement, valid);
+		validatorHelper.param.type(CanonicalNameConstants.MENU_ITEM).optional().validate(executableElement, validation);
 	}
 
 	@Override
@@ -87,7 +76,7 @@ public void process(Element element, HasOptionsMenu holder) {
 
 		boolean hasItemParameter = parameters.size() == 1;
 
-		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 
 		JBlock block = holder.getOnOptionsItemSelectedMiddleBlock();
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsMenuHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuHandler.java
similarity index 59%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsMenuHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuHandler.java
index 5feb06cebb..77f4c3f961 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsMenuHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuHandler.java
@@ -13,21 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.OptionsMenu;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.HasOptionsMenu;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -36,23 +33,15 @@
 
 public class OptionsMenuHandler extends BaseAnnotationHandler<HasOptionsMenu> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public OptionsMenuHandler(ProcessingEnvironment processingEnvironment) {
-		super(OptionsMenu.class, processingEnvironment);
+	public OptionsMenuHandler(AndroidAnnotationsEnvironment environment) {
+		super(OptionsMenu.class, environment);
 	}
 
 	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
-	}
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.hasEActivityOrEFragment(element, validation);
 
-	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasEActivityOrEFragment(element, validatedElements, valid);
-
-		validatorHelper.resIdsExist(element, IRClass.Res.MENU, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.MENU, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, validation);
 	}
 
 	@Override
@@ -61,10 +50,9 @@ public void process(Element element, HasOptionsMenu holder) {
 		JVar menuInflater = holder.getOnCreateOptionsMenuMenuInflaterVar();
 		JVar menuParam = holder.getOnCreateOptionsMenuMenuParam();
 
-		List<JFieldRef> fieldRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.MENU, false);
+		List<JFieldRef> fieldRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.MENU, false);
 		for (JFieldRef optionsMenuRefId : fieldRefs) {
 			body.invoke(menuInflater, "inflate").arg(optionsMenuRefId).arg(menuParam);
 		}
-
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsMenuItemHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java
similarity index 57%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsMenuItemHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java
index 4819fe993c..fb1265ea5b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OptionsMenuItemHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java
@@ -13,21 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._this;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.OptionsMenuItem;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.HasOptionsMenu;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -36,29 +33,21 @@
 
 public class OptionsMenuItemHandler extends BaseAnnotationHandler<HasOptionsMenu> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public OptionsMenuItemHandler(ProcessingEnvironment processingEnvironment) {
-		super(OptionsMenuItem.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public OptionsMenuItemHandler(AndroidAnnotationsEnvironment environment) {
+		super(OptionsMenuItem.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validation);
 
-		validatorHelper.isDeclaredType(element, valid);
+		validatorHelper.isDeclaredType(element, validation);
 
-		validatorHelper.extendsMenuItem(element, valid);
+		validatorHelper.extendsMenuItem(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -67,7 +56,7 @@ public void process(Element element, HasOptionsMenu holder) {
 		JBlock body = holder.getOnCreateOptionsMenuMethodBody();
 		JVar menuParam = holder.getOnCreateOptionsMenuMenuParam();
 
-		JFieldRef idsRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.ID, true);
+		JFieldRef idsRef = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.ID, true);
 		body.assign(_this().ref(fieldName), menuParam.invoke("findItem").arg(idsRef));
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PrefHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java
similarity index 68%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PrefHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java
index 75a78fa983..3eec6b4695 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PrefHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java
@@ -13,39 +13,38 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.sharedpreferences.Pref;
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
 import org.androidannotations.holder.EComponentHolder;
 import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JExpr;
 import com.sun.codemodel.JFieldRef;
 
-public class PrefHandler extends BaseAnnotationHandler<EComponentHolder> {
+public class PrefHandler extends CoreBaseAnnotationHandler<EComponentHolder> {
 
-	public PrefHandler(ProcessingEnvironment processingEnvironment) {
-		super(Pref.class, processingEnvironment);
+	public PrefHandler(AndroidAnnotationsEnvironment environment) {
+		super(Pref.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.isSharedPreference(element, validatedElements, valid);
+		coreValidatorHelper.isSharedPreference(element, validation);
 	}
 
 	@Override
@@ -53,7 +52,7 @@ public void process(Element element, EComponentHolder holder) {
 
 		String fieldName = element.getSimpleName().toString();
 		TypeMirror fieldTypeMirror = element.asType();
-		JClass prefClass = refClass(fieldTypeMirror.toString());
+		JClass prefClass = getJClass(fieldTypeMirror.toString());
 
 		String elementTypeName = fieldTypeMirror.toString();
 		int index = elementTypeName.lastIndexOf(".");
@@ -61,9 +60,9 @@ public void process(Element element, EComponentHolder holder) {
 			elementTypeName = elementTypeName.substring(index + 1);
 		}
 
-		Set<? extends Element> sharedPrefElements = validatedModel.getRootAnnotatedElements(SharedPref.class.getName());
+		Set<? extends Element> sharedPrefElements = getEnvironment().getValidatedElements().getRootAnnotatedElements(SharedPref.class.getName());
 		for (Element sharedPrefElement : sharedPrefElements) {
-			GeneratedClassHolder sharedPrefHolder = processHolder.getGeneratedClassHolder(sharedPrefElement);
+			GeneratedClassHolder sharedPrefHolder = getEnvironment().getGeneratedClassHolder(sharedPrefElement);
 			String sharedPrefName = sharedPrefHolder.getGeneratedClass().name();
 
 			if (elementTypeName.equals(sharedPrefName)) {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceByKeyHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java
similarity index 64%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceByKeyHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java
index df7a722791..2ba5e93899 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceByKeyHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java
@@ -13,22 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.PreferenceByKey;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.HasPreferences;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JClass;
@@ -36,22 +33,14 @@
 
 public class PreferenceByKeyHandler extends BaseAnnotationHandler<HasPreferences> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public PreferenceByKeyHandler(ProcessingEnvironment processingEnvironment) {
-		super(PreferenceByKey.class, processingEnvironment);
-
+	public PreferenceByKeyHandler(AndroidAnnotationsEnvironment environment) {
+		super(PreferenceByKey.class, environment);
 	}
 
 	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
-	}
+	protected void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEActivityOrEFragment(element, valid);
 
-	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid);
 		validatorHelper.enclosingElementExtendsPreferenceActivityOrPreferenceFragment(element, valid);
 
 		validatorHelper.isDeclaredType(element, valid);
@@ -70,8 +59,8 @@ public void process(Element element, HasPreferences holder) throws Exception {
 		TypeMirror prefFieldTypeMirror = element.asType();
 		String typeQualifiedName = prefFieldTypeMirror.toString();
 
-		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.STRING, true);
-		JClass preferenceClass = refClass(typeQualifiedName);
+		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.STRING, true);
+		JClass preferenceClass = getJClass(typeQualifiedName);
 		JFieldRef fieldRef = ref(fieldName);
 
 		holder.assignFindPreferenceByKey(idRef, preferenceClass, fieldRef);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceChangeHandler.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceChangeHandler.java
index 16cc01c2d8..f193d74066 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceChangeHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.PreferenceChange;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.HasPreferences;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -42,13 +41,14 @@
 
 public class PreferenceChangeHandler extends AbstractPreferenceListenerHandler {
 
-	public PreferenceChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(PreferenceChange.class, processingEnvironment);
+	public PreferenceChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(PreferenceChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
+
 		validatorHelper.enclosingElementExtendsPreferenceActivityOrPreferenceFragment(element, valid);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
@@ -78,8 +78,8 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(HasPreferences holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> userParameters) {
-		JVar preferenceParam = listenerMethod.param(classes().PREFERENCE, "preference");
-		JVar newValueParam = listenerMethod.param(classes().OBJECT, "newValue");
+		JVar preferenceParam = listenerMethod.param(getClasses().PREFERENCE, "preference");
+		JVar newValueParam = listenerMethod.param(getClasses().OBJECT, "newValue");
 
 		for (VariableElement variableElement : userParameters) {
 			String type = variableElement.asType().toString();
@@ -90,10 +90,10 @@ protected void processParameters(HasPreferences holder, JMethod listenerMethod,
 			} else if (type.equals(CanonicalNameConstants.INTEGER) || type.equals(int.class.getName()) || //
 					type.equals(CanonicalNameConstants.FLOAT) || type.equals(float.class.getName()) || //
 					type.equals(CanonicalNameConstants.LONG) || type.equals(long.class.getName())) {
-				JClass wrapperClass = type.startsWith("java") ? holder.refClass(type) : JType.parse(holder.codeModel(), type.replace(".class", "")).boxify();
-				call.arg(wrapperClass.staticInvoke("valueOf").arg(JExpr.cast(holder.classes().STRING, newValueParam)));
+				JClass wrapperClass = type.startsWith("java") ? getJClass(type) : JType.parse(getEnvironment().getCodeModel(), type.replace(".class", "")).boxify();
+				call.arg(wrapperClass.staticInvoke("valueOf").arg(JExpr.cast(getClasses().STRING, newValueParam)));
 			} else {
-				JClass userParamClass = codeModelHelper.typeMirrorToJClass(variableElement.asType(), holder);
+				JClass userParamClass = codeModelHelper.typeMirrorToJClass(variableElement.asType());
 				call.arg(JExpr.cast(userParamClass, newValueParam));
 
 				if (type.equals(CanonicalNameConstants.STRING_SET)) {
@@ -105,7 +105,7 @@ protected void processParameters(HasPreferences holder, JMethod listenerMethod,
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onPreferenceChange");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onPreferenceChange");
 	}
 
 	@Override
@@ -115,6 +115,6 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().PREFERENCE_CHANGE_LISTENER;
+		return getClasses().PREFERENCE_CHANGE_LISTENER;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceClickHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceClickHandler.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceClickHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceClickHandler.java
index 4b2a0d3cc8..3720063c88 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceClickHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceClickHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.PreferenceClick;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.HasPreferences;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -41,13 +40,13 @@
 
 public class PreferenceClickHandler extends AbstractPreferenceListenerHandler {
 
-	public PreferenceClickHandler(ProcessingEnvironment processingEnvironment) {
-		super(PreferenceClick.class, processingEnvironment);
+	public PreferenceClickHandler(AndroidAnnotationsEnvironment environment) {
+		super(PreferenceClick.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
 		validatorHelper.enclosingElementExtendsPreferenceActivityOrPreferenceFragment(element, valid);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
@@ -72,7 +71,7 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(HasPreferences holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> userParameters) {
-		JVar preferenceParam = listenerMethod.param(classes().PREFERENCE, "preference");
+		JVar preferenceParam = listenerMethod.param(getClasses().PREFERENCE, "preference");
 
 		if (userParameters.size() == 1) {
 			call.arg(castArgumentIfNecessary(holder, CanonicalNameConstants.PREFERENCE, preferenceParam, userParameters.get(0)));
@@ -81,7 +80,7 @@ protected void processParameters(HasPreferences holder, JMethod listenerMethod,
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onPreferenceClick");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onPreferenceClick");
 	}
 
 	@Override
@@ -91,7 +90,7 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().PREFERENCE_CLICK_LISTENER;
+		return getClasses().PREFERENCE_CLICK_LISTENER;
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceHeadersHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceHeadersHandler.java
similarity index 70%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceHeadersHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceHeadersHandler.java
index d433ebff59..de1f9e2081 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceHeadersHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceHeadersHandler.java
@@ -13,17 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.PreferenceHeaders;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.HasPreferenceHeaders;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -33,24 +32,21 @@
 
 public class PreferenceHeadersHandler extends BaseAnnotationHandler<HasPreferenceHeaders> {
 
-	private final AnnotationHelper annotationHelper;
-
-	public PreferenceHeadersHandler(ProcessingEnvironment processingEnvironment) {
-		super(PreferenceHeaders.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnvironment);
+	public PreferenceHeadersHandler(AndroidAnnotationsEnvironment environment) {
+		super(PreferenceHeaders.class, environment);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	protected void validate(Element element, ElementValidation valid) {
 		validatorHelper.isPreferenceFragmentClassPresent(element, valid);
 		validatorHelper.extendsPreferenceActivity(element, valid);
-		validatorHelper.hasEActivity(element, validatedElements, valid);
+		validatorHelper.hasEActivity(element, valid);
 		validatorHelper.resIdsExist(element, IRClass.Res.XML, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, valid);
 	}
 
 	@Override
 	public void process(Element element, HasPreferenceHeaders holder) throws Exception {
-		JFieldRef headerId = annotationHelper.extractAnnotationFieldRefs(processHolder, element, getTarget(), rClass.get(IRClass.Res.XML), false).get(0);
+		JFieldRef headerId = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.XML, false).get(0);
 
 		JBlock block = holder.getOnBuildHeadersBlock();
 		JVar targetParam = holder.getOnBuildHeadersTargetParam();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceScreenHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceScreenHandler.java
similarity index 65%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceScreenHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceScreenHandler.java
index 66a2133a3b..5d9321965e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/PreferenceScreenHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceScreenHandler.java
@@ -13,40 +13,36 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.PreferenceScreen;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.HasPreferences;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JFieldRef;
 
 public class PreferenceScreenHandler extends BaseAnnotationHandler<HasPreferences> {
 
-	private final AnnotationHelper annotationHelper;
-
-	public PreferenceScreenHandler(ProcessingEnvironment processingEnvironment) {
-		super(PreferenceScreen.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnvironment);
+	public PreferenceScreenHandler(AndroidAnnotationsEnvironment environment) {
+		super(PreferenceScreen.class, environment);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	protected void validate(Element element, ElementValidation valid) {
 		validatorHelper.extendsPreferenceActivityOrPreferenceFragment(element, valid);
-		validatorHelper.hasEActivityOrEFragment(element, validatedElements, valid);
+		validatorHelper.hasEActivityOrEFragment(element, valid);
 		validatorHelper.resIdsExist(element, IRClass.Res.XML, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, valid);
 	}
 
 	@Override
 	public void process(Element element, HasPreferences holder) throws Exception {
-		JFieldRef preferenceId = annotationHelper.extractAnnotationFieldRefs(processHolder, element, getTarget(), rClass.get(IRClass.Res.XML), false).get(0);
+		JFieldRef preferenceId = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.XML, false).get(0);
 
 		holder.getPreferenceScreenInitializationBlock().invoke("addPreferencesFromResource").arg(preferenceId);
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverActionHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverActionHandler.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverActionHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverActionHandler.java
index d627d2926e..92a257fb8b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverActionHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverActionHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -22,19 +22,22 @@
 import static com.sun.codemodel.JMod.PUBLIC;
 import static com.sun.codemodel.JMod.STATIC;
 
+import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ReceiverAction;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.handler.BaseAnnotationHandler;
+import org.androidannotations.handler.HasParameterHandlers;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.helper.CaseHelper;
 import org.androidannotations.holder.EReceiverHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -44,24 +47,24 @@
 import com.sun.codemodel.JOp;
 import com.sun.codemodel.JVar;
 
-public class ReceiverActionHandler extends BaseAnnotationHandler<EReceiverHolder> {
+public class ReceiverActionHandler extends BaseAnnotationHandler<EReceiverHolder> implements HasParameterHandlers<EReceiverHolder> {
 
 	private ExtraHandler extraHandler;
 
-	public ReceiverActionHandler(ProcessingEnvironment processingEnvironment) {
-		super(ReceiverAction.class, processingEnvironment);
-		extraHandler = new ExtraHandler(processingEnvironment);
+	public ReceiverActionHandler(AndroidAnnotationsEnvironment environment) {
+		super(ReceiverAction.class, environment);
+		extraHandler = new ExtraHandler(environment);
 	}
 
-	public void register(AnnotationHandlers annotationHandlers) {
-		annotationHandlers.add(this);
-		annotationHandlers.add(extraHandler);
+	@Override
+	public Iterable<AnnotationHandler> getParameterHandlers() {
+		return Collections.<AnnotationHandler> singleton(extraHandler);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	protected void validate(Element element, ElementValidation valid) {
 
-		validatorHelper.enclosingElementHasEReceiver(element, validatedElements, valid);
+		validatorHelper.enclosingElementHasEReceiver(element, valid);
 
 		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
 
@@ -95,15 +98,15 @@ private JFieldVar createStaticField(EReceiverHolder holder, String prefix, Strin
 		if (values == null || values.length == 0) {
 			return null;
 		} else if (values.length == 1) {
-			return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, classes().STRING, staticFieldName, lit(values[0]));
+			return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, getClasses().STRING, staticFieldName, lit(values[0]));
 
 		}
 
-		JInvocation asListInvoke = classes().ARRAYS.staticInvoke("asList");
+		JInvocation asListInvoke = getClasses().ARRAYS.staticInvoke("asList");
 		for (String scheme : values) {
 			asListInvoke.arg(scheme);
 		}
-		JClass listOfStrings = classes().LIST.narrow(classes().STRING);
+		JClass listOfStrings = getClasses().LIST.narrow(getClasses().STRING);
 		return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, listOfStrings, staticFieldName, asListInvoke);
 	}
 
@@ -124,16 +127,16 @@ private void addActionInOnReceive(EReceiverHolder holder, ExecutableElement exec
 
 		List<? extends VariableElement> methodParameters = executableElement.getParameters();
 		for (VariableElement param : methodParameters) {
-			JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType(), holder);
+			JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType());
 
-			if (extraParamClass.equals(classes().CONTEXT)) {
+			if (extraParamClass.equals(getClasses().CONTEXT)) {
 				callActionInvocation.arg(holder.getOnReceiveContext());
-			} else if (extraParamClass.equals(classes().INTENT)) {
+			} else if (extraParamClass.equals(getClasses().INTENT)) {
 				callActionInvocation.arg(intent);
 			} else if (param.getAnnotation(ReceiverAction.Extra.class) != null) {
 				if (extras == null) {
-					extras = callActionBlock.decl(classes().BUNDLE, "extras_", JOp.cond(intent.invoke("getExtras") //
-							.ne(_null()), intent.invoke("getExtras"), _new(classes().BUNDLE)));
+					extras = callActionBlock.decl(getClasses().BUNDLE, "extras_", JOp.cond(intent.invoke("getExtras") //
+							.ne(_null()), intent.invoke("getExtras"), _new(getClasses().BUNDLE)));
 				}
 				callActionInvocation.arg(extraHandler.getExtraValue(param, extras, callActionBlock, holder));
 			}
@@ -143,7 +146,7 @@ private void addActionInOnReceive(EReceiverHolder holder, ExecutableElement exec
 	}
 
 	private String getInvocationName(JFieldVar field) {
-		JClass listOfStrings = classes().LIST.narrow(classes().STRING);
+		JClass listOfStrings = getClasses().LIST.narrow(getClasses().STRING);
 		if (field.type().fullName().equals(listOfStrings.fullName())) {
 			return "contains";
 		}
@@ -152,8 +155,8 @@ private String getInvocationName(JFieldVar field) {
 
 	private static class ExtraHandler extends ExtraParameterHandler {
 
-		public ExtraHandler(ProcessingEnvironment processingEnvironment) {
-			super(ReceiverAction.Extra.class, ReceiverAction.class, processingEnvironment);
+		ExtraHandler(AndroidAnnotationsEnvironment environment) {
+			super(ReceiverAction.Extra.class, ReceiverAction.class, environment);
 		}
 
 		@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverHandler.java
similarity index 70%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverHandler.java
index 9965a6d587..ad72f5cca9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ReceiverHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -22,19 +22,21 @@
 import static com.sun.codemodel.JMod.PUBLIC;
 import static org.androidannotations.helper.ModelConstants.generationSuffix;
 
+import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Receiver;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.handler.HasParameterHandlers;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.HasReceiverRegistration;
 import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -46,39 +48,40 @@
 import com.sun.codemodel.JOp;
 import com.sun.codemodel.JVar;
 
-public class ReceiverHandler extends BaseAnnotationHandler<HasReceiverRegistration> {
+public class ReceiverHandler extends CoreBaseAnnotationHandler<HasReceiverRegistration> implements HasParameterHandlers<HasReceiverRegistration> {
 
 	private ExtraHandler extraHandler;
 
-	public ReceiverHandler(ProcessingEnvironment processingEnvironment) {
-		super(Receiver.class, processingEnvironment);
-		extraHandler = new ExtraHandler(processingEnvironment);
+	public ReceiverHandler(AndroidAnnotationsEnvironment environment) {
+		super(Receiver.class, environment);
+		extraHandler = new ExtraHandler(environment);
 	}
 
-	public void register(AnnotationHandlers annotationHandlers) {
-		annotationHandlers.add(this);
-		annotationHandlers.add(extraHandler);
+	@Override
+	public Iterable<AnnotationHandler> getParameterHandlers() {
+		return Collections.<AnnotationHandler> singleton(extraHandler);
 	}
 
+
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEActivityOrEFragmentOrEServiceOrEIntentService(element, validatedElements, valid);
+	protected void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEActivityOrEFragmentOrEServiceOrEIntentService(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
 		validatorHelper.param.anyOrder() //
 				.type(CanonicalNameConstants.CONTEXT).optional() //
 				.type(CanonicalNameConstants.INTENT).optional() //
 				.annotatedWith(Receiver.Extra.class).multiple().optional() //
-				.validate((ExecutableElement) element, valid);
+				.validate((ExecutableElement) element, validation);
 
-		validatorHelper.hasNotMultipleAnnotatedMethodWithSameName(element.getEnclosingElement(), valid, Receiver.class);
+		validatorHelper.hasNotMultipleAnnotatedMethodWithSameName(element.getEnclosingElement(), validation, Receiver.class);
 
-		validatorHelper.hasRightRegisterAtValueDependingOnEnclosingElement(element, valid);
+		coreValidatorHelper.hasRightRegisterAtValueDependingOnEnclosingElement(element, validation);
 
-		validatorHelper.hasSupportV4JarIfLocal(element, valid);
+		coreValidatorHelper.hasSupportV4JarIfLocal(element, validation);
 	}
 
 	@Override
@@ -99,10 +102,10 @@ public void process(Element element, HasReceiverRegistration holder) throws Exce
 	}
 
 	private JFieldVar createReceiverField(HasReceiverRegistration holder, String receiverName, String methodName, ExecutableElement executableElement) {
-		JDefinedClass anonymousReceiverClass = codeModel().anonymousClass(classes().BROADCAST_RECEIVER);
-		JMethod onReceiveMethod = anonymousReceiverClass.method(PUBLIC, codeModel().VOID, "onReceive");
-		JVar contextVar = onReceiveMethod.param(classes().CONTEXT, "context");
-		JVar intentVar = onReceiveMethod.param(classes().INTENT, "intent");
+		JDefinedClass anonymousReceiverClass = getCodeModel().anonymousClass(getClasses().BROADCAST_RECEIVER);
+		JMethod onReceiveMethod = anonymousReceiverClass.method(PUBLIC, getCodeModel().VOID, "onReceive");
+		JVar contextVar = onReceiveMethod.param(getClasses().CONTEXT, "context");
+		JVar intentVar = onReceiveMethod.param(getClasses().INTENT, "intent");
 
 		JBlock body = onReceiveMethod.body();
 
@@ -112,23 +115,23 @@ private JFieldVar createReceiverField(HasReceiverRegistration holder, String rec
 
 		List<? extends VariableElement> methodParameters = executableElement.getParameters();
 		for (VariableElement param : methodParameters) {
-			JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType(), holder);
+			JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType());
 
-			if (extraParamClass.equals(classes().CONTEXT)) {
+			if (extraParamClass.equals(getClasses().CONTEXT)) {
 				methodCall.arg(contextVar);
-			} else if (extraParamClass.equals(classes().INTENT)) {
+			} else if (extraParamClass.equals(getClasses().INTENT)) {
 				methodCall.arg(intentVar);
 			} else if (param.getAnnotation(Receiver.Extra.class) != null) {
 				if (extras == null) {
-					extras = body.decl(classes().BUNDLE, "extras_", JOp.cond(intentVar.invoke("getExtras").ne(_null()), intentVar.invoke("getExtras"), _new(classes().BUNDLE)));
+					extras = body.decl(getClasses().BUNDLE, "extras_", JOp.cond(intentVar.invoke("getExtras").ne(_null()), intentVar.invoke("getExtras"), _new(getClasses().BUNDLE)));
 				}
-				methodCall.arg(extraHandler.getExtraValue(param, intentVar, extras, body, onReceiveMethod, anonymousReceiverClass, holder));
+				methodCall.arg(extraHandler.getExtraValue(param, intentVar, extras, body, onReceiveMethod, anonymousReceiverClass));
 			}
 		}
 
 		body.add(methodCall);
 		JExpression receiverInit = _new(anonymousReceiverClass);
-		return holder.getGeneratedClass().field(PRIVATE | FINAL, classes().BROADCAST_RECEIVER, receiverName, receiverInit);
+		return holder.getGeneratedClass().field(PRIVATE | FINAL, getClasses().BROADCAST_RECEIVER, receiverName, receiverInit);
 	}
 
 	private void registerAndUnregisterReceiver(HasReceiverRegistration holder, Receiver.RegisterAt registerAt, JFieldVar intentFilterField, JFieldVar receiverField, boolean local) {
@@ -154,7 +157,7 @@ private void registerAndUnregisterReceiver(HasReceiverRegistration holder, Recei
 
 		JExpression broadcastManager;
 		if (local) {
-			broadcastManager = classes().LOCAL_BROADCAST_MANAGER.staticInvoke("getInstance").arg(holder.getContextRef());
+			broadcastManager = getClasses().LOCAL_BROADCAST_MANAGER.staticInvoke("getInstance").arg(holder.getContextRef());
 		} else {
 			broadcastManager = holder.getContextRef();
 		}
@@ -165,8 +168,8 @@ private void registerAndUnregisterReceiver(HasReceiverRegistration holder, Recei
 
 	private static class ExtraHandler extends ExtraParameterHandler {
 
-		public ExtraHandler(ProcessingEnvironment processingEnvironment) {
-			super(Receiver.Extra.class, Receiver.class, processingEnvironment);
+		ExtraHandler(AndroidAnnotationsEnvironment environment) {
+			super(Receiver.Extra.class, Receiver.class, environment);
 		}
 
 		@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RootContextHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RootContextHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java
index 98d2cabf21..347377d4a8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RootContextHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.lit;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.RootContext;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EBeanHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -37,17 +37,17 @@
 
 public class RootContextHandler extends BaseAnnotationHandler<EBeanHolder> {
 
-	public RootContextHandler(ProcessingEnvironment processingEnvironment) {
-		super(RootContext.class, processingEnvironment);
+	public RootContextHandler(AndroidAnnotationsEnvironment environment) {
+		super(RootContext.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEBeanAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEBeanAnnotation(element, validation);
 
-		validatorHelper.extendsContext(element, valid);
+		validatorHelper.extendsContext(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -63,12 +63,12 @@ public void process(Element element, EBeanHolder holder) {
 		if (CanonicalNameConstants.CONTEXT.equals(typeQualifiedName)) {
 			body.assign(ref(fieldName), contextRef);
 		} else {
-			JClass extendingContextClass = holder.refClass(typeQualifiedName);
+			JClass extendingContextClass = getEnvironment().getJClass(typeQualifiedName);
 			JConditional cond = body._if(holder.getContextRef()._instanceof(extendingContextClass));
 			cond._then() //
 					.assign(ref(fieldName), cast(extendingContextClass, holder.getContextRef()));
 
-			JInvocation warningInvoke = holder.classes().LOG.staticInvoke("w");
+			JInvocation warningInvoke = getClasses().LOG.staticInvoke("w");
 			warningInvoke.arg(holder.getGeneratedClass().name());
 			JExpression expr = lit("Due to Context class ").plus(holder.getContextRef().invoke("getClass").invoke("getSimpleName")).plus(
 					lit(", the @RootContext " + extendingContextClass.name() + " won't be populated"));
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarProgressChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarProgressChangeHandler.java
similarity index 72%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarProgressChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarProgressChangeHandler.java
index a1655ed6c1..6fa5dbdaea 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarProgressChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarProgressChangeHandler.java
@@ -13,27 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.SeekBarProgressChange;
-import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.OnSeekBarChangeListenerHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -42,33 +38,25 @@
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JVar;
 
-public class SeekBarProgressChangeHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+public class SeekBarProgressChangeHandler extends CoreBaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public SeekBarProgressChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(SeekBarProgressChange.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public SeekBarProgressChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(SeekBarProgressChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
-		validatorHelper.hasSeekBarProgressChangeMethodParameters((ExecutableElement) element, valid);
+		coreValidatorHelper.hasSeekBarProgressChangeMethodParameters((ExecutableElement) element, validation);
 	}
 
 	@Override
@@ -95,7 +83,7 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
 			}
 		}
 
-		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 
 		for (JFieldRef idRef : idsRefs) {
 			OnSeekBarChangeListenerHolder onSeekBarChangeListenerHolder = holder.getOnSeekBarChangeListenerHolder(idRef);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarTouchStartHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarTouchStartHandler.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarTouchStartHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarTouchStartHandler.java
index 1fbbda4ffb..a7044c472c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarTouchStartHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarTouchStartHandler.java
@@ -13,10 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
-
-import javax.annotation.processing.ProcessingEnvironment;
+package org.androidannotations.internal.core.handler;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.SeekBarTouchStart;
 import org.androidannotations.holder.OnSeekBarChangeListenerHolder;
 
@@ -25,8 +24,8 @@
 
 public class SeekBarTouchStartHandler extends AbstractSeekBarTouchHandler {
 
-	public SeekBarTouchStartHandler(ProcessingEnvironment processingEnvironment) {
-		super(SeekBarTouchStart.class, processingEnvironment);
+	public SeekBarTouchStartHandler(AndroidAnnotationsEnvironment environment) {
+		super(SeekBarTouchStart.class, environment);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarTouchStopHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarTouchStopHandler.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarTouchStopHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarTouchStopHandler.java
index 5c0d63123e..278bac3269 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SeekBarTouchStopHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SeekBarTouchStopHandler.java
@@ -13,10 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
-
-import javax.annotation.processing.ProcessingEnvironment;
+package org.androidannotations.internal.core.handler;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.SeekBarTouchStop;
 import org.androidannotations.holder.OnSeekBarChangeListenerHolder;
 
@@ -25,8 +24,8 @@
 
 public class SeekBarTouchStopHandler extends AbstractSeekBarTouchHandler {
 
-	public SeekBarTouchStopHandler(ProcessingEnvironment processingEnvironment) {
-		super(SeekBarTouchStop.class, processingEnvironment);
+	public SeekBarTouchStopHandler(AndroidAnnotationsEnvironment environment) {
+		super(SeekBarTouchStop.class, environment);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ServiceActionHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ServiceActionHandler.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ServiceActionHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ServiceActionHandler.java
index 008ca7a4b2..cd3065014d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ServiceActionHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ServiceActionHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.lit;
@@ -23,18 +23,17 @@
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ServiceAction;
-import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.BundleHelper;
 import org.androidannotations.helper.CaseHelper;
 import org.androidannotations.holder.EIntentServiceHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -47,21 +46,18 @@
 
 public class ServiceActionHandler extends BaseAnnotationHandler<EIntentServiceHolder> {
 
-	private AnnotationHelper annotationHelper;
-
-	public ServiceActionHandler(ProcessingEnvironment processingEnvironment) {
-		super(ServiceAction.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnvironment);
+	public ServiceActionHandler(AndroidAnnotationsEnvironment environment) {
+		super(ServiceAction.class, environment);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	protected void validate(Element element, ElementValidation validation) {
 
-		validatorHelper.enclosingElementHasEIntentService(element, validatedElements, valid);
+		validatorHelper.enclosingElementHasEIntentService(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -83,7 +79,7 @@ public void process(Element element, EIntentServiceHolder holder) throws Excepti
 
 	private JFieldVar createStaticActionField(EIntentServiceHolder holder, String extraKey, String methodName) {
 		String staticFieldName = CaseHelper.camelCaseToUpperSnakeCase("action", methodName, null);
-		return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, classes().STRING, staticFieldName, lit(extraKey));
+		return holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, getClasses().STRING, staticFieldName, lit(extraKey));
 	}
 
 	private void addActionInOnHandleIntent(EIntentServiceHolder holder, ExecutableElement executableElement, String methodName, JFieldVar actionKeyField) {
@@ -100,7 +96,7 @@ private void addActionInOnHandleIntent(EIntentServiceHolder holder, ExecutableEl
 		if (methodParameters.size() > 0) {
 			// Extras
 			JVar intent = holder.getOnHandleIntentIntent();
-			JVar extras = callActionBlock.decl(classes().BUNDLE, "extras");
+			JVar extras = callActionBlock.decl(getClasses().BUNDLE, "extras");
 			extras.init(intent.invoke("getExtras"));
 			callActionBlock = callActionBlock._if(extras.ne(_null()))._then();
 
@@ -109,10 +105,10 @@ private void addActionInOnHandleIntent(EIntentServiceHolder holder, ExecutableEl
 				String paramName = param.getSimpleName().toString();
 				String extraParamName = paramName + "Extra";
 				JFieldVar paramVar = getStaticExtraField(holder, paramName);
-				JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType(), holder);
+				JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType());
 
-				BundleHelper bundleHelper = new BundleHelper(annotationHelper, param.asType());
-				JExpression getExtraExpression = bundleHelper.getExpressionToRestoreFromIntentOrBundle(extraParamClass, intent, extras, paramVar, onHandleIntentMethod, holder);
+				BundleHelper bundleHelper = new BundleHelper(getEnvironment(), param.asType());
+				JExpression getExtraExpression = bundleHelper.getExpressionToRestoreFromIntentOrBundle(extraParamClass, intent, extras, paramVar, onHandleIntentMethod);
 
 				JVar extraField = callActionBlock.decl(extraParamClass, extraParamName, getExtraExpression);
 				callActionInvocation.arg(extraField);
@@ -131,7 +127,7 @@ private void addActionToIntentBuilder(EIntentServiceHolder holder, ExecutableEle
 
 		for (VariableElement param : executableElement.getParameters()) {
 			String paramName = param.getSimpleName().toString();
-			JClass parameterClass = codeModelHelper.typeMirrorToJClass(param.asType(), holder);
+			JClass parameterClass = codeModelHelper.typeMirrorToJClass(param.asType());
 
 			JFieldVar paramVar = getStaticExtraField(holder, paramName);
 			JVar methodParam = method.param(parameterClass, paramName);
@@ -146,7 +142,7 @@ private JFieldVar getStaticExtraField(EIntentServiceHolder holder, String extraN
 		String staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(null, extraName, "Extra");
 		JFieldVar staticExtraField = holder.getGeneratedClass().fields().get(staticFieldName);
 		if (staticExtraField == null) {
-			staticExtraField = holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, classes().STRING, staticFieldName, lit(extraName));
+			staticExtraField = holder.getGeneratedClass().field(PUBLIC | STATIC | FINAL, getClasses().STRING, staticFieldName, lit(extraName));
 		}
 		return staticExtraField;
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SharedPrefHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SharedPrefHandler.java
similarity index 78%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SharedPrefHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SharedPrefHandler.java
index 0023c8dae4..a18b2cb8db 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SharedPrefHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SharedPrefHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.lit;
@@ -27,12 +27,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ResId;
 import org.androidannotations.annotations.sharedpreferences.DefaultBoolean;
 import org.androidannotations.annotations.sharedpreferences.DefaultFloat;
@@ -49,17 +50,11 @@
 import org.androidannotations.api.sharedpreferences.LongPrefField;
 import org.androidannotations.api.sharedpreferences.StringPrefField;
 import org.androidannotations.api.sharedpreferences.StringSetPrefField;
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
 import org.androidannotations.holder.SharedPrefHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
 import org.androidannotations.rclass.IRClass;
 import org.androidannotations.rclass.IRClass.Res;
 import org.androidannotations.rclass.IRInnerClass;
@@ -72,10 +67,7 @@
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JVar;
 
-public class SharedPrefHandler extends BaseGeneratingAnnotationHandler<SharedPrefHolder> {
-
-	private IdAnnotationHelper annotationHelper;
-	private APTCodeModelHelper aptCodeModelHelper;
+public class SharedPrefHandler extends CoreBaseGeneratingAnnotationHandler<SharedPrefHolder> {
 
 	private static final class DefaultPrefInfo<T> {
 		final Class<? extends Annotation> annotationClass;
@@ -105,52 +97,45 @@ private static final class DefaultPrefInfo<T> {
 		}
 	};
 
-	public SharedPrefHandler(ProcessingEnvironment processingEnvironment) {
-		super(SharedPref.class, processingEnvironment);
-		aptCodeModelHelper = new APTCodeModelHelper();
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public SharedPrefHandler(AndroidAnnotationsEnvironment environment) {
+		super(SharedPref.class, environment);
 	}
 
 	@Override
-	public SharedPrefHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new SharedPrefHolder(processHolder, annotatedElement);
+	public SharedPrefHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new SharedPrefHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		TypeElement typeElement = (TypeElement) element;
 
-		validatorHelper.isInterface(typeElement, valid);
+		validatorHelper.isInterface(typeElement, validation);
 
-		List<? extends Element> inheritedMembers = processingEnv.getElementUtils().getAllMembers(typeElement);
+		List<? extends Element> inheritedMembers = getProcessingEnvironment().getElementUtils().getAllMembers(typeElement);
 
 		for (Element memberElement : inheritedMembers) {
 			if (!memberElement.getEnclosingElement().asType().toString().equals("java.lang.Object")) {
-				validatorHelper.isPrefMethod(memberElement, valid);
+				coreValidatorHelper.isPrefMethod(memberElement, validation);
 
-				DefaultPrefInfo<?> info = null;
+				DefaultPrefInfo<?> info;
 				IdValidatorHelper defaultAnnotationValidatorHelper = null;
 
-				if (valid.isValid()) {
+				if (validation.isValid()) {
 					info = DEFAULT_PREF_INFOS.get(((ExecutableElement) memberElement).getReturnType().toString());
-					validatorHelper.hasCorrectDefaultAnnotation((ExecutableElement) memberElement, valid);
+					coreValidatorHelper.hasCorrectDefaultAnnotation((ExecutableElement) memberElement, validation);
 
-					if (valid.isValid() && memberElement.getAnnotation(DefaultRes.class) != null) {
-						defaultAnnotationValidatorHelper = new IdValidatorHelper(new IdAnnotationHelper(processingEnv, DefaultRes.class.getName(), rClass));
-						defaultAnnotationValidatorHelper.resIdsExist(memberElement, info.resType, FallbackStrategy.USE_ELEMENT_NAME, valid);
-					} else if (valid.isValid() && memberElement.getAnnotation(info.annotationClass) != null) {
-						defaultAnnotationValidatorHelper = new IdValidatorHelper(new IdAnnotationHelper(processingEnv, info.annotationClass.getName(), rClass));
+					if (validation.isValid() && memberElement.getAnnotation(DefaultRes.class) != null) {
+						defaultAnnotationValidatorHelper = new IdValidatorHelper(new IdAnnotationHelper(getEnvironment(), DefaultRes.class.getName()));
+						defaultAnnotationValidatorHelper.resIdsExist(memberElement, info.resType, FallbackStrategy.USE_ELEMENT_NAME, validation);
+					} else if (validation.isValid() && memberElement.getAnnotation(info.annotationClass) != null) {
+						defaultAnnotationValidatorHelper = new IdValidatorHelper(new IdAnnotationHelper(getEnvironment(), info.annotationClass.getName()));
 					}
 
-					if (valid.isValid() && defaultAnnotationValidatorHelper != null) {
-						defaultAnnotationValidatorHelper.annotationParameterIsOptionalValidResId(memberElement, IRClass.Res.STRING, "keyRes", valid);
+					if (validation.isValid() && defaultAnnotationValidatorHelper != null) {
+						defaultAnnotationValidatorHelper.annotationParameterIsOptionalValidResId(memberElement, IRClass.Res.STRING, "keyRes", validation);
 					}
 				}
 			}
@@ -198,7 +183,7 @@ private void generateConstructor(Element element, SharedPrefHolder holder) {
 			break;
 		}
 		case APPLICATION_DEFAULT: {
-			JClass preferenceManagerClass = refClass("android.preference.PreferenceManager");
+			JClass preferenceManagerClass = getJClass("android.preference.PreferenceManager");
 			constructorSuperBlock.invoke("super") //
 					.arg(preferenceManagerClass.staticInvoke("getDefaultSharedPreferences") //
 							.arg(contextParam));
@@ -209,9 +194,9 @@ private void generateConstructor(Element element, SharedPrefHolder holder) {
 
 	private JMethod getLocalClassName(SharedPrefHolder holder) {
 
-		JClass stringClass = classes().STRING;
+		JClass stringClass = getClasses().STRING;
 		JMethod getLocalClassName = holder.getGeneratedClass().method(PRIVATE | STATIC, stringClass, "getLocalClassName");
-		JClass contextClass = classes().CONTEXT;
+		JClass contextClass = getClasses().CONTEXT;
 
 		JVar contextParam = getLocalClassName.param(contextClass, "context");
 
@@ -221,7 +206,7 @@ private JMethod getLocalClassName(SharedPrefHolder holder) {
 
 		JVar className = body.decl(stringClass, "className", contextParam.invoke("getClass").invoke("getName"));
 
-		JVar packageLen = body.decl(codeModel().INT, "packageLen", packageName.invoke("length"));
+		JVar packageLen = body.decl(getCodeModel().INT, "packageLen", packageName.invoke("length"));
 
 		JExpression condition = className.invoke("startsWith").arg(packageName).not() //
 				.cor(className.invoke("length").lte(packageLen)) //
@@ -262,7 +247,7 @@ private JExpression createFieldMethod(SharedPrefHolder holder, ExecutableElement
 		JExpression defaultValueExpr;
 
 		if (annotation != null && method.getAnnotation(DefaultStringSet.class) == null) {
-			defaultValueExpr = aptCodeModelHelper.litObject(annotationHelper.extractAnnotationParameter(method, annotationClass.getName(), "value"));
+			defaultValueExpr = codeModelHelper.litObject(annotationHelper.extractAnnotationParameter(method, annotationClass.getName(), "value"));
 		} else if (method.getAnnotation(DefaultRes.class) != null) {
 			defaultValueExpr = extractResValue(holder, method, resType);
 			annotationClass = DefaultRes.class;
@@ -270,7 +255,7 @@ private JExpression createFieldMethod(SharedPrefHolder holder, ExecutableElement
 			defaultValueExpr = newEmptyStringHashSet();
 			annotationClass = DefaultStringSet.class;
 		} else {
-			defaultValueExpr = defaultValue != null ? aptCodeModelHelper.litObject(defaultValue) : newEmptyStringHashSet();
+			defaultValueExpr = defaultValue != null ? codeModelHelper.litObject(defaultValue) : newEmptyStringHashSet();
 			annotationClass = null;
 		}
 
@@ -286,8 +271,8 @@ private JExpression createFieldMethod(SharedPrefHolder holder, ExecutableElement
 		if (keyResId == ResId.DEFAULT_VALUE) {
 			keyExpression = lit(fieldName);
 		} else {
-			IRInnerClass idClass = rClass.get(IRClass.Res.STRING);
-			JFieldRef idRef = idClass.getIdStaticRef(keyResId, processHolder);
+			IRInnerClass idClass = getEnvironment().getRClass().get(IRClass.Res.STRING);
+			JFieldRef idRef = idClass.getIdStaticRef(keyResId, getEnvironment());
 			keyExpression = holder.getEditorContextField().invoke("getString").arg(idRef);
 		}
 
@@ -296,7 +281,7 @@ private JExpression createFieldMethod(SharedPrefHolder holder, ExecutableElement
 	}
 
 	private JExpression extractResValue(SharedPrefHolder holder, Element method, IRClass.Res res) {
-		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, method, DefaultRes.class.getCanonicalName(), res, true);
+		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(method, DefaultRes.class.getCanonicalName(), res, true);
 
 		String resourceGetMethodName = null;
 		switch (res) {
@@ -316,7 +301,7 @@ private JExpression extractResValue(SharedPrefHolder holder, Element method, IRC
 	}
 
 	private JExpression newEmptyStringHashSet() {
-		return JExpr._new(classes().HASH_SET.narrow(classes().STRING)).arg(lit(0));
+		return JExpr._new(getClasses().HASH_SET.narrow(getClasses().STRING)).arg(lit(0));
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeBackgroundHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeBackgroundHandler.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeBackgroundHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeBackgroundHandler.java
index 4c3f618db9..71dbaf6653 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeBackgroundHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeBackgroundHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.lit;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.SupposeBackground;
 import org.androidannotations.api.BackgroundExecutor;
 import org.androidannotations.holder.EComponentHolder;
@@ -34,8 +34,8 @@ public class SupposeBackgroundHandler extends SupposeThreadHandler {
 
 	private static final String METHOD_CHECK_BG_THREAD = "checkBgThread";
 
-	public SupposeBackgroundHandler(ProcessingEnvironment processingEnvironment) {
-		super(SupposeBackground.class, processingEnvironment);
+	public SupposeBackgroundHandler(AndroidAnnotationsEnvironment environment) {
+		super(SupposeBackground.class, environment);
 	}
 
 	@Override
@@ -44,7 +44,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 
 		JMethod delegatingMethod = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
 
-		JClass bgExecutor = refClass(BackgroundExecutor.class);
+		JClass bgExecutor = getJClass(BackgroundExecutor.class);
 
 		SupposeBackground annotation = element.getAnnotation(SupposeBackground.class);
 		String[] serial = annotation.serial();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeThreadHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeThreadHandler.java
similarity index 67%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeThreadHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeThreadHandler.java
index 6ee3eb675a..80b14c1e9d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeThreadHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeThreadHandler.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 public abstract class SupposeThreadHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public SupposeThreadHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
+	public SupposeThreadHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
 	}
 
 	@Override
-	protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	protected void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, valid);
 		validatorHelper.isNotPrivate(element, valid);
 		validatorHelper.isNotFinal(element, valid);
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeUiThreadHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeUiThreadHandler.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeUiThreadHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeUiThreadHandler.java
index 34145971df..24b2c3832b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SupposeUiThreadHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SupposeUiThreadHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.annotations.SupposeUiThread;
 import org.androidannotations.api.BackgroundExecutor;
 import org.androidannotations.holder.EComponentHolder;
@@ -31,8 +31,8 @@ public class SupposeUiThreadHandler extends SupposeThreadHandler {
 
 	private static final String METHOD_CHECK_UI_THREAD = "checkUiThread";
 
-	public SupposeUiThreadHandler(ProcessingEnvironment processingEnvironment) {
-		super(SupposeUiThread.class, processingEnvironment);
+	public SupposeUiThreadHandler(AndroidAnnotationsEnvironment environment) {
+		super(SupposeUiThread.class, environment);
 	}
 
 	@Override
@@ -42,7 +42,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 		JMethod delegatingMethod = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
 		JBlock body = delegatingMethod.body();
 
-		JClass bgExecutor = refClass(BackgroundExecutor.class);
+		JClass bgExecutor = getJClass(BackgroundExecutor.class);
 
 		body.pos(0);
 		body.staticInvoke(bgExecutor, METHOD_CHECK_UI_THREAD);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SystemServiceHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SystemServiceHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java
index bd0e13d5fd..73bdbd93d6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SystemServiceHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java
@@ -13,22 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.assign;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.SystemService;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.internal.core.model.AndroidSystemServices;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -39,17 +40,17 @@
 
 public class SystemServiceHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public SystemServiceHandler(ProcessingEnvironment processingEnvironment) {
-		super(SystemService.class, processingEnvironment);
+	public SystemServiceHandler(AndroidAnnotationsEnvironment environment) {
+		super(SystemService.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.androidService(androidSystemServices, element, valid);
+		validatorHelper.androidService(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -59,12 +60,12 @@ public void process(Element element, EComponentHolder holder) {
 		TypeMirror serviceType = element.asType();
 		String fieldTypeQualifiedName = serviceType.toString();
 
-		JFieldRef serviceRef = androidSystemServices.getServiceConstant(serviceType, holder);
+		JFieldRef serviceRef = new AndroidSystemServices(getEnvironment()).getServiceConstantRef(serviceType);
 
 		JBlock methodBody = holder.getInitBody();
 
 		if (CanonicalNameConstants.APP_WIDGET_MANAGER.equals(fieldTypeQualifiedName)) {
-			createSpecialInjection(holder, fieldName, fieldTypeQualifiedName, serviceRef, methodBody, 21, "LOLLIPOP", holder.classes().APP_WIDGET_MANAGER, "getInstance", true);
+			createSpecialInjection(holder, fieldName, fieldTypeQualifiedName, serviceRef, methodBody, 21, "LOLLIPOP", getClasses().APP_WIDGET_MANAGER, "getInstance", true);
 		} else {
 			methodBody.add(createNormalInjection(holder, fieldName, fieldTypeQualifiedName, serviceRef, methodBody));
 		}
@@ -73,7 +74,7 @@ public void process(Element element, EComponentHolder holder) {
 	@SuppressWarnings("checkstyle:parameternumber")
 	private void createSpecialInjection(EComponentHolder holder, String fieldName, String fieldTypeQualifiedName, JFieldRef serviceRef, JBlock methodBody, int apiLevel, String apiLevelName,
 			JClass serviceClass, String injectionMethodName, boolean contextNeeded) {
-		if (androidManifest.getMinSdkVersion() >= apiLevel) {
+		if (getEnvironment().getAndroidManifest().getMinSdkVersion() >= apiLevel) {
 			methodBody.add(createNormalInjection(holder, fieldName, fieldTypeQualifiedName, serviceRef, methodBody));
 		} else {
 			JInvocation injectionMethodInvokation = serviceClass.staticInvoke(injectionMethodName);
@@ -83,7 +84,7 @@ private void createSpecialInjection(EComponentHolder holder, String fieldName, S
 			JStatement oldInjection = (JStatement) assign(ref(fieldName), injectionMethodInvokation);
 
 			if (isApiOnClasspath(apiLevelName)) {
-				JConditional conditional = methodBody._if(holder.classes().BUILD_VERSION.staticRef("SDK_INT").gte(holder.classes().BUILD_VERSION_CODES.staticRef(apiLevelName)));
+				JConditional conditional = methodBody._if(getClasses().BUILD_VERSION.staticRef("SDK_INT").gte(getClasses().BUILD_VERSION_CODES.staticRef(apiLevelName)));
 				conditional._then().add(createNormalInjection(holder, fieldName, fieldTypeQualifiedName, serviceRef, methodBody));
 				conditional._else().add(oldInjection);
 			} else {
@@ -93,11 +94,11 @@ private void createSpecialInjection(EComponentHolder holder, String fieldName, S
 	}
 
 	private JStatement createNormalInjection(EComponentHolder holder, String fieldName, String fieldTypeQualifiedName, JFieldRef serviceRef, JBlock methodBody) {
-		return (JStatement) assign(ref(fieldName), cast(refClass(fieldTypeQualifiedName), holder.getContextRef().invoke("getSystemService").arg(serviceRef)));
+		return (JStatement) assign(ref(fieldName), cast(getJClass(fieldTypeQualifiedName), holder.getContextRef().invoke("getSystemService").arg(serviceRef)));
 	}
 
 	private boolean isApiOnClasspath(String apiName) {
-		TypeElement typeElement = processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.BUILD_VERSION_CODES);
+		TypeElement typeElement = getProcessingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.BUILD_VERSION_CODES);
 		for (Element element : typeElement.getEnclosedElements()) {
 			if (element.getSimpleName().contentEquals(apiName)) {
 				return true;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TextChangeHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TextChangeHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TextChangeHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TextChangeHandler.java
index b11d52caf7..d456bb5eed 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TextChangeHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TextChangeHandler.java
@@ -13,27 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.TextChange;
-import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.TextWatcherHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JBlock;
@@ -42,33 +38,25 @@
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JVar;
 
-public class TextChangeHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+public class TextChangeHandler extends CoreBaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper idAnnotationHelper;
-
-	public TextChangeHandler(ProcessingEnvironment processingEnvironment) {
-		super(TextChange.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		idAnnotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public TextChangeHandler(AndroidAnnotationsEnvironment environment) {
+		super(TextChange.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.doesntThrowException(element, valid);
+		validatorHelper.doesntThrowException(element, validation);
 
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
 
-		validatorHelper.hasTextChangedMethodParameters((ExecutableElement) element, valid);
+		coreValidatorHelper.hasTextChangedMethodParameters((ExecutableElement) element, validation);
 	}
 
 	@Override
@@ -101,15 +89,15 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
 					beforeParameterPosition = i;
 				}
 			} else {
-				TypeMirror textViewType = idAnnotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
-				if (idAnnotationHelper.isSubtype(parameterType, textViewType)) {
+				TypeMirror textViewType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.TEXT_VIEW).asType();
+				if (annotationHelper.isSubtype(parameterType, textViewType)) {
 					viewParameterPosition = i;
 					viewParameterType = parameterType;
 				}
 			}
 		}
 
-		List<JFieldRef> idsRefs = idAnnotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 
 		for (JFieldRef idRef : idsRefs) {
 			TextWatcherHolder textWatcherHolder = holder.getTextWatcherHolder(idRef, viewParameterType);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TouchHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TouchHandler.java
similarity index 78%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TouchHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TouchHandler.java
index 468532ed31..aa12efb8e9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TouchHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TouchHandler.java
@@ -13,22 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Touch;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -41,22 +40,22 @@
 
 public class TouchHandler extends AbstractViewListenerHandler {
 
-	public TouchHandler(ProcessingEnvironment processingEnvironment) {
-		super(Touch.class, processingEnvironment);
+	public TouchHandler(AndroidAnnotationsEnvironment environment) {
+		super(Touch.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
+		validatorHelper.returnTypeIsVoidOrBoolean(executableElement, validation);
 
 		validatorHelper.param.anyOrder() //
 				.type(CanonicalNameConstants.MOTION_EVENT).optional() //
 				.extendsType(CanonicalNameConstants.VIEW).optional() //
-				.validate(executableElement, valid);
+				.validate(executableElement, validation);
 	}
 
 	@Override
@@ -73,8 +72,8 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
 
 	@Override
 	protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
-		JVar viewParam = listenerMethod.param(classes().VIEW, "view");
-		JVar eventParam = listenerMethod.param(classes().MOTION_EVENT, "event");
+		JVar viewParam = listenerMethod.param(getClasses().VIEW, "view");
+		JVar eventParam = listenerMethod.param(getClasses().MOTION_EVENT, "event");
 
 		for (VariableElement parameter : parameters) {
 			String parameterType = parameter.asType().toString();
@@ -89,7 +88,7 @@ protected void processParameters(EComponentWithViewSupportHolder holder, JMethod
 
 	@Override
 	protected JMethod createListenerMethod(JDefinedClass listenerAnonymousClass) {
-		return listenerAnonymousClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onTouch");
+		return listenerAnonymousClass.method(JMod.PUBLIC, getCodeModel().BOOLEAN, "onTouch");
 	}
 
 	@Override
@@ -99,6 +98,6 @@ protected String getSetterName() {
 
 	@Override
 	protected JClass getListenerClass() {
-		return classes().VIEW_ON_TOUCH_LISTENER;
+		return getClasses().VIEW_ON_TOUCH_LISTENER;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TraceHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TraceHandler.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TraceHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TraceHandler.java
index bbf21c0cba..262671b173 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TraceHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TraceHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static org.androidannotations.helper.AndroidConstants.LOG_DEBUG;
 import static org.androidannotations.helper.AndroidConstants.LOG_ERROR;
@@ -25,14 +25,14 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Trace;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -48,17 +48,17 @@
 
 public class TraceHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public TraceHandler(ProcessingEnvironment processingEnvironment) {
-		super(Trace.class, processingEnvironment);
+	public TraceHandler(AndroidAnnotationsEnvironment environment) {
+		super(Trace.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.hasValidLogLevel(element, valid);
+		validatorHelper.hasValidLogLevel(element, validation);
 	}
 
 	@Override
@@ -74,22 +74,22 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 
 		JBlock methodBody = method.body();
 
-		JInvocation isLoggableInvocation = classes().LOG.staticInvoke("isLoggable");
-		isLoggableInvocation.arg(JExpr.lit(tag)).arg(logLevelFromInt(level, classes().LOG));
+		JInvocation isLoggableInvocation = getClasses().LOG.staticInvoke("isLoggable");
+		isLoggableInvocation.arg(JExpr.lit(tag)).arg(logLevelFromInt(level, getClasses().LOG));
 
 		JConditional ifStatement = methodBody._if(isLoggableInvocation);
 
-		JInvocation currentTimeInvoke = classes().SYSTEM.staticInvoke("currentTimeMillis");
+		JInvocation currentTimeInvoke = getClasses().SYSTEM.staticInvoke("currentTimeMillis");
 		JBlock thenBody = ifStatement._then();
 
 		// Log In
 		String logMethodName = logMethodNameFromLevel(level);
-		JInvocation logEnterInvoke = classes().LOG.staticInvoke(logMethodName);
+		JInvocation logEnterInvoke = getClasses().LOG.staticInvoke(logMethodName);
 		logEnterInvoke.arg(tag);
 
 		logEnterInvoke.arg(getEnterMessage(method, executableElement));
 		thenBody.add(logEnterInvoke);
-		JVar startDeclaration = thenBody.decl(codeModel().LONG, "start", currentTimeInvoke);
+		JVar startDeclaration = thenBody.decl(getCodeModel().LONG, "start", currentTimeInvoke);
 
 		JTryBlock tryBlock;
 
@@ -99,7 +99,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 			tryBlock.body().add(previousMethodBody);
 		} else {
 			JInvocation superCall = codeModelHelper.getSuperCall(holder, method);
-			result = thenBody.decl(refClass(Object.class), "result", JExpr._null());
+			result = thenBody.decl(getJClass(Object.class), "result", JExpr._null());
 			tryBlock = thenBody._try();
 			tryBlock.body().assign(result, superCall);
 			tryBlock.body()._return(JExpr.cast(boxify(method.type()), result));
@@ -107,9 +107,9 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 
 		JBlock finallyBlock = tryBlock._finally();
 
-		JVar durationDeclaration = finallyBlock.decl(codeModel().LONG, "duration", currentTimeInvoke.minus(startDeclaration));
+		JVar durationDeclaration = finallyBlock.decl(getCodeModel().LONG, "duration", currentTimeInvoke.minus(startDeclaration));
 
-		JInvocation logExitInvoke = classes().LOG.staticInvoke(logMethodName);
+		JInvocation logExitInvoke = getClasses().LOG.staticInvoke(logMethodName);
 		logExitInvoke.arg(tag);
 
 		logExitInvoke.arg(getExitMessage(executableElement, method, result, durationDeclaration));
@@ -121,7 +121,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 	}
 
 	private JClass boxify(JType type) throws ClassNotFoundException {
-		return codeModel().parseType(type.fullName()).boxify();
+		return getCodeModel().parseType(type.fullName()).boxify();
 	}
 
 	private JExpression getExitMessage(ExecutableElement element, JMethod method, JVar result, JVar duration) throws ClassNotFoundException {
@@ -139,13 +139,13 @@ private JExpression getExitMessage(ExecutableElement element, JMethod method, JV
 
 		methodName += "(" + paramStr.toString() + ")";
 
-		JInvocation format = refClass(String.class).staticInvoke("format");
+		JInvocation format = getJClass(String.class).staticInvoke("format");
 		if (result == null) {
 			format.arg("Exiting [" + methodName + "], duration in ms: %d");
 		} else {
 			format.arg("Exiting [" + methodName + " returning: %s], duration in ms: %d");
 			if (method.type().isArray()) {
-				JClass arraysClass = refClass(Arrays.class);
+				JClass arraysClass = getJClass(Arrays.class);
 				format.arg(arraysClass.staticInvoke("toString").arg(JExpr.cast(boxify(method.type()), result)));
 			} else {
 				format.arg(result);
@@ -164,7 +164,7 @@ private JExpression getEnterMessage(JMethod method, ExecutableElement element) {
 			return JExpr.lit("Entering [" + methodName + "()]");
 		}
 
-		JClass arraysClass = refClass(Arrays.class);
+		JClass arraysClass = getJClass(Arrays.class);
 		StringBuilder paramStr = new StringBuilder();
 		List<JExpression> paramExpressions = new ArrayList<>();
 		for (int i = 0; i < params.size(); i++) {
@@ -180,7 +180,7 @@ private JExpression getEnterMessage(JMethod method, ExecutableElement element) {
 			}
 		}
 
-		JInvocation format = refClass(String.class).staticInvoke("format");
+		JInvocation format = getJClass(String.class).staticInvoke("format");
 		format.arg(JExpr.lit("Entering [" + methodName + "(" + paramStr + ")]"));
 		for (JExpression expr : paramExpressions) {
 			format.arg(expr);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TransactionalHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TransactionalHandler.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TransactionalHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TransactionalHandler.java
index bc11cd3879..86263a75c5 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/TransactionalHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TransactionalHandler.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.Transactional;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
@@ -37,26 +37,26 @@
 
 public class TransactionalHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public TransactionalHandler(ProcessingEnvironment processingEnvironment) {
-		super(Transactional.class, processingEnvironment);
+	public TransactionalHandler(AndroidAnnotationsEnvironment environment) {
+		super(Transactional.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		validatorHelper.doesntThrowException(executableElement, valid);
+		validatorHelper.doesntThrowException(executableElement, validation);
 
-		validatorHelper.isNotFinal(element, valid);
+		validatorHelper.isNotFinal(element, validation);
 
 		validatorHelper.param.inOrder() //
 				.type(CanonicalNameConstants.SQLITE_DATABASE) //
 				.anyType().multiple().optional() //
-				.validate(executableElement, valid);
+				.validate(executableElement, validation);
 	}
 
 	@Override
@@ -64,7 +64,7 @@ public void process(Element element, EComponentHolder holder) {
 		ExecutableElement executableElement = (ExecutableElement) element;
 
 		String returnTypeName = executableElement.getReturnType().toString();
-		JClass returnType = refClass(returnTypeName);
+		JClass returnType = getJClass(returnTypeName);
 
 		JMethod method = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
 		codeModelHelper.removeBody(method);
@@ -94,13 +94,13 @@ public void process(Element element, EComponentHolder holder) {
 			tryBody._return(result);
 		}
 
-		JCatchBlock catchBlock = tryBlock._catch(refClass(RuntimeException.class));
+		JCatchBlock catchBlock = tryBlock._catch(getJClass(RuntimeException.class));
 
 		JVar exceptionParam = catchBlock.param("e");
 
 		JBlock catchBody = catchBlock.body();
 
-		JInvocation errorInvoke = catchBody.staticInvoke(classes().LOG, "e");
+		JInvocation errorInvoke = catchBody.staticInvoke(getClasses().LOG, "e");
 
 		errorInvoke.arg(holder.getGeneratedClass().name());
 		errorInvoke.arg("Error in transaction");
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/UiThreadHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/UiThreadHandler.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/UiThreadHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/UiThreadHandler.java
index eef86d5c81..e7a98a5a11 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/UiThreadHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/UiThreadHandler.java
@@ -13,20 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.lit;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.api.UiThreadExecutor;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -44,15 +43,15 @@ public class UiThreadHandler extends AbstractRunnableHandler {
 	private static final String METHOD_GET_THREAD = "getThread";
 	private static final String METHOD_RUN_TASK = "runTask";
 
-	public UiThreadHandler(ProcessingEnvironment processingEnvironment) {
-		super(UiThread.class, processingEnvironment);
+	public UiThreadHandler(AndroidAnnotationsEnvironment environment) {
+		super(UiThread.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		super.validate(element, valid);
 
-		validatorHelper.usesEnqueueIfHasId(element, valid);
+		coreValidatorHelper.usesEnqueueIfHasId(element, valid);
 	}
 
 	@Override
@@ -60,7 +59,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 		ExecutableElement executableElement = (ExecutableElement) element;
 		JMethod delegatingMethod = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
 		JBlock previousBody = codeModelHelper.removeBody(delegatingMethod);
-		JDefinedClass anonymousRunnableClass = codeModelHelper.createDelegatingAnonymousRunnableClass(holder, previousBody);
+		JDefinedClass anonymousRunnableClass = codeModelHelper.createDelegatingAnonymousRunnableClass(previousBody);
 
 		UiThread annotation = element.getAnnotation(UiThread.class);
 		long delay = annotation.delay();
@@ -70,7 +69,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 			// Put in the check for the UI thread.
 			addUIThreadCheck(delegatingMethod, previousBody, holder);
 		}
-		delegatingMethod.body().add(refClass(UiThreadExecutor.class).staticInvoke(METHOD_RUN_TASK) //
+		delegatingMethod.body().add(getJClass(UiThreadExecutor.class).staticInvoke(METHOD_RUN_TASK) //
 				.arg(annotation.id()) //
 				.arg(_new(anonymousRunnableClass)) //
 				.arg(lit(delay)));
@@ -85,8 +84,8 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 	 */
 	private void addUIThreadCheck(JMethod delegatingMethod, JBlock previousBody, EComponentHolder holder) throws JClassAlreadyExistsException {
 		// Get the Thread and Looper class.
-		JClass tClass = holder.classes().THREAD;
-		JClass lClass = holder.classes().LOOPER;
+		JClass tClass = getClasses().THREAD;
+		JClass lClass = getClasses().LOOPER;
 
 		// invoke the methods.
 		JExpression lhs = tClass.staticInvoke(METHOD_CUR_THREAD);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ViewByIdHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java
similarity index 56%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ViewByIdHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java
index ee24d85730..fa54bdd1ee 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ViewByIdHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java
@@ -13,23 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ViewById;
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JClass;
@@ -37,30 +33,21 @@
 
 public class ViewByIdHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper annotationHelper;
-
-	public ViewByIdHandler(ProcessingEnvironment processingEnvironment) {
-		super(ViewById.class, processingEnvironment);
-		codeModelHelper = new APTCodeModelHelper();
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public ViewByIdHandler(AndroidAnnotationsEnvironment environment) {
+		super(ViewById.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.isDeclaredType(element, valid);
+		validatorHelper.isDeclaredType(element, validation);
 
-		validatorHelper.extendsView(element, valid);
+		validatorHelper.extendsView(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -69,8 +56,8 @@ public void process(Element element, EComponentWithViewSupportHolder holder) {
 
 		TypeMirror uiFieldTypeMirror = element.asType();
 
-		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(processHolder, element, IRClass.Res.ID, true);
-		JClass viewClass = codeModelHelper.typeMirrorToJClass(uiFieldTypeMirror, holder);
+		JFieldRef idRef = annotationHelper.extractOneAnnotationFieldRef(element, IRClass.Res.ID, true);
+		JClass viewClass = codeModelHelper.typeMirrorToJClass(uiFieldTypeMirror);
 		JFieldRef fieldRef = ref(fieldName);
 
 		holder.processViewById(idRef, viewClass, fieldRef);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ViewsByIdHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java
similarity index 65%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ViewsByIdHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java
index c5daf01acc..f7917468ba 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ViewsByIdHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java
@@ -13,29 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.ref;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.ViewsById;
-import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.IdAnnotationHelper;
 import org.androidannotations.helper.IdValidatorHelper;
 import org.androidannotations.holder.EComponentWithViewSupportHolder;
 import org.androidannotations.holder.FoundViewHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 import org.androidannotations.rclass.IRClass;
 
 import com.sun.codemodel.JClass;
@@ -43,29 +40,21 @@
 
 public class ViewsByIdHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
 
-	private IdAnnotationHelper helper;
-
-	public ViewsByIdHandler(ProcessingEnvironment processingEnvironment) {
-		super(ViewsById.class, processingEnvironment);
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		helper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	public ViewsByIdHandler(AndroidAnnotationsEnvironment environment) {
+		super(ViewsById.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validation);
 
-		validatorHelper.isDeclaredType(element, valid);
+		validatorHelper.isDeclaredType(element, validation);
 
-		validatorHelper.extendsListOfView(element, valid);
+		validatorHelper.extendsListOfView(element, validation);
 
-		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, valid);
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.NEED_RES_ID, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 	}
 
 	@Override
@@ -73,12 +62,12 @@ public void process(Element element, EComponentWithViewSupportHolder holder) {
 		JFieldRef elementRef = ref(element.getSimpleName().toString());
 
 		TypeMirror viewType = extractViewClass(element);
-		JClass viewClass = codeModelHelper.typeMirrorToJClass(viewType, holder);
+		JClass viewClass = codeModelHelper.typeMirrorToJClass(viewType);
 
 		instantiateArrayList(elementRef, viewType, holder);
 		clearList(elementRef, holder);
 
-		List<JFieldRef> idsRefs = helper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(element, IRClass.Res.ID, true);
 		for (JFieldRef idRef : idsRefs) {
 			addViewToListIfNotNull(elementRef, viewClass, idRef, holder);
 
@@ -86,9 +75,9 @@ public void process(Element element, EComponentWithViewSupportHolder holder) {
 	}
 
 	private void instantiateArrayList(JFieldRef elementRef, TypeMirror viewType, EComponentWithViewSupportHolder holder) {
-		TypeElement arrayListTypeElement = helper.typeElementFromQualifiedName(CanonicalNameConstants.ARRAYLIST);
-		DeclaredType arrayListType = helper.getTypeUtils().getDeclaredType(arrayListTypeElement, viewType);
-		JClass arrayListClass = codeModelHelper.typeMirrorToJClass(arrayListType, holder);
+		TypeElement arrayListTypeElement = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.ARRAYLIST);
+		DeclaredType arrayListType = getProcessingEnvironment().getTypeUtils().getDeclaredType(arrayListTypeElement, viewType);
+		JClass arrayListClass = codeModelHelper.typeMirrorToJClass(arrayListType);
 
 		holder.getInitBody().assign(elementRef, _new(arrayListClass));
 	}
@@ -97,7 +86,7 @@ private TypeMirror extractViewClass(Element element) {
 		DeclaredType elementType = (DeclaredType) element.asType();
 		List<? extends TypeMirror> elementTypeArguments = elementType.getTypeArguments();
 
-		TypeMirror viewType = helper.typeElementFromQualifiedName(CanonicalNameConstants.VIEW).asType();
+		TypeMirror viewType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.VIEW).asType();
 		if (!elementTypeArguments.isEmpty()) {
 			viewType = elementTypeArguments.get(0);
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/WakeLockHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/WakeLockHandler.java
similarity index 73%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/WakeLockHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/WakeLockHandler.java
index fe20d602b4..cf638d316f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/WakeLockHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/WakeLockHandler.java
@@ -13,18 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.WakeLock;
 import org.androidannotations.annotations.WakeLock.Flag;
 import org.androidannotations.annotations.WakeLock.Level;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JConditional;
@@ -35,22 +34,22 @@
 import com.sun.codemodel.JTryBlock;
 import com.sun.codemodel.JVar;
 
-public class WakeLockHandler extends BaseAnnotationHandler<EComponentHolder> {
+public class WakeLockHandler extends CoreBaseAnnotationHandler<EComponentHolder> {
 
-	public WakeLockHandler(ProcessingEnvironment processingEnvironment) {
-		super(WakeLock.class, processingEnvironment);
+	public WakeLockHandler(AndroidAnnotationsEnvironment environment) {
+		super(WakeLock.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, valid);
 
 		ExecutableElement executableElement = (ExecutableElement) element;
-		validatorHelper.doesNotHaveTraceAnnotationAndReturnValue(executableElement, validatedElements, valid);
+		coreValidatorHelper.doesNotHaveTraceAnnotationAndReturnValue(executableElement, valid);
 
-		validatorHelper.doesNotUseFlagsWithPartialWakeLock(element, validatedElements, valid);
+		coreValidatorHelper.doesNotUseFlagsWithPartialWakeLock(element, valid);
 
-		validatorHelper.hasWakeLockPermission(element, androidManifest, valid);
+		validatorHelper.hasWakeLockPermission(getEnvironment().getAndroidManifest(), valid);
 
 		validatorHelper.isNotPrivate(element, valid);
 
@@ -72,16 +71,16 @@ public void process(Element element, EComponentHolder holder) {
 
 		JBlock methodBody = method.body();
 
-		JExpression levelAndFlags = classes().POWER_MANAGER.staticRef(level.name());
+		JExpression levelAndFlags = getClasses().POWER_MANAGER.staticRef(level.name());
 		if (flags.length > 0) {
 			for (Flag flag : flags) {
-				levelAndFlags = levelAndFlags.bor(classes().POWER_MANAGER.staticRef(flag.name()));
+				levelAndFlags = levelAndFlags.bor(getClasses().POWER_MANAGER.staticRef(flag.name()));
 			}
 		}
 
 		JInvocation newWakeLock = holder.getPowerManagerRef().invoke("newWakeLock").arg(levelAndFlags).arg(JExpr.lit(tag));
 
-		JVar wakeLock = methodBody.decl(classes().WAKE_LOCK, "wakeLock", JExpr._null());
+		JVar wakeLock = methodBody.decl(getClasses().WAKE_LOCK, "wakeLock", JExpr._null());
 
 		JTryBlock tryBlock = methodBody._try();
 		tryBlock.body().assign(wakeLock, newWakeLock);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/WindowFeatureHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/WindowFeatureHandler.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/WindowFeatureHandler.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/WindowFeatureHandler.java
index e58610beaf..441cba25a1 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/WindowFeatureHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/WindowFeatureHandler.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.internal.core.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.annotations.WindowFeature;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
 import com.sun.codemodel.JExpr;
 
 public class WindowFeatureHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	public WindowFeatureHandler(ProcessingEnvironment processingEnvironment) {
-		super(WindowFeature.class, processingEnvironment);
+	public WindowFeatureHandler(AndroidAnnotationsEnvironment environment) {
+		super(WindowFeature.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.hasEActivity(element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ActivityIntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/ActivityIntentBuilder.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ActivityIntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/ActivityIntentBuilder.java
index 8997b266fe..64a1c1e177 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ActivityIntentBuilder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/ActivityIntentBuilder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.core.helper;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.ref;
@@ -29,6 +29,8 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.util.ElementFilter;
 
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.holder.HasIntentBuilder;
 
 import com.sun.codemodel.JBlock;
@@ -74,29 +76,29 @@ private void createAdditionalIntentMethods() {
 		if (hasFragmentInClasspath()) {
 			// intent() with android.app.Fragment param
 			JMethod method = holder.getGeneratedClass().method(STATIC | PUBLIC, holder.getIntentBuilderClass(), "intent");
-			JVar fragmentParam = method.param(holder.classes().FRAGMENT, "fragment");
+			JVar fragmentParam = method.param(getClasses().FRAGMENT, "fragment");
 			method.body()._return(_new(holder.getIntentBuilderClass()).arg(fragmentParam));
 		}
 		if (hasFragmentSupportInClasspath()) {
 			// intent() with android.support.v4.app.Fragment param
 			JMethod method = holder.getGeneratedClass().method(STATIC | PUBLIC, holder.getIntentBuilderClass(), "intent");
-			JVar fragmentParam = method.param(holder.classes().SUPPORT_V4_FRAGMENT, "supportFragment");
+			JVar fragmentParam = method.param(getClasses().SUPPORT_V4_FRAGMENT, "supportFragment");
 			method.body()._return(_new(holder.getIntentBuilderClass()).arg(fragmentParam));
 		}
 	}
 
 	@Override
 	protected JClass getSuperClass() {
-		JClass superClass = holder.refClass(org.androidannotations.api.builder.ActivityIntentBuilder.class);
+		JClass superClass = environment.getJClass(org.androidannotations.api.builder.ActivityIntentBuilder.class);
 		return superClass.narrow(builderClass);
 	}
 
 	private void createAdditionalConstructor() {
 		if (hasFragmentInClasspath()) {
-			fragmentField = addFragmentConstructor(holder.classes().FRAGMENT, "fragment" + generationSuffix());
+			fragmentField = addFragmentConstructor(getClasses().FRAGMENT, "fragment" + generationSuffix());
 		}
 		if (hasFragmentSupportInClasspath()) {
-			fragmentSupportField = addFragmentConstructor(holder.classes().SUPPORT_V4_FRAGMENT, "fragmentSupport" + generationSuffix());
+			fragmentSupportField = addFragmentConstructor(getClasses().SUPPORT_V4_FRAGMENT, "fragmentSupport" + generationSuffix());
 		}
 	}
 
@@ -114,9 +116,9 @@ private JFieldVar addFragmentConstructor(JClass fragmentClass, String fieldName)
 	}
 
 	private void overrideStartForResultMethod() {
-		JMethod method = holder.getIntentBuilderClass().method(PUBLIC, holder.codeModel().VOID, "startForResult");
+		JMethod method = holder.getIntentBuilderClass().method(PUBLIC, environment.getCodeModel().VOID, "startForResult");
 		method.annotate(Override.class);
-		JVar requestCode = method.param(holder.codeModel().INT, "requestCode");
+		JVar requestCode = method.param(environment.getCodeModel().INT, "requestCode");
 		JBlock body = method.body();
 
 		JConditional condition = null;
@@ -154,12 +156,12 @@ private void overrideStartForResultMethod() {
 			activityStartInvocationBlock = method.body();
 		}
 
-		JConditional activityCondition = activityStartInvocationBlock._if(contextField._instanceof(holder.classes().ACTIVITY));
+		JConditional activityCondition = activityStartInvocationBlock._if(contextField._instanceof(getClasses().ACTIVITY));
 		JBlock thenBlock = activityCondition._then();
-		JVar activityVar = thenBlock.decl(holder.classes().ACTIVITY, "activity", JExpr.cast(holder.classes().ACTIVITY, contextField));
+		JVar activityVar = thenBlock.decl(getClasses().ACTIVITY, "activity", JExpr.cast(getClasses().ACTIVITY, contextField));
 
 		if (hasActivityCompatInClasspath() && hasActivityOptionsInActivityCompat()) {
-			thenBlock.staticInvoke(holder.classes().ACTIVITY_COMPAT, "startActivityForResult") //
+			thenBlock.staticInvoke(getClasses().ACTIVITY_COMPAT, "startActivityForResult") //
 					.arg(activityVar).arg(intentField).arg(requestCode).arg(optionsField);
 		} else if (hasActivityOptionsInFragment()) {
 			JBlock startForResultInvocationBlock;
@@ -189,7 +191,7 @@ private void overrideStartForResultMethod() {
 	}
 
 	private JBlock createCallWithIfGuard(JVar requestCode, JBlock thenBlock, JExpression invocationTarget) {
-		JConditional guardIf = thenBlock._if(holder.classes().BUILD_VERSION.staticRef("SDK_INT").gte(holder.classes().BUILD_VERSION_CODES.staticRef("JELLY_BEAN")));
+		JConditional guardIf = thenBlock._if(getClasses().BUILD_VERSION.staticRef("SDK_INT").gte(getClasses().BUILD_VERSION_CODES.staticRef("JELLY_BEAN")));
 		JBlock startInvocationBlock = guardIf._then();
 		String methodName = requestCode != null ? "startActivityForResult" : "startActivity";
 
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/CoreValidatorHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/CoreValidatorHelper.java
new file mode 100644
index 0000000000..64df5f7ed1
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/CoreValidatorHelper.java
@@ -0,0 +1,402 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal.core.helper;
+
+import static org.androidannotations.helper.ModelConstants.classSuffix;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.ErrorType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
+
+import org.androidannotations.ElementValidation;
+import org.androidannotations.annotations.Receiver;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.annotations.WakeLock;
+import org.androidannotations.annotations.sharedpreferences.DefaultBoolean;
+import org.androidannotations.annotations.sharedpreferences.DefaultFloat;
+import org.androidannotations.annotations.sharedpreferences.DefaultInt;
+import org.androidannotations.annotations.sharedpreferences.DefaultLong;
+import org.androidannotations.annotations.sharedpreferences.DefaultString;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+
+public class CoreValidatorHelper extends IdValidatorHelper {
+
+	private static final List<String> VALID_PREF_RETURN_TYPES = Arrays.asList("int", "boolean", "float", "long", CanonicalNameConstants.STRING, CanonicalNameConstants.STRING_SET);
+	private static final List<String> INVALID_PREF_METHOD_NAMES = Arrays.asList("edit", "getSharedPreferences", "clear", "getEditor", "apply");
+
+	private static final List<Receiver.RegisterAt> VALID_ACTIVITY_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy, Receiver.RegisterAt.OnResumeOnPause,
+			Receiver.RegisterAt.OnStartOnStop);
+	private static final List<Receiver.RegisterAt> VALID_SERVICE_REGISTER_AT = Collections.singletonList(Receiver.RegisterAt.OnCreateOnDestroy);
+	private static final List<Receiver.RegisterAt> VALID_FRAGMENT_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy, Receiver.RegisterAt.OnResumeOnPause,
+			Receiver.RegisterAt.OnStartOnStop, Receiver.RegisterAt.OnAttachOnDetach);
+
+	public CoreValidatorHelper(IdAnnotationHelper idAnnotationHelper) {
+		super(idAnnotationHelper);
+	}
+
+	public void doesNotHaveTraceAnnotationAndReturnValue(ExecutableElement executableElement, ElementValidation valid) {
+		TypeMirror returnType = executableElement.getReturnType();
+		if (elementHasAnnotation(Trace.class, executableElement) && returnType.getKind() != TypeKind.VOID) {
+			valid.addError(executableElement, "@WakeLock annotated methods with a return value are not supported by @Trace");
+		}
+	}
+
+	public void doesNotUseFlagsWithPartialWakeLock(Element element, ElementValidation valid) {
+		WakeLock annotation = element.getAnnotation(WakeLock.class);
+		if (annotation.level().equals(WakeLock.Level.PARTIAL_WAKE_LOCK) && annotation.flags().length > 0) {
+			valid.addWarning("Flags have no effect when combined with a PARTIAL_WAKE_LOCK");
+		}
+	}
+
+	public void applicationRegistered(Element element, AndroidManifest manifest, ElementValidation valid) {
+
+		if (manifest.isLibraryProject()) {
+			return;
+		}
+
+		String applicationClassName = manifest.getApplicationClassName();
+		if (applicationClassName != null) {
+
+			TypeElement typeElement = (TypeElement) element;
+
+			String componentQualifiedName = typeElement.getQualifiedName().toString();
+			String generatedComponentQualifiedName = componentQualifiedName + classSuffix();
+
+			if (!typeElement.getModifiers().contains(Modifier.ABSTRACT) && !applicationClassName.equals(generatedComponentQualifiedName)) {
+				if (applicationClassName.equals(componentQualifiedName)) {
+					valid.addError("The AndroidManifest.xml file contains the original component, and not the AndroidAnnotations generated component."
+							+ " Please register " + generatedComponentQualifiedName + " instead of " + componentQualifiedName);
+				} else {
+					valid.addWarning("The component " + generatedComponentQualifiedName + " is not registered in the AndroidManifest.xml file.");
+				}
+			}
+		} else {
+			valid.addError("No application class registered in the AndroidManifest.xml");
+		}
+
+	}
+
+	public void isSharedPreference(Element element, ElementValidation valid) {
+
+		TypeMirror type = element.asType();
+
+		/*
+		 * The type is not available yet because it has just been generated
+		 */
+		if (type instanceof ErrorType || type.getKind() == TypeKind.ERROR) {
+			String elementTypeName = type.toString();
+
+			boolean sharedPrefValidatedInRound = false;
+			if (elementTypeName.endsWith(classSuffix())) {
+				String prefTypeName = elementTypeName.substring(0, elementTypeName.length() - classSuffix().length());
+				prefTypeName = prefTypeName.replace(classSuffix() + ".", ".");
+
+				Set<? extends Element> sharedPrefElements = validatedModel().getRootAnnotatedElements(SharedPref.class.getName());
+
+				for (Element sharedPrefElement : sharedPrefElements) {
+					TypeElement sharedPrefTypeElement = (TypeElement) sharedPrefElement;
+
+					String sharedPrefQualifiedName = sharedPrefTypeElement.getQualifiedName().toString();
+
+					if (sharedPrefQualifiedName.endsWith(prefTypeName)) {
+						sharedPrefValidatedInRound = true;
+						break;
+					}
+				}
+			}
+
+			if (!sharedPrefValidatedInRound) {
+				valid.invalidate();
+			}
+
+		} else {
+			extendsType(element, SharedPreferencesHelper.class.getName(), valid);
+		}
+
+	}
+
+	public void isPrefMethod(Element element, ElementValidation valid) {
+		if (!element.getKind().equals(ElementKind.METHOD)) {
+			valid.addError("Only methods are allowed in an %s annotated interface");
+		} else {
+			ExecutableElement executableElement = (ExecutableElement) element;
+			String methodName = executableElement.getSimpleName().toString();
+			if (executableElement.getParameters().size() > 0) {
+				valid.addError("Method " + methodName + " should have no parameters in an %s annotated interface");
+			} else {
+
+				String returnType = executableElement.getReturnType().toString();
+
+				if (!VALID_PREF_RETURN_TYPES.contains(returnType)) {
+					valid.addError("Method " + methodName + " should only return preference simple types in an %s annotated interface");
+				} else {
+					if (INVALID_PREF_METHOD_NAMES.contains(methodName)) {
+						valid.addError("The method name " + methodName + " is forbidden in an %s annotated interface");
+					} else {
+						return;
+					}
+				}
+			}
+		}
+		valid.invalidate();
+	}
+
+	public void hasCorrectDefaultAnnotation(ExecutableElement method, ElementValidation valid) {
+		checkDefaultAnnotation(method, DefaultBoolean.class, "boolean", new TypeKindAnnotationCondition(TypeKind.BOOLEAN), valid);
+		checkDefaultAnnotation(method, DefaultFloat.class, "float", new TypeKindAnnotationCondition(TypeKind.FLOAT), valid);
+		checkDefaultAnnotation(method, DefaultInt.class, "int", new TypeKindAnnotationCondition(TypeKind.INT), valid);
+		checkDefaultAnnotation(method, DefaultLong.class, "long", new TypeKindAnnotationCondition(TypeKind.LONG), valid);
+		checkDefaultAnnotation(method, DefaultString.class, "String", new DefaultAnnotationCondition() {
+			@Override
+			public boolean correctReturnType(TypeMirror returnType) {
+				return returnType.toString().equals(CanonicalNameConstants.STRING);
+			}
+		}, valid);
+	}
+
+	private interface DefaultAnnotationCondition {
+		boolean correctReturnType(TypeMirror returnType);
+	}
+
+	private class TypeKindAnnotationCondition implements DefaultAnnotationCondition {
+
+		private final TypeKind typeKind;
+
+		TypeKindAnnotationCondition(TypeKind typeKind) {
+			this.typeKind = typeKind;
+		}
+
+		@Override
+		public boolean correctReturnType(TypeMirror returnType) {
+			return returnType.getKind() == typeKind;
+		}
+
+	}
+
+	private <T extends Annotation> void checkDefaultAnnotation(ExecutableElement method, Class<T> annotationClass, String expectedReturnType, DefaultAnnotationCondition condition,
+																ElementValidation valid) {
+		T defaultAnnotation = method.getAnnotation(annotationClass);
+		if (defaultAnnotation != null) {
+			if (!condition.correctReturnType(method.getReturnType())) {
+				valid.addError(TargetAnnotationHelper.annotationName(annotationClass) + " can only be used on a method that returns a " + expectedReturnType);
+			}
+		}
+	}
+
+	public void hasBeforeTextChangedMethodParameters(ExecutableElement executableElement, ElementValidation valid) {
+		List<? extends VariableElement> parameters = executableElement.getParameters();
+		boolean charSequenceParameterFound = false;
+		boolean textViewParameterFound = false;
+		for (VariableElement parameter : parameters) {
+			String parameterType = parameter.asType().toString();
+			if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) {
+				if (charSequenceParameterFound) {
+					valid.addError("Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence");
+				}
+				charSequenceParameterFound = true;
+				continue;
+			}
+			if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
+				if (textViewParameterFound) {
+					valid.addError("Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
+				}
+				textViewParameterFound = true;
+				continue;
+			}
+			if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
+				String parameterName = parameter.toString();
+				if ("start".equals(parameterName) || "count".equals(parameterName) || "after".equals(parameterName)) {
+					continue;
+				}
+				valid.addError("Unrecognized parameter name. You can only have start, before, or count parameter name."
+						+ " Try to pick a parameter from android.text.TextWatcher.beforeTextChanged() method.");
+				continue;
+			}
+			valid.addError("Unrecognized parameter (" + parameter.toString()
+					+ "). %s can only have a android.widget.TextView parameter and/or parameters from android.text.TextWatcher.beforeTextChanged() method.");
+		}
+	}
+
+	public void hasTextChangedMethodParameters(ExecutableElement executableElement, ElementValidation valid) {
+		List<? extends VariableElement> parameters = executableElement.getParameters();
+		boolean charSequenceParameterFound = false;
+		boolean textViewParameterFound = false;
+		for (VariableElement parameter : parameters) {
+			String parameterType = parameter.asType().toString();
+			if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) {
+				if (charSequenceParameterFound) {
+					valid.addError("Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence");
+				}
+				charSequenceParameterFound = true;
+				continue;
+			}
+			if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
+				if (textViewParameterFound) {
+					valid.addError("Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
+				}
+				textViewParameterFound = true;
+				continue;
+			}
+			if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
+				String parameterName = parameter.toString();
+				if ("start".equals(parameterName) || "before".equals(parameterName) || "count".equals(parameterName)) {
+					continue;
+				}
+				valid.addError("Unrecognized parameter name. You can only have start, before, or count parameter name."
+						+ " Try to pick a parameter from the android.text.TextWatcher.onTextChanged() method.");
+				continue;
+			}
+			valid.addError("Unrecognized parameter (" + parameter.toString()
+					+ "). %s can only have a android.widget.TextView parameter and/or parameters from android.text.TextWatcher.onTextChanged() method.");
+		}
+	}
+
+	public void hasAfterTextChangedMethodParameters(ExecutableElement executableElement, ElementValidation valid) {
+		List<? extends VariableElement> parameters = executableElement.getParameters();
+		boolean editableParameterFound = false;
+		boolean textViewParameterFound = false;
+		for (VariableElement parameter : parameters) {
+			String parameterType = parameter.asType().toString();
+			if (parameterType.equals(CanonicalNameConstants.EDITABLE)) {
+				if (editableParameterFound) {
+					valid.addError("Unrecognized parameter declaration. you can declare only one parameter of type android.text.Editable");
+				}
+				editableParameterFound = true;
+				continue;
+			}
+			if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
+				if (textViewParameterFound) {
+					valid.addError("Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
+				}
+				textViewParameterFound = true;
+				continue;
+			}
+			valid.addError("Unrecognized parameter type. %s can only have a android.widget.TextView parameter and/or an android.text.Editable parameter."
+					+ " See android.text.TextWatcher.afterTextChanged() for more informations.");
+		}
+	}
+
+	public void hasSeekBarProgressChangeMethodParameters(ExecutableElement executableElement, ElementValidation valid) {
+		List<? extends VariableElement> parameters = executableElement.getParameters();
+		boolean seekBarParameterFound = false;
+		boolean fromUserParameterFound = false;
+		boolean progressParameterFound = false;
+		for (VariableElement parameter : parameters) {
+			String parameterType = parameter.asType().toString();
+			if (parameterType.equals(CanonicalNameConstants.SEEKBAR)) {
+				if (seekBarParameterFound) {
+					valid.addError("Unrecognized parameter declaration. You can declare only one parameter of type " + CanonicalNameConstants.SEEKBAR);
+				}
+				seekBarParameterFound = true;
+				continue;
+			}
+			if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
+				if (progressParameterFound) {
+					valid.addError("You can have only one parameter of type " + CanonicalNameConstants.INTEGER);
+				}
+				progressParameterFound = true;
+				continue;
+			}
+			if (parameter.asType().getKind() == TypeKind.BOOLEAN || CanonicalNameConstants.BOOLEAN.equals(parameterType)) {
+				if (fromUserParameterFound) {
+					valid.addError("You can have only one parameter of type " + CanonicalNameConstants.BOOLEAN);
+				}
+				fromUserParameterFound = true;
+				continue;
+			}
+			valid.addError("Unrecognized parameter '" + parameter.toString() + "'. %s signature should be " + executableElement.getSimpleName() + "("
+					+ CanonicalNameConstants.SEEKBAR + " seekBar, int progress, boolean fromUser). The 'fromUser' and 'progress' parameters are optional.");
+		}
+	}
+
+	public void hasSeekBarTouchTrackingMethodParameters(ExecutableElement executableElement, ElementValidation valid) {
+		List<? extends VariableElement> parameters = executableElement.getParameters();
+
+		if (parameters.size() > 1) {
+			valid.addError("Unrecognized parameter declaration. You can only have one parameter of type " + CanonicalNameConstants.SEEKBAR
+					+ ". Try declaring " + executableElement.getSimpleName() + "(" + CanonicalNameConstants.SEEKBAR + " seekBar);");
+			return;
+		}
+
+		if (parameters.size() == 1) {
+			String parameterType = parameters.get(0).asType().toString();
+			if (!parameterType.equals(CanonicalNameConstants.SEEKBAR)) {
+				valid.addError("Unrecognized parameter declaration. You can only have one parameter of type " + CanonicalNameConstants.SEEKBAR
+						+ ". Try declaring " + executableElement.getSimpleName() + "(" + CanonicalNameConstants.SEEKBAR + " seekBar);");
+			}
+		}
+
+	}
+
+	public void hasRightRegisterAtValueDependingOnEnclosingElement(Element element, ElementValidation valid) {
+		Element enclosingElement = element.getEnclosingElement();
+		Receiver.RegisterAt registerAt = element.getAnnotation(Receiver.class).registerAt();
+
+		Map<String, List<Receiver.RegisterAt>> validRegisterAts = new HashMap<>();
+		validRegisterAts.put(CanonicalNameConstants.ACTIVITY, VALID_ACTIVITY_REGISTER_AT);
+		validRegisterAts.put(CanonicalNameConstants.SERVICE, VALID_SERVICE_REGISTER_AT);
+		validRegisterAts.put(CanonicalNameConstants.FRAGMENT, VALID_FRAGMENT_REGISTER_AT);
+
+		for (Map.Entry<String, List<Receiver.RegisterAt>> validRegisterAt : validRegisterAts.entrySet()) {
+			String enclosingType = validRegisterAt.getKey();
+			Collection<Receiver.RegisterAt> validRegisterAtValues = validRegisterAt.getValue();
+			if (extendsType(enclosingElement, enclosingType) && !validRegisterAtValues.contains(registerAt)) {
+				valid.addError("The parameter registerAt of @Receiver in " + enclosingType + " can only be one of the following values : " + validRegisterAtValues);
+			}
+		}
+	}
+
+	public void hasSupportV4JarIfLocal(Element element, ElementValidation valid) {
+		boolean local = element.getAnnotation(Receiver.class).local();
+		if (local) {
+			Elements elementUtils = annotationHelper.getElementUtils();
+			if (elementUtils.getTypeElement(CanonicalNameConstants.LOCAL_BROADCAST_MANAGER) == null) {
+				valid.addError("To use the LocalBroadcastManager, you MUST include the android-support-v4 jar");
+			}
+		}
+	}
+
+	public void usesEnqueueIfHasId(Element element, ElementValidation valid) {
+		UiThread annotation = element.getAnnotation(UiThread.class);
+
+		if (!"".equals(annotation.id()) && annotation.propagation() == UiThread.Propagation.REUSE) {
+			valid.addError("An id only can be used with Propagation.ENQUEUE");
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/IntentBuilder.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/IntentBuilder.java
index 84f010da6f..e342515dee 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/IntentBuilder.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.androidannotations.helper;
+package org.androidannotations.internal.core.helper;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._super;
@@ -35,7 +35,12 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.Pair;
 import org.androidannotations.holder.HasIntentBuilder;
+import org.androidannotations.internal.process.ProcessHolder;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;
@@ -50,6 +55,7 @@
 
 public abstract class IntentBuilder {
 
+	protected AndroidAnnotationsEnvironment environment;
 	protected HasIntentBuilder holder;
 	protected AndroidManifest androidManifest;
 	protected JDefinedClass builderClass;
@@ -61,15 +67,17 @@ public abstract class IntentBuilder {
 
 	protected Elements elementUtils;
 	protected Types typeUtils;
-	protected APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
+	protected APTCodeModelHelper codeModelHelper;
 
 	public IntentBuilder(HasIntentBuilder holder, AndroidManifest androidManifest) {
+		this.environment = holder.getEnvironment();
 		this.holder = holder;
 		this.androidManifest = androidManifest;
-		elementUtils = holder.processingEnvironment().getElementUtils();
-		typeUtils = holder.processingEnvironment().getTypeUtils();
-		contextClass = holder.classes().CONTEXT;
-		intentClass = holder.classes().INTENT;
+		codeModelHelper = new APTCodeModelHelper(environment);
+		elementUtils = environment.getProcessingEnvironment().getElementUtils();
+		typeUtils = environment.getProcessingEnvironment().getTypeUtils();
+		contextClass = environment.getClasses().CONTEXT;
+		intentClass = environment.getClasses().INTENT;
 	}
 
 	public void build() throws JClassAlreadyExistsException {
@@ -89,7 +97,7 @@ private void createClass() throws JClassAlreadyExistsException {
 	private void createContextConstructor() {
 		JExpression generatedClass = holder.getGeneratedClass().dotclass();
 		JMethod constructor = holder.getIntentBuilderClass().constructor(JMod.PUBLIC);
-		JVar constructorContextParam = constructor.param(holder.classes().CONTEXT, "context");
+		JVar constructorContextParam = constructor.param(getClasses().CONTEXT, "context");
 		constructor.body().invoke("super").arg(constructorContextParam).arg(generatedClass);
 	}
 
@@ -111,7 +119,7 @@ public JMethod getPutExtraMethod(TypeMirror elementType, String parameterName, J
 
 	private JMethod addPutExtraMethod(TypeMirror elementType, String parameterName, JFieldVar extraKeyField) {
 		JMethod method = holder.getIntentBuilderClass().method(PUBLIC, holder.getIntentBuilderClass(), parameterName);
-		JClass parameterClass = codeModelHelper.typeMirrorToJClass(elementType, holder);
+		JClass parameterClass = codeModelHelper.typeMirrorToJClass(elementType);
 		JVar extraParameterVar = method.param(parameterClass, parameterName);
 		JInvocation superCall = getSuperPutExtraInvocation(elementType, extraParameterVar, extraKeyField);
 		method.body()._return(superCall);
@@ -122,17 +130,17 @@ public JInvocation getSuperPutExtraInvocation(TypeMirror elementType, JVar extra
 		JExpression extraParameterArg = extraParam;
 		// Cast to Parcelable or Serializable if needed
 		if (elementType.getKind() == TypeKind.DECLARED) {
-			Elements elementUtils = holder.processingEnvironment().getElementUtils();
+			Elements elementUtils = environment.getProcessingEnvironment().getElementUtils();
 			TypeMirror parcelableType = elementUtils.getTypeElement(PARCELABLE).asType();
 			if (!typeUtils.isSubtype(elementType, parcelableType)) {
 				TypeMirror stringType = elementUtils.getTypeElement(STRING).asType();
 				if (!typeUtils.isSubtype(elementType, stringType)) {
-					extraParameterArg = cast(holder.classes().SERIALIZABLE, extraParameterArg);
+					extraParameterArg = cast(environment.getClasses().SERIALIZABLE, extraParameterArg);
 				}
 			} else {
 				TypeMirror serializableType = elementUtils.getTypeElement(SERIALIZABLE).asType();
 				if (typeUtils.isSubtype(elementType, serializableType)) {
-					extraParameterArg = cast(holder.classes().PARCELABLE, extraParameterArg);
+					extraParameterArg = cast(environment.getClasses().PARCELABLE, extraParameterArg);
 				}
 			}
 		}
@@ -140,4 +148,12 @@ public JInvocation getSuperPutExtraInvocation(TypeMirror elementType, JVar extra
 	}
 
 	protected abstract JClass getSuperClass();
+
+	protected ProcessHolder.Classes getClasses() {
+		return environment.getClasses();
+	}
+
+	protected JClass getJClass(Class<?> clazz) {
+		return environment.getJClass(clazz);
+	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ServiceIntentBuilder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/ServiceIntentBuilder.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ServiceIntentBuilder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/ServiceIntentBuilder.java
index 5070bd3db0..bb2900a19a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ServiceIntentBuilder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/helper/ServiceIntentBuilder.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.core.helper;
 
+import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.holder.HasIntentBuilder;
 
 import com.sun.codemodel.JClass;
@@ -27,7 +28,7 @@ public ServiceIntentBuilder(HasIntentBuilder holder, AndroidManifest androidMani
 
 	@Override
 	protected JClass getSuperClass() {
-		JClass superClass = holder.refClass(org.androidannotations.api.builder.ServiceIntentBuilder.class);
+		JClass superClass = getJClass(org.androidannotations.api.builder.ServiceIntentBuilder.class);
 		return superClass.narrow(builderClass);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidRes.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidRes.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidRes.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidRes.java
index 558fa5822f..5077aa36f4 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidRes.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidRes.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.model;
+package org.androidannotations.internal.core.model;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java
index 78d9d8ad09..3ac3976558 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java
@@ -13,22 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.model;
+package org.androidannotations.internal.core.model;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.holder.EComponentHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JFieldRef;
 
 public class AndroidSystemServices {
 
+	private AndroidAnnotationsEnvironment environment;
 	private Map<String, String> registeredServices = new HashMap<>();
 
-	public AndroidSystemServices() {
+	public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
 		// in alphabetical order
 		registeredServices.put("android.view.accessibility.AccessibilityManager", "android.content.Context.ACCESSIBILITY_SERVICE");
 		registeredServices.put("android.accounts.AccountManager", "android.content.Context.ACCOUNT_SERVICE");
@@ -108,17 +110,17 @@ public String getServiceConstant(TypeMirror serviceType) {
 		return registeredServices.get(serviceType.toString());
 	}
 
-	public JFieldRef getServiceConstant(TypeMirror serviceType, EComponentHolder holder) {
-		return extractIdStaticRef(holder, getServiceConstant(serviceType));
+	public JFieldRef getServiceConstantRef(TypeMirror serviceType) {
+		return extractIdStaticRef(getServiceConstant(serviceType));
 	}
 
-	private JFieldRef extractIdStaticRef(EComponentHolder holder, String staticFieldQualifiedName) {
+	private JFieldRef extractIdStaticRef(String staticFieldQualifiedName) {
 		if (staticFieldQualifiedName != null) {
 			int fieldSuffix = staticFieldQualifiedName.lastIndexOf('.');
 			String fieldName = staticFieldQualifiedName.substring(fieldSuffix + 1);
 			String className = staticFieldQualifiedName.substring(0, fieldSuffix);
 
-			return holder.refClass(className).staticRef(fieldName);
+			return environment.getJClass(className).staticRef(fieldName);
 		} else {
 			return null;
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RoboGuiceConstants.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/AndroidManifestNotFoundException.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RoboGuiceConstants.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/AndroidManifestNotFoundException.java
index a15d56a3ba..51d729e089 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RoboGuiceConstants.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/AndroidManifestNotFoundException.java
@@ -13,13 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.exception;
 
-public abstract class RoboGuiceConstants {
+public class AndroidManifestNotFoundException extends Exception {
 
-	public static final String ROBOGUICE_APPLICATION_CLASS = "roboguice.application.RoboApplication";
-
-	private RoboGuiceConstants() {
+	public AndroidManifestNotFoundException(String message, Throwable cause) {
+		super(message, cause);
 	}
-
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/exception/ProcessingException.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/ProcessingException.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/exception/ProcessingException.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/ProcessingException.java
index 52e86e4d05..bfdad9111f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/exception/ProcessingException.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/ProcessingException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.exception;
+package org.androidannotations.internal.exception;
 
 import javax.lang.model.element.Element;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/IsValid.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/RClassNotFoundException.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/IsValid.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/RClassNotFoundException.java
index 6e2da0c07e..48582125df 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/IsValid.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/RClassNotFoundException.java
@@ -13,17 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.process;
+package org.androidannotations.internal.exception;
 
-public class IsValid {
+public class RClassNotFoundException extends Exception {
 
-	boolean valid = true;
-
-	public void invalidate() {
-		valid = false;
-	}
-
-	public boolean isValid() {
-		return valid;
+	public RClassNotFoundException(String message) {
+		super(message);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/ValidationException.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/ValidationException.java
new file mode 100644
index 0000000000..0e36f15971
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/ValidationException.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal.exception;
+
+import java.util.List;
+
+import org.androidannotations.ElementValidation;
+
+public class ValidationException extends Exception {
+
+	private final List<ElementValidation> failedValidations;
+
+	public ValidationException(List<ElementValidation> failedValidations) {
+		this.failedValidations = failedValidations;
+	}
+
+	public List<ElementValidation> getFailedValidations() {
+		return failedValidations;
+	}
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/exception/VersionMismatchException.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/VersionMismatchException.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/exception/VersionMismatchException.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/VersionMismatchException.java
index 9e05f9aa37..c8fd19fced 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/exception/VersionMismatchException.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/VersionMismatchException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.exception;
+package org.androidannotations.internal.exception;
 
 public class VersionMismatchException extends Exception {
 
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/VersionNotFoundException.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/VersionNotFoundException.java
new file mode 100644
index 0000000000..ffe5c7eb4b
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/exception/VersionNotFoundException.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.internal.exception;
+
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+
+public class VersionNotFoundException extends Exception {
+
+	private final AndroidAnnotationsPlugin plugin;
+
+	public VersionNotFoundException(AndroidAnnotationsPlugin plugin) {
+		this.plugin = plugin;
+	}
+
+	@Override
+	public String getMessage() {
+		return plugin.getName() + " does not declare its version!";
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/CodeModelGenerator.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/CodeModelGenerator.java
index b0039c46c6..ac065d29f7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/CodeModelGenerator.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.generation;
+package org.androidannotations.internal.generation;
 
 import java.io.IOException;
 
 import javax.annotation.processing.Filer;
 
-import org.androidannotations.process.ModelProcessor;
+import org.androidannotations.internal.process.ModelProcessor;
 
 import com.sun.codemodel.writer.PrologCodeWriter;
 
@@ -30,17 +30,14 @@ public class CodeModelGenerator {
 
 	public CodeModelGenerator(Filer filer, String aaVersion) {
 		this.filer = filer;
-		this.header = "DO NOT EDIT THIS FILE."
-			+ "Generated using AndroidAnnotations " + aaVersion + ".\n "
+		this.header = "DO NOT EDIT THIS FILE.\n"
+			+ "Generated using AndroidAnnotations " + aaVersion + ".\n\n"
 			+ "You can create a larger work that contains this file and distribute that work under terms of your choice.\n";
 	}
 
 	public void generate(ModelProcessor.ProcessResult processResult) throws IOException {
 
-		ApiCodeGenerator apiCodeGenerator = new ApiCodeGenerator(filer);
-		apiCodeGenerator.writeApiClasses(processResult.apiClassesToGenerate, processResult.originatingElements);
-
-		SourceCodewriter sourceCodeWriter = new SourceCodewriter(filer, processResult.originatingElements);
+		SourceCodeWriter sourceCodeWriter = new SourceCodeWriter(filer, processResult.originatingElements);
 
 		PrologCodeWriter prologCodeWriter = new PrologCodeWriter(sourceCodeWriter, header);
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ResourceCodeWriter.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/ResourceCodeWriter.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ResourceCodeWriter.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/ResourceCodeWriter.java
index 4f864f04fa..3502603db4 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ResourceCodeWriter.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/ResourceCodeWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.generation;
+package org.androidannotations.internal.generation;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java
index e260b5c8b4..28a2a23f41 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.generation;
+package org.androidannotations.internal.generation;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -23,17 +23,17 @@
 import javax.lang.model.element.Element;
 import javax.tools.JavaFileObject;
 
+import org.androidannotations.internal.process.OriginatingElements;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
-import org.androidannotations.process.OriginatingElements;
 
 import com.sun.codemodel.CodeWriter;
 import com.sun.codemodel.JPackage;
 
-public class SourceCodewriter extends CodeWriter {
+public class SourceCodeWriter extends CodeWriter {
 
 	private static final VoidOutputStream VOID_OUTPUT_STREAM = new VoidOutputStream();
-	private static final Logger LOGGER = LoggerFactory.getLogger(SourceCodewriter.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(SourceCodeWriter.class);
 	private final Filer filer;
 	private OriginatingElements originatingElements;
 
@@ -44,7 +44,7 @@ public void write(int arg0) throws IOException {
 		}
 	}
 
-	public SourceCodewriter(Filer filer, OriginatingElements originatingElements) {
+	public SourceCodeWriter(Filer filer, OriginatingElements originatingElements) {
 		this.filer = filer;
 		this.originatingElements = originatingElements;
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AndroidManifestFinder.java
similarity index 76%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AndroidManifestFinder.java
index 407629c853..c1509499ed 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AndroidManifestFinder.java
@@ -13,23 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.helper;
 
 import static org.androidannotations.helper.ModelConstants.classSuffix;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.util.Elements;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.androidannotations.helper.FileHelper.FileHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.internal.exception.AndroidManifestNotFoundException;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
 import org.w3c.dom.Document;
@@ -40,51 +43,48 @@
 
 public class AndroidManifestFinder {
 
+	public static final Option OPTION_MANIFEST = new Option("androidManifestFile", null);
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(AndroidManifestFinder.class);
 	private static final int MAX_PARENTS_FROM_SOURCE_FOLDER = 10;
 
-	private final ProcessingEnvironment processingEnv;
-	private final OptionsHelper optionsHelper;
+	private final AndroidAnnotationsEnvironment environment;
 
-	public AndroidManifestFinder(ProcessingEnvironment processingEnv) {
-		this.processingEnv = processingEnv;
-		optionsHelper = new OptionsHelper(processingEnv);
+	public AndroidManifestFinder(AndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
 	}
 
-	public Option<AndroidManifest> extractAndroidManifest() {
-		Option<File> androidManifestFileOption = findManifestFile();
-
-		if (androidManifestFileOption.isAbsent()) {
-			return Option.absent();
-		}
-
-		File androidManifestFile = androidManifestFileOption.get();
-
-		String projectDirectory = androidManifestFile.getParent();
+	public AndroidManifest extractAndroidManifest() throws AndroidManifestNotFoundException {
+		try {
+			File androidManifestFile = findManifestFile();
+			String projectDirectory = androidManifestFile.getParent();
 
-		File projectProperties = new File(projectDirectory, "project.properties");
+			File projectProperties = new File(projectDirectory, "project.properties");
 
-		boolean libraryProject = false;
-		if (projectProperties.exists()) {
-			Properties properties = new Properties();
-			try {
-				properties.load(new FileInputStream(projectProperties));
-				if (properties.containsKey("android.library")) {
-					String androidLibraryProperty = properties.getProperty("android.library");
-					libraryProject = androidLibraryProperty.equals("true");
+			boolean libraryProject = false;
+			if (projectProperties.exists()) {
+				Properties properties = new Properties();
+				try {
+					properties.load(new FileInputStream(projectProperties));
+					if (properties.containsKey("android.library")) {
+						String androidLibraryProperty = properties.getProperty("android.library");
+						libraryProject = androidLibraryProperty.equals("true");
 
-					LOGGER.debug("Found android.library={} property in project.properties", libraryProject);
+						LOGGER.debug("Found android.library={} property in project.properties", libraryProject);
+					}
+				} catch (IOException ignored) {
+					// we assume the project is not a library
 				}
-			} catch (IOException ignored) {
-				// we assume the project is not a library
 			}
-		}
 
-		return parse(androidManifestFile, libraryProject);
+			return parse(androidManifestFile, libraryProject);
+		} catch (FileNotFoundException exception) {
+			throw new AndroidManifestNotFoundException("Unable to find AndroidManifest.xml", exception);
+		}
 	}
 
-	private Option<File> findManifestFile() {
-		String androidManifestFile = optionsHelper.getAndroidManifestFile();
+	private File findManifestFile() throws FileNotFoundException {
+		String androidManifestFile = environment.getOptionValue(OPTION_MANIFEST);
 		if (androidManifestFile != null) {
 			return findManifestInSpecifiedPath(androidManifestFile);
 		} else {
@@ -92,15 +92,15 @@ private Option<File> findManifestFile() {
 		}
 	}
 
-	private Option<File> findManifestInSpecifiedPath(String androidManifestPath) {
+	private File findManifestInSpecifiedPath(String androidManifestPath) throws FileNotFoundException {
 		File androidManifestFile = new File(androidManifestPath);
 		if (!androidManifestFile.exists()) {
 			LOGGER.error("Could not find the AndroidManifest.xml file in specified path : {}", androidManifestPath);
-			return Option.absent();
+			throw new FileNotFoundException();
 		} else {
 			LOGGER.debug("AndroidManifest.xml file found with specified path: {}", androidManifestFile.toString());
 		}
-		return Option.of(androidManifestFile);
+		return androidManifestFile;
 	}
 
 	/**
@@ -110,13 +110,9 @@ private Option<File> findManifestInSpecifiedPath(String androidManifestPath) {
 	 * find the AndroidManifest.xml file. Any better solution will be
 	 * appreciated.
 	 */
-	private Option<File> findManifestInParentsDirectories() {
-		Option<FileHolder> projectRootHolderOption = FileHelper.findRootProjectHolder(processingEnv);
-		if (projectRootHolderOption.isAbsent()) {
-			return Option.absent();
-		}
+	private File findManifestInParentsDirectories() throws FileNotFoundException {
+		FileHelper.FileHolder projectRootHolder = FileHelper.findRootProjectHolder(environment.getProcessingEnvironment());
 
-		FileHolder projectRootHolder = projectRootHolderOption.get();
 		File projectRoot = projectRootHolder.projectRoot;
 
 		File androidManifestFile = new File(projectRoot, "AndroidManifest.xml");
@@ -134,17 +130,17 @@ private Option<File> findManifestInParentsDirectories() {
 		}
 
 		if (!androidManifestFile.exists()) {
-			LOGGER.error("Could not find the AndroidManifest.xml file, going up from path [{}] found using dummy file [] (max atempts: {})",
+			LOGGER.error("Could not find the AndroidManifest.xml file, going up from path [{}] found using dummy file [{}] (max atempts: {})",
 					projectRootHolder.sourcesGenerationFolder.getAbsolutePath(), projectRootHolder.dummySourceFilePath, MAX_PARENTS_FROM_SOURCE_FOLDER);
-			return Option.absent();
+			throw new FileNotFoundException();
 		} else {
 			LOGGER.debug("AndroidManifest.xml file found in parent folder {}: {}", projectRoot.getAbsolutePath(), androidManifestFile.toString());
 		}
 
-		return Option.of(androidManifestFile);
+		return androidManifestFile;
 	}
 
-	private Option<AndroidManifest> parse(File androidManifestFile, boolean libraryProject) {
+	private AndroidManifest parse(File androidManifestFile, boolean libraryProject) throws AndroidManifestNotFoundException {
 		DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
 
 		Document doc;
@@ -153,7 +149,7 @@ private Option<AndroidManifest> parse(File androidManifestFile, boolean libraryP
 			doc = docBuilder.parse(androidManifestFile);
 		} catch (Exception e) {
 			LOGGER.error("Could not parse the AndroidManifest.xml file at path {}", androidManifestFile, e);
-			return Option.absent();
+			throw new AndroidManifestNotFoundException("Could not parse the AndroidManifest.xml file at path {}" + androidManifestFile, e);
 		}
 
 		Element documentElement = doc.getDocumentElement();
@@ -173,7 +169,7 @@ private Option<AndroidManifest> parse(File androidManifestFile, boolean libraryP
 		}
 
 		if (libraryProject) {
-			return Option.of(AndroidManifest.createLibraryManifest(applicationPackage, minSdkVersion, maxSdkVersion, targetSdkVersion));
+			return AndroidManifest.createLibraryManifest(applicationPackage, minSdkVersion, maxSdkVersion, targetSdkVersion);
 		}
 
 		NodeList applicationNodes = documentElement.getElementsByTagName("application");
@@ -223,8 +219,8 @@ private Option<AndroidManifest> parse(File androidManifestFile, boolean libraryP
 		List<String> permissionQualifiedNames = new ArrayList<>();
 		permissionQualifiedNames.addAll(usesPermissionQualifiedNames);
 
-		return Option.of(AndroidManifest.createManifest(applicationPackage, applicationClassQualifiedName, componentQualifiedNames, permissionQualifiedNames, minSdkVersion, maxSdkVersion,
-				targetSdkVersion, applicationDebuggableMode));
+		return AndroidManifest.createManifest(applicationPackage, applicationClassQualifiedName, componentQualifiedNames, permissionQualifiedNames,
+				minSdkVersion, maxSdkVersion, targetSdkVersion, applicationDebuggableMode);
 	}
 
 	private int extractAttributeIntValue(Node node, String attribute, int defaultValue) {
@@ -286,7 +282,7 @@ private String manifestNameToValidQualifiedName(String applicationPackage, Node
 	}
 
 	private boolean classOrModelClassExists(String className) {
-		Elements elementUtils = processingEnv.getElementUtils();
+		Elements elementUtils = environment.getProcessingEnvironment().getElementUtils();
 
 		if (className.endsWith(classSuffix())) {
 			className = className.substring(0, className.length() - classSuffix().length());
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationArrayParamExtractor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AnnotationArrayParamExtractor.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationArrayParamExtractor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AnnotationArrayParamExtractor.java
index 350d218aad..99c303d1fe 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationArrayParamExtractor.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AnnotationArrayParamExtractor.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.helper;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.SimpleAnnotationValueVisitor6;
 
-import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.helper.APTCodeModelHelper;
 
 import com.sun.codemodel.JAnnotationArrayMember;
 import com.sun.codemodel.JClass;
@@ -29,11 +29,9 @@
 
 public class AnnotationArrayParamExtractor extends SimpleAnnotationValueVisitor6<Void, JAnnotationArrayMember> {
 
-	private GeneratedClassHolder holder;
 	private APTCodeModelHelper helper;
 
-	public AnnotationArrayParamExtractor(GeneratedClassHolder holder, APTCodeModelHelper helper) {
-		this.holder = holder;
+	public AnnotationArrayParamExtractor(APTCodeModelHelper helper) {
 		this.helper = helper;
 	}
 
@@ -93,7 +91,7 @@ public Void visitString(String s, JAnnotationArrayMember p) {
 
 	@Override
 	public Void visitType(TypeMirror t, JAnnotationArrayMember p) {
-		JClass annotationClass = helper.typeMirrorToJClass(t, holder);
+		JClass annotationClass = helper.typeMirrorToJClass(t);
 		JExpression dotclass = JExpr.dotclass(annotationClass);
 		p.param(dotclass);
 		return null;
@@ -101,7 +99,7 @@ public Void visitType(TypeMirror t, JAnnotationArrayMember p) {
 
 	@Override
 	public Void visitEnumConstant(VariableElement c, JAnnotationArrayMember p) {
-		JClass annotationClass = helper.typeMirrorToJClass(c.asType(), holder);
+		JClass annotationClass = helper.typeMirrorToJClass(c.asType());
 		JExpression expression = JExpr.direct(annotationClass.fullName() + "." + c.getSimpleName());
 		p.param(expression);
 		return null;
@@ -109,7 +107,7 @@ public Void visitEnumConstant(VariableElement c, JAnnotationArrayMember p) {
 
 	@Override
 	public Void visitAnnotation(AnnotationMirror a, JAnnotationArrayMember p) {
-		helper.addAnnotation(p, a, holder);
+		helper.copyAnnotation(p, a);
 		return null;
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationParamExtractor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AnnotationParamExtractor.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationParamExtractor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AnnotationParamExtractor.java
index 99caf1ccf6..cc0ec092f0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationParamExtractor.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AnnotationParamExtractor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.helper;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -27,7 +27,7 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.SimpleAnnotationValueVisitor6;
 
-import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.helper.APTCodeModelHelper;
 
 import com.sun.codemodel.JAnnotationArrayMember;
 import com.sun.codemodel.JAnnotationUse;
@@ -39,12 +39,10 @@
 public class AnnotationParamExtractor extends SimpleAnnotationValueVisitor6<Void, String> {
 
 	private JAnnotationUse use;
-	private GeneratedClassHolder holder;
 	private APTCodeModelHelper helper;
 
-	public AnnotationParamExtractor(JAnnotationUse use, GeneratedClassHolder holder, APTCodeModelHelper helper) {
+	public AnnotationParamExtractor(JAnnotationUse use, APTCodeModelHelper helper) {
 		this.use = use;
-		this.holder = holder;
 		this.helper = helper;
 	}
 
@@ -53,7 +51,7 @@ public Void visitArray(List<? extends AnnotationValue> vals, String p) {
 		JAnnotationArrayMember paramArray = use.paramArray(p);
 
 		for (AnnotationValue annotationValue : vals) {
-			annotationValue.accept(new AnnotationArrayParamExtractor(holder, helper), paramArray);
+			annotationValue.accept(new AnnotationArrayParamExtractor(helper), paramArray);
 		}
 
 		return null;
@@ -115,7 +113,7 @@ public Void visitString(String s, String p) {
 
 	@Override
 	public Void visitEnumConstant(VariableElement c, String p) {
-		JClass annotationClass = helper.typeMirrorToJClass(c.asType(), holder);
+		JClass annotationClass = helper.typeMirrorToJClass(c.asType());
 		JExpression expression = JExpr.direct(annotationClass.fullName() + "." + c.getSimpleName());
 		use.param(p, expression);
 		return null;
@@ -123,7 +121,7 @@ public Void visitEnumConstant(VariableElement c, String p) {
 
 	@Override
 	public Void visitType(TypeMirror t, String p) {
-		JClass annotationClass = helper.typeMirrorToJClass(t, holder);
+		JClass annotationClass = helper.typeMirrorToJClass(t);
 		JExpression dotclass = JExpr.dotclass(annotationClass);
 		use.param(p, dotclass);
 		return null;
@@ -132,13 +130,13 @@ public Void visitType(TypeMirror t, String p) {
 	@Override
 	public Void visitAnnotation(AnnotationMirror a, String p) {
 		try {
-			JClass annotationJClass = helper.typeMirrorToJClass(a.getAnnotationType(), holder);
+			JClass annotationJClass = helper.typeMirrorToJClass(a.getAnnotationType());
 			Constructor<JAnnotationUse> constructor = JAnnotationUse.class.getDeclaredConstructor(JClass.class);
 			constructor.setAccessible(true);
 			JAnnotationUse paramAnnotation = constructor.newInstance(annotationJClass);
 			Map<? extends ExecutableElement, ? extends AnnotationValue> parameters = a.getElementValues();
 			for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> param : parameters.entrySet()) {
-				param.getValue().accept(new AnnotationParamExtractor(paramAnnotation, holder, helper), param.getKey().getSimpleName().toString());
+				param.getValue().accept(new AnnotationParamExtractor(paramAnnotation, helper), param.getKey().getSimpleName().toString());
 			}
 
 			Method addValueMethod = use.getClass().getDeclaredMethod("addValue", String.class, JAnnotationValue.class);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ErrorHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/ErrorHelper.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ErrorHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/ErrorHelper.java
index 21deee9c3b..a71e2dbde9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ErrorHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/ErrorHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.helper;
 
 import java.io.BufferedReader;
 import java.io.CharArrayWriter;
@@ -31,7 +31,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.util.Elements;
 
-import org.androidannotations.exception.ProcessingException;
+import org.androidannotations.internal.exception.ProcessingException;
 
 public class ErrorHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/FileHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/FileHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java
index be24b5e24a..a7650517cf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/FileHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java
@@ -13,9 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.helper;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -30,13 +31,9 @@ public final class FileHelper {
 	private FileHelper() {
 	}
 
-	public static Option<File> findRootProject(ProcessingEnvironment processingEnv) {
-		Option<FileHolder> rootProjectHolder = findRootProjectHolder(processingEnv);
-		if (rootProjectHolder.isAbsent()) {
-			return Option.absent();
-		}
-
-		return Option.of(rootProjectHolder.get().projectRoot);
+	public static File findRootProject(ProcessingEnvironment processingEnv) throws FileNotFoundException {
+		FileHolder rootProjectHolder = findRootProjectHolder(processingEnv);
+		return rootProjectHolder.projectRoot;
 	}
 
 	/**
@@ -46,14 +43,14 @@ public static Option<File> findRootProject(ProcessingEnvironment processingEnv)
 	 * find the AndroidManifest.xml file. Any better solution will be
 	 * appreciated.
 	 */
-	public static Option<FileHolder> findRootProjectHolder(ProcessingEnvironment processingEnv) {
+	public static FileHolder findRootProjectHolder(ProcessingEnvironment processingEnv) throws FileNotFoundException {
 		Filer filer = processingEnv.getFiler();
 
 		FileObject dummySourceFile;
 		try {
 			dummySourceFile = filer.createResource(StandardLocation.SOURCE_OUTPUT, "", "dummy" + System.currentTimeMillis());
 		} catch (IOException ignored) {
-			return Option.absent();
+			throw new FileNotFoundException();
 		}
 		String dummySourceFilePath = dummySourceFile.toUri().toString();
 
@@ -69,24 +66,18 @@ public static Option<FileHolder> findRootProjectHolder(ProcessingEnvironment pro
 		try {
 			cleanURI = new URI(dummySourceFilePath);
 		} catch (URISyntaxException e) {
-			return Option.absent();
+			throw new FileNotFoundException();
 		}
 
 		File dummyFile = new File(cleanURI);
 		File sourcesGenerationFolder = dummyFile.getParentFile();
 		File projectRoot = sourcesGenerationFolder.getParentFile();
 
-		return Option.of(new FileHolder(dummySourceFilePath, sourcesGenerationFolder, projectRoot));
+		return new FileHolder(dummySourceFilePath, sourcesGenerationFolder, projectRoot);
 	}
 
-	public static File resolveOutputDirectory(ProcessingEnvironment processingEnv) {
-		Option<File> rootProjectOption = FileHelper.findRootProject(processingEnv);
-		if (rootProjectOption.isAbsent()) {
-			// Execution root folder
-			return null;
-		}
-
-		File rootProject = rootProjectOption.get();
+	public static File resolveOutputDirectory(ProcessingEnvironment processingEnv) throws FileNotFoundException {
+		File rootProject = FileHelper.findRootProject(processingEnv);
 
 		// Target folder - Maven
 		File targetFolder = new File(rootProject, "target");
@@ -115,7 +106,7 @@ static class FileHolder {
 		File sourcesGenerationFolder;
 		File projectRoot;
 
-		public FileHolder(String dummySourceFilePath, File sourcesGenerationFolder, File projectRoot) {
+		FileHolder(String dummySourceFilePath, File sourcesGenerationFolder, File projectRoot) {
 			this.dummySourceFilePath = dummySourceFilePath;
 			this.sourcesGenerationFolder = sourcesGenerationFolder;
 			this.projectRoot = projectRoot;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ViewNotifierHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/ViewNotifierHelper.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ViewNotifierHelper.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/ViewNotifierHelper.java
index 3912ab8a4a..547ff4148f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ViewNotifierHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/ViewNotifierHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.internal.helper;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -46,7 +46,7 @@ public void invokeViewChanged(JBlock block) {
 	}
 
 	public JVar replacePreviousNotifier(JBlock block) {
-		JClass notifierClass = holder.refClass(OnViewChangedNotifier.class);
+		JClass notifierClass = holder.getEnvironment().getJClass(OnViewChangedNotifier.class);
 		if (notifier == null) {
 			notifier = holder.getGeneratedClass().field(PRIVATE | FINAL, notifierClass, "onViewChangedNotifier" + generationSuffix(), _new(notifierClass));
 			holder.getGeneratedClass()._implements(HasViews.class);
@@ -55,12 +55,12 @@ public JVar replacePreviousNotifier(JBlock block) {
 	}
 
 	public JVar replacePreviousNotifierWithNull(JBlock block) {
-		JClass notifierClass = holder.refClass(OnViewChangedNotifier.class);
+		JClass notifierClass = holder.getEnvironment().getJClass(OnViewChangedNotifier.class);
 		return block.decl(notifierClass, "previousNotifier", notifierClass.staticInvoke("replaceNotifier").arg(_null()));
 	}
 
 	public void resetPreviousNotifier(JBlock block, JVar previousNotifier) {
-		JClass notifierClass = holder.refClass(OnViewChangedNotifier.class);
+		JClass notifierClass = holder.getEnvironment().getJClass(OnViewChangedNotifier.class);
 		block.staticInvoke(notifierClass, "replaceNotifier").arg(previousNotifier);
 	}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElements.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/AnnotationElements.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElements.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/AnnotationElements.java
index 0960c315ae..88e1130b7a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElements.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/AnnotationElements.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.model;
+package org.androidannotations.internal.model;
 
 import java.util.Set;
 
@@ -22,11 +22,11 @@
 
 public interface AnnotationElements {
 
-	public static class AnnotatedAndRootElements {
+	class AnnotatedAndRootElements {
 		public final Element annotatedElement;
 		public final TypeElement rootTypeElement;
 
-		public AnnotatedAndRootElements(Element annotatedElement, TypeElement rootTypeElement) {
+		AnnotatedAndRootElements(Element annotatedElement, TypeElement rootTypeElement) {
 			this.annotatedElement = annotatedElement;
 			this.rootTypeElement = rootTypeElement;
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElementsHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/AnnotationElementsHolder.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElementsHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/AnnotationElementsHolder.java
index 701f80643b..945cc2b95d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElementsHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/AnnotationElementsHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.model;
+package org.androidannotations.internal.model;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/ModelExtractor.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/ModelExtractor.java
index 64f3631365..41005fadfc 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/model/ModelExtractor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.model;
+package org.androidannotations.internal.model;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ModelProcessor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ModelProcessor.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java
index 56995f9dd1..cba710d4b9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ModelProcessor.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java
@@ -13,26 +13,25 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.process;
+package org.androidannotations.internal.process;
 
 import java.util.Set;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.NestingKind;
 import javax.lang.model.element.TypeElement;
 
-import org.androidannotations.exception.ProcessingException;
 import org.androidannotations.handler.AnnotationHandler;
-import org.androidannotations.handler.AnnotationHandlers;
 import org.androidannotations.handler.GeneratingAnnotationHandler;
 import org.androidannotations.holder.GeneratedClassHolder;
+import org.androidannotations.internal.InternalAndroidAnnotationsEnvironment;
+import org.androidannotations.internal.exception.ProcessingException;
+import org.androidannotations.internal.model.AnnotationElements;
+import org.androidannotations.internal.model.AnnotationElements.AnnotatedAndRootElements;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.model.AnnotationElements.AnnotatedAndRootElements;
 
 import com.sun.codemodel.JCodeModel;
 
@@ -44,32 +43,25 @@ public static class ProcessResult {
 
 		public final JCodeModel codeModel;
 		public final OriginatingElements originatingElements;
-		public final Set<Class<?>> apiClassesToGenerate;
 
-		public ProcessResult(//
-				JCodeModel codeModel, //
-				OriginatingElements originatingElements, //
-				Set<Class<?>> apiClassesToGenerate) {
+		public ProcessResult(JCodeModel codeModel, OriginatingElements originatingElements) {
 
 			this.codeModel = codeModel;
 			this.originatingElements = originatingElements;
-			this.apiClassesToGenerate = apiClassesToGenerate;
 		}
 	}
 
-	private final ProcessingEnvironment processingEnv;
-	private final AnnotationHandlers annotationHandlers;
+	private final InternalAndroidAnnotationsEnvironment environment;
 
-	public ModelProcessor(ProcessingEnvironment processingEnv, AnnotationHandlers annotationHandlers) {
-		this.processingEnv = processingEnv;
-		this.annotationHandlers = annotationHandlers;
+	public ModelProcessor(InternalAndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public ProcessResult process(AnnotationElements validatedModel) throws ProcessingException, Exception {
-		ProcessHolder processHolder = new ProcessHolder(processingEnv);
+	public ProcessResult process(AnnotationElements validatedModel) throws Exception {
+		ProcessHolder processHolder = new ProcessHolder(environment.getProcessingEnvironment());
 
-		annotationHandlers.setProcessHolder(processHolder);
+		environment.setProcessHolder(processHolder);
 
 		LOGGER.info("Processing root elements");
 
@@ -85,7 +77,7 @@ public ProcessResult process(AnnotationElements validatedModel) throws Processin
 
 		LOGGER.info("Processing enclosed elements");
 
-		for (AnnotationHandler annotationHandler : annotationHandlers.getDecorating()) {
+		for (AnnotationHandler annotationHandler : environment.getDecoratingHandlers()) {
 			String annotationName = annotationHandler.getTarget();
 
 			/*
@@ -143,8 +135,7 @@ public ProcessResult process(AnnotationElements validatedModel) throws Processin
 
 		return new ProcessResult(//
 				processHolder.codeModel(), //
-				processHolder.getOriginatingElements(), //
-				processHolder.getApiClassesToGenerate());
+				processHolder.getOriginatingElements());
 	}
 
 	private <T extends GeneratedClassHolder> void processThrowing(AnnotationHandler<T> handler, Element element, T generatedClassHolder) throws ProcessingException {
@@ -168,7 +159,7 @@ private boolean isAbstractClass(Element annotatedElement) {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private boolean generateElements(AnnotationElements validatedModel, ProcessHolder processHolder) throws Exception {
 		boolean isElementRemaining = false;
-		for (GeneratingAnnotationHandler generatingAnnotationHandler : annotationHandlers.getGenerating()) {
+		for (GeneratingAnnotationHandler generatingAnnotationHandler : environment.getGeneratingHandlers()) {
 			String annotationName = generatingAnnotationHandler.getTarget();
 			Set<? extends Element> annotatedElements = validatedModel.getRootAnnotatedElements(annotationName);
 
@@ -190,7 +181,7 @@ private boolean generateElements(AnnotationElements validatedModel, ProcessHolde
 						if (typeElement.getNestingKind() == NestingKind.MEMBER && processHolder.getGeneratedClassHolder(enclosingElement) == null) {
 							isElementRemaining = true;
 						} else {
-							GeneratedClassHolder generatedClassHolder = generatingAnnotationHandler.createGeneratedClassHolder(processHolder, typeElement);
+							GeneratedClassHolder generatedClassHolder = generatingAnnotationHandler.createGeneratedClassHolder(environment, typeElement);
 							processHolder.put(annotatedElement, generatedClassHolder);
 							generatingAnnotationHandler.process(annotatedElement, generatedClassHolder);
 						}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ModelValidator.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java
similarity index 50%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ModelValidator.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java
index 98ec94cfc3..afcc264dd8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ModelValidator.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java
@@ -13,42 +13,46 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.process;
+package org.androidannotations.internal.process;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 
-import org.androidannotations.exception.ProcessingException;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.handler.AnnotationHandler;
-import org.androidannotations.handler.AnnotationHandlers;
+import org.androidannotations.internal.exception.ValidationException;
+import org.androidannotations.internal.model.AnnotationElements;
+import org.androidannotations.internal.model.AnnotationElementsHolder;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.model.AnnotationElementsHolder;
 
 public class ModelValidator {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ModelValidator.class);
-	private AnnotationHandlers annotationHandlers;
+	private AndroidAnnotationsEnvironment environment;
 
-	public ModelValidator(AnnotationHandlers annotationHandlers) {
-		this.annotationHandlers = annotationHandlers;
+	public ModelValidator(AndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
 	}
 
-	public AnnotationElements validate(AnnotationElementsHolder extractedModel) throws ProcessingException, Exception {
+	public AnnotationElements validate(AnnotationElements extractedModel, AnnotationElementsHolder validatingHolder) throws ValidationException {
 
 		LOGGER.info("Validating elements");
+		List<ElementValidation> failedValidations = new ArrayList<>();
 
 		/*
 		 * We currently do not validate the elements on the ancestors, assuming
 		 * they've already been validated. This also means some checks such as
 		 * unique ids might not be check all situations.
 		 */
-		AnnotationElementsHolder validatedElements = extractedModel.validatingHolder();
 
-		for (AnnotationHandler<?> annotationHandler : annotationHandlers.get()) {
+		for (AnnotationHandler annotationHandler : environment.getHandlers()) {
 			String validatorSimpleName = annotationHandler.getClass().getSimpleName();
 			String annotationName = annotationHandler.getTarget();
 
@@ -56,30 +60,37 @@ public AnnotationElements validate(AnnotationElementsHolder extractedModel) thro
 
 			Set<Element> validatedAnnotatedElements = new HashSet<>();
 
-			validatedElements.putRootAnnotatedElements(annotationName, validatedAnnotatedElements);
+			validatingHolder.putRootAnnotatedElements(annotationName, validatedAnnotatedElements);
 
 			if (!annotatedElements.isEmpty()) {
 				LOGGER.debug("Validating with {}: {}", validatorSimpleName, annotatedElements);
 			}
 
 			for (Element annotatedElement : annotatedElements) {
-				if (validateThrowing(annotationHandler, annotatedElement, validatedElements)) {
+				ElementValidation elementValidation = annotationHandler.validate(annotatedElement);
+
+				AnnotationMirror annotationMirror = elementValidation.getAnnotationMirror();
+				for (ElementValidation.Error error : elementValidation.getErrors()) {
+					LOGGER.error(error.getMessage(), error.getElement(), annotationMirror);
+				}
+
+				for (String warning : elementValidation.getWarnings()) {
+					LOGGER.warn(warning, elementValidation.getElement(), elementValidation.getAnnotationMirror());
+				}
+
+				if (elementValidation.isValid()) {
 					validatedAnnotatedElements.add(annotatedElement);
 				} else {
-					LOGGER.warn("Element {} unvalidated by {}", annotatedElement, validatorSimpleName);
+					failedValidations.add(elementValidation);
+					LOGGER.warn("Element {} invalidated by {}", annotatedElement, annotatedElement, validatorSimpleName);
 				}
 			}
 		}
 
-		return validatedElements;
-	}
-
-	private boolean validateThrowing(AnnotationHandler<?> handler, Element element, AnnotationElements validatedElements) throws Exception, ProcessingException {
-		try {
-			return handler.validate(element, validatedElements);
-		} catch (Exception e) {
-			throw new ProcessingException(e, element);
+		if (!failedValidations.isEmpty()) {
+			throw new ValidationException(failedValidations);
 		}
-	}
 
+		return validatingHolder;
+	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/OriginatingElements.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/OriginatingElements.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/OriginatingElements.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/OriginatingElements.java
index 747cc4126b..54027104ff 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/OriginatingElements.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/OriginatingElements.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.process;
+package org.androidannotations.internal.process;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ProcessHolder.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ProcessHolder.java
index 2f4bbff739..72ef95fabd 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ProcessHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.process;
+package org.androidannotations.internal.process;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -25,7 +25,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
@@ -130,38 +129,6 @@ public class Classes {
 		public final JClass PREFERENCE_CLICK_LISTENER = refClass(CanonicalNameConstants.PREFERENCE_CLICK_LISTENER);
 		public final JClass PREFERENCE_ACTIVITY_HEADER = refClass(CanonicalNameConstants.PREFERENCE_ACTIVITY_HEADER);
 
-		/*
-		 * RoboGuice
-		 */
-		public final JClass ROBO_CONTEXT = refClass(CanonicalNameConstants.ROBO_CONTEXT);
-		public final JClass ROBO_INJECTOR = refClass(CanonicalNameConstants.ROBO_INJECTOR);
-		public final JClass CONTENT_VIEW_LISTENER = refClass(CanonicalNameConstants.CONTENT_VIEW_LISTENER);
-		public final JClass KEY = refClass(CanonicalNameConstants.KEY);
-		public final JClass ON_RESTART_EVENT = refClass(CanonicalNameConstants.ON_RESTART_EVENT);
-		public final JClass ON_START_EVENT = refClass(CanonicalNameConstants.ON_START_EVENT);
-		public final JClass ON_RESUME_EVENT = refClass(CanonicalNameConstants.ON_RESUME_EVENT);
-		public final JClass ON_PAUSE_EVENT = refClass(CanonicalNameConstants.ON_PAUSE_EVENT);
-		public final JClass ON_NEW_INTENT_EVENT = refClass(CanonicalNameConstants.ON_NEW_INTENT_EVENT);
-		public final JClass EVENT_MANAGER = refClass(CanonicalNameConstants.EVENT_MANAGER);
-		public final JClass CONTEXT_SCOPE = refClass(CanonicalNameConstants.CONTEXT_SCOPE);
-		public final JClass VIEW_MEMBERS_INJECTOR = refClass(CanonicalNameConstants.VIEW_MEMBERS_INJECTOR);
-		public final JClass ROBO_GUICE = refClass(CanonicalNameConstants.ROBO_GUICE);
-		public final JClass INJECT = refClass(CanonicalNameConstants.INJECT);
-		public final JClass ON_STOP_EVENT = refClass(CanonicalNameConstants.ON_STOP_EVENT);
-		public final JClass ON_DESTROY_EVENT = refClass(CanonicalNameConstants.ON_DESTROY_EVENT);
-		public final JClass ON_CONFIGURATION_CHANGED_EVENT = refClass(CanonicalNameConstants.ON_CONFIGURATION_CHANGED_EVENT);
-		public final JClass ON_CONTENT_CHANGED_EVENT = refClass(CanonicalNameConstants.ON_CONTENT_CHANGED_EVENT);
-		public final JClass ON_ACTIVITY_RESULT_EVENT = refClass(CanonicalNameConstants.ON_ACTIVITY_RESULT_EVENT);
-		public final JClass ON_CREATE_EVENT = refClass(CanonicalNameConstants.ON_CREATE_EVENT);
-
-		/*
-		 * OrmLite
-		 */
-		public final JClass CONNECTION_SOURCE = refClass(CanonicalNameConstants.CONNECTION_SOURCE);
-		public final JClass OPEN_HELPER_MANAGER = refClass(CanonicalNameConstants.OPEN_HELPER_MANAGER);
-		public final JClass RUNTIME_EXCEPTION_DAO = refClass(CanonicalNameConstants.RUNTIME_EXCEPTION_DAO);
-		public final JClass DAO_MANAGER = refClass(CanonicalNameConstants.DAO_MANAGER);
-
 		/*
 		 * HttpClient
 		 */
@@ -172,20 +139,6 @@ public class Classes {
 		public final JClass SCHEME = refClass(CanonicalNameConstants.SCHEME);
 		public final JClass SCHEME_REGISTRY = refClass(CanonicalNameConstants.SCHEME_REGISTRY);
 		public final JClass SINGLE_CLIENT_CONN_MANAGER = refClass(CanonicalNameConstants.SINGLE_CLIENT_CONN_MANAGER);
-
-		/*
-		 * SpringFramework
-		 */
-		public final JClass REST_TEMPLATE = refClass(CanonicalNameConstants.REST_TEMPLATE);
-		public final JClass HTTP_METHOD = refClass(CanonicalNameConstants.HTTP_METHOD);
-		public final JClass HTTP_ENTITY = refClass(CanonicalNameConstants.HTTP_ENTITY);
-		public final JClass HTTP_HEADERS = refClass(CanonicalNameConstants.HTTP_HEADERS);
-		public final JClass MEDIA_TYPE = refClass(CanonicalNameConstants.MEDIA_TYPE);
-		public final JClass RESPONSE_ENTITY = refClass(CanonicalNameConstants.RESPONSE_ENTITY);
-		public final JClass HTTP_AUTHENTICATION = refClass(CanonicalNameConstants.HTTP_AUTHENTICATION);
-		public final JClass HTTP_BASIC_AUTHENTICATION = refClass(CanonicalNameConstants.HTTP_BASIC_AUTHENTICATION);
-		public final JClass REST_CLIENT_EXCEPTION = refClass(CanonicalNameConstants.REST_CLIENT_EXCEPTION);
-		public final JClass NESTED_RUNTIME_EXCEPTION = refClass(CanonicalNameConstants.NESTED_RUNTIME_EXCEPTION);
 	}
 
 	// CHECKSTYLE:ON
@@ -200,8 +153,6 @@ public class Classes {
 
 	private final Classes classes;
 
-	private final Set<Class<?>> apiClassesToGenerate = new HashSet<>();
-
 	private final OriginatingElements originatingElements = new OriginatingElements();
 
 	public ProcessHolder(ProcessingEnvironment processingEnvironment) {
@@ -292,12 +243,4 @@ public OriginatingElements getOriginatingElements() {
 		return originatingElements;
 	}
 
-	public Set<Class<?>> getApiClassesToGenerate() {
-		return apiClassesToGenerate;
-	}
-
-	public void generateApiClass(Element originatingElement, Class<?> apiClass) {
-		originatingElements.add(apiClass.getCanonicalName(), originatingElement);
-		apiClassesToGenerate.add(apiClass);
-	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/TimeStats.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/TimeStats.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/TimeStats.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/TimeStats.java
index 4bae1a16b7..a8e4a6c28a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/TimeStats.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/TimeStats.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.process;
+package org.androidannotations.internal.process;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,7 +35,7 @@ private static class Duration implements Comparable<Duration> {
 		public final String key;
 		public final long durationInMs;
 
-		public Duration(String key, long durationInMs) {
+		Duration(String key, long durationInMs) {
 			this.key = key;
 			this.durationInMs = durationInMs;
 		}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/AndroidRClassFinder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/AndroidRClassFinder.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/AndroidRClassFinder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/AndroidRClassFinder.java
index 4c5b8b8fd0..fc6b882438 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/AndroidRClassFinder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/AndroidRClassFinder.java
@@ -13,15 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rclass;
+package org.androidannotations.internal.rclass;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 
-import org.androidannotations.helper.Option;
+import org.androidannotations.internal.exception.RClassNotFoundException;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
+import org.androidannotations.rclass.IRClass;
 
 public class AndroidRClassFinder {
 
@@ -33,16 +34,15 @@ public AndroidRClassFinder(ProcessingEnvironment processingEnv) {
 		this.processingEnv = processingEnv;
 	}
 
-	public Option<IRClass> find() {
+	public IRClass find() throws RClassNotFoundException {
 		Elements elementUtils = processingEnv.getElementUtils();
 		TypeElement androidRType = elementUtils.getTypeElement("android.R");
 		if (androidRType == null) {
 			LOGGER.error("The android.R class cannot be found");
-			return Option.absent();
+			throw new RClassNotFoundException("The android.R class cannot be found");
 		}
 
 		LOGGER.info("Found Android class: {}", androidRType.toString());
-
-		return Option.<IRClass> of(new RClass(androidRType));
+		return new RClass(androidRType);
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundInnerClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/CompoundInnerClass.java
similarity index 69%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundInnerClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/CompoundInnerClass.java
index 96b3b9dd35..8c7deb7897 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundInnerClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/CompoundInnerClass.java
@@ -13,18 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rclass;
+package org.androidannotations.internal.rclass;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.rclass.IRInnerClass;
 
 import com.sun.codemodel.JFieldRef;
 
-public class CoumpoundInnerClass implements IRInnerClass {
+public class CompoundInnerClass implements IRInnerClass {
 
 	private final IRInnerClass rInnerClass;
 	private final IRInnerClass androidRInnerClass;
 
-	public CoumpoundInnerClass(IRInnerClass rInnerClass, IRInnerClass androidRInnerClass) {
+	public CompoundInnerClass(IRInnerClass rInnerClass, IRInnerClass androidRInnerClass) {
 		this.rInnerClass = rInnerClass;
 		this.androidRInnerClass = androidRInnerClass;
 	}
@@ -58,19 +59,19 @@ public String getIdQualifiedName(String name) {
 	}
 
 	@Override
-	public JFieldRef getIdStaticRef(Integer idValue, ProcessHolder holder) {
-		JFieldRef idStaticRef = rInnerClass.getIdStaticRef(idValue, holder);
+	public JFieldRef getIdStaticRef(Integer idValue, AndroidAnnotationsEnvironment environment) {
+		JFieldRef idStaticRef = rInnerClass.getIdStaticRef(idValue, environment);
 		if (idStaticRef == null) {
-			idStaticRef = androidRInnerClass.getIdStaticRef(idValue, holder);
+			idStaticRef = androidRInnerClass.getIdStaticRef(idValue, environment);
 		}
 		return idStaticRef;
 	}
 
 	@Override
-	public JFieldRef getIdStaticRef(String name, ProcessHolder holder) {
-		JFieldRef idStaticRef = rInnerClass.getIdStaticRef(name, holder);
+	public JFieldRef getIdStaticRef(String name, AndroidAnnotationsEnvironment environment) {
+		JFieldRef idStaticRef = rInnerClass.getIdStaticRef(name, environment);
 		if (idStaticRef == null) {
-			idStaticRef = androidRInnerClass.getIdStaticRef(name, holder);
+			idStaticRef = androidRInnerClass.getIdStaticRef(name, environment);
 		}
 		return idStaticRef;
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundRClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/CompoundRClass.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundRClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/CompoundRClass.java
index ae4775922e..eca966af6b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundRClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/CompoundRClass.java
@@ -13,21 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rclass;
+package org.androidannotations.internal.rclass;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class CoumpoundRClass implements IRClass {
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRInnerClass;
+
+public class CompoundRClass implements IRClass {
 
 	private final Map<String, IRInnerClass> rInnerClasses = new HashMap<>();
 
-	public CoumpoundRClass(IRClass rClass, IRClass androidRclass) {
+	public CompoundRClass(IRClass rClass, IRClass androidRclass) {
 		for (Res res : Res.values()) {
 			IRInnerClass rInnerClass = rClass.get(res);
 			IRInnerClass androidRInnerClass = androidRclass.get(res);
-			IRInnerClass coumpoundInnerClass = new CoumpoundInnerClass(rInnerClass, androidRInnerClass);
-			rInnerClasses.put(res.rName(), coumpoundInnerClass);
+			IRInnerClass compoundInnerClass = new CompoundInnerClass(rInnerClass, androidRInnerClass);
+			rInnerClasses.put(res.rName(), compoundInnerClass);
 		}
 	}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ProjectRClassFinder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/ProjectRClassFinder.java
similarity index 62%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ProjectRClassFinder.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/ProjectRClassFinder.java
index 6b83a7a527..08bd524bb8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ProjectRClassFinder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/ProjectRClassFinder.java
@@ -13,47 +13,47 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rclass;
+package org.androidannotations.internal.rclass;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
 import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.Option;
-import org.androidannotations.helper.OptionsHelper;
+import org.androidannotations.internal.exception.RClassNotFoundException;
 import org.androidannotations.logger.Logger;
 import org.androidannotations.logger.LoggerFactory;
+import org.androidannotations.rclass.IRClass;
 
 public class ProjectRClassFinder {
 
+	public static final Option OPTION_RESOURCE_PACKAGE_NAME = new Option("resourcePackageName", null);
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(ProjectRClassFinder.class);
 
-	private ProcessingEnvironment processingEnv;
-	private OptionsHelper optionsHelper;
+	private AndroidAnnotationsEnvironment environment;
 
-	public ProjectRClassFinder(ProcessingEnvironment processingEnv) {
-		this.processingEnv = processingEnv;
-		optionsHelper = new OptionsHelper(processingEnv);
+	public ProjectRClassFinder(AndroidAnnotationsEnvironment environment) {
+		this.environment = environment;
 	}
 
-	public Option<IRClass> find(AndroidManifest manifest) {
-		Elements elementUtils = processingEnv.getElementUtils();
+	public IRClass find(AndroidManifest manifest) throws RClassNotFoundException {
+		Elements elementUtils = environment.getProcessingEnvironment().getElementUtils();
 		String rClass = getRClassPackageName(manifest) + ".R";
 		TypeElement rType = elementUtils.getTypeElement(rClass);
 
 		if (rType == null) {
 			LOGGER.error("The generated {} class cannot be found", rClass);
-			return Option.absent();
+			throw new RClassNotFoundException("The generated " + rClass + " class cannot be found");
 		}
 
 		LOGGER.info("Found project R class: {}", rType.toString());
-
-		return Option.<IRClass> of(new RClass(rType));
+		return new RClass(rType);
 	}
 
 	public String getRClassPackageName(AndroidManifest manifest) {
-		String resourcePackageName = optionsHelper.getResourcePackageName();
+		String resourcePackageName = environment.getOptionValue(OPTION_RESOURCE_PACKAGE_NAME);
 		if (resourcePackageName != null) {
 			return resourcePackageName;
 		} else {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RClass.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RClass.java
index d178b1a9ee..15c663974f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rclass;
+package org.androidannotations.internal.rclass;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,6 +23,9 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRInnerClass;
+
 public class RClass implements IRClass {
 
 	private final Map<String, RInnerClass> rClass = new HashMap<>();
@@ -50,7 +53,7 @@ public IRInnerClass get(Res res) {
 		if (rInnerClass != null) {
 			return rInnerClass;
 		} else {
-			return IRInnerClass.EMPTY_R_INNER_CLASS;
+			return new RInnerClass(null);
 		}
 	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RInnerClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RInnerClass.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RInnerClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RInnerClass.java
index f6dca90e62..be7a19aa97 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RInnerClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RInnerClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rclass;
+package org.androidannotations.internal.rclass;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,8 +27,9 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.helper.CaseHelper;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.rclass.IRInnerClass;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JFieldRef;
@@ -105,24 +106,24 @@ public String getIdQualifiedName(String name) {
 	}
 
 	@Override
-	public JFieldRef getIdStaticRef(Integer idValue, ProcessHolder holder) {
+	public JFieldRef getIdStaticRef(Integer idValue, AndroidAnnotationsEnvironment environment) {
 		String layoutFieldQualifiedName = getIdQualifiedName(idValue);
-		return extractIdStaticRef(holder, layoutFieldQualifiedName);
+		return extractIdStaticRef(environment, layoutFieldQualifiedName);
 	}
 
 	@Override
-	public JFieldRef getIdStaticRef(String name, ProcessHolder holder) {
+	public JFieldRef getIdStaticRef(String name, AndroidAnnotationsEnvironment environment) {
 		String layoutFieldQualifiedName = getIdQualifiedName(name);
-		return extractIdStaticRef(holder, layoutFieldQualifiedName);
+		return extractIdStaticRef(environment, layoutFieldQualifiedName);
 	}
 
-	public static JFieldRef extractIdStaticRef(ProcessHolder holder, String layoutFieldQualifiedName) {
+	public static JFieldRef extractIdStaticRef(AndroidAnnotationsEnvironment environment, String layoutFieldQualifiedName) {
 		if (layoutFieldQualifiedName != null) {
 			int fieldSuffix = layoutFieldQualifiedName.lastIndexOf('.');
 			String fieldName = layoutFieldQualifiedName.substring(fieldSuffix + 1);
 			String rInnerClassName = layoutFieldQualifiedName.substring(0, fieldSuffix);
 
-			JClass refClass = holder.refClass(rInnerClassName);
+			JClass refClass = environment.getJClass(rInnerClassName);
 			return refClass.staticRef(fieldName);
 		} else {
 			return null;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/Level.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Level.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/Level.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Level.java
index ddf79bc540..c7ad64ace6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/Level.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Level.java
@@ -25,7 +25,7 @@ public enum Level {
 	public final int weight;
 	public final String name;
 
-	private Level(int weight, String name) {
+	Level(int weight, String name) {
 		this.weight = weight;
 		this.name = name;
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/Logger.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java
index eccd710a32..2d580c5cef 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/Logger.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java
@@ -68,6 +68,10 @@ public void warn(String message, Element element, Throwable thr, Object... args)
 		log(Level.WARN, message, element, null, thr, args);
 	}
 
+	public void warn(String message, Element element, AnnotationMirror annotationMirror) {
+		log(Level.WARN, message, element, annotationMirror, null);
+	}
+
 	public void error(String message, Object... args) {
 		error(message, null, null, args);
 	}
@@ -84,6 +88,10 @@ public void error(String message, Element element, Throwable thr, Object... args
 		log(Level.ERROR, message, element, null, thr, args);
 	}
 
+	public void error(String message, Element element, AnnotationMirror annotationMirror) {
+		log(Level.ERROR, message, element, annotationMirror, null);
+	}
+
 	public boolean isLoggable(Level level) {
 		return level.isGreaterOrEquals(loggerContext.getCurrentLevel());
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
similarity index 67%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
index 5e9e87c471..1dacfa4982 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
@@ -18,11 +18,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 
-import org.androidannotations.helper.OptionsHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
 import org.androidannotations.logger.appender.Appender;
 import org.androidannotations.logger.appender.ConsoleAppender;
 import org.androidannotations.logger.appender.FileAppender;
@@ -31,6 +31,10 @@
 
 public final class LoggerContext {
 
+	public static final Option OPTION_LOG_LEVEL = new Option("logLevel", "DEBUG");
+	public static final Option OPTION_LOG_APPENDER_CONSOLE = new Option("logAppenderConsole", "false");
+	public static final Option OPTION_LOG_APPENDER_FILE = new Option("logAppenderFile", "true");
+
 	private static LoggerContext instance = null;
 	private static final Level DEFAULT_LEVEL = Level.DEBUG;
 
@@ -68,16 +72,15 @@ public void setCurrentLevel(Level currentLevel) {
 		this.currentLevel = currentLevel;
 	}
 
-	public void setProcessingEnv(ProcessingEnvironment processingEnv) {
+	public void setEnvironment(AndroidAnnotationsEnvironment environment) {
 		appenders.clear();
-		OptionsHelper optionsHelper = new OptionsHelper(processingEnv);
-		resolveLogLevel(optionsHelper);
-		addConsoleAppender(optionsHelper);
-		addFileAppender(optionsHelper);
+		resolveLogLevel(environment);
+		addConsoleAppender(environment);
+		addFileAppender(environment);
 		appenders.add(new MessagerAppender());
 
 		for (Appender appender : appenders) {
-			appender.setProcessingEnv(processingEnv);
+			appender.setEnvironment(environment);
 			appender.open();
 		}
 	}
@@ -88,18 +91,25 @@ public void close() {
 		}
 	}
 
-	private void resolveLogLevel(OptionsHelper optionsHelper) {
-		setCurrentLevel(optionsHelper.getLogLevel());
+	private void resolveLogLevel(AndroidAnnotationsEnvironment environment) {
+		Level level = Level.DEBUG;
+		try {
+			level = Level.parse(environment.getOptionValue(OPTION_LOG_LEVEL));
+		} catch (Exception ignored) {
+			// Do nothing, keep the default value;
+		}
+		setCurrentLevel(level);
 	}
 
-	private void addConsoleAppender(OptionsHelper optionsHelper) {
-		if (optionsHelper.shouldUseConsoleAppender()) {
+
+	private void addConsoleAppender(AndroidAnnotationsEnvironment environment) {
+		if (environment.getOptionBooleanValue(OPTION_LOG_APPENDER_CONSOLE)) {
 			appenders.add(new ConsoleAppender());
 		}
 	}
 
-	private void addFileAppender(OptionsHelper optionsHelper) {
-		if (optionsHelper.shouldUseFileAppender()) {
+	private void addFileAppender(AndroidAnnotationsEnvironment environment) {
+		if (environment.getOptionBooleanValue(OPTION_LOG_APPENDER_FILE)) {
 			appenders.add(new FileAppender());
 		}
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerFactory.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerFactory.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerFactory.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerFactory.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java
index e2f8503b31..25e0d848ea 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java
@@ -19,7 +19,7 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 
-import org.androidannotations.helper.OptionsHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.logger.Level;
 import org.androidannotations.logger.formatter.Formatter;
 
@@ -27,7 +27,6 @@ public abstract class Appender {
 
 	protected final Formatter formatter;
 	protected ProcessingEnvironment processingEnv;
-	protected OptionsHelper optionsHelper;
 
 	public Appender(Formatter formatter) {
 		this.formatter = formatter;
@@ -37,9 +36,8 @@ public Formatter getFormatter() {
 		return formatter;
 	}
 
-	public void setProcessingEnv(ProcessingEnvironment processingEnv) {
-		this.processingEnv = processingEnv;
-		optionsHelper = new OptionsHelper(processingEnv);
+	public void setEnvironment(AndroidAnnotationsEnvironment environment) {
+		this.processingEnv = environment.getProcessingEnvironment();
 	}
 
 	public abstract void open();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/ConsoleAppender.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/ConsoleAppender.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/ConsoleAppender.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/ConsoleAppender.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
similarity index 76%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
index 393a1ac9bb..874897b9d3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
@@ -21,18 +21,21 @@
 import java.io.IOException;
 
 import javax.annotation.processing.Messager;
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.tools.Diagnostic.Kind;
 
-import org.androidannotations.helper.FileHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
+import org.androidannotations.internal.helper.FileHelper;
 import org.androidannotations.logger.Level;
 import org.androidannotations.logger.LoggerContext;
 import org.androidannotations.logger.formatter.FormatterFull;
 
 public class FileAppender extends Appender {
 
+	public static final Option OPTION_LOG_FILE = new Option("logFile", null);
+
 	private static final String DEFAULT_FILENAME = "androidannotations.log";
 
 	private File file;
@@ -79,17 +82,21 @@ public synchronized void append(Level level, Element element, AnnotationMirror a
 	}
 
 	@Override
-	public void setProcessingEnv(ProcessingEnvironment processingEnv) {
-		super.setProcessingEnv(processingEnv);
-		resolveLogFile();
+	public void setEnvironment(AndroidAnnotationsEnvironment environment) {
+		super.setEnvironment(environment);
+		resolveLogFile(environment);
 	}
 
-	private void resolveLogFile() {
-		String logFile = optionsHelper.getLogFile();
-		if (logFile != null) {
-			file = resolveLogFileInSpecifiedPath(logFile);
-		} else {
-			file = resolveLogFileInParentsDirectories();
+	private void resolveLogFile(AndroidAnnotationsEnvironment environment) {
+		String logFile = environment.getOptionValue(OPTION_LOG_FILE);
+		try {
+			if (logFile != null) {
+				file = resolveLogFileInSpecifiedPath(logFile);
+			} else {
+				file = resolveLogFileInParentsDirectories();
+			}
+		} catch (FileNotFoundException exception) {
+			file = null;
 		}
 
 		Level logLevel = LoggerContext.getInstance().getCurrentLevel();
@@ -103,13 +110,13 @@ private void resolveLogFile() {
 		}
 	}
 
-	private File resolveLogFileInSpecifiedPath(String logFile) {
+	private File resolveLogFileInSpecifiedPath(String logFile) throws FileNotFoundException {
 		File outputDirectory = FileHelper.resolveOutputDirectory(processingEnv);
 		logFile = logFile.replace("{outputFolder}", outputDirectory.getAbsolutePath());
 		return new File(logFile);
 	}
 
-	private File resolveLogFileInParentsDirectories() {
+	private File resolveLogFileInParentsDirectories() throws FileNotFoundException {
 		File outputDirectory = FileHelper.resolveOutputDirectory(processingEnv);
 		return new File(outputDirectory, DEFAULT_FILENAME);
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/MessagerAppender.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/MessagerAppender.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/MessagerAppender.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/appender/MessagerAppender.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/formatter/Formatter.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/formatter/Formatter.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/formatter/Formatter.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/formatter/Formatter.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterFull.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterFull.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterFull.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterFull.java
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterSimple.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterSimple.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterSimple.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/formatter/FormatterSimple.java
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/AndroidAnnotationsPlugin.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/AndroidAnnotationsPlugin.java
new file mode 100644
index 0000000000..7360aac263
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/AndroidAnnotationsPlugin.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.plugin;
+
+import java.io.FileNotFoundException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.internal.exception.VersionNotFoundException;
+import org.androidannotations.logger.Logger;
+import org.androidannotations.logger.LoggerFactory;
+
+public abstract class AndroidAnnotationsPlugin {
+
+	private final Logger logger = LoggerFactory.getLogger(getClass());
+
+	private String version;
+	private String apiVersion;
+
+	public abstract String getName();
+	public abstract List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv);
+
+	@Override
+	public String toString() {
+		return getName();
+	}
+
+	public List<Option> getSupportedOptions() {
+		return Collections.emptyList();
+	}
+
+	public boolean shouldCheckApiAndProcessorVersions() {
+		return true;
+	}
+
+	public final void loadVersion() throws FileNotFoundException, VersionNotFoundException {
+		version = getVersionFromPropertyFile(getName().toLowerCase());
+		apiVersion = getVersionFromPropertyFile(getName().toLowerCase() + "-api");
+	}
+
+	private String getVersionFromPropertyFile(String name) throws FileNotFoundException, VersionNotFoundException {
+		String filename = name + ".properties";
+		Properties properties;
+		try {
+			URL url = getClass().getClassLoader().getResource(filename);
+			properties = new Properties();
+			properties.load(url.openStream());
+		} catch (Exception e) {
+			logger.error("Property file {} couldn't be parsed", filename);
+			throw new FileNotFoundException("Property file " + filename + " couldn't be parsed.");
+		}
+
+		String version = properties.getProperty("version");
+
+		if (version == null) {
+			logger.error("{} plugin is missing 'version' property!", getName());
+			throw new VersionNotFoundException(this);
+		}
+
+		return version;
+	}
+
+	public String getApiVersion() {
+		return apiVersion;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/PluginClassHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/PluginClassHolder.java
new file mode 100644
index 0000000000..67fb492cd0
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/PluginClassHolder.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.plugin;
+
+import javax.lang.model.element.TypeElement;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.holder.GeneratedClassHolder;
+
+import com.sun.codemodel.JClass;
+import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JDefinedClass;
+
+public class PluginClassHolder<H extends GeneratedClassHolder> {
+
+	private H holder;
+
+	public PluginClassHolder(H holder) {
+		this.holder = holder;
+	}
+
+	public H holder() {
+		return holder;
+	}
+
+	public JDefinedClass getGeneratedClass() {
+		return holder.getGeneratedClass();
+	}
+
+	public TypeElement getAnnotatedElement() {
+		return holder.getAnnotatedElement();
+	}
+
+	public AndroidAnnotationsEnvironment environment() {
+		return holder().getEnvironment();
+	}
+
+	protected JClass getJClass(String fullyQualifiedClassName) {
+		return environment().getJClass(fullyQualifiedClassName);
+	}
+
+	protected JClass getJClass(Class<?> clazz) {
+		return environment().getJClass(clazz);
+	}
+
+	protected JCodeModel getCodeModel() {
+		return environment().getCodeModel();
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
index 1df88a2f10..5801bc30eb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
@@ -19,7 +19,7 @@
 
 public interface IRClass {
 
-	public enum Res {
+	enum Res {
 		LAYOUT, ID, STRING, ARRAY, COLOR, ANIM, BOOL, DIMEN, DRAWABLE, INTEGER, MOVIE, MENU, RAW, XML;
 		public String rName() {
 			return toString().toLowerCase(Locale.ENGLISH);
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
index 41d6d0deb7..d43f655ced 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
@@ -15,7 +15,7 @@
  */
 package org.androidannotations.rclass;
 
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
 
 import com.sun.codemodel.JFieldRef;
 
@@ -29,10 +29,8 @@ public interface IRInnerClass {
 
 	String getIdQualifiedName(String name);
 
-	JFieldRef getIdStaticRef(Integer idValue, ProcessHolder holder);
+	JFieldRef getIdStaticRef(Integer idValue, AndroidAnnotationsEnvironment environment);
 
-	JFieldRef getIdStaticRef(String name, ProcessHolder holder);
-
-	IRInnerClass EMPTY_R_INNER_CLASS = new RInnerClass(null);
+	JFieldRef getIdStaticRef(String name, AndroidAnnotationsEnvironment environment);
 
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 0000000000..c6abfcd775
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+org.androidannotations.internal.AndroidAnnotationProcessor
diff --git a/AndroidAnnotations/androidannotations/src/main/resources/androidannotations.properties b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/androidannotations.properties
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/main/resources/androidannotations.properties
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/androidannotations.properties
diff --git a/AndroidAnnotations/androidannotations/src/test/java/android/R.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/android/R.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/android/R.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/android/R.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/android/support/v4/preference/PreferenceFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/android/support/v4/preference/PreferenceFragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/android/support/v4/preference/PreferenceFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/android/support/v4/preference/PreferenceFragment.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/github/machinarius/preferencefragment/PreferenceFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/com/github/machinarius/preferencefragment/PreferenceFragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/com/github/machinarius/preferencefragment/PreferenceFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/com/github/machinarius/preferencefragment/PreferenceFragment.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java
index 90c24fcebd..bb848b9fb9 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java
@@ -15,8 +15,8 @@
  */
 package org.androidannotations.copyannotations;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/copyannotations/HasOtherAnnotations.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/copyannotations/HasOtherAnnotations.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/copyannotations/HasOtherAnnotations.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/copyannotations/HasOtherAnnotations.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
index 84c82351a7..79304aa2df 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
@@ -15,8 +15,8 @@
  */
 package org.androidannotations.ebean;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBean.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBean.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBean.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBean.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBeanExt.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBeanExt.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBeanExt.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBeanExt.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java
index 0c0cb59835..50cf578c9f 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java
@@ -15,8 +15,8 @@
  */
 package org.androidannotations.eviewgroup;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroup.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroup.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroup.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroup.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroupExt.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroupExt.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroupExt.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/eviewgroup/SomeGenericViewGroupExt.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityInManifest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityInManifest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityInManifest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityInManifest.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java
index 1f86472599..edaa2d20c9 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java
@@ -17,8 +17,8 @@
 
 import java.io.File;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithDrawable.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithDrawable.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithDrawable.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithDrawable.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithGetDrawableMethod.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithGetDrawableMethod.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithGetDrawableMethod.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithGetDrawableMethod.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ChangedGenerationSuffixTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ChangedGenerationSuffixTest.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ChangedGenerationSuffixTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ChangedGenerationSuffixTest.java
index ce0b2e591f..35d0013ebc 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ChangedGenerationSuffixTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ChangedGenerationSuffixTest.java
@@ -18,8 +18,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java
index d260eac0da..63b0b94616 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java
@@ -17,8 +17,8 @@
 
 import java.io.File;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/R.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/R.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/R.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/R.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/helper/CaseHelperTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/helper/CaseHelperTest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/helper/CaseHelperTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/helper/CaseHelperTest.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivity.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivity.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java
index 780cf7ed1e..c0c9609d17 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithAbstractInnerClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithAbstractInnerClass.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithAbstractInnerClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithAbstractInnerClass.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithNonAbstractInnerClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithNonAbstractInnerClass.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithNonAbstractInnerClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/AbstractActivityWithNonAbstractInnerClass.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/InnerClassTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/InnerClassTest.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/InnerClassTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/InnerClassTest.java
index 0956620dfe..44829d24d5 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/innerclasses/InnerClassTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/innerclasses/InnerClassTest.java
@@ -15,8 +15,8 @@
  */
 package org.androidannotations.innerclasses;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/logger/LoggerTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/logger/LoggerTest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/logger/LoggerTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/logger/LoggerTest.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/logger/formatter/FormatterTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/logger/formatter/FormatterTest.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/logger/formatter/FormatterTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/logger/formatter/FormatterTest.java
index ad70a92932..c67b742f34 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/logger/formatter/FormatterTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/logger/formatter/FormatterTest.java
@@ -28,7 +28,7 @@ public class FormatterTest {
 	class SomeObject {
 		String name;
 
-		public SomeObject(String name) {
+		SomeObject(String name) {
 			this.name = name;
 		}
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
index 013dfde614..dc9979fcde 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
index f4934f4151..f50c9fbb06 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
@@ -15,15 +15,15 @@
  */
 package org.androidannotations.manifest;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
-import org.junit.Before;
-import org.junit.Test;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
+import org.junit.Before;
+import org.junit.Test;
+
 public class AndroidManifestFinderTest extends AAProcessorTestHelper {
 
 	@Before
@@ -55,6 +55,7 @@ public void failsIfCannotFindSpecifiedManifest() {
 
 	@Test
 	public void findsManifestInGeneratedSourceParentFolder() throws Exception {
+		deleteManifestFromParentOfOutputDirectory();
 		copyManifestToParentOfOutputDirectory();
 		CompileResult result = compileFiles(SomeClass.class);
 		assertCompilationSuccessful(result);
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuActivity.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuActivity.java
index a2a90f2ede..2f611ba0a2 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuActivity.java
@@ -15,11 +15,12 @@
  */
 package org.androidannotations.menu;
 
-import android.app.Activity;
-import android.view.Menu;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.InjectMenu;
 
+import android.app.Activity;
+import android.view.Menu;
+
 @EActivity
 public class InjectMenuActivity extends Activity {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuTest.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuTest.java
index 79eb680b89..c140483918 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/InjectMenuTest.java
@@ -16,13 +16,13 @@
 package org.androidannotations.menu;
 
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import java.io.IOException;
+
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class InjectMenuTest extends AAProcessorTestHelper {
 
 	@Before
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemActivity.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemActivity.java
index 0475972f2c..5c54b2049b 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemActivity.java
@@ -15,11 +15,12 @@
  */
 package org.androidannotations.menu;
 
-import android.app.Activity;
-import android.view.MenuItem;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.OptionsMenuItem;
 
+import android.app.Activity;
+import android.view.MenuItem;
+
 @EActivity
 public class OptionsMenuItemActivity extends Activity {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemTest.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemTest.java
index fbd5fbd94e..ad929d4e7c 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/OptionsMenuItemTest.java
@@ -15,13 +15,13 @@
  */
 package org.androidannotations.menu;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import java.io.IOException;
+
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class OptionsMenuItemTest extends AAProcessorTestHelper {
 
 	@Before
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/R.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/R.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/menu/R.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/menu/R.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/MachinariusSettingsFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/MachinariusSettingsFragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/MachinariusSettingsFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/MachinariusSettingsFragment.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java
index f8af7c1b3e..f98e61d84f 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java
@@ -15,8 +15,8 @@
  */
 package org.androidannotations.preference;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/R.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/R.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/R.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/R.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/SettingsFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/SettingsFragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/SettingsFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/SettingsFragment.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/SupportSettingsFragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/SupportSettingsFragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/SupportSettingsFragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/preference/SupportSettingsFragment.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/RClassFinderTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/rclass/RClassFinderTest.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/RClassFinderTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/rclass/RClassFinderTest.java
index 79124a84c9..60852614dd 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/RClassFinderTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/rclass/RClassFinderTest.java
@@ -15,9 +15,9 @@
  */
 package org.androidannotations.rclass;
 
-import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
 import org.androidannotations.manifest.SomeClass;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithInvalidRegisterAt.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithInvalidRegisterAt.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithInvalidRegisterAt.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithInvalidRegisterAt.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithTwoSameNameMethod.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithTwoSameNameMethod.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithTwoSameNameMethod.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithTwoSameNameMethod.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithValidReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithValidReceiver.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithValidReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ActivityWithValidReceiver.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/FragmentWithValidReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/FragmentWithValidReceiver.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/FragmentWithValidReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/FragmentWithValidReceiver.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java
index 67f9a70210..bf93b43afb 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithInvalidReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithInvalidReceiver.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithInvalidReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithInvalidReceiver.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithValidReceiver.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithValidReceiver.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithValidReceiver.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/receiver/ServiceWithValidReceiver.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/testprocessor/R.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/testprocessor/R.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/testprocessor/R.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/testprocessor/R.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/GenericViewByIdActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/GenericViewByIdActivity.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/GenericViewByIdActivity.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/GenericViewByIdActivity.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/R.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/R.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/R.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/R.java
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/ViewByIdTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/ViewByIdTest.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/ViewByIdTest.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/ViewByIdTest.java
index 61f50879b2..75bb844662 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/viewbyid/ViewByIdTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/viewbyid/ViewByIdTest.java
@@ -15,8 +15,8 @@
  */
 package org.androidannotations.viewbyid;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/copyannotations/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/copyannotations/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/copyannotations/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/copyannotations/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/eviewgroup/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/eviewgroup/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/eviewgroup/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/eviewgroup/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/ActivityCompat.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/ActivityCompat.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/ActivityCompat.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/ActivityCompat.java
index ecb4c45cc9..e889f1901a 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/ActivityCompat.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/ActivityCompat.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
 public class ActivityCompat {
 
 	public static void startActivity(Activity activity, Intent intent, Bundle options) {
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawable.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawable.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawable.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawable.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk20.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk20.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk20.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk20.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk21.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk21.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk21.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawableMinSdk21.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinFroyo.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinFroyo.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinFroyo.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinFroyo.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinJB.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinJB.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinJB.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/AndroidManifestMinJB.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Build.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Build.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Build.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Build.java
index 5e19742837..870332b5a7 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Build.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Build.java
@@ -19,6 +19,7 @@
  * We have to put this on resources folder because we want to add it to
  * classpath only on some unit tests methods
  */
+@SuppressWarnings("checkstyle:typename")
 public class Build {
 	
 	public static class VERSION {
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Context.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Context.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Context.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Context.java
index 74a00567c1..5e6879ce58 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Context.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Context.java
@@ -15,7 +15,6 @@
  */
 package android.content;
 
-import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java
index 4e1450f34b..0a6f816b95 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
 public class ContextCompat {
 
 	public static Drawable getDrawable(Context context, int id) {
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Fragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Fragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/Fragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/Fragment.java
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/support/ActivityCompat.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/support/ActivityCompat.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/support/ActivityCompat.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/support/ActivityCompat.java
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/support/Fragment.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/support/Fragment.java
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/support/Fragment.java
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/support/Fragment.java
index 4622b18d63..135d03e15b 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/generation/support/Fragment.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/generation/support/Fragment.java
@@ -15,8 +15,8 @@
  */
 package android.support.v4.app;
 
-import android.content.Intent;
 import android.app.Activity;
+import android.content.Intent;
 
 /**
  * We have to put this on resources folder because we want to add it to
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoDebbugableManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoDebbugableManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoDebbugableManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoDebbugableManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoInternetPermissionManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoInternetPermissionManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoInternetPermissionManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/hierarchyviewer/NoInternetPermissionManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/innerclasses/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/innerclasses/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/innerclasses/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/innerclasses/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/ParseErrorManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/manifest/ParseErrorManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/ParseErrorManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/manifest/ParseErrorManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/menu/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/menu/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/menu/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/menu/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/preference/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/preference/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/preference/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/preference/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rclass/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/rclass/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rclass/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/rclass/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/receiver/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/receiver/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/receiver/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/receiver/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/viewbyid/AndroidManifest.xml b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/viewbyid/AndroidManifest.xml
similarity index 100%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/viewbyid/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/viewbyid/AndroidManifest.xml
diff --git a/AndroidAnnotations/androidannotations-core/pom.xml b/AndroidAnnotations/androidannotations-core/pom.xml
new file mode 100644
index 0000000000..626ae623db
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-parent</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-core</artifactId>
+	<description>The folder containing AndroidAnnotations project</description>
+	<name>AndroidAnnotations Core</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<main.basedir>${project.parent.basedir}</main.basedir>
+	</properties>
+
+	<modules>
+		<module>androidannotations</module>
+		<module>androidannotations-api</module>
+		<module>androidannotations-test</module>
+		<module>androidannotations-testutils</module>
+	</modules>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-api/pom.xml b/AndroidAnnotations/androidannotations-ormlite/ormlite-api/pom.xml
new file mode 100644
index 0000000000..e72614aede
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-api/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<artifactId>androidannotations-ormlite</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>ormlite-api</artifactId>
+	<description>The API jar containing the annotations</description>
+	<name>OrmLite plugin API</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-api/src/main/java/org/androidannotations/ormlite/annotations/OrmLiteDao.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-api/src/main/java/org/androidannotations/ormlite/annotations/OrmLiteDao.java
index 93ba854da3..3f7b91c337 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-api/src/main/java/org/androidannotations/ormlite/annotations/OrmLiteDao.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations;
+package org.androidannotations.ormlite.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/eclipse-dependencies/build.properties b/AndroidAnnotations/androidannotations-ormlite/ormlite-api/src/main/resources/ormlite-api.properties
similarity index 86%
rename from AndroidAnnotations/eclipse-dependencies/build.properties
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-api/src/main/resources/ormlite-api.properties
index adef13699b..6e97a9b22b 100644
--- a/AndroidAnnotations/eclipse-dependencies/build.properties
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-api/src/main/resources/ormlite-api.properties
@@ -14,6 +14,4 @@
 # the License.
 #
 
-bin.includes = META-INF/,\
-               codemodel-2.6.jar,\
-               android-2.3.1.jar
+version=${project.version}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/pom.xml b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/pom.xml
new file mode 100644
index 0000000000..9e8537cd96
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<artifactId>androidannotations-ormlite</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>ormlite-test</artifactId>
+	<packaging>apk</packaging>
+	<name>OrmLite plugin functional test suite</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+		<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>ormlite</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>ormlite-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.j256.ormlite</groupId>
+			<artifactId>ormlite-android</artifactId>
+			<version>4.48</version>
+		</dependency>
+		<dependency>
+			<groupId>org.robolectric</groupId>
+			<artifactId>robolectric</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup</groupId>
+			<artifactId>fest-android</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easytesting</groupId>
+			<artifactId>fest-reflect</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.simpligility.maven.plugins</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<showWarnings>true</showWarnings>
+					<compilerArgs>
+						<arg>-AlogLevel=WARNING</arg>
+						<arg>-AandroidManifestFile=${project.basedir}/src/main/AndroidManifest.xml</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/AndroidManifest.xml b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..b8d78892ec
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.androidannotations.ormlite.test"
+    android:versionCode="1"
+    android:versionName="2.1-SNAPSHOT" xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="16" tools:ignore="OldTargetApi"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".MyApplication_"
+        android:debuggable="true" >
+        <activity android:name=".MyActivity_" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".OrmLiteOnDestroyActivity_" />
+
+        <receiver android:name=".MyReceiver_" />
+
+        <provider
+            android:name=".MyProvider_"
+            android:authorities=""
+            android:exported="false" />
+
+        <service
+            android:name=".MyService_"
+            android:exported="false" />
+    </application>
+
+</manifest>
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/Car.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/Car.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/Car.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/Car.java
index 46d26f5f1b..aca9c6d143 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/Car.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/Car.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/DatabaseHelper.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/DatabaseHelper.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/DatabaseHelper.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/DatabaseHelper.java
index 397be50e8d..1b31909ab5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/DatabaseHelper.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/DatabaseHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import java.sql.SQLException;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteActivity.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyActivity.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteActivity.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyActivity.java
index 78f63997be..a00b4e6bb0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteActivity.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyActivity.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
 
 import android.app.Activity;
 
@@ -25,7 +25,8 @@
 import com.j256.ormlite.dao.RuntimeExceptionDao;
 
 @EActivity
-public class OrmLiteActivity extends Activity {
+public class MyActivity extends Activity {
+
 	@OrmLiteDao(helper = DatabaseHelper.class)
 	UserDao userDao;
 
@@ -39,5 +40,6 @@ public class OrmLiteActivity extends Activity {
 	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
 
 	@Bean
-	OrmLiteBean ormLiteBean;
+	MyBean ormLiteBean;
+
 }
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyApplication.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyApplication.java
new file mode 100644
index 0000000000..0889738ae9
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyApplication.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.test;
+
+import org.androidannotations.annotations.EApplication;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+import android.app.Application;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.RuntimeExceptionDao;
+
+@EApplication
+public class MyApplication extends Application {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	Dao<Car, Long> carDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyBean.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyBean.java
new file mode 100644
index 0000000000..49d09774ea
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyBean.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.test;
+
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.RuntimeExceptionDao;
+
+@EBean
+public class MyBean {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	Dao<Car, Long> carDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
+
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyFragment.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyFragment.java
new file mode 100644
index 0000000000..087d4676db
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyFragment.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.test;
+
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+import android.app.Fragment;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.RuntimeExceptionDao;
+
+@EFragment
+public class MyFragment extends Fragment {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	Dao<Car, Long> carDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
+
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyProvider.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyProvider.java
new file mode 100644
index 0000000000..7a1e3fd912
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyProvider.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.test;
+
+import org.androidannotations.annotations.EProvider;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.RuntimeExceptionDao;
+
+@EProvider
+public class MyProvider extends ContentProvider {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	Dao<Car, Long> carDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
+
+	@Override
+	public boolean onCreate() {
+		return false;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] strings, String s, String[] strings2, String s2) {
+		return null;
+	}
+
+	@Override
+	public String getType(Uri uri) {
+		return null;
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues contentValues) {
+		return null;
+	}
+
+	@Override
+	public int delete(Uri uri, String s, String[] strings) {
+		return 0;
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues contentValues, String s, String[] strings) {
+		return 0;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyReceiver.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyReceiver.java
new file mode 100644
index 0000000000..3373d193de
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyReceiver.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.test;
+
+import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.RuntimeExceptionDao;
+
+@EReceiver
+public class MyReceiver extends BroadcastReceiver {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	Dao<Car, Long> carDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyService.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyService.java
new file mode 100644
index 0000000000..914e6b38f8
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/MyService.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.test;
+
+import org.androidannotations.annotations.EService;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+import android.app.IntentService;
+import android.content.Intent;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.RuntimeExceptionDao;
+
+@EService
+public class MyService extends IntentService {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	Dao<Car, Long> carDao;
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	RuntimeExceptionDao<Car, Long> runtimeExceptionDao;
+
+	public MyService() {
+		super(MyService.class.getSimpleName());
+	}
+
+	@Override
+	protected void onHandleIntent(Intent intent) {
+
+	}
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyActivity.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/OrmLiteOnDestroyActivity.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyActivity.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/OrmLiteOnDestroyActivity.java
index f109d2325c..03cf0de879 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyActivity.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/OrmLiteOnDestroyActivity.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
 
 import android.app.Activity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/User.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/User.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/User.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/User.java
index 95730823aa..0242aaa116 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/User.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/User.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDao.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserDao.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDao.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserDao.java
index 3ca4f7ce7d..3e5c79d4c7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDao.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserDao.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import com.j256.ormlite.dao.Dao;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDaoImpl.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserDaoImpl.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDaoImpl.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserDaoImpl.java
index 0365279952..a706ffba50 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDaoImpl.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserDaoImpl.java
@@ -13,12 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
+
+import java.sql.SQLException;
 
 import com.j256.ormlite.dao.BaseDaoImpl;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.DatabaseTableConfig;
-import java.sql.SQLException;
 
 public class UserDaoImpl extends BaseDaoImpl<User, Long> implements UserDao {
 	
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserRuntimeExceptionDao.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserRuntimeExceptionDao.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserRuntimeExceptionDao.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserRuntimeExceptionDao.java
index b47e79c278..aadfa5a258 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserRuntimeExceptionDao.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/java/org/androidannotations/ormlite/test/UserRuntimeExceptionDao.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.RuntimeExceptionDao;
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/res/values/strings.xml b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..9a6260a142
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/main/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<resources>
+    <string name="app_name">ormlite-test</string>
+</resources>
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/java/org/androidannotations/ormlite/test/OrmLiteActivityTest.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/java/org/androidannotations/ormlite/test/OrmLiteActivityTest.java
index ef58d1cbca..30a8624bf2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/java/org/androidannotations/ormlite/test/OrmLiteActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
@@ -25,12 +25,12 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class OrmLiteActivityTest {
-
-	private OrmLiteActivity_ activity;
+	
+	private MyActivity activity;
 
 	@Before
-	public void setUp() {
-		activity = Robolectric.buildActivity(OrmLiteActivity_.class).create().get();
+	public void setup() {
+		activity = Robolectric.buildActivity(MyActivity_.class).create().get();
 	}
 
 	@Test
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyTest.java b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/java/org/androidannotations/ormlite/test/OrmLiteOnDestroyTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyTest.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/java/org/androidannotations/ormlite/test/OrmLiteOnDestroyTest.java
index 61cad4f3c5..2e6c3403f3 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyTest.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/java/org/androidannotations/ormlite/test/OrmLiteOnDestroyTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.ormlite.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.fest.reflect.core.Reflection.field;
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/resources/org.robolectric.Config.properties b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/resources/org.robolectric.Config.properties
new file mode 100644
index 0000000000..93f06bf97c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite-test/src/test/resources/org.robolectric.Config.properties
@@ -0,0 +1 @@
+manifest=src/main/AndroidManifest.xml
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-bundle/pom.xml b/AndroidAnnotations/androidannotations-ormlite/ormlite/pom.xml
similarity index 55%
rename from AndroidAnnotations/androidannotations-bundle/pom.xml
rename to AndroidAnnotations/androidannotations-ormlite/ormlite/pom.xml
index 13e7a3e1c9..eba00fffae 100644
--- a/AndroidAnnotations/androidannotations-bundle/pom.xml
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/pom.xml
@@ -20,64 +20,67 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>androidannotations-parent</artifactId>
 		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-ormlite</artifactId>
 		<version>4.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>androidannotations-bundle</artifactId>
-	<description>Project generating the standalone AndroidAnnotations Zip</description>
-	<name>AndroidAnnotations Bundle</name>
-	<packaging>pom</packaging>
+	<artifactId>ormlite</artifactId>
+	<name>OrmLite Annotation Processor</name>
+	<description>AndroidAnnotations plugin for OrmLite</description>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.androidannotations</groupId>
-			<artifactId>androidannotations-with-codemodel</artifactId>
+			<artifactId>androidannotations</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.androidannotations</groupId>
-			<artifactId>androidannotations-api</artifactId>
-			<classifier>javadoc</classifier>
+			<artifactId>ormlite-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.androidannotations</groupId>
-			<artifactId>androidannotations-api</artifactId>
-			<classifier>sources</classifier>
+			<groupId>com.sun.codemodel</groupId>
+			<artifactId>codemodel</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.androidannotations</groupId>
-			<artifactId>androidannotations</artifactId>
-			<classifier>javadoc</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.androidannotations</groupId>
-			<artifactId>androidannotations</artifactId>
-			<classifier>sources</classifier>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bundle.xml</descriptor>
-					</descriptors>	
-					<finalName>${project.build.finalName}</finalName>
-					<appendAssemblyId>false</appendAssemblyId>
+					<compilerArgument>-proc:none</compilerArgument>
 				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
+						<id>attach-sources</id>
 						<goals>
-							<goal>single</goal>
+							<goal>jar</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/OrmLitePlugin.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/OrmLitePlugin.java
new file mode 100644
index 0000000000..97fa4f8fd7
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/OrmLitePlugin.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.ormlite.handler.OrmLiteDaoHandler;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+
+public class OrmLitePlugin extends AndroidAnnotationsPlugin {
+
+	private static final String NAME = "OrmLite";
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
+		List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
+		annotationHandlers.add(new OrmLiteDaoHandler(androidAnnotationEnv));
+		return annotationHandlers;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OrmLiteDaoHandler.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java
similarity index 53%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OrmLiteDaoHandler.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java
index d0ffbb955d..2f10b93af6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/OrmLiteDaoHandler.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.ormlite.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.annotations.OrmLiteDao;
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.OrmLiteHelper;
-import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+import org.androidannotations.ormlite.helper.OrmLiteClasses;
+import org.androidannotations.ormlite.helper.OrmLiteHelper;
+import org.androidannotations.ormlite.helper.OrmLiteValidatorHelper;
+import org.androidannotations.ormlite.holder.OrmLiteHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
@@ -43,57 +43,58 @@
 public class OrmLiteDaoHandler extends BaseAnnotationHandler<EComponentHolder> {
 
 	private final OrmLiteHelper ormLiteHelper;
-	private final TargetAnnotationHelper helper;
+	private final OrmLiteValidatorHelper ormLiteValidatorHelper;
 
-	public OrmLiteDaoHandler(ProcessingEnvironment processingEnvironment) {
-		super(OrmLiteDao.class, processingEnvironment);
-		helper = new TargetAnnotationHelper(processingEnv, getTarget());
-		ormLiteHelper = new OrmLiteHelper(helper);
-		codeModelHelper = new APTCodeModelHelper();
+	public OrmLiteDaoHandler(AndroidAnnotationsEnvironment environment) {
+		super(OrmLiteDao.class, environment);
+		ormLiteHelper = new OrmLiteHelper(annotationHelper);
+		ormLiteValidatorHelper = new OrmLiteValidatorHelper(environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasOrmLiteJars(element, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		ormLiteValidatorHelper.hasOrmLiteJars(validation);
 
-		validatorHelper.extendsOrmLiteDao(element, valid, ormLiteHelper);
+		ormLiteValidatorHelper.extendsOrmLiteDao(element, validation, ormLiteHelper);
 
-		validatorHelper.hasASqlLiteOpenHelperParameterizedType(element, valid);
+		ormLiteValidatorHelper.hasASqliteOpenHelperParametrizedType(element, validation);
 	}
 
 	@Override
 	public void process(Element element, EComponentHolder holder) {
+		OrmLiteHolder ormLiteHolder = holder.getPluginHolder(new OrmLiteHolder(holder));
+
 		String fieldName = element.getSimpleName().toString();
 
-		JClass modelClass = refClass(ormLiteHelper.getEntityType(element));
-		JClass idClass = refClass(ormLiteHelper.getEntityIdType(element));
+		JClass modelClass = getJClass(ormLiteHelper.getEntityType(element).toString());
+		JClass idClass = getJClass(ormLiteHelper.getEntityIdType(element).toString());
 		JExpression modelClassDotClass = modelClass.dotclass();
 
-		JClass daoClass = refClass(CanonicalNameConstants.DAO).narrow(modelClass, idClass);
+		JClass daoClass = getJClass(OrmLiteClasses.DAO).narrow(modelClass, idClass);
 
-		TypeMirror databaseHelperTypeMirror = helper.extractAnnotationParameter(element, "helper");
-		JFieldVar databaseHelperRef = holder.getDatabaseHelperRef(databaseHelperTypeMirror);
+		TypeMirror databaseHelperTypeMirror = annotationHelper.extractAnnotationParameter(element, "helper");
+		JFieldVar databaseHelperRef = ormLiteHolder.getDatabaseHelperRef(databaseHelperTypeMirror);
 
 		JBlock initBody = holder.getInitBody();
 
 		JExpression injectExpr = databaseHelperRef.invoke("getDao").arg(modelClassDotClass);
 		if (elementExtendsRuntimeExceptionDao(element)) {
-			JClass daoImplClass = codeModelHelper.typeMirrorToJClass(element.asType(), holder);
+			JClass daoImplClass = codeModelHelper.typeMirrorToJClass(element.asType());
 			injectExpr = _new(daoImplClass).arg(cast(daoClass, injectExpr));
 		}
 
 		JTryBlock tryBlock = initBody._try();
 		tryBlock.body().assign(ref(fieldName), injectExpr);
 
-		JCatchBlock catchBlock = tryBlock._catch(classes().SQL_EXCEPTION);
+		JCatchBlock catchBlock = tryBlock._catch(getClasses().SQL_EXCEPTION);
 		JVar exception = catchBlock.param("e");
 
 		catchBlock.body() //
-				.staticInvoke(classes().LOG, "e") //
+				.staticInvoke(getClasses().LOG, "e") //
 				.arg(holder.getGeneratedClass().name()) //
 				.arg("Could not create DAO " + fieldName) //
 				.arg(exception);
@@ -101,6 +102,6 @@ public void process(Element element, EComponentHolder holder) {
 
 	private boolean elementExtendsRuntimeExceptionDao(Element element) {
 		TypeMirror elementType = element.asType();
-		return helper.isSubtype(elementType, ormLiteHelper.getRuntimeExceptionDaoParametrizedType());
+		return annotationHelper.isSubtype(elementType, ormLiteHelper.getRuntimeExceptionDaoParametrizedType());
 	}
 }
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteClasses.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteClasses.java
new file mode 100644
index 0000000000..217c70ff80
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteClasses.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.helper;
+
+public final class OrmLiteClasses {
+
+	public static final String DAO = "com.j256.ormlite.dao.Dao";
+	public static final String OPEN_HELPER_MANAGER = "com.j256.ormlite.android.apptools.OpenHelperManager";
+	public static final String RUNTIME_EXCEPTION_DAO = "com.j256.ormlite.dao.RuntimeExceptionDao";
+
+	private OrmLiteClasses() {
+
+	}
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OrmLiteHelper.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteHelper.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OrmLiteHelper.java
rename to AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteHelper.java
index 5158454577..8e9cb4bf7e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OrmLiteHelper.java
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteHelper.java
@@ -13,9 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
-
-import static com.sun.codemodel.JExpr._null;
+package org.androidannotations.ormlite.helper;
 
 import java.util.List;
 
@@ -26,11 +24,7 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
 
-import org.androidannotations.holder.HasLifecycleMethods;
-import org.androidannotations.process.ProcessHolder;
-
-import com.sun.codemodel.JBlock;
-import com.sun.codemodel.JFieldVar;
+import org.androidannotations.helper.TargetAnnotationHelper;
 
 public class OrmLiteHelper {
 
@@ -111,19 +105,12 @@ public DeclaredType getTypedRuntimeExceptionDao(Element element) {
 	}
 
 	private void createDaoParametrizedTypes() {
-		daoTypeElement = helper.typeElementFromQualifiedName(CanonicalNameConstants.DAO);
-		runtimeExceptionDaoTypeElement = helper.typeElementFromQualifiedName(CanonicalNameConstants.RUNTIME_EXCEPTION_DAO);
+		daoTypeElement = helper.typeElementFromQualifiedName(OrmLiteClasses.DAO);
+		runtimeExceptionDaoTypeElement = helper.typeElementFromQualifiedName(OrmLiteClasses.RUNTIME_EXCEPTION_DAO);
 
 		Types typeUtils = helper.getTypeUtils();
 		TypeMirror wildcardType = typeUtils.getWildcardType(null, null);
 		daoParametrizedType = helper.getTypeUtils().getDeclaredType(daoTypeElement, wildcardType, wildcardType);
 		runtimeExceptionDaoParametrizedType = helper.getTypeUtils().getDeclaredType(runtimeExceptionDaoTypeElement, wildcardType, wildcardType);
 	}
-
-	public static void injectReleaseInDestroy(JFieldVar databaseHelperRef, HasLifecycleMethods holder, ProcessHolder.Classes classes) {
-		JBlock destroyBody = holder.getOnDestroyBeforeSuperBlock();
-
-		destroyBody.staticInvoke(classes.OPEN_HELPER_MANAGER, "releaseHelper");
-		destroyBody.assign(databaseHelperRef, _null());
-	}
 }
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteValidatorHelper.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteValidatorHelper.java
new file mode 100644
index 0000000000..a29680ed64
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteValidatorHelper.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.helper;
+
+import java.util.List;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.ormlite.annotations.OrmLiteDao;
+
+public class OrmLiteValidatorHelper {
+
+	public AnnotationHelper annotationHelper;
+
+	public OrmLiteValidatorHelper(AndroidAnnotationsEnvironment environment) {
+		annotationHelper = new AnnotationHelper(environment);
+	}
+
+	public void hasOrmLiteJars(ElementValidation valid) {
+		Elements elementUtils = annotationHelper.getElementUtils();
+		if (elementUtils.getTypeElement(OrmLiteClasses.DAO) == null) {
+			valid.addError("Could not find the OrmLite framework in the classpath, the following class is missing: " + OrmLiteClasses.DAO);
+		}
+	}
+
+	public void extendsOrmLiteDao(Element element, ElementValidation valid, OrmLiteHelper ormLiteHelper) {
+		if (!valid.isValid()) {
+			// we now that the element is invalid. early exit as the reason
+			// could be missing ormlite classes
+			return;
+		}
+
+		TypeMirror elementTypeMirror = element.asType();
+		Types typeUtils = annotationHelper.getTypeUtils();
+
+		DeclaredType daoParametrizedType = ormLiteHelper.getDaoParametrizedType();
+		DeclaredType runtimeExceptionDaoParametrizedType = ormLiteHelper.getRuntimeExceptionDaoParametrizedType();
+
+		// Checks that elementType extends Dao<?, ?> or
+		// RuntimeExceptionDao<?, ?>
+		if (!annotationHelper.isSubtype(elementTypeMirror, daoParametrizedType) && !annotationHelper.isSubtype(elementTypeMirror, runtimeExceptionDaoParametrizedType)) {
+			valid.addError("%s can only be used on an element that extends " + daoParametrizedType.toString() //
+					+ " or " + runtimeExceptionDaoParametrizedType.toString());
+			return;
+		}
+
+		if (annotationHelper.isSubtype(elementTypeMirror, runtimeExceptionDaoParametrizedType) //
+				&& !typeUtils.isAssignable(ormLiteHelper.getTypedRuntimeExceptionDao(element), elementTypeMirror)) {
+
+			boolean hasConstructor = false;
+			Element elementType = typeUtils.asElement(elementTypeMirror);
+			DeclaredType daoWithTypedParameters = ormLiteHelper.getTypedDao(element);
+			for (ExecutableElement constructor : ElementFilter.constructorsIn(elementType.getEnclosedElements())) {
+				List<? extends VariableElement> parameters = constructor.getParameters();
+				if (parameters.size() == 1) {
+					TypeMirror type = parameters.get(0).asType();
+					if (annotationHelper.isSubtype(type, daoWithTypedParameters)) {
+						hasConstructor = true;
+					}
+				}
+			}
+			if (!hasConstructor) {
+				valid.addError(elementTypeMirror.toString() + " requires a constructor that takes only a " + daoWithTypedParameters.toString());
+			}
+		}
+	}
+
+	public void hasASqliteOpenHelperParametrizedType(Element element, ElementValidation valid) {
+		TypeMirror helperType = annotationHelper.extractAnnotationParameter(element, OrmLiteDao.class.getName(), "helper");
+
+		TypeMirror openHelperType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.SQLITE_OPEN_HELPER).asType();
+		if (!annotationHelper.isSubtype(helperType, openHelperType)) {
+			valid.addError("%s helper() parameter must extend " + CanonicalNameConstants.SQLITE_OPEN_HELPER);
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/holder/OrmLiteHolder.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/holder/OrmLiteHolder.java
new file mode 100644
index 0000000000..f8acd39ff4
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/holder/OrmLiteHolder.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.ormlite.holder;
+
+import static com.sun.codemodel.JExpr._null;
+import static com.sun.codemodel.JMod.PRIVATE;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.lang.model.type.TypeMirror;
+
+import org.androidannotations.helper.CaseHelper;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.holder.EComponentHolder;
+import org.androidannotations.holder.HasLifecycleMethods;
+import org.androidannotations.ormlite.helper.OrmLiteClasses;
+import org.androidannotations.plugin.PluginClassHolder;
+
+import com.sun.codemodel.JBlock;
+import com.sun.codemodel.JClass;
+import com.sun.codemodel.JExpression;
+import com.sun.codemodel.JFieldVar;
+
+public class OrmLiteHolder extends PluginClassHolder<EComponentHolder> {
+
+	private Map<TypeMirror, JFieldVar> databaseHelperRefs = new HashMap<>();
+
+	public OrmLiteHolder(EComponentHolder holder) {
+		super(holder);
+	}
+
+	public JFieldVar getDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
+		JFieldVar databaseHelperRef = databaseHelperRefs.get(databaseHelperTypeMirror);
+		if (databaseHelperRef == null) {
+			databaseHelperRef = setDatabaseHelperRef(databaseHelperTypeMirror);
+			injectReleaseInOnDestroy(databaseHelperRef);
+		}
+		return databaseHelperRef;
+	}
+
+	private JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
+		JClass databaseHelperClass = getJClass(databaseHelperTypeMirror.toString());
+		String fieldName = CaseHelper.lowerCaseFirst(databaseHelperClass.name()) + ModelConstants.generationSuffix();
+		JFieldVar databaseHelperRef = getGeneratedClass().field(PRIVATE, databaseHelperClass, fieldName);
+		databaseHelperRefs.put(databaseHelperTypeMirror, databaseHelperRef);
+
+		JExpression dbHelperClass = databaseHelperClass.dotclass();
+		holder().getInitBody().assign(databaseHelperRef, //
+				getJClass(OrmLiteClasses.OPEN_HELPER_MANAGER).staticInvoke("getHelper").arg(holder().getContextRef()).arg(dbHelperClass));
+
+		return databaseHelperRef;
+	}
+
+	private void injectReleaseInOnDestroy(JFieldVar databaseHelperRef) {
+		if (holder() instanceof HasLifecycleMethods) {
+			JBlock destroyBody = ((HasLifecycleMethods) holder()).getOnDestroyBeforeSuperBlock();
+
+			destroyBody.staticInvoke(getJClass(OrmLiteClasses.OPEN_HELPER_MANAGER), "releaseHelper");
+			destroyBody.assign(databaseHelperRef, _null());
+		}
+	}
+
+}
diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
new file mode 100644
index 0000000000..54eee3eac2
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
@@ -0,0 +1 @@
+org.androidannotations.ormlite.OrmLitePlugin
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-api/build.properties b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/resources/ormlite.properties
similarity index 79%
rename from AndroidAnnotations/androidannotations-api/build.properties
rename to AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/resources/ormlite.properties
index c0bd8cc6ac..6e97a9b22b 100644
--- a/AndroidAnnotations/androidannotations-api/build.properties
+++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/resources/ormlite.properties
@@ -14,9 +14,4 @@
 # the License.
 #
 
-source.. = src/main/java/,\
-           src/main/resources/,\
-           src/test/java/,\
-           src/main/eclipse/
-bin.includes = META-INF/,\
-               .
+version=${project.version}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-ormlite/pom.xml b/AndroidAnnotations/androidannotations-ormlite/pom.xml
new file mode 100644
index 0000000000..4ca0db0419
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-ormlite/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-parent</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-ormlite</artifactId>
+	<description>The folder containing OrmLite plugin for AndroidAnnotations</description>
+	<name>OrmLite plugin parent</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<main.basedir>${project.parent.basedir}</main.basedir>
+	</properties>
+
+	<modules>
+		<module>ormlite</module>
+		<module>ormlite-api</module>
+		<module>ormlite-test</module>
+	</modules>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>ormlite-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>ormlite</artifactId>
+				<version>${project.version}</version>
+				<scope>compile</scope>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-otto/otto-test/pom.xml b/AndroidAnnotations/androidannotations-otto/otto-test/pom.xml
new file mode 100644
index 0000000000..0e19d0f8b5
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<artifactId>androidannotations-otto</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>otto-test</artifactId>
+	<packaging>apk</packaging>
+	<name>Otto plugin functional test suite</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+		<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>otto</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup</groupId>
+			<artifactId>otto</artifactId>
+			<version>1.3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.robolectric</groupId>
+			<artifactId>robolectric</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup</groupId>
+			<artifactId>fest-android</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.simpligility.maven.plugins</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<showWarnings>true</showWarnings>
+					<compilerArgs>
+						<arg>-AlogLevel=WARNING</arg>
+						<arg>-AandroidManifestFile=${project.basedir}/src/main/AndroidManifest.xml</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-otto/otto-test/src/main/AndroidManifest.xml b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9fe14d18d0
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.androidannotations.otto.test"
+    android:versionCode="1"
+    android:versionName="2.1-SNAPSHOT" xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="16" tools:ignore="OldTargetApi"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application>
+
+        <activity android:name=".OttoActivity_" />
+
+    </application>
+
+</manifest>
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/otto/Event.java b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/java/org/androidannotations/otto/test/Event.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/otto/Event.java
rename to AndroidAnnotations/androidannotations-otto/otto-test/src/main/java/org/androidannotations/otto/test/Event.java
index cfb2a43fda..83828dc3d0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/otto/Event.java
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/java/org/androidannotations/otto/test/Event.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.otto;
+package org.androidannotations.otto.test;
 
 public class Event {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/otto/OttoActivity.java b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/java/org/androidannotations/otto/test/OttoActivity.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/otto/OttoActivity.java
rename to AndroidAnnotations/androidannotations-otto/otto-test/src/main/java/org/androidannotations/otto/test/OttoActivity.java
index 908acf4ec3..9ac418ddc0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/otto/OttoActivity.java
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/java/org/androidannotations/otto/test/OttoActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.otto;
+package org.androidannotations.otto.test;
 
 import org.androidannotations.annotations.EActivity;
 
diff --git a/AndroidAnnotations/androidannotations-otto/otto-test/src/main/res/values/strings.xml b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..41b41d7683
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/src/main/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<resources>
+    <string name="app_name">otto-test</string>
+</resources>
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/otto/OttoActivityTest.java b/AndroidAnnotations/androidannotations-otto/otto-test/src/test/java/org/androidannotations/otto/test/OttoActivityTest.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/otto/OttoActivityTest.java
rename to AndroidAnnotations/androidannotations-otto/otto-test/src/test/java/org/androidannotations/otto/test/OttoActivityTest.java
index d38324c01f..2791b56ad4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/otto/OttoActivityTest.java
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/src/test/java/org/androidannotations/otto/test/OttoActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.otto;
+package org.androidannotations.otto.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
@@ -28,8 +28,8 @@ public class OttoActivityTest {
 	@Test
 	public void testOttoMethodsCalled() {
 		OttoActivity activity = Robolectric.setupActivity(OttoActivity_.class);
-		
+
 		assertThat(activity.lastEvent).isNotNull();
 	}
-	
+
 }
diff --git a/AndroidAnnotations/androidannotations-otto/otto-test/src/test/resources/org.robolectric.Config.properties b/AndroidAnnotations/androidannotations-otto/otto-test/src/test/resources/org.robolectric.Config.properties
new file mode 100644
index 0000000000..93f06bf97c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto-test/src/test/resources/org.robolectric.Config.properties
@@ -0,0 +1 @@
+manifest=src/main/AndroidManifest.xml
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-with-codemodel/pom.xml b/AndroidAnnotations/androidannotations-otto/otto/pom.xml
similarity index 59%
rename from AndroidAnnotations/androidannotations-with-codemodel/pom.xml
rename to AndroidAnnotations/androidannotations-otto/otto/pom.xml
index 110922d6f4..5e4fa7383a 100644
--- a/AndroidAnnotations/androidannotations-with-codemodel/pom.xml
+++ b/AndroidAnnotations/androidannotations-otto/otto/pom.xml
@@ -20,54 +20,66 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>androidannotations-parent</artifactId>
 		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-otto</artifactId>
 		<version>4.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>androidannotations-with-codemodel</artifactId>
-	<description>Project generating the annotation processing jar with CodeModel dependency included</description>
-	<name>AndroidAnnotations With CodeModel</name>
-	<packaging>pom</packaging>
+	<artifactId>otto</artifactId>
+	<name>Otto Annotation Processor</name>
+	<description>AndroidAnnotations plugin for Otto</description>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.codemodel</groupId>
+			<artifactId>codemodel</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/jar-with-codemodel.xml</descriptor>
-					</descriptors>	
-					<finalName>${project.build.finalName}</finalName>
-					<appendAssemblyId>false</appendAssemblyId>
+					<compilerArgument>-proc:none</compilerArgument>
 				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
+						<id>attach-javadocs</id>
 						<goals>
-							<goal>single</goal>
+							<goal>jar</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/OttoPlugin.java b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/OttoPlugin.java
new file mode 100644
index 0000000000..1c32f61c2b
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/OttoPlugin.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.otto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.otto.handler.ProduceHandler;
+import org.androidannotations.otto.handler.SubscribeHandler;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+
+public class OttoPlugin extends AndroidAnnotationsPlugin {
+
+	private static final String NAME = "Otto";
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	public boolean shouldCheckApiAndProcessorVersions() {
+		return false;
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
+		List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
+		annotationHandlers.add(new SubscribeHandler(androidAnnotationEnv));
+		annotationHandlers.add(new ProduceHandler(androidAnnotationEnv));
+		return annotationHandlers;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ProduceHandler.java b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/AbstractOttoHandler.java
similarity index 50%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ProduceHandler.java
rename to AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/AbstractOttoHandler.java
index cacb158c87..eabc706369 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ProduceHandler.java
+++ b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/AbstractOttoHandler.java
@@ -13,29 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.otto.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
+import org.androidannotations.helper.ValidatorParameterHelper;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
 
-public class ProduceHandler extends BaseAnnotationHandler<EComponentHolder> {
+import com.sun.codemodel.JMethod;
 
-	private final TargetAnnotationHelper annotationHelper;
+public abstract class AbstractOttoHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	public ProduceHandler(ProcessingEnvironment processingEnvironment) {
-		super(CanonicalNameConstants.PRODUCE, processingEnvironment);
-		annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
+	public AbstractOttoHandler(String target, AndroidAnnotationsEnvironment environment) {
+		super(target, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+	public void validate(Element element, ElementValidation valid) {
 		if (!annotationHelper.enclosingElementHasEnhancedComponentAnnotation(element)) {
 			valid.invalidate();
 			return;
@@ -46,9 +45,9 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
 		/*
 		 * We check that twice to skip invalid annotated elements
 		 */
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(executableElement, validatedElements, valid);
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(executableElement, valid);
 
-		validatorHelper.returnTypeIsNotVoid(executableElement, valid);
+		validateReturnType(executableElement, valid);
 
 		validatorHelper.isPublic(element, valid);
 
@@ -56,13 +55,29 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
 
 		validatorHelper.isNotFinal(element, valid);
 
-		validatorHelper.param.noParam().validate(executableElement, valid);
+		getParamValidator().validate(executableElement, valid);
 	}
 
+	protected abstract ValidatorParameterHelper.Validator getParamValidator();
+
+	protected abstract void validateReturnType(ExecutableElement executableElement, ElementValidation validation);
+
 	@Override
 	public void process(Element element, EComponentHolder holder) throws Exception {
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
+		JMethod method = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
+
+		addOttoAnnotation(executableElement, method);
 	}
+
+	private void addOttoAnnotation(ExecutableElement element, JMethod method) {
+		for (AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
+			if (annotationMirror.getAnnotationType().toString().equals(getTarget())) {
+				codeModelHelper.copyAnnotation(method, annotationMirror);
+				break;
+			}
+		}
+	}
+
 }
diff --git a/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/ProduceHandler.java b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/ProduceHandler.java
new file mode 100644
index 0000000000..57b78617ec
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/ProduceHandler.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.otto.handler;
+
+import javax.lang.model.element.ExecutableElement;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.helper.ValidatorParameterHelper;
+import org.androidannotations.otto.helper.OttoClasses;
+
+public class ProduceHandler extends AbstractOttoHandler {
+
+	public ProduceHandler(AndroidAnnotationsEnvironment environment) {
+		super(OttoClasses.PRODUCE, environment);
+	}
+
+	@Override
+	protected ValidatorParameterHelper.Validator getParamValidator() {
+		return validatorHelper.param.noParam();
+	}
+
+	@Override
+	protected void validateReturnType(ExecutableElement executableElement, ElementValidation validation) {
+		validatorHelper.returnTypeIsNotVoid(executableElement, validation);
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/SubscribeHandler.java b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/SubscribeHandler.java
new file mode 100644
index 0000000000..23d4491925
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/handler/SubscribeHandler.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.otto.handler;
+
+import javax.lang.model.element.ExecutableElement;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.helper.ValidatorParameterHelper;
+import org.androidannotations.otto.helper.OttoClasses;
+
+public class SubscribeHandler extends AbstractOttoHandler {
+
+	public SubscribeHandler(AndroidAnnotationsEnvironment environment) {
+		super(OttoClasses.SUBSCRIBE, environment);
+	}
+
+	@Override
+	protected ValidatorParameterHelper.Validator getParamValidator() {
+		return validatorHelper.param.anyType();
+	}
+
+	@Override
+	protected void validateReturnType(ExecutableElement executableElement, ElementValidation validation) {
+		validatorHelper.returnTypeIsVoid(executableElement, validation);
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithOnBackPressedMethod.java b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/helper/OttoClasses.java
similarity index 72%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithOnBackPressedMethod.java
rename to AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/helper/OttoClasses.java
index 3e7cb86ab3..1b9a0011f5 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithOnBackPressedMethod.java
+++ b/AndroidAnnotations/androidannotations-otto/otto/src/main/java/org/androidannotations/otto/helper/OttoClasses.java
@@ -13,16 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.generation;
+package org.androidannotations.otto.helper;
 
-import org.androidannotations.annotations.EActivity;
+public final class OttoClasses {
 
-import android.app.Activity;
+	public static final String SUBSCRIBE = "com.squareup.otto.Subscribe";
+	public static final String PRODUCE = "com.squareup.otto.Produce";
 
-@EActivity
-public class ActivityWithOnBackPressedMethod extends Activity {
+	private OttoClasses() {
 
-	public void onBackPressed() {
 	}
-
 }
diff --git a/AndroidAnnotations/androidannotations-otto/otto/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin b/AndroidAnnotations/androidannotations-otto/otto/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
new file mode 100644
index 0000000000..70d25fb967
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/otto/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
@@ -0,0 +1 @@
+org.androidannotations.otto.OttoPlugin
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-otto/pom.xml b/AndroidAnnotations/androidannotations-otto/pom.xml
new file mode 100644
index 0000000000..7fc2aae1a7
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-otto/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-parent</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-otto</artifactId>
+	<description>The folder containing Otto plugin for AndroidAnnotations</description>
+	<name>Otto plugin parent</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<main.basedir>${project.parent.basedir}</main.basedir>
+	</properties>
+
+	<modules>
+		<module>otto</module>
+		<module>otto-test</module>
+	</modules>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>otto</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-rest-spring/pom.xml b/AndroidAnnotations/androidannotations-rest-spring/pom.xml
new file mode 100644
index 0000000000..87d46dcc95
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-parent</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-rest-spring</artifactId>
+	<description>The folder containing REST plugin for AndroidAnnotations with Spring REST template</description>
+	<name>REST plugin with Spring REST template parent</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<main.basedir>${project.parent.basedir}</main.basedir>
+		<spring-android-version>1.0.1.RELEASE</spring-android-version>
+	</properties>
+
+	<modules>
+		<module>rest-spring</module>
+		<module>rest-spring-api</module>
+		<module>rest-spring-test</module>
+	</modules>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>rest-spring</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>rest-spring-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.android</groupId>
+				<artifactId>spring-android-rest-template</artifactId>
+				<version>${spring-android-version}</version>
+			</dependency>
+		</dependencies>
+
+	</dependencyManagement>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/pom.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/pom.xml
new file mode 100644
index 0000000000..82d0e68f1e
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<artifactId>androidannotations-rest-spring</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>rest-spring-api</artifactId>
+	<description>The API jar containing the annotations</description>
+	<name>REST with Spring REST template plugin API</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.android</groupId>
+			<artifactId>spring-android-rest-template</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Accept.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Accept.java
similarity index 90%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Accept.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Accept.java
index 298abdcd27..98c273accc 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Accept.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Accept.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,7 +28,7 @@
  * <p>
  * The annotation {@link #value()} is mandatory and define the <a
  * href="https://en.wikipedia.org/wiki/Internet_media_type">media type</a> to
- * accept. We provide a {@link org.androidannotations.api.rest.MediaType
+ * accept. We provide a {@link org.androidannotations.rest.spring.api.MediaType
  * MediaType} class to help you.
  * </p>
  * <blockquote>
@@ -65,9 +65,9 @@
 
 	/**
 	 * The accepted media type.
-	 * 
-	 * @see org.androidannotations.api.rest.MediaType
-	 * 
+	 *
+	 * @see org.androidannotations.rest.spring.api.MediaType
+	 *
 	 * @return the media type
 	 */
 	String value();
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Delete.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Delete.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Delete.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Delete.java
index 12d545778e..27acca9112 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Delete.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Delete.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Get.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Get.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Get.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Get.java
index 81703e0e7c..25c14e33c6 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Get.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Get.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Head.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Head.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Head.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Head.java
index 61366d3eff..258722c03d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Head.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Head.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Options.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Options.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Options.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Options.java
index a361fb58cc..8e3afa830b 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Options.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Options.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Post.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Post.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Post.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Post.java
index 78dffeb8af..c55f22f1e6 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Post.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Post.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Put.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Put.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Put.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Put.java
index fc96c438ba..f0dbc8154c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Put.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Put.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresAuthentication.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresAuthentication.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresAuthentication.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresAuthentication.java
index 53f304c244..1377aa458e 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresAuthentication.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresAuthentication.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,7 +28,7 @@
  * <p>
  * To set the current authentication object to use, you MUST either let your
  * RestClient interface extends of
- * {@link org.androidannotations.api.rest.RestClientHeaders RestClientHeaders}
+ * {@link org.androidannotations.rest.spring.api.RestClientHeaders RestClientHeaders}
  * or add the following method to your interface :
  * <code>void setAuthentication(org.springframework.http.HttpAuthentication auth)</code>
  * .
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookie.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresCookie.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookie.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresCookie.java
index 8eae51c1cd..8e9ffcad51 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookie.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresCookie.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@
  * </p>
  * <p>
  * To set a cookie's value you MUST either let your RestClient interface extends
- * of {@link org.androidannotations.api.rest.RestClientHeaders
+ * of {@link org.androidannotations.rest.spring.api.RestClientHeaders
  * RestClientHeaders} or add the following method to your interface :
  * <code>void setCookie(String name, String value)</code>.
  * </p>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookieInUrl.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresCookieInUrl.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookieInUrl.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresCookieInUrl.java
index ee542baa97..3607da078e 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookieInUrl.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresCookieInUrl.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresHeader.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresHeader.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresHeader.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresHeader.java
index f936936813..5d6198fd1c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresHeader.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RequiresHeader.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@
  * </p>
  * <p>
  * To set a header's value you MUST either let your RestClient interface extends
- * of {@link org.androidannotations.api.rest.RestClientHeaders
+ * of {@link org.androidannotations.rest.spring.api.RestClientHeaders
  * RestClientHeaders} or add the following method to your interface :
  * <code>void setHeader(String name, String value)</code>.
  * </p>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Rest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Rest.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Rest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Rest.java
index 2dabf9e927..43fdd3d0a3 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Rest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/Rest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -237,9 +237,9 @@
  * 
  * 
  * @see RestService
- * @see org.androidannotations.api.rest.RestClientSupport
- * @see org.androidannotations.api.rest.RestClientRootUrl
- * @see org.androidannotations.api.rest.RestClientHeaders
+ * @see org.androidannotations.rest.spring.api.RestClientSupport
+ * @see org.androidannotations.rest.spring.api.RestClientRootUrl
+ * @see org.androidannotations.rest.spring.api.RestClientHeaders
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RestService.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RestService.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RestService.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RestService.java
index de929892d8..e76c8025a4 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RestService.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/RestService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/SetsCookie.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/SetsCookie.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/SetsCookie.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/SetsCookie.java
index 999beb6c4c..a11b5397dd 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/SetsCookie.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/annotations/SetsCookie.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations.rest;
+package org.androidannotations.rest.spring.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/MediaType.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/MediaType.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/MediaType.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/MediaType.java
index a85d292c9a..e3da35840c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/MediaType.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/MediaType.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.rest;
+package org.androidannotations.rest.spring.api;
 
 public final class MediaType {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientErrorHandling.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientErrorHandling.java
similarity index 85%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientErrorHandling.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientErrorHandling.java
index a82fb69eac..fac9d18d54 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientErrorHandling.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientErrorHandling.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.rest;
+package org.androidannotations.rest.spring.api;
 
 /**
  * A @Rest interface implementing this interface will automatically have the
  * implementations of this method generated.
  * 
- * @see org.androidannotations.annotations.rest.Rest
+ * @see org.androidannotations.rest.spring.annotations.Rest
  */
 public interface RestClientErrorHandling {
 	/**
 	 * Sets the error handler called when a rest error occurs.
 	 * 
-	 * @param handler {@link org.androidannotations.api.rest.RestErrorHandler}
+	 * @param handler {@link RestErrorHandler}
 	 *      which handle exception from rest service
 	 */
 	void setRestErrorHandler(RestErrorHandler handler);
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientHeaders.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientHeaders.java
similarity index 71%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientHeaders.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientHeaders.java
index 2c26649366..33d17c939d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientHeaders.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientHeaders.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.rest;
+package org.androidannotations.rest.spring.api;
 
 import org.springframework.http.HttpAuthentication;
 
@@ -21,10 +21,10 @@
  * A @Rest interface implementing this interface will automatically have the
  * implementations of these methods generated.
  * 
- * @see org.androidannotations.annotations.rest.Rest
- * @see org.androidannotations.annotations.rest.RequiresCookie
- * @see org.androidannotations.annotations.rest.RequiresHeader
- * @see org.androidannotations.annotations.rest.RequiresAuthentication
+ * @see org.androidannotations.rest.spring.annotations.Rest
+ * @see org.androidannotations.rest.spring.annotations.RequiresCookie
+ * @see org.androidannotations.rest.spring.annotations.RequiresHeader
+ * @see org.androidannotations.rest.spring.annotations.RequiresAuthentication
  */
 public interface RestClientHeaders {
 
@@ -35,7 +35,7 @@ public interface RestClientHeaders {
 	 *            Name of the cookie
 	 * @return the cookie value.
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresCookie
+	 * @see org.androidannotations.rest.spring.annotations.RequiresCookie
 	 */
 	String getCookie(String name);
 
@@ -47,7 +47,7 @@ public interface RestClientHeaders {
 	 * @param value
 	 *            Value of the cookie
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresCookie
+	 * @see org.androidannotations.rest.spring.annotations.RequiresCookie
 	 */
 	void setCookie(String name, String value);
 
@@ -58,7 +58,7 @@ public interface RestClientHeaders {
 	 *            Name of the header
 	 * @return the header value.
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresHeader
+	 * @see org.androidannotations.rest.spring.annotations.RequiresHeader
 	 */
 	String getHeader(String name);
 
@@ -70,7 +70,7 @@ public interface RestClientHeaders {
 	 * @param value
 	 *            Value of the header
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresHeader
+	 * @see org.androidannotations.rest.spring.annotations.RequiresHeader
 	 */
 	void setHeader(String name, String value);
 
@@ -80,7 +80,7 @@ public interface RestClientHeaders {
 	 * @param auth
 	 *            Authentication data
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresAuthentication
+	 * @see org.androidannotations.rest.spring.annotations.RequiresAuthentication
 	 */
 	void setAuthentication(HttpAuthentication auth);
 
@@ -92,7 +92,7 @@ public interface RestClientHeaders {
 	 * @param password
 	 *            Password of the user
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresAuthentication
+	 * @see org.androidannotations.rest.spring.annotations.RequiresAuthentication
 	 */
 	void setHttpBasicAuth(String user, String password);
 
@@ -102,7 +102,7 @@ public interface RestClientHeaders {
 	 * @param token
 	 *            Token used for authentication
 	 * 
-	 * @see org.androidannotations.annotations.rest.RequiresAuthentication
+	 * @see org.androidannotations.rest.spring.annotations.RequiresAuthentication
 	 */
 	void setBearerAuth(String token);
 }
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientRootUrl.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientRootUrl.java
similarity index 90%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientRootUrl.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientRootUrl.java
index 6294d3d96a..0b9f0a7938 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientRootUrl.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientRootUrl.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.rest;
+package org.androidannotations.rest.spring.api;
 
 /**
  * A @Rest interface implementing this interface will automatically have the
  * implementations of these methods generated.
  * 
- * @see org.androidannotations.annotations.rest.Rest
+ * @see org.androidannotations.rest.spring.annotations.Rest
  */
 public interface RestClientRootUrl {
 	/**
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientSupport.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientSupport.java
similarity index 91%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientSupport.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientSupport.java
index aeb739d899..18af9c07e2 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestClientSupport.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestClientSupport.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.rest;
+package org.androidannotations.rest.spring.api;
 
 import org.springframework.web.client.RestTemplate;
 
@@ -21,7 +21,7 @@
  * A @Rest interface implementing this interface will automatically have the
  * implementations of these methods generated.
  * 
- * @see org.androidannotations.annotations.rest.Rest
+ * @see org.androidannotations.rest.spring.annotations.Rest
  */
 public interface RestClientSupport {
 	/**
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestErrorHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestErrorHandler.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestErrorHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestErrorHandler.java
index a70e8acd2e..053f191846 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/RestErrorHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/java/org/androidannotations/rest/spring/api/RestErrorHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.rest;
+package org.androidannotations.rest.spring.api;
 
 import org.springframework.core.NestedRuntimeException;
 
diff --git a/AndroidAnnotations/androidannotations/build.properties b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/resources/rest-spring-api.properties
similarity index 76%
rename from AndroidAnnotations/androidannotations/build.properties
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/resources/rest-spring-api.properties
index e816518213..6e97a9b22b 100644
--- a/AndroidAnnotations/androidannotations/build.properties
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-api/src/main/resources/rest-spring-api.properties
@@ -14,10 +14,4 @@
 # the License.
 #
 
-source.. = src/main/java/,\
-           src/main/eclipse/,\
-           src/main/resources/,\
-           src/test/java/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+version=${project.version}
\ No newline at end of file
diff --git a/AndroidAnnotations/functional-test-1-5/pom.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/pom.xml
similarity index 51%
rename from AndroidAnnotations/functional-test-1-5/pom.xml
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/pom.xml
index ef89852343..d9eeae2ad8 100644
--- a/AndroidAnnotations/functional-test-1-5/pom.xml
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/pom.xml
@@ -20,26 +20,22 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>androidannotations-parent</artifactId>
+		<artifactId>androidannotations-rest-spring</artifactId>
 		<groupId>org.androidannotations</groupId>
 		<version>4.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>functional-test-1-5</artifactId>
+	<artifactId>rest-spring-test</artifactId>
 	<packaging>apk</packaging>
-	<name>AndroidAnnotations functional test suite</name>
+	<name>REST with Spring REST template plugin functional test suite</name>
 
 	<properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+		<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
 		<jackson-version>1.9.11</jackson-version>
 		<simple-version>2.7.1</simple-version>
-		<spring-android-version>1.0.1.RELEASE</spring-android-version>
-		<jackson-version>1.9.6</jackson-version>
-		<simple-version>2.4.1</simple-version>
-		<android-rome-version>1.0.0-r2</android-rome-version>
-		<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes> 
 	</properties>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>org.androidannotations</groupId>
@@ -48,48 +44,27 @@
 		</dependency>
 		<dependency>
 			<groupId>org.androidannotations</groupId>
-			<artifactId>androidannotations-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<version>4.1.1.4</version>
+			<artifactId>rest-spring</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android-test</artifactId>
-			<version>4.1.1.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.roboguice</groupId>
-			<artifactId>roboguice</artifactId>
-			<version>3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.j256.ormlite</groupId>
-			<artifactId>ormlite-android</artifactId>
-			<version>4.48</version>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.squareup</groupId>
-			<artifactId>otto</artifactId>
-			<version>1.3.5</version>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>rest-spring-api</artifactId>
 		</dependency>
 		<dependency>
-			<!-- spring-android-rest-template is required to use the Rest API -->
 			<groupId>org.springframework.android</groupId>
 			<artifactId>spring-android-rest-template</artifactId>
 		</dependency>
 		<dependency>
-			<!-- Using Jackson for JSON marshaling -->
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
 			<version>${jackson-version}</version>
 		</dependency>
 		<dependency>
-			<!-- Using Simple for XML marshaling -->
 			<groupId>org.simpleframework</groupId>
 			<artifactId>simple-xml</artifactId>
 			<version>${simple-version}</version>
@@ -110,68 +85,33 @@
 		</dependency>
 		<dependency>
 			<groupId>com.google.android</groupId>
-			<artifactId>support-v4</artifactId>
-			<version>r7</version>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.robolectric</groupId>
 			<artifactId>robolectric</artifactId>
-			<version>2.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easytesting</groupId>
-			<artifactId>fest-reflect</artifactId>
-			<version>1.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup</groupId>
 			<artifactId>fest-android</artifactId>
-			<version>1.0.8</version>
-			<scope>test</scope>
-			<exclusions>
-			<exclusion>
-				<groupId>com.android.support</groupId>
-				<artifactId>support-v4</artifactId>
-			</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.8</version>
-			<scope>test</scope>
+			<artifactId>mockito-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>140</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
-				<version>4.2.1</version>
-				<configuration>
-					<androidManifestFile>AndroidManifest.xml</androidManifestFile>
-					<sdk>
-						<platform>16</platform>
-					</sdk>
-					<dex>
-						<jvmArguments>
-							<jvmArgument>-Xmx512m</jvmArgument>
-						</jvmArguments>
-					</dex>
-					<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
-				</configuration>
-				<extensions>true</extensions>
 			</plugin>
 
 			<plugin>
@@ -181,9 +121,8 @@
 					<target>1.6</target>
 					<showWarnings>true</showWarnings>
 					<compilerArgs>
-						<arg>-Atrace=true</arg>
-						<arg>-AlogLevel=ERROR</arg>
-						<arg>-AlogFile=${project.build.directory}/functional-test.log</arg>
+						<arg>-AlogLevel=WARNING</arg>
+						<arg>-AandroidManifestFile=${project.basedir}/src/main/AndroidManifest.xml</arg>
 					</compilerArgs>
 				</configuration>
 			</plugin>
@@ -196,35 +135,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>com.simpligility.maven.plugins</groupId>
-										<artifactId>android-maven-plugin</artifactId>
-										<versionRange>[4.2.1,)</versionRange>
-										<goals>
-											<goal>emma</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 
 </project>
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/AndroidManifest.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..ab1ef39f02
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.androidannotations.rest.spring.test"
+    android:versionCode="1"
+    android:versionName="1" xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="16" tools:ignore="OldTargetApi"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application>
+
+        <activity android:name=".MyServiceActivity_" />
+
+    </application>
+
+</manifest>
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanConverter.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanConverter.java
index 21252d5d1a..009b61f16f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanConverter.java
@@ -13,7 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
+
+import java.io.IOException;
+import java.util.List;
 
 import org.androidannotations.annotations.EBean;
 import org.springframework.http.HttpInputMessage;
@@ -23,9 +26,6 @@
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
 
-import java.io.IOException;
-import java.util.List;
-
 @EBean
 public class EBeanConverter implements HttpMessageConverter<Object> {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanInterceptor.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanInterceptor.java
index 58a6ab54bd..f79e43c58b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanInterceptor.java
@@ -13,7 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
+
+import java.io.IOException;
 
 import org.androidannotations.annotations.EBean;
 import org.springframework.http.HttpRequest;
@@ -21,8 +23,6 @@
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 
-import java.io.IOException;
-
 @EBean
 public class EBeanInterceptor implements ClientHttpRequestInterceptor {
 	@Override
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanUsingService.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanUsingService.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanUsingService.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanUsingService.java
index 4cca484916..12564151b7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanUsingService.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanUsingService.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EBean;
-import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.rest.spring.annotations.RestService;
 
 @EBean
 public class EBeanUsingService {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/Event.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/Event.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/Event.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/Event.java
index fd2f33bb3a..2c7497463f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/Event.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/Event.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 public class Event {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EventList.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EventList.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EventList.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EventList.java
index c844561632..6e9bd6f7cb 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EventList.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EventList.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 public class EventList {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/GenericEvent.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/GenericEvent.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/GenericEvent.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/GenericEvent.java
index 8b1ebcb19a..c9fa05ee33 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/GenericEvent.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/GenericEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 public class GenericEvent<T extends Object> {
 	T value;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/HttpMethodsService.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/HttpMethodsService.java
similarity index 72%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/HttpMethodsService.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/HttpMethodsService.java
index bdc72297d4..1cc0240834 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/HttpMethodsService.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/HttpMethodsService.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import java.util.Set;
 
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.Rest;
-import org.androidannotations.api.rest.RestClientErrorHandling;
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.androidannotations.rest.spring.api.RestClientErrorHandling;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyRequestFactory.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyRequestFactory.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyRequestFactory.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyRequestFactory.java
index 63f8f4f4d7..b2736b37a5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyRequestFactory.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyRequestFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import org.androidannotations.annotations.EBean;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyService.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyService.java
index 425bd2c5ee..14d49a8f17 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyService.java
@@ -13,26 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.androidannotations.annotations.rest.Accept;
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.RequiresAuthentication;
-import org.androidannotations.annotations.rest.RequiresCookie;
-import org.androidannotations.annotations.rest.RequiresCookieInUrl;
-import org.androidannotations.annotations.rest.RequiresHeader;
-import org.androidannotations.annotations.rest.Rest;
-import org.androidannotations.annotations.rest.SetsCookie;
-import org.androidannotations.api.rest.MediaType;
+import org.androidannotations.rest.spring.annotations.Accept;
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.RequiresAuthentication;
+import org.androidannotations.rest.spring.annotations.RequiresCookie;
+import org.androidannotations.rest.spring.annotations.RequiresCookieInUrl;
+import org.androidannotations.rest.spring.annotations.RequiresHeader;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.androidannotations.rest.spring.annotations.SetsCookie;
+import org.androidannotations.rest.spring.api.MediaType;
 import org.springframework.http.HttpAuthentication;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyServiceActivity.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyServiceActivity.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyServiceActivity.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyServiceActivity.java
index 951a8d9817..f5d6f595d0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyServiceActivity.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyServiceActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
-
-import android.app.Activity;
+package org.androidannotations.rest.spring.test;
 
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.rest.spring.annotations.RestService;
+
+import android.app.Activity;
 
 @EActivity
 public class MyServiceActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/RequestInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/RequestInterceptor.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/RequestInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/RequestInterceptor.java
index 78612b10c5..5cdbb2bedb 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/RequestInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/RequestInterceptor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import java.io.IOException;
 
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/res/values/strings.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..fda9cedded
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<resources>
+    <string name="app_name">rest-spring-test</string>
+</resources>
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/HttpMethodServiceTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/HttpMethodServiceTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/HttpMethodServiceTest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/HttpMethodServiceTest.java
index 2624df514a..6cc7fcea8c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/HttpMethodServiceTest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/HttpMethodServiceTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/MyServiceTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/MyServiceTest.java
index c75be3b49a..07431bb503 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/MyServiceTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.argThat;
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.androidannotations.test15.rest.RequestTestBuilder.RequestTestBuilderExecutor;
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;
 import org.junit.Test;
@@ -238,7 +237,7 @@ public void authenticate() {
 				.requestHeader("SomeFancyHeader", "aFancyHeader") //
 				.responseCookie("xt", "1234") //
 				.responseCookie("sjsaid", "5678") //
-				.asserts(new RequestTestBuilderExecutor() {
+				.asserts(new RequestTestBuilder.RequestTestBuilderExecutor() {
 					@Override
 					public void execute(MyService myService) {
 						myService.authenticate();
@@ -252,7 +251,7 @@ public void removeEventWithRequires() {
 				.requestCookie("myCookie", "myCookieValue") //
 				.requestHeader("SomeFancyHeader", "aFancyHeader") //
 				.hasUrlVariables(true) //
-				.asserts(new RequestTestBuilderExecutor() {
+				.asserts(new RequestTestBuilder.RequestTestBuilderExecutor() {
 					@Override
 					public void execute(MyService myService) {
 						myService.removeEventWithRequires(0);
@@ -267,7 +266,7 @@ public void updateEventWithRequires() {
 				.requestHeader("SomeFancyHeader", "aFancyHeader") //
 				.responseContent("{'id':1,'name':'event1'}") //
 				.hasUrlVariables(true) //
-				.asserts(new RequestTestBuilderExecutor() {
+				.asserts(new RequestTestBuilder.RequestTestBuilderExecutor() {
 					@Override
 					public void execute(MyService myService) {
 						myService.updateEventWithRequires(0);
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/RequestTestBuilder.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/RequestTestBuilder.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
index 3e2d42a089..f10f653f4c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/rest/RequestTestBuilder.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.rest;
+package org.androidannotations.rest.spring.test;
 
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.verify;
@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.AssertionFailedError;
-
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;
 import org.mockito.ArgumentMatcher;
@@ -37,9 +35,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.client.RestTemplate;
 
+import junit.framework.AssertionFailedError;
+
 public class RequestTestBuilder {
 	private MyService_ myService = new MyService_(null);
-	private HttpEntityArgumentMatcher entityArgumentMatcher = new HttpEntityArgumentMatcher();;
+	private HttpEntityArgumentMatcher entityArgumentMatcher = new HttpEntityArgumentMatcher();
 	private RestTemplate restTemplate;
 
 	private Map<String, String> requestHeaders = new HashMap<String, String>();
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/resources/org.robolectric.Config.properties b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/resources/org.robolectric.Config.properties
new file mode 100644
index 0000000000..93f06bf97c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/resources/org.robolectric.Config.properties
@@ -0,0 +1 @@
+manifest=src/main/AndroidManifest.xml
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/pom.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/pom.xml
new file mode 100644
index 0000000000..6be11355c6
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-rest-spring</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>rest-spring</artifactId>
+	<name>REST Annotation Processor with Spring REST template</name>
+	<description>AndroidAnnotations plugin for REST with Spring REST template</description>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>rest-spring-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.codemodel</groupId>
+			<artifactId>codemodel</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.android</groupId>
+			<artifactId>spring-android-rest-template</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-testutils</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgument>-proc:none</compilerArgument>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/RestSpringPlugin.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/RestSpringPlugin.java
new file mode 100644
index 0000000000..f9a8bdc5e3
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/RestSpringPlugin.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.rest.spring;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+import org.androidannotations.rest.spring.handler.DeleteHandler;
+import org.androidannotations.rest.spring.handler.GetHandler;
+import org.androidannotations.rest.spring.handler.HeadHandler;
+import org.androidannotations.rest.spring.handler.OptionsHandler;
+import org.androidannotations.rest.spring.handler.PostHandler;
+import org.androidannotations.rest.spring.handler.PutHandler;
+import org.androidannotations.rest.spring.handler.RestHandler;
+import org.androidannotations.rest.spring.handler.RestServiceHandler;
+
+public class RestSpringPlugin extends AndroidAnnotationsPlugin {
+
+	private static final String NAME = "REST-Spring";
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
+		List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
+		annotationHandlers.add(new RestHandler(androidAnnotationEnv));
+		annotationHandlers.add(new GetHandler(androidAnnotationEnv));
+		annotationHandlers.add(new PostHandler(androidAnnotationEnv));
+		annotationHandlers.add(new PutHandler(androidAnnotationEnv));
+		annotationHandlers.add(new DeleteHandler(androidAnnotationEnv));
+		annotationHandlers.add(new HeadHandler(androidAnnotationEnv));
+		annotationHandlers.add(new OptionsHandler(androidAnnotationEnv));
+		annotationHandlers.add(new RestServiceHandler(androidAnnotationEnv));
+		return annotationHandlers;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/DeleteHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/DeleteHandler.java
similarity index 60%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/DeleteHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/DeleteHandler.java
index 3f4d6a1542..a12cb96f00 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/DeleteHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/DeleteHandler.java
@@ -13,29 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.rest.spring.annotations.Delete;
 
 public class DeleteHandler extends RestMethodHandler {
 
-	public DeleteHandler(ProcessingEnvironment processingEnvironment) {
-		super(Delete.class, processingEnvironment);
+	public DeleteHandler(AndroidAnnotationsEnvironment environment) {
+		super(Delete.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, valid);
+		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, validation);
 
-		restAnnotationHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter((ExecutableElement) element, valid);
+		restSpringValidatorHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter((ExecutableElement) element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/GetHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/GetHandler.java
similarity index 60%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/GetHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/GetHandler.java
index d4d19b29d7..0dfce99779 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/GetHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/GetHandler.java
@@ -13,29 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.rest.spring.annotations.Get;
 
 public class GetHandler extends RestMethodHandler {
 
-	public GetHandler(ProcessingEnvironment processingEnvironment) {
-		super(Get.class, processingEnvironment);
+	public GetHandler(AndroidAnnotationsEnvironment environment) {
+		super(Get.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, valid);
+		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, validation);
 
-		restAnnotationHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter((ExecutableElement) element, valid);
+		restSpringValidatorHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter((ExecutableElement) element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/HeadHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/HeadHandler.java
similarity index 64%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/HeadHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/HeadHandler.java
index c2b3b43e9d..fbfd2e6773 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/HeadHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/HeadHandler.java
@@ -13,16 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.holder.RestHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.holder.RestHolder;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JExpr;
@@ -30,17 +29,17 @@
 
 public class HeadHandler extends RestMethodHandler {
 
-	public HeadHandler(ProcessingEnvironment processingEnvironment) {
-		super(Head.class, processingEnvironment);
+	public HeadHandler(AndroidAnnotationsEnvironment environment) {
+		super(Head.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.hasHttpHeadersReturnType((ExecutableElement) element, valid);
+		restSpringValidatorHelper.hasHttpHeadersReturnType((ExecutableElement) element, validation);
 
-		restAnnotationHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter((ExecutableElement) element, valid);
+		restSpringValidatorHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter((ExecutableElement) element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/OptionsHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/OptionsHandler.java
similarity index 63%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/OptionsHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/OptionsHandler.java
index 8dba462d13..5ca88ec16f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/OptionsHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/OptionsHandler.java
@@ -13,33 +13,32 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.holder.RestHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.holder.RestHolder;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JExpression;
 
 public class OptionsHandler extends RestMethodHandler {
 
-	public OptionsHandler(ProcessingEnvironment processingEnvironment) {
-		super(Options.class, processingEnvironment);
+	public OptionsHandler(AndroidAnnotationsEnvironment environment) {
+		super(Options.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.hasSetOfHttpMethodReturnType((ExecutableElement) element, valid);
+		restSpringValidatorHelper.hasSetOfHttpMethodReturnType((ExecutableElement) element, validation);
 
-		restAnnotationHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter((ExecutableElement) element, valid);
+		restSpringValidatorHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter((ExecutableElement) element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/PostHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/PostHandler.java
similarity index 60%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/PostHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/PostHandler.java
index a7e979d535..bf310d3993 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/PostHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/PostHandler.java
@@ -13,29 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.rest.spring.annotations.Post;
 
 public class PostHandler extends RestMethodHandler {
 
-	public PostHandler(ProcessingEnvironment processingEnvironment) {
-		super(Post.class, processingEnvironment);
+	public PostHandler(AndroidAnnotationsEnvironment environment) {
+		super(Post.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, valid);
+		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, validation);
 
-		restAnnotationHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter((ExecutableElement) element, valid);
+		restSpringValidatorHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter((ExecutableElement) element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/PutHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/PutHandler.java
similarity index 60%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/PutHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/PutHandler.java
index 2240e7e85e..0d89ae98d0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/PutHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/PutHandler.java
@@ -13,29 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.rest.spring.annotations.Put;
 
 public class PutHandler extends RestMethodHandler {
 
-	public PutHandler(ProcessingEnvironment processingEnvironment) {
-		super(Put.class, processingEnvironment);
+	public PutHandler(AndroidAnnotationsEnvironment environment) {
+		super(Put.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
-		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, valid);
+		validatorHelper.doesNotReturnPrimitive((ExecutableElement) element, validation);
 
-		restAnnotationHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter((ExecutableElement) element, valid);
+		restSpringValidatorHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter((ExecutableElement) element, validation);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestHandler.java
similarity index 60%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestHandler.java
index 43dac7b3a2..ee902d392f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestHandler.java
@@ -13,29 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.lit;
 import static org.androidannotations.helper.CanonicalNameConstants.ARRAYLIST;
-import static org.androidannotations.helper.CanonicalNameConstants.CLIENT_HTTP_REQUEST_INTERCEPTOR;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.CLIENT_HTTP_REQUEST_INTERCEPTOR;
 
 import java.util.List;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.AnnotationHelper;
-import org.androidannotations.holder.RestHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.androidannotations.rest.spring.helper.RestSpringValidatorHelper;
+import org.androidannotations.rest.spring.holder.RestHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -44,44 +41,43 @@
 
 public class RestHandler extends BaseGeneratingAnnotationHandler<RestHolder> {
 
-	private final AnnotationHelper annotationHelper;
+	private final RestSpringValidatorHelper restSpringValidatorHelper;
 
-	public RestHandler(ProcessingEnvironment processingEnvironment) {
-		super(Rest.class, processingEnvironment);
-		annotationHelper = new AnnotationHelper(processingEnv);
-		codeModelHelper = new APTCodeModelHelper();
+	public RestHandler(AndroidAnnotationsEnvironment environment) {
+		super(Rest.class, environment);
+		restSpringValidatorHelper = new RestSpringValidatorHelper(environment, getTarget());
 	}
 
 	@Override
-	public RestHolder createGeneratedClassHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		return new RestHolder(processHolder, annotatedElement);
+	public RestHolder createGeneratedClassHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		return new RestHolder(environment, annotatedElement);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		super.validate(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		super.validate(element, validation);
 
 		TypeElement typeElement = (TypeElement) element;
 
-		validatorHelper.notAlreadyValidated(element, validatedElements, valid);
+		validatorHelper.notAlreadyValidated(element, validation);
 
-		validatorHelper.hasSpringAndroidJars(element, valid);
+		restSpringValidatorHelper.hasSpringAndroidJars(validation);
 
-		validatorHelper.isInterface(typeElement, valid);
+		validatorHelper.isInterface(typeElement, validation);
 
-		validatorHelper.isTopLevel(typeElement, valid);
+		validatorHelper.isTopLevel(typeElement, validation);
 
-		validatorHelper.doesNotExtendInvalidInterfaces(typeElement, valid);
+		validatorHelper.hasInternetPermission(getEnvironment().getAndroidManifest(), validation);
 
-		validatorHelper.unannotatedMethodReturnsRestTemplate(typeElement, valid);
+		restSpringValidatorHelper.doesNotExtendInvalidInterfaces(typeElement, validation);
 
-		validatorHelper.validateConverters(element, valid);
+		restSpringValidatorHelper.unannotatedMethodReturnsRestTemplate(typeElement, validation);
 
-		validatorHelper.validateInterceptors(element, valid);
+		restSpringValidatorHelper.validateConverters(element, validation);
 
-		validatorHelper.validateRequestFactory(element, valid);
+		restSpringValidatorHelper.validateInterceptors(element, validation);
 
-		validatorHelper.hasInternetPermission(typeElement, androidManifest, valid);
+		restSpringValidatorHelper.validateRequestFactory(element, validation);
 	}
 
 	@Override
@@ -104,7 +100,7 @@ private void setConverters(Element element, RestHolder holder) {
 		JBlock init = holder.getInit().body();
 		init.add(invoke(restTemplateField, "getMessageConverters").invoke("clear"));
 		for (DeclaredType converterType : converters) {
-			JInvocation newConverter = codeModelHelper.newBeanOrEBean(holder, converterType, holder.getInitContextParam());
+			JInvocation newConverter = codeModelHelper.newBeanOrEBean(converterType, holder.getInitContextParam());
 			init.add(invoke(restTemplateField, "getMessageConverters").invoke("add").arg(newConverter));
 		}
 	}
@@ -112,14 +108,14 @@ private void setConverters(Element element, RestHolder holder) {
 	private void setInterceptors(Element element, RestHolder holder) {
 		List<DeclaredType> interceptors = annotationHelper.extractAnnotationClassArrayParameter(element, getTarget(), "interceptors");
 		if (interceptors != null) {
-			JClass listClass = refClass(ARRAYLIST);
-			JClass clientInterceptorClass = refClass(CLIENT_HTTP_REQUEST_INTERCEPTOR);
+			JClass listClass = getJClass(ARRAYLIST);
+			JClass clientInterceptorClass = getJClass(CLIENT_HTTP_REQUEST_INTERCEPTOR);
 			listClass = listClass.narrow(clientInterceptorClass);
 			JFieldVar restTemplateField = holder.getRestTemplateField();
 			JBlock init = holder.getInit().body();
 			init.add(invoke(restTemplateField, "setInterceptors").arg(_new(listClass)));
 			for (DeclaredType interceptorType : interceptors) {
-				JInvocation newInterceptor = codeModelHelper.newBeanOrEBean(holder, interceptorType, holder.getInitContextParam());
+				JInvocation newInterceptor = codeModelHelper.newBeanOrEBean(interceptorType, holder.getInitContextParam());
 				init.add(invoke(restTemplateField, "getInterceptors").invoke("add").arg(newInterceptor));
 			}
 		}
@@ -128,7 +124,7 @@ private void setInterceptors(Element element, RestHolder holder) {
 	private void setRequestFactory(Element element, RestHolder holder) {
 		DeclaredType requestFactoryType = annotationHelper.extractAnnotationClassParameter(element, getTarget(), "requestFactory");
 		if (requestFactoryType != null) {
-			JInvocation requestFactory = codeModelHelper.newBeanOrEBean(holder, requestFactoryType, holder.getInitContextParam());
+			JInvocation requestFactory = codeModelHelper.newBeanOrEBean(requestFactoryType, holder.getInitContextParam());
 			holder.getInit().body().add(invoke(holder.getRestTemplateField(), "setRequestFactory").arg(requestFactory));
 		}
 	}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestMethodHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestMethodHandler.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestMethodHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestMethodHandler.java
index 950e98229b..bf4dfc5a57 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestMethodHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestMethodHandler.java
@@ -13,26 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
+
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.HTTP_METHOD;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.NESTED_RUNTIME_EXCEPTION;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.RESPONSE_ENTITY;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.handler.BaseAnnotationHandler;
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.RestAnnotationHelper;
-import org.androidannotations.holder.RestHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.rest.spring.helper.RestAnnotationHelper;
+import org.androidannotations.rest.spring.helper.RestSpringValidatorHelper;
+import org.androidannotations.rest.spring.holder.RestHolder;
 
 import com.sun.codemodel.JArray;
 import com.sun.codemodel.JBlock;
@@ -53,20 +55,21 @@
 public abstract class RestMethodHandler extends BaseAnnotationHandler<RestHolder> {
 
 	protected final RestAnnotationHelper restAnnotationHelper;
+	protected final RestSpringValidatorHelper restSpringValidatorHelper;
 
-	public RestMethodHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		super(targetClass, processingEnvironment);
-		restAnnotationHelper = new RestAnnotationHelper(processingEnv, getTarget());
-		codeModelHelper = new APTCodeModelHelper();
+	public RestMethodHandler(Class<?> targetClass, AndroidAnnotationsEnvironment environment) {
+		super(targetClass, environment);
+		restAnnotationHelper = new RestAnnotationHelper(environment, getTarget());
+		restSpringValidatorHelper = new RestSpringValidatorHelper(environment, getTarget());
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.notAlreadyValidated(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.notAlreadyValidated(element, validation);
 
-		validatorHelper.enclosingElementHasRestAnnotation(element, validatedElements, valid);
+		restSpringValidatorHelper.enclosingElementHasRestAnnotation(element, validation);
 
-		validatorHelper.throwsOnlyRestClientException((ExecutableElement) element, valid);
+		restSpringValidatorHelper.throwsOnlyRestClientException((ExecutableElement) element, validation);
 	}
 
 	@Override
@@ -105,7 +108,7 @@ public void process(Element element, RestHolder holder) {
 
 	protected JClass getMethodReturnClass(Element element, RestHolder holder) {
 		ExecutableElement executableElement = (ExecutableElement) element;
-		return codeModelHelper.typeMirrorToJClass(executableElement.getReturnType(), holder);
+		return codeModelHelper.typeMirrorToJClass(executableElement.getReturnType());
 	}
 
 	protected SortedMap<String, JVar> addMethodParams(ExecutableElement executableElement, RestHolder restHolder, JMethod method) {
@@ -117,9 +120,9 @@ protected SortedMap<String, JVar> addMethodParams(ExecutableElement executableEl
 
 			JVar param;
 			if (parameter.asType().getKind().isPrimitive()) {
-				param = method.param(JType.parse(codeModel(), paramType), paramName);
+				param = method.param(JType.parse(getCodeModel(), paramType), paramName);
 			} else {
-				JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameter.asType(), restHolder);
+				JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameter.asType());
 				param = method.param(parameterClass, paramName);
 			}
 			methodParams.put(paramName, param);
@@ -139,7 +142,7 @@ protected JExpression getUrl(Element element, RestHolder restHolder) {
 	protected abstract String getUrlSuffix(Element element);
 
 	protected JExpression getHttpMethod() {
-		JClass httpMethod = classes().HTTP_METHOD;
+		JClass httpMethod = getJClass(HTTP_METHOD);
 		String simpleName = getTarget().substring(getTarget().lastIndexOf('.') + 1);
 		String restMethodInCapitalLetters = simpleName.toUpperCase(Locale.ENGLISH);
 		return httpMethod.staticRef(restMethodInCapitalLetters);
@@ -148,7 +151,7 @@ protected JExpression getHttpMethod() {
 	protected JExpression getRequestEntity(ExecutableElement element, RestHolder holder, JBlock methodBody, SortedMap<String, JVar> params) {
 		JVar httpHeaders = restAnnotationHelper.declareHttpHeaders(element, holder, methodBody);
 		JVar entitySentToServer = restAnnotationHelper.getEntitySentToServer(element, params);
-		return restAnnotationHelper.declareHttpEntity(processHolder, methodBody, entitySentToServer, httpHeaders);
+		return restAnnotationHelper.declareHttpEntity(methodBody, entitySentToServer, httpHeaders);
 	}
 
 	protected JExpression getResponseClass(Element element, RestHolder holder) {
@@ -160,7 +163,7 @@ protected JExpression getUrlVariables(Element element, RestHolder holder, JBlock
 	}
 
 	protected JExpression addResultCallMethod(JExpression exchangeCall, JClass methodReturnClass) {
-		if (methodReturnClass != null && !methodReturnClass.fullName().startsWith(CanonicalNameConstants.RESPONSE_ENTITY)) {
+		if (methodReturnClass != null && !methodReturnClass.fullName().startsWith(RESPONSE_ENTITY)) {
 			return JExpr.invoke(exchangeCall, "getBody");
 		}
 		return exchangeCall;
@@ -172,14 +175,14 @@ private JExpression setCookies(ExecutableElement executableElement, RestHolder r
 			boolean methodReturnVoid = executableElement.getReturnType().getKind() == TypeKind.VOID;
 
 			JClass exchangeResponseClass = restAnnotationHelper.retrieveResponseClass(executableElement.getReturnType(), restHolder);
-			JType narrowType = exchangeResponseClass == null || methodReturnVoid ? codeModel().VOID : exchangeResponseClass;
-			JClass responseEntityClass = classes().RESPONSE_ENTITY.narrow(narrowType);
+			JType narrowType = exchangeResponseClass == null || methodReturnVoid ? getCodeModel().VOID : exchangeResponseClass;
+			JClass responseEntityClass = getJClass(RESPONSE_ENTITY).narrow(narrowType);
 			JVar responseEntity = methodBody.decl(responseEntityClass, "response", exchangeCall);
 
 			// set cookies
-			JClass stringListClass = classes().LIST.narrow(classes().STRING);
-			JClass stringArrayClass = classes().STRING.array();
-			JArray cookiesArray = JExpr.newArray(classes().STRING);
+			JClass stringListClass = getClasses().LIST.narrow(getClasses().STRING);
+			JClass stringArrayClass = getClasses().STRING.array();
+			JArray cookiesArray = JExpr.newArray(getClasses().STRING);
 			for (String cookie : settingCookies) {
 				cookiesArray.add(JExpr.lit(cookie));
 			}
@@ -190,18 +193,18 @@ private JExpression setCookies(ExecutableElement executableElement, RestHolder r
 
 			// for loop over list... add if in string array
 			JForEach forEach = methodBody._if(allCookiesList.ne(JExpr._null()))._then() //
-					.forEach(classes().STRING, "rawCookie", allCookiesList);
+					.forEach(getClasses().STRING, "rawCookie", allCookiesList);
 			JVar rawCookieVar = forEach.var();
 
 			JBlock forLoopBody = forEach.body();
 
-			JForEach innerForEach = forLoopBody.forEach(classes().STRING, "thisCookieName", requestedCookiesVar);
+			JForEach innerForEach = forLoopBody.forEach(getClasses().STRING, "thisCookieName", requestedCookiesVar);
 			JBlock innerBody = innerForEach.body();
 			JBlock thenBlock = innerBody._if(JExpr.invoke(rawCookieVar, "startsWith").arg(innerForEach.var()))._then();
 
 			// where does the cookie VALUE end?
 			JInvocation valueEnd = rawCookieVar.invoke("indexOf").arg(JExpr.lit(';'));
-			JVar valueEndVar = thenBlock.decl(codeModel().INT, "valueEnd", valueEnd);
+			JVar valueEndVar = thenBlock.decl(getCodeModel().INT, "valueEnd", valueEnd);
 			JBlock fixValueEndBlock = thenBlock._if(valueEndVar.eq(JExpr.lit(-1)))._then();
 			fixValueEndBlock.assign(valueEndVar, rawCookieVar.invoke("length"));
 
@@ -230,7 +233,7 @@ private JBlock surroundWithRestTryCatch(RestHolder holder, JBlock block, boolean
 			JTryBlock tryBlock = newBlock._try();
 			codeModelHelper.copy(block, tryBlock.body());
 
-			JCatchBlock jCatch = tryBlock._catch(classes().NESTED_RUNTIME_EXCEPTION);
+			JCatchBlock jCatch = tryBlock._catch(getJClass(NESTED_RUNTIME_EXCEPTION));
 
 			JBlock catchBlock = jCatch.body();
 			JConditional conditional = catchBlock._if(JOp.ne(holder.getRestErrorHandlerField(), JExpr._null()));
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestServiceHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java
similarity index 62%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestServiceHandler.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java
index 6510feafa3..ab37f30a07 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/rest/RestServiceHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java
@@ -13,21 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler.rest;
+package org.androidannotations.rest.spring.handler;
 
 import static org.androidannotations.helper.ModelConstants.classSuffix;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.annotations.rest.Rest;
-import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
 import org.androidannotations.handler.BaseAnnotationHandler;
-import org.androidannotations.helper.APTCodeModelHelper;
 import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.androidannotations.rest.spring.annotations.RestService;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -36,19 +34,17 @@
 
 public class RestServiceHandler extends BaseAnnotationHandler<EComponentHolder> {
 
-	private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
-
-	public RestServiceHandler(ProcessingEnvironment processingEnvironment) {
-		super(RestService.class, processingEnvironment);
+	public RestServiceHandler(AndroidAnnotationsEnvironment environment) {
+		super(RestService.class, environment);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
 
-		validatorHelper.isNotPrivate(element, valid);
+		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.typeHasAnnotation(Rest.class, element, valid);
+		validatorHelper.typeHasAnnotation(Rest.class, element, validation);
 	}
 
 	@Override
@@ -56,12 +52,12 @@ public void process(Element element, EComponentHolder holder) {
 		String fieldName = element.getSimpleName().toString();
 
 		TypeMirror fieldTypeMirror = element.asType();
-		TypeMirror erasedFieldTypeMirror = processingEnv.getTypeUtils().erasure(fieldTypeMirror);
+		TypeMirror erasedFieldTypeMirror = getProcessingEnvironment().getTypeUtils().erasure(fieldTypeMirror);
 		String interfaceName = erasedFieldTypeMirror.toString();
 
 		String generatedClassName = interfaceName + classSuffix();
 
-		JClass clazz = codeModelHelper.narrowGeneratedClass(refClass(generatedClassName), fieldTypeMirror, holder);
+		JClass clazz = codeModelHelper.narrowGeneratedClass(getJClass(generatedClassName), fieldTypeMirror);
 
 		JBlock methodBody = holder.getInitBody();
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RestAnnotationHelper.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestAnnotationHelper.java
similarity index 77%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RestAnnotationHelper.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestAnnotationHelper.java
index 49646bb9a6..93b1e37601 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RestAnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestAnnotationHelper.java
@@ -13,7 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.helper;
+package org.androidannotations.rest.spring.helper;
+
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.HTTP_ENTITY;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.HTTP_HEADERS;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.MEDIA_TYPE;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.RESPONSE_ENTITY;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -25,27 +30,27 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.ArrayType;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.WildcardType;
 
-import org.androidannotations.annotations.rest.Accept;
-import org.androidannotations.annotations.rest.RequiresAuthentication;
-import org.androidannotations.annotations.rest.RequiresCookie;
-import org.androidannotations.annotations.rest.RequiresCookieInUrl;
-import org.androidannotations.annotations.rest.RequiresHeader;
-import org.androidannotations.annotations.rest.SetsCookie;
-import org.androidannotations.holder.RestHolder;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.rest.spring.annotations.Accept;
+import org.androidannotations.rest.spring.annotations.RequiresAuthentication;
+import org.androidannotations.rest.spring.annotations.RequiresCookie;
+import org.androidannotations.rest.spring.annotations.RequiresCookieInUrl;
+import org.androidannotations.rest.spring.annotations.RequiresHeader;
+import org.androidannotations.rest.spring.annotations.SetsCookie;
+import org.androidannotations.rest.spring.holder.RestHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -58,65 +63,11 @@
 
 public class RestAnnotationHelper extends TargetAnnotationHelper {
 
-	private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
-
-	public RestAnnotationHelper(ProcessingEnvironment processingEnv, String annotationName) {
-		super(processingEnv, annotationName);
-	}
-
-	public void urlVariableNamesExistInParameters(ExecutableElement element, Set<String> variableNames, IsValid valid) {
-
-		List<? extends VariableElement> parameters = element.getParameters();
-
-		List<String> parametersName = new ArrayList<>();
-		for (VariableElement parameter : parameters) {
-			parametersName.add(parameter.getSimpleName().toString());
-		}
-
-		String[] cookiesToUrl = requiredUrlCookies(element);
-		if (cookiesToUrl != null) {
-			for (String cookie : cookiesToUrl) {
-				parametersName.add(cookie);
-			}
-		}
+	private APTCodeModelHelper codeModelHelper;
 
-		for (String variableName : variableNames) {
-			if (!parametersName.contains(variableName)) {
-				valid.invalidate();
-				printAnnotationError(element, "%s annotated method has an url variable which name could not be found in the method parameters: " + variableName);
-				return;
-			}
-		}
-	}
-
-	public void urlVariableNamesExistInParametersAndHasNoOneMoreParameter(ExecutableElement element, IsValid valid) {
-		if (valid.isValid()) {
-			Set<String> variableNames = extractUrlVariableNames(element);
-			urlVariableNamesExistInParameters(element, variableNames, valid);
-			if (valid.isValid()) {
-				List<? extends VariableElement> parameters = element.getParameters();
-
-				if (parameters.size() > variableNames.size()) {
-					valid.invalidate();
-					printAnnotationError(element, "%s annotated method has only url variables in the method parameters");
-				}
-			}
-		}
-	}
-
-	public void urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter(ExecutableElement element, IsValid valid) {
-		if (valid.isValid()) {
-			Set<String> variableNames = extractUrlVariableNames(element);
-			urlVariableNamesExistInParameters(element, variableNames, valid);
-			if (valid.isValid()) {
-				List<? extends VariableElement> parameters = element.getParameters();
-
-				if (parameters.size() > variableNames.size() + 1) {
-					valid.invalidate();
-					printAnnotationError(element, "%s annotated method has more than one entity parameter");
-				}
-			}
-		}
+	public RestAnnotationHelper(AndroidAnnotationsEnvironment environment, String annotationName) {
+		super(environment, annotationName);
+		codeModelHelper = new APTCodeModelHelper(environment);
 	}
 
 	/** Captures URI template variable names. */
@@ -149,7 +100,7 @@ public JVar declareUrlVariables(ExecutableElement element, RestHolder holder, JB
 			}
 		}
 
-		JClass hashMapClass = holder.classes().HASH_MAP.narrow(String.class, Object.class);
+		JClass hashMapClass = getEnvironment().getClasses().HASH_MAP.narrow(String.class, Object.class);
 		if (!urlVariables.isEmpty()) {
 			JVar hashMapVar = methodBody.decl(hashMapClass, "urlVariables", JExpr._new(hashMapClass));
 			for (String urlVariable : urlVariables) {
@@ -204,7 +155,7 @@ public String[] requiredCookies(ExecutableElement executableElement) {
 		}
 	}
 
-	public static String[] requiredUrlCookies(ExecutableElement executableElement) {
+	public String[] requiredUrlCookies(ExecutableElement executableElement) {
 		RequiresCookieInUrl cookieAnnotation = executableElement.getAnnotation(RequiresCookieInUrl.class);
 		if (cookieAnnotation == null) {
 			cookieAnnotation = executableElement.getEnclosingElement().getAnnotation(RequiresCookieInUrl.class);
@@ -252,23 +203,23 @@ public JVar declareHttpHeaders(ExecutableElement executableElement, RestHolder h
 
 		if (hasMediaTypeDefined || requiresCookies || requiresHeaders || requiresAuth) {
 			// we need the headers
-			httpHeadersVar = body.decl(holder.classes().HTTP_HEADERS, "httpHeaders", JExpr._new(holder.classes().HTTP_HEADERS));
+			httpHeadersVar = body.decl(getEnvironment().getJClass(HTTP_HEADERS), "httpHeaders", JExpr._new(getEnvironment().getJClass(HTTP_HEADERS)));
 		}
 
 		if (hasMediaTypeDefined) {
-			JClass collectionsClass = holder.refClass(CanonicalNameConstants.COLLECTIONS);
-			JClass mediaTypeClass = holder.refClass(CanonicalNameConstants.MEDIA_TYPE);
+			JClass collectionsClass = getEnvironment().getJClass(CanonicalNameConstants.COLLECTIONS);
+			JClass mediaTypeClass = getEnvironment().getJClass(MEDIA_TYPE);
 
 			JInvocation mediaTypeListParam = collectionsClass.staticInvoke("singletonList").arg(mediaTypeClass.staticInvoke("parseMediaType").arg(mediaType));
 			body.add(JExpr.invoke(httpHeadersVar, "setAccept").arg(mediaTypeListParam));
 		}
 
 		if (requiresCookies) {
-			JClass stringBuilderClass = holder.classes().STRING_BUILDER;
+			JClass stringBuilderClass = getEnvironment().getClasses().STRING_BUILDER;
 			JVar cookiesValueVar = body.decl(stringBuilderClass, "cookiesValue", JExpr._new(stringBuilderClass));
 			for (String cookie : cookies) {
 				JInvocation cookieValue = JExpr.invoke(holder.getAvailableCookiesField(), "get").arg(cookie);
-				JInvocation cookieFormatted = holder.classes().STRING.staticInvoke("format").arg(String.format("%s=%%s;", cookie)).arg(cookieValue);
+				JInvocation cookieFormatted = getEnvironment().getClasses().STRING.staticInvoke("format").arg(String.format("%s=%%s;", cookie)).arg(cookieValue);
 				JInvocation appendCookie = JExpr.invoke(cookiesValueVar, "append").arg(cookieFormatted);
 				body.add(appendCookie);
 			}
@@ -303,8 +254,8 @@ public JVar getEntitySentToServer(ExecutableElement element, SortedMap<String, J
 		return null;
 	}
 
-	public JExpression declareHttpEntity(ProcessHolder holder, JBlock body, JVar entitySentToServer, JVar httpHeaders) {
-		JType entityType = holder.refClass(Object.class);
+	public JExpression declareHttpEntity(JBlock body, JVar entitySentToServer, JVar httpHeaders) {
+		JType entityType = getEnvironment().getJClass(Object.class);
 
 		if (entitySentToServer != null) {
 			entityType = entitySentToServer.type();
@@ -314,7 +265,7 @@ public JExpression declareHttpEntity(ProcessHolder holder, JBlock body, JVar ent
 			}
 		}
 
-		JClass httpEntity = holder.classes().HTTP_ENTITY;
+		JClass httpEntity = getEnvironment().getJClass(HTTP_ENTITY);
 		JClass narrowedHttpEntity = httpEntity.narrow(entityType);
 		JInvocation newHttpEntityVarCall = JExpr._new(narrowedHttpEntity);
 
@@ -349,12 +300,12 @@ public JClass retrieveResponseClass(TypeMirror returnType, RestHolder holder) {
 
 		JClass responseClass;
 
-		if (returnTypeString.startsWith(CanonicalNameConstants.RESPONSE_ENTITY)) {
+		if (returnTypeString.startsWith(RESPONSE_ENTITY)) {
 			DeclaredType declaredReturnType = (DeclaredType) returnType;
 			if (declaredReturnType.getTypeArguments().size() > 0) {
 				responseClass = resolveResponseClass(declaredReturnType.getTypeArguments().get(0), holder);
 			} else {
-				responseClass = holder.classes().RESPONSE_ENTITY;
+				responseClass = getEnvironment().getJClass(RESPONSE_ENTITY);
 			}
 		} else {
 			responseClass = resolveResponseClass(returnType, holder);
@@ -394,13 +345,13 @@ private JClass resolveResponseClass(TypeMirror expectedType, RestHolder holder)
 
 			// is NOT a generics, return directly
 			if (typeArguments.isEmpty()) {
-				return codeModelHelper.typeMirrorToJClass(declaredType, holder);
+				return codeModelHelper.typeMirrorToJClass(declaredType);
 			}
 
 			// is a generics, must generate a new super class
 			TypeElement declaredElement = (TypeElement) declaredType.asElement();
 
-			JClass baseClass = codeModelHelper.typeMirrorToJClass(declaredType, holder).erasure();
+			JClass baseClass = codeModelHelper.typeMirrorToJClass(declaredType).erasure();
 			JClass decoratedExpectedClass = retrieveDecoratedResponseClass(declaredType, declaredElement, holder);
 			if (decoratedExpectedClass == null) {
 				decoratedExpectedClass = baseClass;
@@ -412,7 +363,7 @@ private JClass resolveResponseClass(TypeMirror expectedType, RestHolder holder)
 		}
 
 		// is not a class nor an interface, return directly
-		return codeModelHelper.typeMirrorToJClass(expectedType, holder);
+		return codeModelHelper.typeMirrorToJClass(expectedType);
 	}
 
 	/**
@@ -444,7 +395,7 @@ private JClass retrieveDecoratedResponseClass(DeclaredType declaredType, TypeEle
 		if (decoratedClassName != null) {
 			// Configure the super class of the final decorated class
 			String decoratedClassNameSuffix = "";
-			JClass decoratedSuperClass = holder.refClass(decoratedClassName);
+			JClass decoratedSuperClass = getEnvironment().getJClass(decoratedClassName);
 			for (TypeMirror typeArgument : declaredType.getTypeArguments()) {
 				TypeMirror actualTypeArgument = typeArgument;
 				if (typeArgument instanceof WildcardType) {
@@ -455,7 +406,7 @@ private JClass retrieveDecoratedResponseClass(DeclaredType declaredType, TypeEle
 						actualTypeArgument = wildcardType.getSuperBound();
 					}
 				}
-				JClass narrowJClass = codeModelHelper.typeMirrorToJClass(actualTypeArgument, holder);
+				JClass narrowJClass = codeModelHelper.typeMirrorToJClass(actualTypeArgument);
 				decoratedSuperClass = decoratedSuperClass.narrow(narrowJClass);
 				decoratedClassNameSuffix += plainName(narrowJClass);
 			}
@@ -464,7 +415,7 @@ private JClass retrieveDecoratedResponseClass(DeclaredType declaredType, TypeEle
 			decoratedFinalClassName = decoratedFinalClassName.replaceAll("\\[\\]", "s");
 			String packageName = holder.getGeneratedClass()._package().name();
 			decoratedFinalClassName = packageName + "." + decoratedFinalClassName;
-			JDefinedClass decoratedJClass = holder.definedClass(decoratedFinalClassName);
+			JDefinedClass decoratedJClass = getEnvironment().getDefinedClass(decoratedFinalClassName);
 			decoratedJClass._extends(decoratedSuperClass);
 
 			return decoratedJClass;
@@ -495,6 +446,6 @@ protected String plainName(JClass jClass) {
 	}
 
 	public JExpression nullCastedToNarrowedClass(RestHolder holder) {
-		return JExpr.cast(holder.refClass(Class.class).narrow(holder.refClass(Void.class)), JExpr._null());
+		return JExpr.cast(getEnvironment().getJClass(Class.class).narrow(getEnvironment().getJClass(Void.class)), JExpr._null());
 	}
 }
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestSpringClasses.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestSpringClasses.java
new file mode 100644
index 0000000000..106b0a37cd
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestSpringClasses.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.rest.spring.helper;
+
+public final class RestSpringClasses {
+
+	public static final String RESPONSE_ENTITY = "org.springframework.http.ResponseEntity";
+	public static final String HTTP_HEADERS = "org.springframework.http.HttpHeaders";
+	public static final String MEDIA_TYPE = "org.springframework.http.MediaType";
+	public static final String HTTP_METHOD = "org.springframework.http.HttpMethod";
+	public static final String HTTP_ENTITY = "org.springframework.http.HttpEntity";
+	public static final String REST_TEMPLATE = "org.springframework.web.client.RestTemplate";
+	public static final String HTTP_MESSAGE_CONVERTER = "org.springframework.http.converter.HttpMessageConverter";
+	public static final String CLIENT_HTTP_REQUEST_INTERCEPTOR = "org.springframework.http.client.ClientHttpRequestInterceptor";
+	public static final String CLIENT_HTTP_REQUEST_FACTORY = "org.springframework.http.client.ClientHttpRequestFactory";
+	public static final String HTTP_AUTHENTICATION = "org.springframework.http.HttpAuthentication";
+	public static final String HTTP_BASIC_AUTHENTICATION = "org.springframework.http.HttpBasicAuthentication";
+	public static final String REST_CLIENT_EXCEPTION = "org.springframework.web.client.RestClientException";
+	public static final String NESTED_RUNTIME_EXCEPTION = "org.springframework.core.NestedRuntimeException";
+
+	private RestSpringClasses() {
+
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestSpringValidatorHelper.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestSpringValidatorHelper.java
new file mode 100644
index 0000000000..bb18eb8cca
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestSpringValidatorHelper.java
@@ -0,0 +1,426 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.rest.spring.helper;
+
+import static java.util.Arrays.asList;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.CLIENT_HTTP_REQUEST_FACTORY;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.CLIENT_HTTP_REQUEST_INTERCEPTOR;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.HTTP_MESSAGE_CONVERTER;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.REST_CLIENT_EXCEPTION;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.REST_TEMPLATE;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+import javax.lang.model.util.Elements;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.androidannotations.rest.spring.api.RestClientErrorHandling;
+import org.androidannotations.rest.spring.api.RestClientHeaders;
+import org.androidannotations.rest.spring.api.RestClientRootUrl;
+import org.androidannotations.rest.spring.api.RestClientSupport;
+
+public class RestSpringValidatorHelper extends ValidatorHelper {
+
+	private static final List<String> VALID_REST_INTERFACES = asList(RestClientHeaders.class.getName(), RestClientErrorHandling.class.getName(),
+			RestClientRootUrl.class.getName(), RestClientSupport.class.getName());
+	private static final List<Class<? extends Annotation>> REST_ANNOTATION_CLASSES = Arrays.asList(Get.class, Head.class, Options.class, Post.class, Put.class, Delete.class);
+
+	private static final String METHOD_NAME_SET_ROOT_URL = "setRootUrl";
+	private static final String METHOD_NAME_SET_AUTHENTICATION = "setAuthentication";
+	private static final String METHOD_NAME_SET_BEARER_AUTH = "setBearerAuth";
+	private static final String METHOD_NAME_GET_COOKIE = "getCookie";
+	private static final String METHOD_NAME_GET_HEADER = "getHeader";
+
+	private static final String METHOD_NAME_GET_ROOT_URL = "getRootUrl";
+
+	private final RestAnnotationHelper restAnnotationHelper;
+
+	public RestSpringValidatorHelper(AndroidAnnotationsEnvironment environment, String target) {
+		super(new TargetAnnotationHelper(environment, target));
+		restAnnotationHelper = new RestAnnotationHelper(environment, target);
+	}
+
+	public void doesNotExtendInvalidInterfaces(TypeElement element, ElementValidation valid) {
+		if (element.getInterfaces().size() > 0) {
+			boolean isValid = true;
+
+			for (TypeMirror iface : element.getInterfaces()) {
+				if (!VALID_REST_INTERFACES.contains(iface.toString())) {
+					isValid = false;
+					break;
+				}
+			}
+
+			if (!isValid) {
+				valid.addError("%s interfaces can only extend the following interfaces: " + VALID_REST_INTERFACES);
+			}
+		}
+	}
+
+	public void enclosingElementHasRestAnnotation(Element element, ElementValidation valid) {
+		String error = "can only be used in an interface annotated with";
+		enclosingElementHasAnnotation(Rest.class, element, valid, error);
+	}
+
+	public void unannotatedMethodReturnsRestTemplate(TypeElement typeElement, ElementValidation valid) {
+		List<? extends Element> enclosedElements = typeElement.getEnclosedElements();
+		boolean foundGetRestTemplateMethod = false;
+		boolean foundSetRestTemplateMethod = false;
+		boolean foundSetAuthenticationMethod = false;
+		boolean foundSetBearerAuthMethod = false;
+		boolean foundSetRootUrlMethod = false;
+		boolean foundGetCookieMethod = false;
+		boolean foundGetHeaderMethod = false;
+		boolean foundGetRootUrlMethod = false;
+
+		for (Element enclosedElement : enclosedElements) {
+			if (enclosedElement.getKind() != ElementKind.METHOD) {
+				valid.addError(enclosedElement, "Only methods are allowed in a %s annotated interface");
+			} else {
+
+				boolean hasRestAnnotation = false;
+				for (Class<? extends Annotation> annotationClass : REST_ANNOTATION_CLASSES) {
+					if (enclosedElement.getAnnotation(annotationClass) != null) {
+						hasRestAnnotation = true;
+						break;
+					}
+				}
+
+				if (!hasRestAnnotation) {
+
+					ExecutableElement executableElement = (ExecutableElement) enclosedElement;
+					TypeMirror returnType = executableElement.getReturnType();
+					String simpleName = executableElement.getSimpleName().toString();
+
+					if (returnType.toString().equals(REST_TEMPLATE)) {
+						if (executableElement.getParameters().size() > 0) {
+							valid.addError(enclosedElement,
+									"The method returning a RestTemplate should not declare any parameter in a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
+						} else {
+							if (foundGetRestTemplateMethod) {
+								valid.addError(enclosedElement, "Only one method should declare returning a RestTemplate in a " + TargetAnnotationHelper.annotationName(Rest.class)
+										+ " annotated interface");
+							} else {
+								foundGetRestTemplateMethod = true;
+							}
+						}
+					} else if (simpleName.equals(METHOD_NAME_GET_ROOT_URL)) {
+						if (!returnType.toString().equals(CanonicalNameConstants.STRING)) {
+							valid.addError(enclosedElement, "The method getRootUrl must return String on a %s annotated interface");
+						}
+
+						if (executableElement.getParameters().size() != 0) {
+							valid.addError(enclosedElement, "The method getRootUrl cannot have parameters on a " + TargetAnnotationHelper.annotationName(Rest.class)
+									+ " annotated interface");
+						}
+
+						if (!foundGetRootUrlMethod) {
+							foundGetRootUrlMethod = true;
+						} else {
+							valid.addError(enclosedElement, "The can be only one getRootUrl method on a %s annotated interface");
+						}
+					} else if (returnType.getKind() == TypeKind.VOID) {
+						List<? extends VariableElement> parameters = executableElement.getParameters();
+						if (parameters.size() == 1) {
+							VariableElement firstParameter = parameters.get(0);
+							if (firstParameter.asType().toString().equals(REST_TEMPLATE)) {
+								if (!foundSetRestTemplateMethod) {
+									foundSetRestTemplateMethod = true;
+								} else {
+									valid.addError(enclosedElement, "You can only have oneRestTemplate setter method on a " + TargetAnnotationHelper.annotationName(Rest.class)
+											+ " annotated interface");
+								}
+							} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_SET_ROOT_URL) && !foundSetRootUrlMethod) {
+								foundSetRootUrlMethod = true;
+							} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_SET_AUTHENTICATION) && !foundSetAuthenticationMethod) {
+								foundSetAuthenticationMethod = true;
+							} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_SET_BEARER_AUTH) && !foundSetBearerAuthMethod) {
+								foundSetBearerAuthMethod = true;
+							} else {
+								valid.addError(enclosedElement,
+										"The method to set a RestTemplate should have only one RestTemplate parameter on a " + TargetAnnotationHelper.annotationName(Rest.class)
+												+ " annotated interface");
+
+							}
+						} else if (parameters.size() == 2) {
+							VariableElement firstParameter = parameters.get(0);
+							VariableElement secondParameter = parameters.get(1);
+							if (!(firstParameter.asType().toString().equals(CanonicalNameConstants.STRING) && secondParameter.asType().toString().equals(CanonicalNameConstants.STRING))) {
+								valid.addError(enclosedElement,
+										"The method to set headers, cookies, or HTTP Basic Auth should have only String parameters on a " + TargetAnnotationHelper.annotationName(Rest.class)
+												+ " annotated interface");
+							}
+						} else {
+							valid.addError(enclosedElement,
+									"The method to set a RestTemplate should have only one RestTemplate parameter on a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
+						}
+					} else if (returnType.toString().equals(CanonicalNameConstants.STRING)) {
+						List<? extends VariableElement> parameters = executableElement.getParameters();
+						if (parameters.size() == 1) {
+							VariableElement firstParameter = parameters.get(0);
+							if (firstParameter.asType().toString().equals(CanonicalNameConstants.STRING)) {
+								if (executableElement.getSimpleName().toString().equals(METHOD_NAME_GET_COOKIE) && !foundGetCookieMethod) {
+									foundGetCookieMethod = true;
+								} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_GET_HEADER) && !foundGetHeaderMethod) {
+									foundGetHeaderMethod = true;
+								} else {
+									valid.addError(enclosedElement,
+											"Only one getCookie(String) and one getHeader(String) method are allowed on a " + TargetAnnotationHelper.annotationName(Rest.class)
+													+ " annotated interface");
+								}
+							} else {
+								valid.addError(enclosedElement,
+										"Only getCookie(String) and getHeader(String) can return a String on a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
+							}
+
+						} else {
+							valid.addError(enclosedElement, "The only methods that can return a String on a " + TargetAnnotationHelper.annotationName(Rest.class)
+									+ " annotated interface are getCookie(String) and getHeader(String)");
+						}
+					} else {
+						valid.addError(enclosedElement, "All methods should be annotated in a " + TargetAnnotationHelper.annotationName(Rest.class)
+								+ " annotated interface, except the ones that returns or set a RestTemplate");
+					}
+				}
+			}
+		}
+	}
+
+	public void validateConverters(Element element, ElementValidation valid) {
+		TypeMirror httpMessageConverterType = annotationHelper.typeElementFromQualifiedName(HTTP_MESSAGE_CONVERTER).asType();
+		TypeMirror httpMessageConverterTypeErased = annotationHelper.getTypeUtils().erasure(httpMessageConverterType);
+		List<DeclaredType> converters = annotationHelper.extractAnnotationClassArrayParameter(element, annotationHelper.getTarget(), "converters");
+
+		if (converters == null || converters.isEmpty()) {
+			valid.addError(element, "At least one converter is required");
+			return;
+		}
+
+		for (DeclaredType converterType : converters) {
+			TypeMirror erasedConverterType = annotationHelper.getTypeUtils().erasure(converterType);
+			if (annotationHelper.isSubtype(erasedConverterType, httpMessageConverterTypeErased)) {
+				Element converterElement = converterType.asElement();
+				if (converterElement.getKind().isClass()) {
+					if (!annotationHelper.isAbstract(converterElement)) {
+						if (converterElement.getAnnotation(EBean.class) == null) {
+							List<ExecutableElement> constructors = ElementFilter.constructorsIn(converterElement.getEnclosedElements());
+							boolean hasPublicWithNoArgumentConstructor = false;
+							for (ExecutableElement constructor : constructors) {
+								if (annotationHelper.isPublic(constructor) && constructor.getParameters().isEmpty()) {
+									hasPublicWithNoArgumentConstructor = true;
+								}
+							}
+							if (!hasPublicWithNoArgumentConstructor) {
+								valid.addError("The converter class must have a public no argument constructor");
+							}
+						}
+					} else {
+						valid.addError("The converter class must not be abstract");
+					}
+				} else {
+					valid.addError("The converter class must be a class");
+				}
+			} else {
+				valid.addError("The converter class must be a subtype of " + HTTP_MESSAGE_CONVERTER);
+			}
+		}
+	}
+
+	public void validateInterceptors(Element element, ElementValidation valid) {
+		TypeMirror clientHttpRequestInterceptorType = annotationHelper.typeElementFromQualifiedName(CLIENT_HTTP_REQUEST_INTERCEPTOR).asType();
+		TypeMirror clientHttpRequestInterceptorTypeErased = annotationHelper.getTypeUtils().erasure(clientHttpRequestInterceptorType);
+		List<DeclaredType> interceptors = annotationHelper.extractAnnotationClassArrayParameter(element, annotationHelper.getTarget(), "interceptors");
+		if (interceptors == null) {
+			return;
+		}
+		for (DeclaredType interceptorType : interceptors) {
+			TypeMirror erasedInterceptorType = annotationHelper.getTypeUtils().erasure(interceptorType);
+			if (annotationHelper.isSubtype(erasedInterceptorType, clientHttpRequestInterceptorTypeErased)) {
+				Element interceptorElement = interceptorType.asElement();
+				if (interceptorElement.getKind().isClass()) {
+					if (!annotationHelper.isAbstract(interceptorElement)) {
+						if (interceptorElement.getAnnotation(EBean.class) == null) {
+							List<ExecutableElement> constructors = ElementFilter.constructorsIn(interceptorElement.getEnclosedElements());
+							boolean hasPublicWithNoArgumentConstructor = false;
+							for (ExecutableElement constructor : constructors) {
+								if (annotationHelper.isPublic(constructor) && constructor.getParameters().isEmpty()) {
+									hasPublicWithNoArgumentConstructor = true;
+								}
+							}
+							if (!hasPublicWithNoArgumentConstructor) {
+								valid.addError("The interceptor class must have a public no argument constructor or be annotated with @EBean");
+							}
+						}
+					} else {
+						valid.addError("The interceptor class must not be abstract");
+					}
+				} else {
+					valid.addError("The interceptor class must be a class");
+				}
+			} else {
+				valid.addError("The interceptor class must be a subtype of " + CLIENT_HTTP_REQUEST_INTERCEPTOR);
+			}
+		}
+	}
+
+	public void validateRequestFactory(Element element, ElementValidation valid) {
+		TypeMirror clientHttpRequestFactoryType = annotationHelper.typeElementFromQualifiedName(CLIENT_HTTP_REQUEST_FACTORY).asType();
+		DeclaredType requestFactory = annotationHelper.extractAnnotationClassParameter(element, annotationHelper.getTarget(), "requestFactory");
+		if (requestFactory != null) {
+			if (annotationHelper.isSubtype(requestFactory, clientHttpRequestFactoryType)) {
+				Element requestFactoryElement = requestFactory.asElement();
+				if (requestFactoryElement.getKind().isClass()) {
+					if (!annotationHelper.isAbstract(requestFactoryElement)) {
+						if (requestFactoryElement.getAnnotation(EBean.class) != null) {
+							return;
+						}
+						List<ExecutableElement> constructors = ElementFilter.constructorsIn(requestFactoryElement.getEnclosedElements());
+						for (ExecutableElement constructor : constructors) {
+							if (annotationHelper.isPublic(constructor) && constructor.getParameters().isEmpty()) {
+								return;
+							}
+						}
+						valid.addError("The requestFactory class must have a public no argument constructor or must be annotated with @EBean");
+					} else {
+						valid.addError("The requestFactory class must not be abstract");
+					}
+				} else {
+					valid.addError("The requestFactory class must be a class");
+				}
+			} else {
+				valid.addError("The requestFactory class must be a subtype of " + CLIENT_HTTP_REQUEST_FACTORY);
+			}
+		}
+	}
+
+	public void throwsOnlyRestClientException(ExecutableElement element, ElementValidation valid) {
+		List<? extends TypeMirror> thrownTypes = element.getThrownTypes();
+		if (thrownTypes.size() > 0) {
+			if (thrownTypes.size() > 1 || !thrownTypes.get(0).toString().equals(REST_CLIENT_EXCEPTION)) {
+				valid.addError("%s annotated methods can only declare throwing a RestClientException");
+			}
+		}
+	}
+
+	public void urlVariableNamesExistInParameters(ExecutableElement element, Set<String> variableNames, ElementValidation valid) {
+
+		List<? extends VariableElement> parameters = element.getParameters();
+
+		List<String> parametersName = new ArrayList<>();
+		for (VariableElement parameter : parameters) {
+			parametersName.add(parameter.getSimpleName().toString());
+		}
+
+		String[] cookiesToUrl = restAnnotationHelper.requiredUrlCookies(element);
+		if (cookiesToUrl != null) {
+			Collections.addAll(parametersName, cookiesToUrl);
+		}
+
+		for (String variableName : variableNames) {
+			if (!parametersName.contains(variableName)) {
+				valid.addError("%s annotated method has an url variable which name could not be found in the method parameters: " + variableName);
+				return;
+			}
+		}
+	}
+
+	public void urlVariableNamesExistInParametersAndHasNoOneMoreParameter(ExecutableElement element, ElementValidation valid) {
+		if (valid.isValid()) {
+			Set<String> variableNames = restAnnotationHelper.extractUrlVariableNames(element);
+			urlVariableNamesExistInParameters(element, variableNames, valid);
+			if (valid.isValid()) {
+				List<? extends VariableElement> parameters = element.getParameters();
+
+				if (parameters.size() > variableNames.size()) {
+					valid.addError("%s annotated method has only url variables in the method parameters");
+				}
+			}
+		}
+	}
+
+	public void urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter(ExecutableElement element, ElementValidation valid) {
+		if (valid.isValid()) {
+			Set<String> variableNames = restAnnotationHelper.extractUrlVariableNames(element);
+			urlVariableNamesExistInParameters(element, variableNames, valid);
+			if (valid.isValid()) {
+				List<? extends VariableElement> parameters = element.getParameters();
+
+				if (parameters.size() > variableNames.size() + 1) {
+					valid.addError("%s annotated method has more than one entity parameter");
+				}
+			}
+		}
+	}
+
+	public void hasSpringAndroidJars(ElementValidation valid) {
+		Elements elementUtils = annotationHelper.getElementUtils();
+		if (elementUtils.getTypeElement(REST_TEMPLATE) == null) {
+			valid.addError("Could not find the SpringAndroid framework in the classpath, the following class is missing: " + REST_TEMPLATE);
+		}
+	}
+
+	public void hasHttpHeadersReturnType(ExecutableElement element, ElementValidation valid) {
+		String returnType = element.getReturnType().toString();
+		if (!returnType.equals("org.springframework.http.HttpHeaders")) {
+			valid.addError("%s annotated methods can only return a HttpHeaders, not " + returnType);
+		}
+	}
+
+	public void hasSetOfHttpMethodReturnType(ExecutableElement element, ElementValidation valid) {
+		TypeMirror returnType = element.getReturnType();
+		String returnTypeString = returnType.toString();
+		if (!returnTypeString.equals("java.util.Set<org.springframework.http.HttpMethod>")) {
+			valid.addError("%s annotated methods can only return a Set of HttpMethod, not " + returnTypeString);
+		} else {
+			DeclaredType declaredType = (DeclaredType) returnType;
+			List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
+			if (typeArguments.size() != 1) {
+				valid.addError("%s annotated methods can only return a parameterized Set (with HttpMethod)");
+			} else {
+				TypeMirror typeArgument = typeArguments.get(0);
+				if (!typeArgument.toString().equals("org.springframework.http.HttpMethod")) {
+					valid.addError("%s annotated methods can only return a parameterized Set of HttpMethod, not " + typeArgument.toString());
+				}
+			}
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/RestHolder.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/holder/RestHolder.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/RestHolder.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/holder/RestHolder.java
index 7a49fc114b..754ae60de2 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/RestHolder.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/holder/RestHolder.java
@@ -13,13 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.holder;
+package org.androidannotations.rest.spring.holder;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JExpr.lit;
-import static org.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE;
 import static org.androidannotations.helper.CanonicalNameConstants.STRING;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.HTTP_AUTHENTICATION;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.HTTP_BASIC_AUTHENTICATION;
+import static org.androidannotations.rest.spring.helper.RestSpringClasses.REST_TEMPLATE;
 
 import java.util.List;
 
@@ -27,9 +29,9 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
 
-import org.androidannotations.api.rest.RestErrorHandler;
-import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.process.ProcessHolder;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.holder.BaseGeneratedClassHolder;
+import org.androidannotations.rest.spring.api.RestErrorHandler;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -53,15 +55,15 @@ public class RestHolder extends BaseGeneratedClassHolder {
 	private JFieldVar authenticationField;
 	private JFieldVar restErrorHandlerField;
 
-	public RestHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
-		super(processHolder, annotatedElement);
+	public RestHolder(AndroidAnnotationsEnvironment environment, TypeElement annotatedElement) throws Exception {
+		super(environment, annotatedElement);
 		implementMethods();
 	}
 
 	@Override
 	protected void setExtends() {
 		String annotatedComponentQualifiedName = annotatedElement.getQualifiedName().toString();
-		JClass annotatedComponent = codeModel().directClass(annotatedComponentQualifiedName);
+		JClass annotatedComponent = getCodeModel().directClass(annotatedComponentQualifiedName);
 		generatedClass._implements(narrow(annotatedComponent));
 	}
 
@@ -127,7 +129,7 @@ private void implementSetBasicAuth(List<ExecutableElement> methods) {
 		JMethod setAuthMethod = codeModelHelper.implementMethod(this, methods, "setHttpBasicAuth", TypeKind.VOID.toString(), STRING, STRING);
 
 		if (setAuthMethod != null) {
-			JClass basicAuthClass = classes().HTTP_BASIC_AUTHENTICATION;
+			JClass basicAuthClass = getJClass(HTTP_BASIC_AUTHENTICATION);
 			JInvocation basicAuthentication = JExpr._new(basicAuthClass).arg(setAuthMethod.params().get(0)).arg(setAuthMethod.params().get(1));
 			setAuthMethod.body().assign(_this().ref(getAuthenticationField()), basicAuthentication);
 		}
@@ -140,8 +142,8 @@ private void implementSetBearerAuth(List<ExecutableElement> methods) {
 			JVar tokenParamVar = setBearerMethod.params().get(0);
 			JExpression tokenExpr = lit("Bearer ").plus(tokenParamVar);
 
-			JClass authClass = classes().HTTP_AUTHENTICATION;
-			JDefinedClass anonymousHttpAuthClass = codeModel().anonymousClass(authClass);
+			JClass authClass = getJClass(HTTP_AUTHENTICATION);
+			JDefinedClass anonymousHttpAuthClass = getCodeModel().anonymousClass(authClass);
 
 			JMethod getHeaderValueMethod = anonymousHttpAuthClass.method(JMod.PUBLIC, String.class, "getHeaderValue");
 			getHeaderValueMethod.annotate(Override.class);
@@ -154,7 +156,7 @@ private void implementSetBearerAuth(List<ExecutableElement> methods) {
 	}
 
 	private void implementSetAuthentication(List<ExecutableElement> methods) {
-		JMethod setAuthMethod = codeModelHelper.implementMethod(this, methods, "setAuthentication", TypeKind.VOID.toString(), CanonicalNameConstants.HTTP_AUTHENTICATION);
+		JMethod setAuthMethod = codeModelHelper.implementMethod(this, methods, "setAuthentication", TypeKind.VOID.toString(), HTTP_AUTHENTICATION);
 
 		if (setAuthMethod != null) {
 			setAuthMethod.body().assign(_this().ref(getAuthenticationField()), setAuthMethod.params().get(0));
@@ -220,7 +222,7 @@ public JVar getInitContextParam() {
 
 	private void setInit() {
 		init = getGeneratedClass().constructor(JMod.PUBLIC);
-		initContextParam = init.param(classes().CONTEXT, "context");
+		initContextParam = init.param(getClasses().CONTEXT, "context");
 	}
 
 	public JFieldVar getRootUrlField() {
@@ -231,7 +233,7 @@ public JFieldVar getRootUrlField() {
 	}
 
 	private void setRootUrlField() {
-		rootUrlField = getGeneratedClass().field(JMod.PRIVATE, classes().STRING, "rootUrl");
+		rootUrlField = getGeneratedClass().field(JMod.PRIVATE, getClasses().STRING, "rootUrl");
 	}
 
 	public JFieldVar getRestTemplateField() {
@@ -242,8 +244,8 @@ public JFieldVar getRestTemplateField() {
 	}
 
 	private void setRestTemplateField() {
-		restTemplateField = getGeneratedClass().field(JMod.PRIVATE, classes().REST_TEMPLATE, "restTemplate");
-		getInit().body().assign(restTemplateField, _new(classes().REST_TEMPLATE));
+		restTemplateField = getGeneratedClass().field(JMod.PRIVATE, getJClass(REST_TEMPLATE), "restTemplate");
+		getInit().body().assign(restTemplateField, _new(getJClass(REST_TEMPLATE)));
 	}
 
 	public JFieldVar getAvailableHeadersField() {
@@ -254,8 +256,8 @@ public JFieldVar getAvailableHeadersField() {
 	}
 
 	private void setAvailableHeadersField() {
-		JClass stringClass = classes().STRING;
-		JClass mapClass = classes().HASH_MAP.narrow(stringClass, stringClass);
+		JClass stringClass = getClasses().STRING;
+		JClass mapClass = getClasses().HASH_MAP.narrow(stringClass, stringClass);
 		availableHeadersField = getGeneratedClass().field(JMod.PRIVATE, mapClass, "availableHeaders");
 		getInit().body().assign(availableHeadersField, _new(mapClass));
 	}
@@ -268,8 +270,8 @@ public JFieldVar getAvailableCookiesField() {
 	}
 
 	private void setAvailableCookiesField() {
-		JClass stringClass = classes().STRING;
-		JClass mapClass = classes().HASH_MAP.narrow(stringClass, stringClass);
+		JClass stringClass = getClasses().STRING;
+		JClass mapClass = getClasses().HASH_MAP.narrow(stringClass, stringClass);
 		availableCookiesField = getGeneratedClass().field(JMod.PRIVATE, mapClass, "availableCookies");
 		getInit().body().assign(availableCookiesField, _new(mapClass));
 	}
@@ -282,7 +284,7 @@ public JFieldVar getAuthenticationField() {
 	}
 
 	private void setAuthenticationField() {
-		authenticationField = getGeneratedClass().field(JMod.PRIVATE, classes().HTTP_AUTHENTICATION, "authentication");
+		authenticationField = getGeneratedClass().field(JMod.PRIVATE, getJClass(HTTP_AUTHENTICATION), "authentication");
 	}
 
 	public JFieldVar getRestErrorHandlerField() {
@@ -292,7 +294,7 @@ public JFieldVar getRestErrorHandlerField() {
 	}
 
 	private void setRestErrorHandlerField() {
-		JClass restErrorHandlerClass = refClass(RestErrorHandler.class.getName());
+		JClass restErrorHandlerClass = getJClass(RestErrorHandler.class.getName());
 		restErrorHandlerField = getGeneratedClass().field(JMod.PRIVATE, restErrorHandlerClass, "restErrorHandler");
 	}
 
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
new file mode 100644
index 0000000000..45e322689e
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
@@ -0,0 +1 @@
+org.androidannotations.rest.spring.RestSpringPlugin
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/resources/rest-spring.properties b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/resources/rest-spring.properties
new file mode 100644
index 0000000000..6e97a9b22b
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/resources/rest-spring.properties
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+#
+# 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.
+#
+
+version=${project.version}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/AbstractConverter.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/AbstractConverter.java
index beaa3f8563..59a3bfa19a 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/AbstractConverter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import org.springframework.http.converter.AbstractHttpMessageConverter;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/AbstractInterceptor.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/AbstractInterceptor.java
index f2615533d7..d6cc96943d 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/AbstractInterceptor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClassClient.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClassClient.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClassClient.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClassClient.java
index f80b3d66fc..bfa4601e70 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClassClient.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClassClient.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 
 // CHECKSTYLE:OFF
 @Rest(converters = {})
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAbstractConverter.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAbstractConverter.java
index 25051c2728..4660d10b9e 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAbstractConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 
 @Rest(converters = { AbstractConverter.class })
 public interface ClientWithAbstractConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAbstractInterceptor.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAbstractInterceptor.java
index 487713e1d1..f7a0564125 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAbstractInterceptor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 
 @Rest(converters = { AbstractInterceptor.class })
 public interface ClientWithAbstractInterceptor {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAllInterfaces.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAllInterfaces.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAllInterfaces.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAllInterfaces.java
index 0d39ecc4cb..f371662aea 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAllInterfaces.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithAllInterfaces.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
-import org.androidannotations.api.rest.RestClientErrorHandling;
-import org.androidannotations.api.rest.RestClientHeaders;
-import org.androidannotations.api.rest.RestClientRootUrl;
-import org.androidannotations.api.rest.RestClientSupport;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.androidannotations.rest.spring.api.RestClientErrorHandling;
+import org.androidannotations.rest.spring.api.RestClientHeaders;
+import org.androidannotations.rest.spring.api.RestClientRootUrl;
+import org.androidannotations.rest.spring.api.RestClientSupport;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNoConverters.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNoConverters.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNoConverters.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNoConverters.java
index f54d774754..ddfb87e0ba 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNoConverters.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNoConverters.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 
 // CHECKSTYLE:OFF
 @Rest(converters = {})
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNonConverter.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNonConverter.java
index af4eb8951e..2b68014ad4 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNonConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 
 @Rest(converters = { Object.class })
 public interface ClientWithNonConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNonInterceptor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNonInterceptor.java
index df31a266e9..de5ecd42f6 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithNonInterceptor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class }, interceptors = { Object.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithPathVariable.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPathVariable.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithPathVariable.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPathVariable.java
index 37019e0619..79730eef2e 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithPathVariable.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPathVariable.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.util.Set;
 
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithPrimitiveReturnType.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPrimitiveReturnType.java
similarity index 71%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithPrimitiveReturnType.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPrimitiveReturnType.java
index ee1457ef9a..fcacad4033 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithPrimitiveReturnType.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPrimitiveReturnType.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
-
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.Rest;
+package org.androidannotations.rest.spring;
+
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = MappingJacksonHttpMessageConverter.class)
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithRequestEntity.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithRequestEntity.java
similarity index 73%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithRequestEntity.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithRequestEntity.java
index 236892150f..e4ae6738f7 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithRequestEntity.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithRequestEntity.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.util.Set;
 
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithResponseEntity.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithResponseEntity.java
similarity index 70%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithResponseEntity.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithResponseEntity.java
index 8fbb755ef0..4f89299b89 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithResponseEntity.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithResponseEntity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
-
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.Rest;
+package org.androidannotations.rest.spring;
+
+import org.androidannotations.rest.spring.annotations.Delete;
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Head;
+import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Post;
+import org.androidannotations.rest.spring.annotations.Put;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = MappingJacksonHttpMessageConverter.class)
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithValidConverter.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithValidConverter.java
index 2cb78c8396..8a595090d8 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithValidConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithValidInterceptor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithValidInterceptor.java
index 86bb6fd3bc..2a87fe9f55 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithValidInterceptor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class }, interceptors = { ValidInterceptor.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongConstructorConverter.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongConstructorConverter.java
index d3a8a4b0a2..85abc92530 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongConstructorConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 
 @Rest(converters = { WrongConstructorConverter.class })
 public interface ClientWithWrongConstructorConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongConstructorInterceptor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongConstructorInterceptor.java
index bbbf846741..f261409071 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongConstructorInterceptor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class }, interceptors = { WrongConstructorInterceptor.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongEnhancedMethod.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongEnhancedMethod.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java
index 67cb469aa6..ee1ba0069d 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongEnhancedMethod.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongInterface.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongInterface.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongInterface.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongInterface.java
index 0c86e42680..2bdb32651a 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongInterface.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongInterface.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/Entity.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/Entity.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/Entity.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/Entity.java
index d2e767d440..0060acbaa6 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/Entity.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/Entity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 public class Entity {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/GenericClient.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/GenericClient.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/GenericClient.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/GenericClient.java
index 1117b0dcbd..4c21f84bd8 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/GenericClient.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/GenericClient.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
-import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.rest.spring.annotations.Rest;
 import org.springframework.http.converter.StringHttpMessageConverter;
 
 @Rest(converters = { StringHttpMessageConverter.class })
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/GenericClientHolderBean.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/GenericClientHolderBean.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/GenericClientHolderBean.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/GenericClientHolderBean.java
index 6bcd0f411a..ade319e42a 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/GenericClientHolderBean.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/GenericClientHolderBean.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import org.androidannotations.annotations.EBean;
-import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.rest.spring.annotations.RestService;
 
 @EBean
 public class GenericClientHolderBean {
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/R.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/R.java
new file mode 100644
index 0000000000..6a1ddd0faf
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/R.java
@@ -0,0 +1,5 @@
+package org.androidannotations.rest.spring;
+
+public class R {
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestConverterTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestConverterTest.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestConverterTest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestConverterTest.java
index d54dd74f18..c45f7ebbd8 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestConverterTest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestConverterTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestInterceptorTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestInterceptorTest.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestInterceptorTest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestInterceptorTest.java
index c7164470c9..498cc8c688 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestInterceptorTest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestInterceptorTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestServiceTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestServiceTest.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestServiceTest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestServiceTest.java
index 938c3c1c05..93adb999d0 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestServiceTest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestServiceTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestTest.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestTest.java
index 7e969636e6..9ea5a3f5cc 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ValidInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ValidInterceptor.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ValidInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ValidInterceptor.java
index 1be4aae651..dec96413cd 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ValidInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ValidInterceptor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorConverter.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorConverter.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorConverter.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorConverter.java
index bf52175006..05e80ae764 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorConverter.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorConverter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorInterceptor.java
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java
index 5e8f685cf3..a2eff24efe 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.rest;
+package org.androidannotations.rest.spring;
 
 import java.io.IOException;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/resources/org/androidannotations/rest/spring/AndroidManifest.xml
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/resources/org/androidannotations/rest/spring/AndroidManifest.xml
index cd9b2aa73d..23587ee5d5 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/resources/org/androidannotations/rest/spring/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.androidannotations.testprocessor"
+    package="org.androidannotations.rest.spring"
     android:versionCode="1"
     android:versionName="1.0" >
     
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/NoInternetPermissionManifest.xml b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/resources/org/androidannotations/rest/spring/NoInternetPermissionManifest.xml
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/NoInternetPermissionManifest.xml
rename to AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/resources/org/androidannotations/rest/spring/NoInternetPermissionManifest.xml
index f10b686342..0997ecceef 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/NoInternetPermissionManifest.xml
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/resources/org/androidannotations/rest/spring/NoInternetPermissionManifest.xml
@@ -17,7 +17,7 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.androidannotations.testprocessor"
+    package="org.androidannotations.rest.spring"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/AndroidAnnotations/androidannotations-roboguice/pom.xml b/AndroidAnnotations/androidannotations-roboguice/pom.xml
new file mode 100644
index 0000000000..f0e77f2c23
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-parent</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-roboguice</artifactId>
+	<description>The folder containing RoboGuice plugin for AndroidAnnotations</description>
+	<name>RoboGuice plugin parent</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<main.basedir>${project.parent.basedir}</main.basedir>
+	</properties>
+
+	<modules>
+		<module>roboguice</module>
+		<module>roboguice-api</module>
+		<module>roboguice-test</module>
+	</modules>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>roboguice-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.androidannotations</groupId>
+				<artifactId>roboguice</artifactId>
+				<version>${project.version}</version>
+				<scope>compile</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-api/pom.xml b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/pom.xml
new file mode 100644
index 0000000000..2aade22517
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<artifactId>androidannotations-roboguice</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>roboguice-api</artifactId>
+	<description>The API jar containing the annotations</description>
+	<name>RoboGuice plugin API</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RoboGuice.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/java/org/androidannotations/roboguice/annotations/RoboGuice.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RoboGuice.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/java/org/androidannotations/roboguice/annotations/RoboGuice.java
index c1ec66dd45..868864cc76 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RoboGuice.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/java/org/androidannotations/roboguice/annotations/RoboGuice.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.annotations;
+package org.androidannotations.roboguice.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/roboguice/RoboGuiceHelper.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/java/org/androidannotations/roboguice/api/RoboGuiceHelper.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/roboguice/RoboGuiceHelper.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/java/org/androidannotations/roboguice/api/RoboGuiceHelper.java
index d5ce7b7fa4..4c265c0480 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/roboguice/RoboGuiceHelper.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/java/org/androidannotations/roboguice/api/RoboGuiceHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.api.roboguice;
+package org.androidannotations.roboguice.api;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/resources/roboguice-api.properties b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/resources/roboguice-api.properties
new file mode 100644
index 0000000000..6e97a9b22b
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-api/src/main/resources/roboguice-api.properties
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+#
+# 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.
+#
+
+version=${project.version}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/pom.xml b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/pom.xml
new file mode 100644
index 0000000000..f5e7cbaaa5
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<artifactId>androidannotations-roboguice</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>roboguice-test</artifactId>
+	<packaging>apk</packaging>
+	<name>RoboGuice plugin functional test suite</name>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+		<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>roboguice</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>roboguice-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.roboguice</groupId>
+			<artifactId>roboguice</artifactId>
+			<version>3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.robolectric</groupId>
+			<artifactId>robolectric</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup</groupId>
+			<artifactId>fest-android</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easytesting</groupId>
+			<artifactId>fest-reflect</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.simpligility.maven.plugins</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<showWarnings>true</showWarnings>
+					<compilerArgs>
+						<arg>-AlogLevel=WARNING</arg>
+						<arg>-AandroidManifestFile=${project.basedir}/src/main/AndroidManifest.xml</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/AndroidManifest.xml b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..66a6067d44
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.androidannotations.roboguice.test"
+    android:versionCode="1"
+    android:versionName="2.1-SNAPSHOT" xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="16" tools:ignore="OldTargetApi"/>
+
+    <application
+        android:name=".SampleRoboApplication_"
+        android:debuggable="true" >
+
+        <activity android:name=".MapActivityWithRoboGuice_" />
+        <activity android:name=".ActivityWithRoboGuice_" />
+        <activity android:name=".ApplicationInjectedActivity_" />
+    </application>
+
+</manifest>
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/ActivityWithRoboGuice.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/ActivityWithRoboGuice.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/ActivityWithRoboGuice.java
index 611935214e..a65c91c11d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/ActivityWithRoboGuice.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import roboguice.inject.InjectResource;
-import roboguice.inject.InjectView;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.roboguice.annotations.RoboGuice;
+
 import android.app.Activity;
 import android.widget.TextView;
 
 import com.google.inject.Inject;
 
-import org.androidannotations.annotations.AfterViews;
-import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.RoboGuice;
-import org.androidannotations.test15.R;
+import roboguice.inject.InjectResource;
+import roboguice.inject.InjectView;
 
 /**
  * Adapted from http://pivotal.github.com/robolectric/roboguice.html
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ApplicationInjectedActivity.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/ApplicationInjectedActivity.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ApplicationInjectedActivity.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/ApplicationInjectedActivity.java
index edd86de798..9c9b922dae 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ApplicationInjectedActivity.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/ApplicationInjectedActivity.java
@@ -13,11 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.roboguice.test;
 
 import org.androidannotations.annotations.App;
 import org.androidannotations.annotations.EActivity;
-import org.androidannotations.test15.roboguice.SampleRoboApplication;
 
 import android.app.Activity;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/Counter.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/Counter.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/Counter.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/Counter.java
index 41574f142e..25b51bebcc 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/Counter.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/Counter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 public class Counter {
 	public int count = 0;
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorAssert.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/EmptyDependency.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorAssert.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/EmptyDependency.java
index 876dbe5d6f..915ffb0b36 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorAssert.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/EmptyDependency.java
@@ -13,9 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.utils;
+package org.androidannotations.roboguice.test;
 
+import org.androidannotations.annotations.EBean;
 
-public class ProcessorAssert {
+@EBean
+public class EmptyDependency {
 
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteBean.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/EnhancedClass.java
similarity index 78%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteBean.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/EnhancedClass.java
index 5b4b26690b..6f01d08a7d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteBean.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/EnhancedClass.java
@@ -13,15 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.ormlite;
+package org.androidannotations.roboguice.test;
 
+import org.androidannotations.annotations.App;
 import org.androidannotations.annotations.EBean;
-import org.androidannotations.annotations.OrmLiteDao;
 
 @EBean
-public class OrmLiteBean {
-
-	@OrmLiteDao(helper = DatabaseHelper.class)
-	UserDao userDao;
+public class EnhancedClass {
 
+	@App
+	SampleRoboApplication customApplication;
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/MapActivityWithRoboGuice.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/MapActivityWithRoboGuice.java
index efaf84d98d..0df8dfba83 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/MapActivityWithRoboGuice.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import org.androidannotations.annotations.EActivity;
 
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/MyFragment.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/MyFragment.java
new file mode 100644
index 0000000000..f2ec0f765d
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/MyFragment.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.roboguice.test;
+
+import org.androidannotations.annotations.App;
+import org.androidannotations.annotations.EFragment;
+
+import android.app.Fragment;
+
+@EFragment(R.layout.injected)
+public class MyFragment extends Fragment {
+
+	@App
+	SampleRoboApplication customApplication;
+
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/RobolectricSampleModule.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/RobolectricSampleModule.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/RobolectricSampleModule.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/RobolectricSampleModule.java
index 5ad755c848..26ee590f94 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/RobolectricSampleModule.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/RobolectricSampleModule.java
@@ -13,11 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import com.google.inject.AbstractModule;
 
-
 public class RobolectricSampleModule extends AbstractModule {
 
 	@Override
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/SampleRoboApplication.java
similarity index 72%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/SampleRoboApplication.java
index 278af65144..960c6ac847 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/java/org/androidannotations/roboguice/test/SampleRoboApplication.java
@@ -13,14 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EApplication;
-import org.androidannotations.annotations.OrmLiteDao;
-import org.androidannotations.test15.ebean.EmptyDependency;
-import org.androidannotations.test15.ormlite.DatabaseHelper;
-import org.androidannotations.test15.ormlite.UserDao;
 
 import android.app.Application;
 
@@ -30,7 +26,4 @@ public class SampleRoboApplication extends Application {
 	@Bean
 	public EmptyDependency someDependency;
 
-	@OrmLiteDao(helper = DatabaseHelper.class)
-	UserDao userDao;
-
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/drawable-hdpi/roboguice.png b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/drawable-hdpi/roboguice.png
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/drawable-hdpi/roboguice.png
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/drawable-hdpi/roboguice.png
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/res/layout/injected.xml b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/layout/injected.xml
similarity index 100%
rename from AndroidAnnotations/functional-test-1-5/src/main/res/layout/injected.xml
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/layout/injected.xml
diff --git a/AndroidAnnotations/androidannotations/plugin.xml b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/values/strings.xml
similarity index 63%
rename from AndroidAnnotations/androidannotations/plugin.xml
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/values/strings.xml
index ef55683653..381b39b286 100644
--- a/AndroidAnnotations/androidannotations/plugin.xml
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     Copyright (C) 2010-2015 eBusiness Information, Excilys Group
@@ -16,13 +16,9 @@
     the License.
 
 -->
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
-        	<java6processors enableDefault="true">
-                <java6processor class="org.androidannotations.AndroidAnnotationProcessor"/>
-         </java6processors>         
-   </extension>
+<resources>
 
-</plugin>
+    <string name="app_name">android-functional-test-1-5</string>
+    <string name="injected_activity_caption">Roboguice Activity tested with Robolectric</string>
+
+</resources>
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/ApplicationInjectedActivityTest.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/ApplicationInjectedActivityTest.java
index 6706b4f008..5d4830cba3 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/ApplicationInjectedActivityTest.java
@@ -13,12 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15;
+package org.androidannotations.roboguice.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.roboguice.SampleRoboApplication;
-import org.androidannotations.test15.roboguice.SampleRoboApplication_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/FakeDateProvider.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/FakeDateProvider.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/FakeDateProvider.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/FakeDateProvider.java
index 151fdb752a..bc6ea2fca2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/FakeDateProvider.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/FakeDateProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/application/GeneratedApplicationTest.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/GeneratedApplicationTest.java
similarity index 85%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/application/GeneratedApplicationTest.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/GeneratedApplicationTest.java
index 514a6af15f..3593e2888d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/application/GeneratedApplicationTest.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/GeneratedApplicationTest.java
@@ -13,12 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.application;
+package org.androidannotations.roboguice.test;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
-import org.androidannotations.test15.roboguice.SampleRoboApplication;
-import org.androidannotations.test15.roboguice.SampleRoboApplication_;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/InjectedActivityTest.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/InjectedActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/InjectedActivityTest.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/InjectedActivityTest.java
index be2f7750a6..8db6318d71 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/InjectedActivityTest.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/InjectedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -21,19 +21,19 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 
-import org.androidannotations.test15.R;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
-import roboguice.RoboGuice;
 import android.content.Context;
 import android.widget.TextView;
 
 import com.google.inject.Inject;
 
+import roboguice.RoboGuice;
+
 @RunWith(RobolectricTestRunner.class)
 public class InjectedActivityTest {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/RobolectricSampleTestModule.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/RobolectricSampleTestModule.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/RobolectricSampleTestModule.java
index ba384865a0..fcf5518887 100644
--- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/RobolectricSampleTestModule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.test15.roboguice;
+package org.androidannotations.roboguice.test;
 
 import java.util.Date;
 
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java
new file mode 100644
index 0000000000..4dfd4a7b9c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java
@@ -0,0 +1,38 @@
+package org.androidannotations.roboguice.test;
+
+import java.lang.reflect.Method;
+
+import org.robolectric.Robolectric;
+import org.robolectric.TestLifecycleApplication;
+
+import android.app.Application;
+
+import roboguice.RoboGuice;
+
+// CHECKSTYLE:OFF
+public class TestSampleRoboApplication_ extends Application implements TestLifecycleApplication {
+	// CHECKSTYLE:ON
+	@Override
+	public void onCreate() {
+		super.onCreate();
+
+		RoboGuice.overrideApplicationInjector(this, RoboGuice.newDefaultRoboModule(this), new RobolectricSampleModule());
+	}
+
+	@Override
+	public void beforeTest(Method method) {
+	}
+
+	@Override
+	public void prepareTest(Object test) {
+		TestSampleRoboApplication_ application = (TestSampleRoboApplication_) Robolectric.application;
+
+		RoboGuice.overrideApplicationInjector(application, RoboGuice.newDefaultRoboModule(application), new RobolectricSampleTestModule());
+
+		RoboGuice.getInjector(application).injectMembers(test);
+	}
+
+	@Override
+	public void afterTest(Method method) {
+	}
+}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/resources/org.robolectric.Config.properties b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/resources/org.robolectric.Config.properties
new file mode 100644
index 0000000000..93f06bf97c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/resources/org.robolectric.Config.properties
@@ -0,0 +1 @@
+manifest=src/main/AndroidManifest.xml
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/pom.xml b/AndroidAnnotations/androidannotations-roboguice/roboguice/pom.xml
new file mode 100644
index 0000000000..4d8fc1e42f
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<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>
+		<groupId>org.androidannotations</groupId>
+		<artifactId>androidannotations-roboguice</artifactId>
+		<version>4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>roboguice</artifactId>
+	<name>RoboGuice Annotation Processor</name>
+	<description>AndroidAnnotations plugin for RoboGuice</description>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>androidannotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.androidannotations</groupId>
+			<artifactId>roboguice-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.codemodel</groupId>
+			<artifactId>codemodel</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgument>-proc:none</compilerArgument>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java
new file mode 100644
index 0000000000..442dc73cb7
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.roboguice;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.handler.AnnotationHandler;
+import org.androidannotations.plugin.AndroidAnnotationsPlugin;
+import org.androidannotations.roboguice.handler.RoboGuiceHandler;
+
+public class RoboGuicePlugin extends AndroidAnnotationsPlugin {
+
+	private static final String NAME = "RoboGuice";
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
+		List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
+		annotationHandlers.add(new RoboGuiceHandler(androidAnnotationEnv));
+		return annotationHandlers;
+	}
+}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RoboGuiceHandler.java b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/handler/RoboGuiceHandler.java
similarity index 55%
rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RoboGuiceHandler.java
rename to AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/handler/RoboGuiceHandler.java
index 7b047a92fb..7e697a5f10 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RoboGuiceHandler.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/handler/RoboGuiceHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.androidannotations.handler;
+package org.androidannotations.roboguice.handler;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._super;
@@ -26,18 +26,21 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.type.TypeMirror;
 
-import org.androidannotations.annotations.RoboGuice;
+import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.ElementValidation;
+import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EActivityHolder;
-import org.androidannotations.holder.RoboGuiceDelegate;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
+import org.androidannotations.roboguice.annotations.RoboGuice;
+import org.androidannotations.roboguice.api.RoboGuiceHelper;
+import org.androidannotations.roboguice.helper.RoboGuiceClasses;
+import org.androidannotations.roboguice.helper.RoboGuiceValidatorHelper;
+import org.androidannotations.roboguice.holder.RoboGuiceHolder;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
@@ -52,51 +55,54 @@
 
 public class RoboGuiceHandler extends BaseAnnotationHandler<EActivityHolder> {
 
-	public RoboGuiceHandler(ProcessingEnvironment processingEnvironment) {
-		super(RoboGuice.class, processingEnvironment);
+	private final RoboGuiceValidatorHelper roboGuiceValidatorHelper;
+
+	public RoboGuiceHandler(AndroidAnnotationsEnvironment environment) {
+		super(RoboGuice.class, environment);
+		roboGuiceValidatorHelper = new RoboGuiceValidatorHelper(annotationHelper);
 	}
 
 	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		validatorHelper.hasEActivity(element, validatedElements, valid);
+	public void validate(Element element, ElementValidation validation) {
+		validatorHelper.hasEActivity(element, validation);
 
-		validatorHelper.hasRoboGuiceJars(element, valid);
+		roboGuiceValidatorHelper.hasRoboGuiceJars(validation);
 	}
 
 	@Override
 	public void process(Element element, EActivityHolder holder) {
-		RoboGuiceDelegate roboGuiceDelegate = holder.getRoboGuiceDelegate();
+		RoboGuiceHolder roboGuiceHolder = holder.getPluginHolder(new RoboGuiceHolder(holder));
 
-		holder.getGeneratedClass()._implements(classes().ROBO_CONTEXT);
+		holder.getGeneratedClass()._implements(getJClass(RoboGuiceClasses.ROBO_CONTEXT));
 
-		JFieldVar scope = roboGuiceDelegate.getScopeField();
-		JFieldVar scopedObjects = roboGuiceDelegate.getScopedObjectsField();
-		JFieldVar eventManager = roboGuiceDelegate.getEventManagerField();
-		roboGuiceDelegate.getContentViewListenerField();
+		JFieldVar scope = roboGuiceHolder.getScopeField();
+		JFieldVar scopedObjects = roboGuiceHolder.getScopedObjectsField();
+		JFieldVar eventManager = roboGuiceHolder.getEventManagerField();
+		roboGuiceHolder.getContentViewListenerField();
 		listenerFields(element, holder);
 
 		beforeCreateMethod(holder, scope, scopedObjects, eventManager);
-		onRestartMethod(roboGuiceDelegate, eventManager);
-		onStartMethod(roboGuiceDelegate, eventManager);
-		onResumeMethod(roboGuiceDelegate, eventManager);
-		onPauseMethod(roboGuiceDelegate, eventManager);
-		onNewIntentMethod(roboGuiceDelegate, eventManager);
-		onStopMethod(roboGuiceDelegate, eventManager);
-		onDestroyMethod(roboGuiceDelegate, eventManager);
-		onConfigurationChangedMethod(roboGuiceDelegate, eventManager);
-		onContentChangedMethod(roboGuiceDelegate, holder, scope, eventManager);
-		onActivityResultMethod(roboGuiceDelegate, eventManager);
+		onRestartMethod(holder, eventManager);
+		onStartMethod(holder, eventManager);
+		onResumeMethod(holder, eventManager);
+		onPauseMethod(holder, eventManager);
+		onNewIntentMethod(holder, eventManager);
+		onStopMethod(holder, eventManager);
+		onDestroyMethod(holder, eventManager);
+		onConfigurationChangedMethod(holder, roboGuiceHolder, eventManager);
+		onContentChangedMethod(roboGuiceHolder, scope, eventManager);
+		onActivityResultMethod(holder, eventManager);
 		getScopedObjectMap(holder, scopedObjects);
 	}
 
 	private void listenerFields(Element element, EActivityHolder holder) {
 		List<TypeMirror> listenerTypeMirrors = extractListenerTypeMirrors(element);
 		int i = 1;
-		for (TypeMirror listenterTypeMirror : listenerTypeMirrors) {
-			JClass listenerClass = codeModelHelper.typeMirrorToJClass(listenterTypeMirror, holder);
+		for (TypeMirror listenerTypeMirror : listenerTypeMirrors) {
+			JClass listenerClass = codeModelHelper.typeMirrorToJClass(listenerTypeMirror);
 			JFieldVar listener = holder.getGeneratedClass().field(JMod.PRIVATE, listenerClass, "listener" + i + generationSuffix());
 			codeModelHelper.addSuppressWarnings(listener, "unused");
-			listener.annotate(classes().INJECT);
+			listener.annotate(getJClass(RoboGuiceClasses.INJECT));
 			i++;
 		}
 	}
@@ -129,47 +135,47 @@ private List<TypeMirror> extractListenerTypeMirrors(Element activityElement) {
 
 	private void beforeCreateMethod(EActivityHolder holder, JFieldVar scope, JFieldVar scopedObjects, JFieldVar eventManager) {
 		JBlock body = holder.getInitBody();
-		JClass keyWildCard = classes().KEY.narrow(codeModel().wildcard());
-		JClass scopedHashMap = classes().HASH_MAP.narrow(keyWildCard, classes().OBJECT);
+		JClass keyWildCard = getJClass(RoboGuiceClasses.KEY).narrow(getCodeModel().wildcard());
+		JClass scopedHashMap = getClasses().HASH_MAP.narrow(keyWildCard, getClasses().OBJECT);
 		body.assign(scopedObjects, JExpr._new(scopedHashMap));
 
-		JVar injector = body.decl(classes().ROBO_INJECTOR, "injector_", classes().ROBO_GUICE.staticInvoke("getInjector").arg(_this()));
-		body.assign(scope, invoke(injector, "getInstance").arg(classes().CONTEXT_SCOPE.dotclass()));
-		body.assign(eventManager, invoke(injector, "getInstance").arg(classes().EVENT_MANAGER.dotclass()));
+		JVar injector = body.decl(getJClass(RoboGuiceClasses.ROBO_INJECTOR), "injector_", getJClass(RoboGuiceClasses.ROBO_GUICE).staticInvoke("getInjector").arg(_this()));
+		body.assign(scope, invoke(injector, "getInstance").arg(getJClass(RoboGuiceClasses.CONTEXT_SCOPE).dotclass()));
+		body.assign(eventManager, invoke(injector, "getInstance").arg(getJClass(RoboGuiceClasses.EVENT_MANAGER).dotclass()));
 		body.add(injector.invoke("injectMembersWithoutViews").arg(_this()));
-		fireEvent(eventManager, body, classes().ON_CREATE_EVENT, holder.getInitSavedInstanceParam());
+		fireEvent(eventManager, body, getJClass(RoboGuiceClasses.ON_CREATE_EVENT), holder.getInitSavedInstanceParam());
 	}
 
-	private void onRestartMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onRestartMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onRestartAfterSuperBlock = holder.getOnRestartAfterSuperBlock();
-		fireEvent(eventManager, onRestartAfterSuperBlock, classes().ON_RESTART_EVENT);
+		fireEvent(eventManager, onRestartAfterSuperBlock, getJClass(RoboGuiceClasses.ON_RESTART_EVENT));
 	}
 
-	private void onStartMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onStartMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onStartAfterSuperBlock = holder.getOnStartAfterSuperBlock();
-		fireEvent(eventManager, onStartAfterSuperBlock, classes().ON_START_EVENT);
+		fireEvent(eventManager, onStartAfterSuperBlock, getJClass(RoboGuiceClasses.ON_START_EVENT));
 	}
 
-	private void onResumeMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onResumeMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onResumeAfterSuperBlock = holder.getOnResumeAfterSuperBlock();
-		fireEvent(eventManager, onResumeAfterSuperBlock, classes().ON_RESUME_EVENT);
+		fireEvent(eventManager, onResumeAfterSuperBlock, getJClass(RoboGuiceClasses.ON_RESUME_EVENT));
 	}
 
-	private void onPauseMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onPauseMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onPauseAfterSuperBlock = holder.getOnPauseAfterSuperBlock();
-		fireEvent(eventManager, onPauseAfterSuperBlock, classes().ON_PAUSE_EVENT);
+		fireEvent(eventManager, onPauseAfterSuperBlock, getJClass(RoboGuiceClasses.ON_PAUSE_EVENT));
 	}
 
-	private void onNewIntentMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onNewIntentMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onNewIntentAfterSuperBlock = holder.getOnNewIntentAfterSuperBlock();
-		fireEvent(eventManager, onNewIntentAfterSuperBlock, classes().ON_NEW_INTENT_EVENT);
+		fireEvent(eventManager, onNewIntentAfterSuperBlock, getJClass(RoboGuiceClasses.ON_NEW_INTENT_EVENT));
 	}
 
-	private void onStopMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onStopMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onStopBlock = new JBlock(false, false);
 
 		JTryBlock tryBlock = onStopBlock._try();
-		fireEvent(eventManager, tryBlock.body(), classes().ON_STOP_EVENT);
+		fireEvent(eventManager, tryBlock.body(), getJClass(RoboGuiceClasses.ON_STOP_EVENT));
 		JBlock finallyBody = tryBlock._finally();
 
 		finallyBody.invoke(_super(), "onStop");
@@ -178,57 +184,57 @@ private void onStopMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
 		codeModelHelper.replaceSuperCall(onStop, onStopBlock);
 	}
 
-	private void onDestroyMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onDestroyMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onDestroyBlock = new JBlock(false, false);
 
 		JTryBlock tryBlock = onDestroyBlock._try();
-		fireEvent(eventManager, tryBlock.body(), classes().ON_DESTROY_EVENT);
+		fireEvent(eventManager, tryBlock.body(), getJClass(RoboGuiceClasses.ON_DESTROY_EVENT));
 		JBlock finallyBody = tryBlock._finally();
 
 		JTryBlock tryInFinally = finallyBody._try();
-		tryInFinally.body().add(classes().ROBO_GUICE.staticInvoke("destroyInjector").arg(_this()));
+		tryInFinally.body().add(getJClass(RoboGuiceClasses.ROBO_GUICE).staticInvoke("destroyInjector").arg(_this()));
 		tryInFinally._finally().invoke(_super(), "onDestroy");
 
 		JMethod onDestroy = holder.getOnDestroy();
 		codeModelHelper.replaceSuperCall(onDestroy, onDestroyBlock);
 	}
 
-	private void onConfigurationChangedMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
-		JVar currentConfig = holder.getCurrentConfig();
+	private void onConfigurationChangedMethod(EActivityHolder holder, RoboGuiceHolder roboGuiceHolder, JFieldVar eventManager) {
+		JVar currentConfig = roboGuiceHolder.getCurrentConfig();
+		JExpression newConfig = holder.getOnConfigurationChangedNewConfigParam();
 		JBlock onConfigurationChangedAfterSuperBlock = holder.getOnConfigurationChangedAfterSuperBlock();
-		JExpression newConfig = holder.getNewConfig();
-		fireEvent(eventManager, onConfigurationChangedAfterSuperBlock, classes().ON_CONFIGURATION_CHANGED_EVENT, currentConfig, newConfig);
+		fireEvent(eventManager, onConfigurationChangedAfterSuperBlock, getJClass(RoboGuiceClasses.ON_CONFIGURATION_CHANGED_EVENT), currentConfig, newConfig);
 	}
 
-	private void onContentChangedMethod(RoboGuiceDelegate holder, EActivityHolder eActivityHolder, JFieldVar scope, JFieldVar eventManager) {
+	private void onContentChangedMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
 		JBlock onContentChangedAfterSuperBlock = holder.getOnContentChangedAfterSuperBlock();
 
 		// no synchronized in CodeModel
 		// https://java.net/jira/browse/CODEMODEL-6
-		onContentChangedAfterSuperBlock.directStatement("synchronized(" + classes().CONTEXT_SCOPE.name() + ".class" + ")");
+		onContentChangedAfterSuperBlock.directStatement("synchronized(" + getJClass(RoboGuiceClasses.CONTEXT_SCOPE).name() + ".class" + ")");
 		JBlock synchronizedBlock = new JBlock(true, true);
 		synchronizedBlock.invoke(scope, "enter").arg(_this());
 		JTryBlock tryBlock = synchronizedBlock._try();
-		tryBlock.body().staticInvoke(eActivityHolder.refClass(org.androidannotations.api.roboguice.RoboGuiceHelper.class), "callInjectViews").arg(_this());
+		tryBlock.body().staticInvoke(getJClass(RoboGuiceHelper.class), "callInjectViews").arg(_this());
 		tryBlock._finally().invoke(scope, "exit").arg(_this());
 		onContentChangedAfterSuperBlock.add(synchronizedBlock);
 
-		fireEvent(eventManager, onContentChangedAfterSuperBlock, classes().ON_CONTENT_CHANGED_EVENT);
+		fireEvent(eventManager, onContentChangedAfterSuperBlock, getJClass(RoboGuiceClasses.ON_CONTENT_CHANGED_EVENT));
 	}
 
-	private void onActivityResultMethod(RoboGuiceDelegate holder, JFieldVar eventManager) {
+	private void onActivityResultMethod(EActivityHolder holder, JFieldVar eventManager) {
 		JBlock onActivityResultAfterSuperBlock = holder.getOnActivityResultAfterSuperBlock();
-		JVar requestCode = holder.getRequestCode();
-		JVar resultCode = holder.getResultCode();
-		JVar data = holder.getData();
+		JVar requestCode = holder.getOnActivityResultRequestCodeParam();
+		JVar resultCode = holder.getOnActivityResultResultCodeParam();
+		JVar data = holder.getOnActivityResultDataParam();
 
-		fireEvent(eventManager, onActivityResultAfterSuperBlock, classes().ON_ACTIVITY_RESULT_EVENT, requestCode, resultCode, data);
+		fireEvent(eventManager, onActivityResultAfterSuperBlock, getJClass(RoboGuiceClasses.ON_ACTIVITY_RESULT_EVENT), requestCode, resultCode, data);
 	}
 
 	private void fireEvent(JFieldVar eventManager, JBlock body, JClass eventClass, JExpression... eventArguments) {
 		JClass actualEventClass = eventClass;
 		if (eventClass.fullName().startsWith("roboguice.context.event")) {
-			actualEventClass = eventClass.narrow(classes().ACTIVITY);
+			actualEventClass = eventClass.narrow(getClasses().ACTIVITY);
 		}
 
 		JInvocation newEvent = _new(actualEventClass);
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/helper/RoboGuiceClasses.java b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/helper/RoboGuiceClasses.java
new file mode 100644
index 0000000000..4ead2f1bc2
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/helper/RoboGuiceClasses.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.roboguice.helper;
+
+public final class RoboGuiceClasses {
+
+	public static final String ROBO_APPLICATION = "roboguice.application.RoboApplication";
+	public static final String ON_START_EVENT_OLD = "roboguice.activity.event.OnStartEvent";
+	public static final String ROBO_CONTEXT = "roboguice.util.RoboContext";
+	public static final String ROBO_INJECTOR = "roboguice.inject.RoboInjector";
+	public static final String KEY = "com.google.inject.Key";
+	public static final String CONTENT_VIEW_LISTENER = "roboguice.inject.ContentViewListener";
+	public static final String ON_RESTART_EVENT = "roboguice.activity.event.OnRestartEvent";
+	public static final String ON_START_EVENT = "roboguice.context.event.OnStartEvent";
+	public static final String ON_RESUME_EVENT = "roboguice.activity.event.OnResumeEvent";
+	public static final String ON_PAUSE_EVENT = "roboguice.activity.event.OnPauseEvent";
+	public static final String ON_NEW_INTENT_EVENT = "roboguice.activity.event.OnNewIntentEvent";
+	public static final String EVENT_MANAGER = "roboguice.event.EventManager";
+	public static final String CONTEXT_SCOPE = "roboguice.inject.ContextScope";
+	public static final String VIEW_MEMBERS_INJECTOR = "roboguice.inject.ViewListener.ViewMembersInjector";
+	public static final String ROBO_GUICE = "roboguice.RoboGuice";
+	public static final String INJECT = "com.google.inject.Inject";
+	public static final String ON_STOP_EVENT = "roboguice.activity.event.OnStopEvent";
+	public static final String ON_DESTROY_EVENT = "roboguice.context.event.OnDestroyEvent";
+	public static final String ON_CONFIGURATION_CHANGED_EVENT = "roboguice.context.event.OnConfigurationChangedEvent";
+	public static final String ON_CONTENT_CHANGED_EVENT = "roboguice.activity.event.OnContentChangedEvent";
+	public static final String ON_ACTIVITY_RESULT_EVENT = "roboguice.activity.event.OnActivityResultEvent";
+	public static final String ON_CONTENT_VIEW_AVAILABLE_EVENT = "roboguice.activity.event.OnContentViewAvailableEvent";
+	public static final String ON_CREATE_EVENT = "roboguice.context.event.OnCreateEvent";
+
+	private RoboGuiceClasses() {
+
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/helper/RoboGuiceValidatorHelper.java b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/helper/RoboGuiceValidatorHelper.java
new file mode 100644
index 0000000000..bedc59b9e0
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/helper/RoboGuiceValidatorHelper.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.roboguice.helper;
+
+import javax.lang.model.util.Elements;
+
+import org.androidannotations.ElementValidation;
+import org.androidannotations.helper.AnnotationHelper;
+
+public class RoboGuiceValidatorHelper {
+
+	private AnnotationHelper annotationHelper;
+
+	public RoboGuiceValidatorHelper(AnnotationHelper annotationHelper) {
+		this.annotationHelper = annotationHelper;
+	}
+
+	public void hasRoboGuiceJars(ElementValidation valid) {
+		Elements elementUtils = annotationHelper.getElementUtils();
+
+		if (elementUtils.getTypeElement(RoboGuiceClasses.ROBO_CONTEXT) == null) {
+			valid.addError("Could not find the RoboGuice framework in the classpath, the following class is missing: " + RoboGuiceClasses.ROBO_CONTEXT);
+		}
+
+		if (elementUtils.getTypeElement(RoboGuiceClasses.ROBO_APPLICATION) != null) {
+			valid.addError("It seems you are using an old version of RoboGuice. Be sure to use version 3.0!");
+		}
+
+		if (elementUtils.getTypeElement(RoboGuiceClasses.ON_START_EVENT_OLD) != null) {
+			valid.addError("It seems you are using an old version of RoboGuice. Be sure to use version 3.0!");
+		}
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/holder/RoboGuiceHolder.java b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/holder/RoboGuiceHolder.java
new file mode 100644
index 0000000000..07c0027438
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/holder/RoboGuiceHolder.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.roboguice.holder;
+
+import static org.androidannotations.helper.ModelConstants.generationSuffix;
+
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.holder.EActivityHolder;
+import org.androidannotations.plugin.PluginClassHolder;
+import org.androidannotations.roboguice.helper.RoboGuiceClasses;
+
+import com.sun.codemodel.JBlock;
+import com.sun.codemodel.JClass;
+import com.sun.codemodel.JExpr;
+import com.sun.codemodel.JFieldVar;
+import com.sun.codemodel.JMod;
+import com.sun.codemodel.JVar;
+
+public class RoboGuiceHolder extends PluginClassHolder<EActivityHolder> {
+
+	private static final String ON_CONTENT_CHANGED_JAVADOC = "We cannot simply copy the " + "code from RoboActivity, because that can cause classpath issues. "
+			+ "For further details see issue #1116.";
+
+	protected JFieldVar scopedObjects;
+	protected JFieldVar scope;
+	protected JFieldVar eventManager;
+	public JFieldVar contentViewListenerField;
+	protected JVar currentConfig;
+	protected JBlock onContentChangedAfterSuperBlock;
+
+	public RoboGuiceHolder(EActivityHolder holder) {
+		super(holder);
+	}
+
+	public JFieldVar getEventManagerField() {
+		if (eventManager == null) {
+			eventManager = getGeneratedClass().field(JMod.PROTECTED, getJClass(RoboGuiceClasses.EVENT_MANAGER), "eventManager" + generationSuffix());
+		}
+		return eventManager;
+	}
+
+	public JFieldVar getScopedObjectsField() {
+		if (scopedObjects == null) {
+			JClass keyWildCard = getJClass(RoboGuiceClasses.KEY).narrow(getCodeModel().wildcard());
+			JClass scopedHashMap = environment().getClasses().HASH_MAP.narrow(keyWildCard, environment().getClasses().OBJECT);
+			scopedObjects = getGeneratedClass().field(JMod.PROTECTED, scopedHashMap, "scopedObjects" + generationSuffix());
+			scopedObjects.assign(JExpr._new(scopedHashMap));
+		}
+		return scopedObjects;
+	}
+
+	public JFieldVar getScopeField() {
+		if (scope == null) {
+			scope = getGeneratedClass().field(JMod.PRIVATE, getJClass(RoboGuiceClasses.CONTEXT_SCOPE), "scope" + generationSuffix());
+		}
+		return scope;
+	}
+
+	public JFieldVar getContentViewListenerField() {
+		if (contentViewListenerField == null) {
+			contentViewListenerField = getGeneratedClass().field(JMod.NONE, getJClass(RoboGuiceClasses.CONTENT_VIEW_LISTENER), "ignored" + generationSuffix());
+			contentViewListenerField.annotate(getJClass(RoboGuiceClasses.INJECT));
+		}
+		return contentViewListenerField;
+	}
+
+	public JBlock getOnContentChangedAfterSuperBlock() {
+		if (onContentChangedAfterSuperBlock == null) {
+			holder().getOnContentChanged().javadoc().append(ON_CONTENT_CHANGED_JAVADOC);
+			onContentChangedAfterSuperBlock = holder().getOnContentChangedAfterSuperBlock();
+		}
+		return onContentChangedAfterSuperBlock;
+	}
+
+	public JVar getCurrentConfig() {
+		if (currentConfig == null) {
+			JClass configurationClass = environment().getClasses().CONFIGURATION;
+			JBlock onConfigurationChangedBeforeSuperBlock = holder().getOnConfigurationChangedBeforeSuperBlock();
+			currentConfig = onConfigurationChangedBeforeSuperBlock.decl(configurationClass, "currentConfig", JExpr.invoke("getResources").invoke("getConfiguration"));
+			new APTCodeModelHelper(environment()).removeBraces(onConfigurationChangedBeforeSuperBlock);
+		}
+		return currentConfig;
+	}
+}
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
new file mode 100644
index 0000000000..41afdeff72
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/resources/META-INF/services/org.androidannotations.plugin.AndroidAnnotationsPlugin
@@ -0,0 +1 @@
+org.androidannotations.roboguice.RoboGuicePlugin
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/resources/roboguice.properties b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/resources/roboguice.properties
new file mode 100644
index 0000000000..6e97a9b22b
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/resources/roboguice.properties
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+#
+# 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.
+#
+
+version=${project.version}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations-with-codemodel/.gitignore b/AndroidAnnotations/androidannotations-with-codemodel/.gitignore
deleted file mode 100644
index 5e83119b7e..0000000000
--- a/AndroidAnnotations/androidannotations-with-codemodel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.settings
diff --git a/AndroidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml b/AndroidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml
deleted file mode 100644
index 16b7925d06..0000000000
--- a/AndroidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-
-    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
-
-    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.
-
--->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>jar-with-codemodel</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<dependencySets>
-		<dependencySet>
-			<unpack>true</unpack>
-			<outputDirectory>/</outputDirectory>
-			<useProjectArtifact>false</useProjectArtifact>
-			<includes>
-				<include>com.sun.codemodel:codemodel</include>
-				<include>org.androidannotations:androidannotations</include>
-				<include>org.androidannotations:androidannotations-api</include>
-			</includes>
-		</dependencySet>	
-	</dependencySets>
-</assembly>
diff --git a/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF b/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF
deleted file mode 100644
index 027fc0b673..0000000000
--- a/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: androidannotations
-Bundle-SymbolicName: org.androidannotations;singleton:=true
-Bundle-Version: 1.0.0
-Export-Package: org.androidannotations,
- org.androidannotations.annotationprocessor,
- org.androidannotations.annotations,
- org.androidannotations.annotations.res,
- org.androidannotations.annotations.rest,
- org.androidannotations.annotations.sharedpreferences,
- org.androidannotations.api,
- org.androidannotations.generation,
- org.androidannotations.helper,
- org.androidannotations.model,
- org.androidannotations.processing,
- org.androidannotations.processing.rest,
- org.androidannotations.rclass,
- org.androidannotations.validation,
- org.androidannotations.validation.rest
-Bundle-Vendor: androidannotations
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.jdt.apt.core;bundle-version="3.3.402",
- androidannotations-dependencies;bundle-version="1.0.0",
- org.androidannotations-api;bundle-version="1.0.0"
-Import-Package: org.androidannotations
-Bundle-Activator: org.androidannotations.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/AndroidAnnotations/androidannotations/pom.xml b/AndroidAnnotations/androidannotations/pom.xml
deleted file mode 100644
index 15e556f6b2..0000000000
--- a/AndroidAnnotations/androidannotations/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
-
-    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.
-
--->
-<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>
-        <groupId>org.androidannotations</groupId>
-        <artifactId>androidannotations-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>androidannotations</artifactId>
-    <name>AndroidAnnotations Annotation Processor</name>
-    <description>The Annotation Processor jar that generates code</description>
-    
-    <properties>
-		<main.basedir>${project.parent.basedir}</main.basedir>
-	</properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.androidannotations</groupId>
-            <artifactId>androidannotations-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.codemodel</groupId>
-            <artifactId>codemodel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <version>4.1.1.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <!-- spring-android-rest-template is required to use the Rest API -->
-            <groupId>org.springframework.android</groupId>
-            <artifactId>spring-android-rest-template</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <compilerArgument>-proc:none</compilerArgument>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>rebel.xml</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>org/androidannotations/api/**</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-
-</project>
diff --git a/AndroidAnnotations/androidannotations/src/main/eclipse/org/androidannotations/Activator.java b/AndroidAnnotations/androidannotations/src/main/eclipse/org/androidannotations/Activator.java
deleted file mode 100644
index 5fc1a0f888..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/eclipse/org/androidannotations/Activator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-        // The plug-in ID
-        public static final String PLUGIN_ID = "org.androidannotations";
-
-        // The shared instance
-        private static Activator plugin;
-        
-        /**
-         * The constructor
-         */
-        public Activator() {
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-         */
-        public void start(BundleContext context) throws Exception {
-                super.start(context);
-                plugin = this;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-         */
-        public void stop(BundleContext context) throws Exception {
-                plugin = null;
-                super.stop(context);
-        }
-
-        /**
-         * Returns the shared instance
-         *
-         * @return the shared instance
-         */
-        public static Activator getDefault() {
-                return plugin;
-        }
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ApiCodeGenerator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ApiCodeGenerator.java
deleted file mode 100644
index 838f487c11..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ApiCodeGenerator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.generation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Set;
-
-import javax.annotation.processing.Filer;
-import javax.annotation.processing.FilerException;
-import javax.lang.model.element.Element;
-import javax.tools.JavaFileObject;
-
-import org.androidannotations.logger.Logger;
-import org.androidannotations.logger.LoggerFactory;
-import org.androidannotations.process.OriginatingElements;
-
-public class ApiCodeGenerator {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(ApiCodeGenerator.class);
-	private static final byte[] BUFFER = new byte[4096];
-
-	private static void copyStream(InputStream input, OutputStream output) throws IOException {
-		int read;
-		while ((read = input.read(BUFFER)) != -1) {
-			output.write(BUFFER, 0, read);
-		}
-	}
-
-	private final Filer filer;
-
-	public ApiCodeGenerator(Filer filer) {
-		this.filer = filer;
-	}
-
-	public void writeApiClasses(Set<Class<?>> apiClassesToGenerate, OriginatingElements originatingElements) {
-
-		LOGGER.info("Writting following API classes in project: {}", apiClassesToGenerate);
-
-		for (Class<?> apiClassToGenerate : apiClassesToGenerate) {
-
-			String canonicalApiClassName = apiClassToGenerate.getCanonicalName();
-
-			String apiClassFileName = canonicalApiClassName.replace(".", "/") + ".java";
-
-			InputStream apiClassStream = getClass().getClassLoader().getResourceAsStream(apiClassFileName);
-			try {
-
-				if (apiClassStream == null) {
-					/*
-					 * This happens when in AA dev environment, when the
-					 * processor classes are not coming from a jar
-					 */
-					apiClassStream = getClass().getClassLoader().getResourceAsStream('/' + apiClassFileName);
-				}
-
-				Element[] apiClassOriginatingElements = originatingElements.getClassOriginatingElements(canonicalApiClassName);
-
-				JavaFileObject targetedClassFile;
-
-				try {
-					if (apiClassOriginatingElements == null) {
-						targetedClassFile = filer.createSourceFile(canonicalApiClassName);
-					} else {
-						targetedClassFile = filer.createSourceFile(canonicalApiClassName, apiClassOriginatingElements);
-					}
-
-					OutputStream classFileOutputStream = targetedClassFile.openOutputStream();
-					copyStream(apiClassStream, classFileOutputStream);
-					classFileOutputStream.close();
-
-				} catch (FilerException e) {
-					// This exception is thrown when we are trying to generate
-					// an already generated file. This is happening on an
-					// incremental build.
-					// Unfortunately there is no way to check if a file has
-					// already been generated.
-				}
-
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java
deleted file mode 100644
index 01bca6d1aa..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.handler;
-
-import javax.lang.model.element.Element;
-
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.ProcessHolder;
-import org.androidannotations.rclass.IRClass;
-
-public interface AnnotationHandler<T extends GeneratedClassHolder> {
-
-	String getTarget();
-
-	boolean validate(Element element, AnnotationElements validatedElements);
-
-	void process(Element element, T holder) throws Exception;
-
-	void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest);
-
-	void setValidatedModel(AnnotationElements validatedModel);
-
-	void setProcessHolder(ProcessHolder processHolder);
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java
deleted file mode 100644
index f89bf7aa8e..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.handler;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.processing.ProcessingEnvironment;
-
-import org.androidannotations.handler.rest.DeleteHandler;
-import org.androidannotations.handler.rest.GetHandler;
-import org.androidannotations.handler.rest.HeadHandler;
-import org.androidannotations.handler.rest.OptionsHandler;
-import org.androidannotations.handler.rest.PostHandler;
-import org.androidannotations.handler.rest.PutHandler;
-import org.androidannotations.handler.rest.RestHandler;
-import org.androidannotations.handler.rest.RestServiceHandler;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.OptionsHelper;
-import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AndroidRes;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.ProcessHolder;
-import org.androidannotations.rclass.IRClass;
-
-public class AnnotationHandlers {
-
-	private List<AnnotationHandler<? extends GeneratedClassHolder>> annotationHandlers = new ArrayList<>();
-	private List<GeneratingAnnotationHandler<? extends GeneratedClassHolder>> generatingAnnotationHandlers = new ArrayList<>();
-	private List<AnnotationHandler<? extends GeneratedClassHolder>> decoratingAnnotationHandlers = new ArrayList<>();
-	private Set<String> supportedAnnotationNames;
-	private OptionsHelper optionsHelper;
-
-	public AnnotationHandlers(ProcessingEnvironment processingEnvironment) {
-		optionsHelper = new OptionsHelper(processingEnvironment);
-
-		add(new EApplicationHandler(processingEnvironment));
-		add(new EActivityHandler(processingEnvironment));
-		add(new EProviderHandler(processingEnvironment));
-		add(new EReceiverHandler(processingEnvironment));
-		add(new EServiceHandler(processingEnvironment));
-		add(new EIntentServiceHandler(processingEnvironment));
-		add(new EFragmentHandler(processingEnvironment));
-		add(new EBeanHandler(processingEnvironment));
-		add(new EViewGroupHandler(processingEnvironment));
-		add(new EViewHandler(processingEnvironment));
-		add(new SharedPrefHandler(processingEnvironment));
-		add(new PrefHandler(processingEnvironment));
-		add(new RoboGuiceHandler(processingEnvironment));
-		add(new ViewByIdHandler(processingEnvironment));
-		add(new ViewsByIdHandler(processingEnvironment));
-		add(new FragmentByIdHandler(processingEnvironment));
-		add(new FragmentByTagHandler(processingEnvironment));
-		add(new FromHtmlHandler(processingEnvironment));
-		add(new ClickHandler(processingEnvironment));
-		add(new LongClickHandler(processingEnvironment));
-		add(new TouchHandler(processingEnvironment));
-		add(new FocusChangeHandler(processingEnvironment));
-		add(new CheckedChangeHandler(processingEnvironment));
-		add(new ItemClickHandler(processingEnvironment));
-		add(new ItemSelectHandler(processingEnvironment));
-		add(new ItemLongClickHandler(processingEnvironment));
-		add(new EditorActionHandler(processingEnvironment));
-		for (AndroidRes androidRes : AndroidRes.values()) {
-			if (androidRes == AndroidRes.ANIMATION) {
-				add(new AnimationResHandler(processingEnvironment));
-			} else if (androidRes == AndroidRes.DRAWABLE) {
-				add(new DrawableResHandler(processingEnvironment));
-			} else if (androidRes == AndroidRes.HTML) {
-				add(new HtmlResHandler(processingEnvironment));
-			} else {
-				add(new DefaultResHandler(androidRes, processingEnvironment));
-			}
-		}
-		add(new TransactionalHandler(processingEnvironment));
-		add(new FragmentArgHandler(processingEnvironment));
-		add(new SystemServiceHandler(processingEnvironment));
-		add(new RestHandler(processingEnvironment));
-		add(new GetHandler(processingEnvironment));
-		add(new PostHandler(processingEnvironment));
-		add(new PutHandler(processingEnvironment));
-		add(new DeleteHandler(processingEnvironment));
-		add(new HeadHandler(processingEnvironment));
-		add(new OptionsHandler(processingEnvironment));
-		add(new AppHandler(processingEnvironment));
-		add(new BeanHandler(processingEnvironment));
-		add(new InjectMenuHandler(processingEnvironment));
-		add(new OptionsMenuHandler(processingEnvironment));
-		add(new OptionsMenuItemHandler(processingEnvironment));
-		add(new OptionsItemHandler(processingEnvironment));
-		add(new CustomTitleHandler(processingEnvironment));
-		add(new FullscreenHandler(processingEnvironment));
-		add(new RestServiceHandler(processingEnvironment));
-		add(new OrmLiteDaoHandler(processingEnvironment));
-		add(new RootContextHandler(processingEnvironment));
-		add(new NonConfigurationInstanceHandler(processingEnvironment));
-		add(new ExtraHandler(processingEnvironment));
-		add(new BeforeTextChangeHandler(processingEnvironment));
-		add(new TextChangeHandler(processingEnvironment));
-		add(new AfterTextChangeHandler(processingEnvironment));
-		add(new SeekBarProgressChangeHandler(processingEnvironment));
-		add(new SeekBarTouchStartHandler(processingEnvironment));
-		add(new SeekBarTouchStopHandler(processingEnvironment));
-		add(new ServiceActionHandler(processingEnvironment));
-		add(new ProduceHandler(processingEnvironment));
-		add(new SubscribeHandler(processingEnvironment));
-		add(new InstanceStateHandler(processingEnvironment));
-		add(new HttpsClientHandler(processingEnvironment));
-		add(new HierarchyViewerSupportHandler(processingEnvironment));
-		add(new WindowFeatureHandler(processingEnvironment));
-		new ReceiverHandler(processingEnvironment).register(this);
-		new ReceiverActionHandler(processingEnvironment).register(this);
-		new OnActivityResultHandler(processingEnvironment).register(this);
-
-		add(new IgnoredWhenDetachedHandler(processingEnvironment));
-		/* After injection methods must be after injections */
-		add(new AfterInjectHandler(processingEnvironment));
-		add(new AfterExtrasHandler(processingEnvironment));
-		add(new AfterViewsHandler(processingEnvironment));
-
-		/* preference screen handler must be after injections */
-		add(new PreferenceScreenHandler(processingEnvironment));
-		add(new PreferenceHeadersHandler(processingEnvironment));
-		/* Preference injections must be after preference screen handler */
-		add(new PreferenceByKeyHandler(processingEnvironment));
-		add(new PreferenceChangeHandler(processingEnvironment));
-		add(new PreferenceClickHandler(processingEnvironment));
-		/* After preference injection methods must be after preference injections */
-		add(new AfterPreferencesHandler(processingEnvironment));
-
-		if (optionsHelper.shouldLogTrace()) {
-			add(new TraceHandler(processingEnvironment));
-		}
-
-		/*
-		 * WakeLockHandler must be after TraceHandler but before UiThreadHandler
-		 * and BackgroundHandler
-		 */
-		add(new WakeLockHandler(processingEnvironment));
-
-		/*
-		 * UIThreadHandler and BackgroundHandler must be after TraceHandler and
-		 * IgnoredWhenDetached
-		 */
-		add(new UiThreadHandler(processingEnvironment));
-		add(new BackgroundHandler(processingEnvironment));
-
-		/*
-		 * SupposeUiThreadHandler and SupposeBackgroundHandler must be after all
-		 * handlers that modifies generated method body
-		 */
-		if (optionsHelper.shouldEnsureThreadControl()) {
-			add(new SupposeUiThreadHandler(processingEnvironment));
-			add(new SupposeBackgroundHandler(processingEnvironment));
-		}
-	}
-
-	public void add(AnnotationHandler<? extends GeneratedClassHolder> annotationHandler) {
-		annotationHandlers.add(annotationHandler);
-		decoratingAnnotationHandlers.add(annotationHandler);
-	}
-
-	public void add(GeneratingAnnotationHandler<? extends GeneratedClassHolder> annotationHandler) {
-		annotationHandlers.add(annotationHandler);
-		generatingAnnotationHandlers.add(annotationHandler);
-	}
-
-	public List<AnnotationHandler<? extends GeneratedClassHolder>> get() {
-		return annotationHandlers;
-	}
-
-	public List<GeneratingAnnotationHandler<? extends GeneratedClassHolder>> getGenerating() {
-		return generatingAnnotationHandlers;
-	}
-
-	public List<AnnotationHandler<? extends GeneratedClassHolder>> getDecorating() {
-		return decoratingAnnotationHandlers;
-	}
-
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		for (AnnotationHandler<?> annotationHandler : annotationHandlers) {
-			annotationHandler.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
-		}
-	}
-
-	public void setValidatedModel(AnnotationElements validatedModel) {
-		for (AnnotationHandler<?> annotationHandler : annotationHandlers) {
-			annotationHandler.setValidatedModel(validatedModel);
-		}
-	}
-
-	public void setProcessHolder(ProcessHolder processHolder) {
-		for (AnnotationHandler<?> annotationHandler : annotationHandlers) {
-			annotationHandler.setProcessHolder(processHolder);
-		}
-	}
-
-	public Set<String> getSupportedAnnotationTypes() {
-		if (supportedAnnotationNames == null) {
-			Set<String> annotationNames = new HashSet<>();
-			for (AnnotationHandler<?> annotationHandler : annotationHandlers) {
-				annotationNames.add(annotationHandler.getTarget());
-			}
-			supportedAnnotationNames = Collections.unmodifiableSet(annotationNames);
-		}
-		return supportedAnnotationNames;
-	}
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java
deleted file mode 100644
index 56f462aac7..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.handler;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Element;
-import javax.lang.model.type.TypeMirror;
-
-import org.androidannotations.helper.APTCodeModelHelper;
-import org.androidannotations.helper.AndroidManifest;
-import org.androidannotations.helper.IdAnnotationHelper;
-import org.androidannotations.helper.IdValidatorHelper;
-import org.androidannotations.holder.GeneratedClassHolder;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-import org.androidannotations.process.ProcessHolder;
-import org.androidannotations.rclass.IRClass;
-
-import com.sun.codemodel.JClass;
-import com.sun.codemodel.JCodeModel;
-
-public abstract class BaseAnnotationHandler<T extends GeneratedClassHolder> implements AnnotationHandler<T> {
-
-	private final String target;
-	protected ProcessingEnvironment processingEnv;
-	protected IdValidatorHelper validatorHelper;
-	protected IRClass rClass;
-	protected AndroidSystemServices androidSystemServices;
-	protected AndroidManifest androidManifest;
-	protected AnnotationElements validatedModel;
-	protected ProcessHolder processHolder;
-	protected APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
-
-	public BaseAnnotationHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
-		this(targetClass.getCanonicalName(), processingEnvironment);
-	}
-
-	public BaseAnnotationHandler(String target, ProcessingEnvironment processingEnvironment) {
-		this.target = target;
-		this.processingEnv = processingEnvironment;
-	}
-
-	@Override
-	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
-		this.rClass = rClass;
-		this.androidSystemServices = androidSystemServices;
-		this.androidManifest = androidManifest;
-		initValidatorHelper();
-	}
-
-	private void initValidatorHelper() {
-		IdAnnotationHelper annotationHelper = new IdAnnotationHelper(processingEnv, target, rClass);
-		validatorHelper = new IdValidatorHelper(annotationHelper);
-	}
-
-	@Override
-	public void setValidatedModel(AnnotationElements validatedModel) {
-		this.validatedModel = validatedModel;
-	}
-
-	@Override
-	public void setProcessHolder(ProcessHolder processHolder) {
-		this.processHolder = processHolder;
-	}
-
-	public ProcessingEnvironment processingEnvironment() {
-		return processHolder.processingEnvironment();
-	}
-
-	public ProcessHolder.Classes classes() {
-		return processHolder.classes();
-	}
-
-	public JCodeModel codeModel() {
-		return processHolder.codeModel();
-	}
-
-	public JClass refClass(String fullyQualifiedClassName) {
-		return processHolder.refClass(fullyQualifiedClassName);
-	}
-
-	public JClass refClass(TypeMirror typeMirror) {
-		return processHolder.refClass(typeMirror.toString());
-	}
-
-	public JClass refClass(Class<?> clazz) {
-		return processHolder.refClass(clazz);
-	}
-
-	public void generateApiClass(Element originatingElement, Class<?> apiClass) {
-		processHolder.generateApiClass(originatingElement, apiClass);
-	}
-
-	@Override
-	public String getTarget() {
-		return target;
-	}
-
-	@Override
-	public boolean validate(Element element, AnnotationElements validatedElements) {
-		IsValid valid = new IsValid();
-		validate(element, validatedElements, valid);
-		return valid.isValid();
-	}
-
-	protected abstract void validate(Element element, AnnotationElements validatedElements, IsValid valid);
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SubscribeHandler.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SubscribeHandler.java
deleted file mode 100644
index 2659a6dda0..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/SubscribeHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.handler;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
-
-import org.androidannotations.helper.CanonicalNameConstants;
-import org.androidannotations.helper.TargetAnnotationHelper;
-import org.androidannotations.holder.EComponentHolder;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-
-public class SubscribeHandler extends BaseAnnotationHandler<EComponentHolder> {
-
-	private final TargetAnnotationHelper annotationHelper;
-
-	public SubscribeHandler(ProcessingEnvironment processingEnvironment) {
-		super(CanonicalNameConstants.SUBSCRIBE, processingEnvironment);
-		annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
-	}
-
-	@Override
-	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
-		if (!annotationHelper.enclosingElementHasEnhancedComponentAnnotation(element)) {
-			valid.invalidate();
-			return;
-		}
-
-		ExecutableElement executableElement = (ExecutableElement) element;
-
-		/*
-		 * We check that twice to skip invalid annotated elements
-		 */
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(executableElement, validatedElements, valid);
-
-		validatorHelper.returnTypeIsVoid(executableElement, valid);
-
-		validatorHelper.isPublic(element, valid);
-
-		validatorHelper.doesntThrowException(executableElement, valid);
-
-		validatorHelper.isNotFinal(element, valid);
-
-		validatorHelper.param.anyType().validate(executableElement, valid);
-	}
-
-	@Override
-	public void process(Element element, EComponentHolder holder) throws Exception {
-		ExecutableElement executableElement = (ExecutableElement) element;
-
-		codeModelHelper.overrideAnnotatedMethod(executableElement, holder);
-	}
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
deleted file mode 100644
index 9940387229..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.helper;
-
-import java.util.List;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Element;
-
-import org.androidannotations.process.ProcessHolder;
-import org.androidannotations.rclass.IRClass;
-import org.androidannotations.rclass.IRClass.Res;
-import org.androidannotations.rclass.IRInnerClass;
-
-import com.sun.codemodel.JFieldRef;
-
-public class IdAnnotationHelper extends TargetAnnotationHelper {
-
-	private final IRClass rClass;
-
-	public IdAnnotationHelper(ProcessingEnvironment processingEnv, String annotationName, IRClass rClass) {
-		super(processingEnv, annotationName);
-		this.rClass = rClass;
-	}
-
-	public boolean containsIdValue(Integer idValue, Res res) {
-		IRInnerClass rInnerClass = rClass.get(res);
-		return rInnerClass.containsIdValue(idValue);
-	}
-
-	public boolean containsField(String name, Res res) {
-		IRInnerClass rInnerClass = rClass.get(res);
-		return rInnerClass.containsField(name);
-	}
-
-	public List<String> extractAnnotationResources(Element element, Res res, boolean useElementName) {
-		return super.extractAnnotationResources(element, getTarget(), rClass.get(res), useElementName);
-	}
-
-	public List<JFieldRef> extractAnnotationFieldRefs(ProcessHolder holder, Element element, Res res, boolean useElementName) {
-		return extractAnnotationFieldRefs(holder, element, res, useElementName, DEFAULT_FIELD_NAME_VALUE, DEFAULT_FIELD_NAME_RESNAME);
-	}
-
-	public List<JFieldRef> extractAnnotationFieldRefs(ProcessHolder holder, Element element, Res res, boolean useElementName, String idFieldName, String resFieldName) {
-		return super.extractAnnotationFieldRefs(holder, element, getTarget(), rClass.get(res), useElementName, idFieldName, resFieldName);
-	}
-
-	public JFieldRef extractOneAnnotationFieldRef(ProcessHolder holder, Element element, Res res, boolean useElementName) {
-		return extractOneAnnotationFieldRef(holder, element, getTarget(), res, useElementName);
-	}
-
-	public JFieldRef extractOneAnnotationFieldRef(ProcessHolder holder, Element element, String annotationName, Res res, boolean useElementName) {
-		return extractOneAnnotationFieldRef(holder, element, annotationName, res, useElementName, DEFAULT_FIELD_NAME_VALUE, DEFAULT_FIELD_NAME_RESNAME);
-	}
-
-	public JFieldRef extractOneAnnotationFieldRef(ProcessHolder holder, Element element, String annotationName, Res res, boolean useElementName, String idFieldName, String resFieldName) {
-		return extractOneAnnotationFieldRef(holder, element, annotationName, rClass.get(res), useElementName, idFieldName, resFieldName);
-	}
-
-	public JFieldRef extractOneAnnotationFieldRef(ProcessHolder holder, Element element, String annotationName, IRInnerClass rInnerClass, boolean useElementName, String idFieldName,
-			String resFieldName) {
-		List<JFieldRef> jFieldRefs = extractAnnotationFieldRefs(holder, element, annotationName, rInnerClass, useElementName, idFieldName, resFieldName);
-
-		if (jFieldRefs.size() == 1) {
-			return jFieldRefs.get(0);
-		} else {
-			return null;
-		}
-	}
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/Option.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/Option.java
deleted file mode 100644
index 1f00fe8009..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/Option.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.helper;
-
-/**
- * I'd love to use Guava's Optional, but we're trying to keep the dependency
- * level to a minimum.
- */
-public final class Option<T> {
-
-	private static final Option<?> ABSENT = new Option<>(null, false);
-
-	public static <T> Option<T> of(T value) {
-		return new Option<>(value, true);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> Option<T> absent() {
-		return (Option<T>) ABSENT;
-	}
-
-	private final T reference;
-
-	private final boolean isPresent;
-
-	private Option(T reference, boolean isPresent) {
-		this.reference = reference;
-		this.isPresent = isPresent;
-	}
-
-	public boolean isPresent() {
-		return isPresent;
-	}
-
-	public boolean isAbsent() {
-		return !isPresent;
-	}
-
-	public T get() {
-		if (!isPresent) {
-			throw new IllegalStateException("value is absent");
-		}
-		return reference;
-	}
-
-	public T getOr(T defaultValue) {
-		if (isPresent) {
-			return reference;
-		} else {
-			return defaultValue;
-		}
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OptionsHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OptionsHelper.java
deleted file mode 100644
index 635abec1d8..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OptionsHelper.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.helper;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.annotation.processing.ProcessingEnvironment;
-
-import org.androidannotations.logger.Level;
-
-public class OptionsHelper {
-
-	enum Option {
-		TRACE("trace", "false"), //
-		THREAD_CONTROL("threadControl", "true"), //
-		ANDROID_MANIFEST_FILE("androidManifestFile", null), //
-		RESOURCE_PACKAGE_NAME("resourcePackageName", null), //
-		LOG_FILE("logFile", null), //
-		LOG_LEVEL("logLevel", "DEBUG"), //
-		LOG_APPENDER_CONSOLE("logAppenderConsole", "false"), //
-		LOG_APPENDER_FILE("logAppenderFile", "true"), //
-		CLASS_SUFFIX("classSuffix", "_");
-
-		private String key;
-		private String defaultValue;
-
-		private Option(String key, String defaultValue) {
-			this.key = key;
-			this.defaultValue = defaultValue;
-		}
-
-		public String getKey() {
-			return key;
-		}
-
-		public String getDefaultValue() {
-			return defaultValue;
-		}
-	}
-
-	private final Map<String, String> options;
-
-	public OptionsHelper(ProcessingEnvironment processingEnvironment) {
-		options = processingEnvironment.getOptions();
-	}
-
-	public static Set<String> getOptionsConstants() {
-		Set<String> set = new TreeSet<>();
-		for (Option optionEnum : Option.values()) {
-			set.add(optionEnum.getKey());
-		}
-		return set;
-	}
-
-	public boolean shouldLogTrace() {
-		return getBoolean(Option.TRACE);
-	}
-
-	public boolean shouldEnsureThreadControl() {
-		return getBoolean(Option.THREAD_CONTROL);
-	}
-
-	public String getAndroidManifestFile() {
-		return getString(Option.ANDROID_MANIFEST_FILE);
-	}
-
-	public String getResourcePackageName() {
-		return getString(Option.RESOURCE_PACKAGE_NAME);
-	}
-
-	public String getClassSuffix() {
-		return getString(Option.CLASS_SUFFIX);
-	}
-
-	public String getLogFile() {
-		return getString(Option.LOG_FILE);
-	}
-
-	public Level getLogLevel() {
-		try {
-			return Level.parse(getString(Option.LOG_LEVEL));
-		} catch (Exception e) {
-			return Level.parse(Option.LOG_LEVEL.getDefaultValue());
-		}
-	}
-
-	public boolean shouldUseConsoleAppender() {
-		return getBoolean(Option.LOG_APPENDER_CONSOLE);
-	}
-
-	public boolean shouldUseFileAppender() {
-		return getBoolean(Option.LOG_APPENDER_FILE);
-	}
-
-	private String getString(Option option) {
-		String key = option.getKey();
-		if (options.containsKey(key)) {
-			return options.get(key);
-		} else {
-			return option.getDefaultValue();
-		}
-	}
-
-	private boolean getBoolean(Option option) {
-		return Boolean.valueOf(getString(option));
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
deleted file mode 100644
index a030896897..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
+++ /dev/null
@@ -1,1550 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.helper;
-
-import static java.util.Arrays.asList;
-import static org.androidannotations.helper.AndroidConstants.LOG_DEBUG;
-import static org.androidannotations.helper.AndroidConstants.LOG_ERROR;
-import static org.androidannotations.helper.AndroidConstants.LOG_INFO;
-import static org.androidannotations.helper.AndroidConstants.LOG_VERBOSE;
-import static org.androidannotations.helper.AndroidConstants.LOG_WARN;
-import static org.androidannotations.helper.CanonicalNameConstants.CLIENT_HTTP_REQUEST_FACTORY;
-import static org.androidannotations.helper.CanonicalNameConstants.CLIENT_HTTP_REQUEST_INTERCEPTOR;
-import static org.androidannotations.helper.CanonicalNameConstants.HTTP_MESSAGE_CONVERTER;
-import static org.androidannotations.helper.CanonicalNameConstants.INTERNET_PERMISSION;
-import static org.androidannotations.helper.CanonicalNameConstants.WAKELOCK_PERMISSION;
-import static org.androidannotations.helper.ModelConstants.VALID_ANDROID_ANNOTATIONS;
-import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
-import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_VIEW_SUPPORT_ANNOTATIONS;
-import static org.androidannotations.helper.ModelConstants.classSuffix;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.ErrorType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-
-import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.EBean;
-import org.androidannotations.annotations.EFragment;
-import org.androidannotations.annotations.EIntentService;
-import org.androidannotations.annotations.EReceiver;
-import org.androidannotations.annotations.EService;
-import org.androidannotations.annotations.OnActivityResult;
-import org.androidannotations.annotations.Receiver;
-import org.androidannotations.annotations.Trace;
-import org.androidannotations.annotations.UiThread;
-import org.androidannotations.annotations.UiThread.Propagation;
-import org.androidannotations.annotations.ViewById;
-import org.androidannotations.annotations.WakeLock;
-import org.androidannotations.annotations.WakeLock.Level;
-import org.androidannotations.annotations.rest.Delete;
-import org.androidannotations.annotations.rest.Get;
-import org.androidannotations.annotations.rest.Head;
-import org.androidannotations.annotations.rest.Options;
-import org.androidannotations.annotations.rest.Post;
-import org.androidannotations.annotations.rest.Put;
-import org.androidannotations.annotations.rest.Rest;
-import org.androidannotations.annotations.sharedpreferences.DefaultBoolean;
-import org.androidannotations.annotations.sharedpreferences.DefaultFloat;
-import org.androidannotations.annotations.sharedpreferences.DefaultInt;
-import org.androidannotations.annotations.sharedpreferences.DefaultLong;
-import org.androidannotations.annotations.sharedpreferences.DefaultString;
-import org.androidannotations.annotations.sharedpreferences.SharedPref;
-import org.androidannotations.api.rest.RestClientErrorHandling;
-import org.androidannotations.api.rest.RestClientHeaders;
-import org.androidannotations.api.rest.RestClientRootUrl;
-import org.androidannotations.api.rest.RestClientSupport;
-import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
-import org.androidannotations.model.AndroidSystemServices;
-import org.androidannotations.model.AnnotationElements;
-import org.androidannotations.process.IsValid;
-
-@SuppressWarnings("checkstyle:methodcount")
-public class ValidatorHelper {
-
-	private static final List<String> VALID_REST_INTERFACES = asList(RestClientHeaders.class.getName(), RestClientErrorHandling.class.getName(), RestClientRootUrl.class.getName(),
-			RestClientSupport.class.getName());
-
-	private static final List<String> ANDROID_FRAGMENT_QUALIFIED_NAMES = asList(CanonicalNameConstants.FRAGMENT, CanonicalNameConstants.SUPPORT_V4_FRAGMENT);
-
-	private static final String METHOD_NAME_SET_ROOT_URL = "setRootUrl";
-	private static final String METHOD_NAME_SET_AUTHENTICATION = "setAuthentication";
-	private static final String METHOD_NAME_SET_BEARER_AUTH = "setBearerAuth";
-	private static final String METHOD_NAME_GET_COOKIE = "getCookie";
-	private static final String METHOD_NAME_GET_HEADER = "getHeader";
-
-	private static final String METHOD_NAME_GET_ROOT_URL = "getRootUrl";
-
-	private static final List<String> VALID_PREF_RETURN_TYPES = Arrays.asList("int", "boolean", "float", "long", CanonicalNameConstants.STRING, CanonicalNameConstants.STRING_SET);
-
-	private static final List<String> INVALID_PREF_METHOD_NAMES = Arrays.asList("edit", "getSharedPreferences", "clear", "getEditor", "apply");
-
-	private static final Collection<Integer> VALID_LOG_LEVELS = Arrays.asList(LOG_VERBOSE, LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR);
-
-	private static final List<Receiver.RegisterAt> VALID_ACTIVITY_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy, Receiver.RegisterAt.OnResumeOnPause,
-			Receiver.RegisterAt.OnStartOnStop);
-	private static final List<Receiver.RegisterAt> VALID_SERVICE_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy);
-	private static final List<Receiver.RegisterAt> VALID_FRAGMENT_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy, Receiver.RegisterAt.OnResumeOnPause,
-			Receiver.RegisterAt.OnStartOnStop, Receiver.RegisterAt.OnAttachOnDetach);
-
-	private static final List<String> VALID_PREFERENCE_CLASSES = asList(CanonicalNameConstants.PREFERENCE_ACTIVITY, CanonicalNameConstants.PREFERENCE_FRAGMENT,
-			CanonicalNameConstants.SUPPORT_V4_PREFERENCE_FRAGMENT, CanonicalNameConstants.MACHINARIUS_V4_PREFERENCE_FRAGMENT);
-
-	protected final TargetAnnotationHelper annotationHelper;
-
-	public final ValidatorParameterHelper param;
-
-	public ValidatorHelper(TargetAnnotationHelper targetAnnotationHelper) {
-		annotationHelper = targetAnnotationHelper;
-		param = new ValidatorParameterHelper(annotationHelper);
-	}
-
-	public void isNotFinal(Element element, IsValid valid) {
-		if (annotationHelper.isFinal(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s cannot be used on a final element");
-		}
-	}
-
-	public void isNotSynchronized(Element element, IsValid valid) {
-		if (annotationHelper.isSynchronized(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element,
-					"%s cannot be used on a synchronized element. If you think you shall need to use the synchronized keyword for a specific use case, please post on the mailing list.");
-		}
-	}
-
-	public void isInterface(TypeElement element, IsValid valid) {
-		if (!annotationHelper.isInterface(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on an interface");
-		}
-	}
-
-	public void isTopLevel(TypeElement element, IsValid valid) {
-		if (!annotationHelper.isTopLevel(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on a top level type");
-		}
-	}
-
-	public void doesNotExtendInvalidInterfaces(TypeElement element, IsValid valid) {
-		if (element.getInterfaces().size() > 0) {
-			boolean isValid = true;
-
-			for (TypeMirror iface : element.getInterfaces()) {
-				if (!VALID_REST_INTERFACES.contains(iface.toString())) {
-					isValid = false;
-					break;
-				}
-			}
-
-			if (!isValid) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "%s interfaces can only extend the following interfaces: " + VALID_REST_INTERFACES);
-			}
-		}
-	}
-
-	public void doesNotReturnPrimitive(ExecutableElement element, IsValid valid) {
-		if (element.getReturnType().getKind().isPrimitive()) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s cannot return primitive");
-		}
-	}
-
-	public void isNotPrivate(Element element, IsValid valid) {
-		if (annotationHelper.isPrivate(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s cannot be used on a private element");
-		}
-	}
-
-	public void isPublic(Element element, IsValid valid) {
-		if (!annotationHelper.isPublic(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s cannot be used on a non public element");
-		}
-	}
-
-	public void isStatic(Element element, IsValid valid) {
-		if (!annotationHelper.isStatic(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s cannot be used on a non static inner element");
-		}
-	}
-
-	public void enclosingElementIsNotAbstractIfNotAbstract(Element element, IsValid valid) {
-		if (!annotationHelper.isAbstract(element) && annotationHelper.isAbstract(element.getEnclosingElement())) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s cannot be used on a non-abstract inner element whose outer element is abstract");
-		}
-	}
-
-	public void enclosingElementHasEBeanAnnotation(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasClassAnnotation(element, enclosingElement, validatedElements, EBean.class, valid);
-	}
-
-	public void enclosingElementHasEActivity(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasClassAnnotation(element, enclosingElement, validatedElements, EActivity.class, valid);
-	}
-
-	public void enclosingElementHasEActivityOrEFragment(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		List<Class<? extends Annotation>> validAnnotations = asList(EActivity.class, EFragment.class);
-		hasOneOfClassAnnotations(element, enclosingElement, validatedElements, validAnnotations, valid);
-	}
-
-	public void enclosingElementHasEActivityOrEFragmentOrEServiceOrEIntentService(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		List<Class<? extends Annotation>> validAnnotations = asList(EActivity.class, EFragment.class, EService.class, EIntentService.class);
-		hasOneOfClassAnnotations(element, enclosingElement, validatedElements, validAnnotations, valid);
-	}
-
-	public void enclosingElementHasEFragment(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasClassAnnotation(element, enclosingElement, validatedElements, EFragment.class, valid);
-	}
-
-	public void enclosingElementHasEIntentService(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasClassAnnotation(element, enclosingElement, validatedElements, EIntentService.class, valid);
-	}
-
-	public void enclosingElementHasEReceiver(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasClassAnnotation(element, enclosingElement, validatedElements, EReceiver.class, valid);
-	}
-
-	public void hasEActivity(Element element, AnnotationElements validatedElements, IsValid valid) {
-		hasClassAnnotation(element, element, validatedElements, EActivity.class, valid);
-	}
-
-	public void hasEActivityOrEFragment(Element element, AnnotationElements validatedElements, IsValid valid) {
-		List<Class<? extends Annotation>> validAnnotations = asList(EActivity.class, EFragment.class);
-		hasOneOfClassAnnotations(element, element, validatedElements, validAnnotations, valid);
-	}
-
-	public void enclosingElementHasEnhancedViewSupportAnnotation(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasOneOfClassAnnotations(element, enclosingElement, validatedElements, VALID_ENHANCED_VIEW_SUPPORT_ANNOTATIONS, valid);
-	}
-
-	public void enclosingElementHasEnhancedComponentAnnotation(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasOneOfClassAnnotations(element, enclosingElement, validatedElements, VALID_ENHANCED_COMPONENT_ANNOTATIONS, valid);
-	}
-
-	public void enclosingElementHasAndroidAnnotation(Element element, AnnotationElements validatedElements, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		hasOneOfClassAnnotations(element, enclosingElement, validatedElements, VALID_ANDROID_ANNOTATIONS, valid);
-	}
-
-	private void hasClassAnnotation(Element reportElement, Element element, AnnotationElements validatedElements, Class<? extends Annotation> validAnnotation, IsValid valid) {
-		List<Class<? extends Annotation>> validAnnotations = new ArrayList<>();
-		validAnnotations.add(validAnnotation);
-		hasOneOfClassAnnotations(reportElement, element, validatedElements, validAnnotations, valid);
-	}
-
-	private void hasOneOfClassAnnotations(Element reportElement, Element element, AnnotationElements validatedElements, List<Class<? extends Annotation>> validAnnotations, IsValid valid) {
-
-		boolean foundAnnotation = false;
-		for (Class<? extends Annotation> validAnnotation : validAnnotations) {
-			if (element.getAnnotation(validAnnotation) != null) {
-				foundAnnotation = true;
-				break;
-			}
-		}
-
-		if (!foundAnnotation) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(reportElement, "%s can only be used in a class annotated with " + getFormattedValidEnhancedBeanAnnotationTypes(validAnnotations) + ".");
-		}
-	}
-
-	private String getFormattedValidEnhancedBeanAnnotationTypes(List<Class<? extends Annotation>> annotations) {
-		StringBuilder sb = new StringBuilder();
-		if (!annotations.isEmpty()) {
-			sb.append(TargetAnnotationHelper.annotationName(annotations.get(0)));
-
-			for (int i = 1; i < annotations.size(); i++) {
-				sb.append(", ");
-				sb.append(TargetAnnotationHelper.annotationName(annotations.get(i)));
-			}
-		}
-
-		return sb.toString();
-	}
-
-	public void hasViewByIdAnnotation(Element element, AnnotationElements validatedElements, IsValid valid) {
-		String error = "can only be used with annotation";
-		elementHasAnnotation(ViewById.class, element, validatedElements, valid, error);
-	}
-
-	public void enclosingElementHasRestAnnotation(Element element, AnnotationElements validatedElements, IsValid valid) {
-		String error = "can only be used in an interface annotated with";
-		enclosingElementHasAnnotation(Rest.class, element, validatedElements, valid, error);
-	}
-
-	public void enclosingMethodHasAnnotation(Class<? extends Annotation> annotation, Element element, AnnotationElements validatedElements, IsValid valid) {
-		String error = "can only be used with a method annotated with";
-		enclosingElementHasAnnotation(annotation, element, validatedElements, valid, error);
-	}
-
-	public void enclosingElementHasAnnotation(Class<? extends Annotation> annotation, Element element, AnnotationElements validatedElements, IsValid valid, String error) {
-		Element enclosingElement = element.getEnclosingElement();
-		elementHasAnnotation(annotation, enclosingElement, validatedElements, valid, error);
-	}
-
-	public void elementHasAnnotation(Class<? extends Annotation> annotation, Element element, AnnotationElements validatedElements, IsValid valid, String error) {
-
-		Set<? extends Element> layoutAnnotatedElements = validatedElements.getRootAnnotatedElements(annotation.getName());
-
-		if (!layoutAnnotatedElements.contains(element)) {
-			valid.invalidate();
-			if (element.getAnnotation(annotation) == null) {
-				annotationHelper.printAnnotationError(element, "%s " + error + " " + TargetAnnotationHelper.annotationName(annotation));
-			}
-		}
-	}
-
-	public boolean elementHasAnnotation(Class<? extends Annotation> annotation, Element element, AnnotationElements validatedElements) {
-		Set<? extends Element> layoutAnnotatedElements = validatedElements.getRootAnnotatedElements(annotation.getName());
-		return layoutAnnotatedElements.contains(element);
-	}
-
-	public void throwsOnlyRestClientException(ExecutableElement element, IsValid valid) {
-		List<? extends TypeMirror> thrownTypes = element.getThrownTypes();
-		if (thrownTypes.size() > 0) {
-			if (thrownTypes.size() > 1 || !thrownTypes.get(0).toString().equals("org.springframework.web.client.RestClientException")) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "%s annotated methods can only declare throwing a RestClientException");
-			}
-		}
-	}
-
-	public void typeHasAnnotation(Class<? extends Annotation> annotation, Element element, IsValid valid) {
-		TypeMirror elementType = element.asType();
-		typeHasAnnotation(annotation, elementType, element, valid);
-	}
-
-	public void typeHasAnnotation(Class<? extends Annotation> annotation, TypeMirror elementType, Element reportingElement, IsValid valid) {
-		Element typeElement = annotationHelper.getTypeUtils().asElement(elementType);
-		if (!elementHasAnnotationSafe(annotation, typeElement)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(reportingElement, "%s can only be used on an element annotated with " + TargetAnnotationHelper.annotationName(annotation));
-		}
-	}
-
-	public void typeOrTargetValueHasAnnotation(Class<? extends Annotation> annotation, Element element, IsValid valid) {
-		DeclaredType targetAnnotationClassValue = annotationHelper.extractAnnotationClassParameter(element);
-
-		if (targetAnnotationClassValue != null) {
-			typeHasAnnotation(annotation, targetAnnotationClassValue, element, valid);
-
-			if (!annotationHelper.getTypeUtils().isAssignable(targetAnnotationClassValue, element.asType())) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "The value of %s must be assignable into the annotated field");
-			}
-		} else {
-			typeHasAnnotation(annotation, element, valid);
-		}
-	}
-
-	private boolean elementHasAnnotationSafe(Class<? extends Annotation> annotation, Element element) {
-		List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
-		for (AnnotationMirror annotationMirror : annotationMirrors) {
-			if (annotationMirror.getAnnotationType().toString().equals(annotation.getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void hasHttpHeadersReturnType(ExecutableElement element, IsValid valid) {
-		String returnType = element.getReturnType().toString();
-		if (!returnType.equals("org.springframework.http.HttpHeaders")) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s annotated methods can only return a HttpHeaders, not " + returnType);
-		}
-	}
-
-	public void hasSetOfHttpMethodReturnType(ExecutableElement element, IsValid valid) {
-		TypeMirror returnType = element.getReturnType();
-		String returnTypeString = returnType.toString();
-		if (!returnTypeString.equals("java.util.Set<org.springframework.http.HttpMethod>")) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s annotated methods can only return a Set of HttpMethod, not " + returnTypeString);
-		} else {
-			DeclaredType declaredType = (DeclaredType) returnType;
-			List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
-			if (typeArguments.size() != 1) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "%s annotated methods can only return a parameterized Set (with HttpMethod)");
-			} else {
-				TypeMirror typeArgument = typeArguments.get(0);
-				if (!typeArgument.toString().equals("org.springframework.http.HttpMethod")) {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "%s annotated methods can only return a parameterized Set of HttpMethod, not " + typeArgument.toString());
-				}
-			}
-		}
-	}
-
-	public void doesntThrowException(Element element, IsValid valid) {
-		ExecutableElement executableElement = (ExecutableElement) element;
-
-		if (executableElement.getThrownTypes().size() > 0) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s annotated methods should not declare throwing any exception");
-		}
-	}
-
-	public void returnTypeIsVoidOrBoolean(ExecutableElement executableElement, IsValid valid) {
-		TypeMirror returnType = executableElement.getReturnType();
-
-		TypeKind returnKind = returnType.getKind();
-
-		if (returnKind != TypeKind.BOOLEAN && returnKind != TypeKind.VOID && !returnType.toString().equals(CanonicalNameConstants.BOOLEAN)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(executableElement, "%s can only be used on a method with a boolean or a void return type");
-		}
-	}
-
-	public void returnTypeIsVoid(ExecutableElement executableElement, IsValid valid) {
-		TypeMirror returnType = executableElement.getReturnType();
-
-		if (returnType.getKind() != TypeKind.VOID) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(executableElement, "%s can only be used on a method with a void return type");
-		}
-	}
-
-	public void doesNotHaveTraceAnnotationAndReturnValue(ExecutableElement executableElement, AnnotationElements validatedElements, IsValid valid) {
-		TypeMirror returnType = executableElement.getReturnType();
-
-		if (elementHasAnnotation(Trace.class, executableElement, validatedElements) && returnType.getKind() != TypeKind.VOID) {
-			annotationHelper.printAnnotationError(executableElement, "@WakeLock annotated methods with a return value are not supported by @Trace");
-		}
-	}
-
-	public void doesNotUseFlagsWithPartialWakeLock(Element element, AnnotationElements validatedElements, IsValid valid) {
-		WakeLock annotation = element.getAnnotation(WakeLock.class);
-		if (annotation.level().equals(Level.PARTIAL_WAKE_LOCK) && annotation.flags().length > 0) {
-			annotationHelper.printAnnotationWarning(element, "Flags have no effect when combined with a PARTIAL_WAKE_LOCK");
-		}
-	}
-
-	public void returnTypeIsNotVoid(ExecutableElement executableElement, IsValid valid) {
-		TypeMirror returnType = executableElement.getReturnType();
-
-		if (returnType.getKind() == TypeKind.VOID) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(executableElement, "%s can only be used on a method with a return type non void");
-		}
-	}
-
-	public void extendsActivity(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.ACTIVITY, valid);
-	}
-
-	public void extendsFragment(Element element, IsValid valid) {
-		extendsOneOfTypes(element, ANDROID_FRAGMENT_QUALIFIED_NAMES, valid);
-	}
-
-	public void extendsService(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.SERVICE, valid);
-	}
-
-	public void extendsIntentService(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.INTENT_SERVICE, valid);
-	}
-
-	public void extendsReceiver(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.BROADCAST_RECEIVER, valid);
-	}
-
-	public void extendsProvider(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.CONTENT_PROVIDER, valid);
-	}
-
-	public void extendsView(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.VIEW, valid);
-	}
-
-	public void extendsTextView(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.TEXT_VIEW, valid);
-	}
-
-	public void extendsViewGroup(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.VIEW_GROUP, valid);
-	}
-
-	public void extendsApplication(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.APPLICATION, valid);
-	}
-
-	public void extendsContext(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.CONTEXT, valid);
-	}
-
-	public void extendsMenuItem(Element element, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		String enclosingQualifiedName = enclosingElement.asType().toString();
-		TypeElement enclosingTypeElement = annotationHelper.typeElementFromQualifiedName(enclosingQualifiedName);
-
-		if (enclosingTypeElement != null) {
-			extendsType(element, CanonicalNameConstants.MENU_ITEM, valid);
-		}
-	}
-
-	public void extendsMenu(Element element, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		String enclosingQualifiedName = enclosingElement.asType().toString();
-		TypeElement enclosingTypeElement = annotationHelper.typeElementFromQualifiedName(enclosingQualifiedName);
-
-		if (enclosingTypeElement != null) {
-			extendsType(element, CanonicalNameConstants.MENU, valid);
-		}
-	}
-
-	public void extendsOrmLiteDao(Element element, IsValid valid, OrmLiteHelper ormLiteHelper) {
-		if (!valid.isValid()) {
-			// we now that the element is invalid. early exit as the reason
-			// could be missing ormlite classes
-			return;
-		}
-
-		TypeMirror elementTypeMirror = element.asType();
-		Types typeUtils = annotationHelper.getTypeUtils();
-
-		DeclaredType daoParametrizedType = ormLiteHelper.getDaoParametrizedType();
-		DeclaredType runtimeExceptionDaoParametrizedType = ormLiteHelper.getRuntimeExceptionDaoParametrizedType();
-
-		// Checks that elementType extends Dao<?, ?> or
-		// RuntimeExceptionDao<?, ?>
-		if (!annotationHelper.isSubtype(elementTypeMirror, daoParametrizedType) && !annotationHelper.isSubtype(elementTypeMirror, runtimeExceptionDaoParametrizedType)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on an element that extends " + daoParametrizedType.toString() //
-					+ " or " + runtimeExceptionDaoParametrizedType.toString());
-			return;
-		}
-
-		if (annotationHelper.isSubtype(elementTypeMirror, runtimeExceptionDaoParametrizedType) //
-				&& !typeUtils.isAssignable(ormLiteHelper.getTypedRuntimeExceptionDao(element), elementTypeMirror)) {
-
-			boolean hasConstructor = false;
-			Element elementType = typeUtils.asElement(elementTypeMirror);
-			DeclaredType daoWithTypedParameters = ormLiteHelper.getTypedDao(element);
-			for (ExecutableElement constructor : ElementFilter.constructorsIn(elementType.getEnclosedElements())) {
-				List<? extends VariableElement> parameters = constructor.getParameters();
-				if (parameters.size() == 1) {
-					TypeMirror type = parameters.get(0).asType();
-					if (annotationHelper.isSubtype(type, daoWithTypedParameters)) {
-						hasConstructor = true;
-					}
-				}
-			}
-			if (!hasConstructor) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, elementTypeMirror.toString() + " requires a constructor that takes only a " + daoWithTypedParameters.toString());
-			}
-		}
-	}
-
-	public void extendsListOfView(Element element, IsValid valid) {
-		DeclaredType elementType = (DeclaredType) element.asType();
-		List<? extends TypeMirror> elementTypeArguments = elementType.getTypeArguments();
-
-		TypeMirror viewType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.VIEW).asType();
-
-		if (!elementType.toString().equals(CanonicalNameConstants.LIST) && elementTypeArguments.size() == 1 && !annotationHelper.isSubtype(elementTypeArguments.get(0), viewType)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on a " + CanonicalNameConstants.LIST + " of elements extending " + CanonicalNameConstants.VIEW);
-		}
-	}
-
-	public void extendsPreference(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.PREFERENCE, valid);
-	}
-
-	public void hasASqlLiteOpenHelperParameterizedType(Element element, IsValid valid) {
-		TypeMirror helperType = annotationHelper.extractAnnotationParameter(element, "helper");
-
-		TypeMirror openHelperType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.SQLLITE_OPEN_HELPER).asType();
-		if (!annotationHelper.isSubtype(helperType, openHelperType)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s helper() parameter must extend " + CanonicalNameConstants.SQLLITE_OPEN_HELPER);
-		}
-	}
-
-	public void applicationRegistered(Element element, AndroidManifest manifest, IsValid valid) {
-
-		if (manifest.isLibraryProject()) {
-			return;
-		}
-
-		String applicationClassName = manifest.getApplicationClassName();
-		if (applicationClassName != null) {
-
-			TypeElement typeElement = (TypeElement) element;
-
-			String componentQualifiedName = typeElement.getQualifiedName().toString();
-			String generatedComponentQualifiedName = componentQualifiedName + classSuffix();
-
-			if (!typeElement.getModifiers().contains(Modifier.ABSTRACT) && !applicationClassName.equals(generatedComponentQualifiedName)) {
-				if (applicationClassName.equals(componentQualifiedName)) {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "The AndroidManifest.xml file contains the original component, and not the AndroidAnnotations generated component. Please register "
-							+ generatedComponentQualifiedName + " instead of " + componentQualifiedName);
-				} else {
-					annotationHelper.printAnnotationWarning(element, "The component " + generatedComponentQualifiedName + " is not registered in the AndroidManifest.xml file.");
-				}
-			}
-		} else {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "No application class registered in the AndroidManifest.xml");
-		}
-
-	}
-
-	public void isSharedPreference(Element element, AnnotationElements validatedElements, IsValid valid) {
-
-		TypeMirror type = element.asType();
-
-		/*
-		 * The type is not available yet because it has just been generated
-		 */
-		if (type instanceof ErrorType || type.getKind() == TypeKind.ERROR) {
-			String elementTypeName = type.toString();
-
-			boolean sharedPrefValidatedInRound = false;
-			if (elementTypeName.endsWith(classSuffix())) {
-				String prefTypeName = elementTypeName.substring(0, elementTypeName.length() - classSuffix().length());
-				prefTypeName = prefTypeName.replace(classSuffix() + ".", ".");
-
-				Set<? extends Element> sharedPrefElements = validatedElements.getRootAnnotatedElements(SharedPref.class.getName());
-
-				for (Element sharedPrefElement : sharedPrefElements) {
-					TypeElement sharedPrefTypeElement = (TypeElement) sharedPrefElement;
-
-					String sharedPrefQualifiedName = sharedPrefTypeElement.getQualifiedName().toString();
-
-					if (sharedPrefQualifiedName.endsWith(prefTypeName)) {
-						sharedPrefValidatedInRound = true;
-						break;
-					}
-				}
-			}
-
-			if (!sharedPrefValidatedInRound) {
-				valid.invalidate();
-			}
-
-		} else {
-			extendsType(element, SharedPreferencesHelper.class.getName(), valid);
-		}
-
-	}
-
-	public void extendsOneOfTypes(Element element, List<String> typeQualifiedNames, IsValid valid) {
-		TypeMirror elementType = element.asType();
-
-		for (String typeQualifiedName : typeQualifiedNames) {
-			TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(typeQualifiedName);
-			if (typeElement != null) {
-				TypeMirror expectedType = typeElement.asType();
-				if (annotationHelper.isSubtype(elementType, expectedType)) {
-					return;
-				}
-			}
-		}
-		valid.invalidate();
-		annotationHelper.printAnnotationError(element, "%s can only be used on an element that extends one of the following classes: " + typeQualifiedNames);
-	}
-
-	public void extendsType(Element element, String typeQualifiedName, IsValid valid) {
-		if (!extendsType(element, typeQualifiedName)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on an element that extends " + typeQualifiedName);
-		}
-	}
-
-	private boolean extendsType(Element element, String typeQualifiedName) {
-		TypeMirror elementType = element.asType();
-
-		TypeElement typeElement = annotationHelper.typeElementFromQualifiedName(typeQualifiedName);
-		if (typeElement != null) {
-			TypeMirror expectedType = typeElement.asType();
-			return annotationHelper.isSubtype(elementType, expectedType);
-		}
-		return false;
-	}
-
-	public void allowedType(Element element, IsValid valid, TypeMirror fieldTypeMirror, List<String> allowedTypes) {
-
-		String qualifiedName = fieldTypeMirror.toString();
-
-		if (!allowedTypes.contains(qualifiedName)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on a field which is a " + allowedTypes.toString() + ", not " + qualifiedName);
-		}
-	}
-
-	public void hasRoboGuiceJars(Element element, IsValid valid) {
-		Elements elementUtils = annotationHelper.getElementUtils();
-
-		if (elementUtils.getTypeElement(CanonicalNameConstants.ROBO_CONTEXT) == null) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "Could not find the RoboGuice framework in the classpath, the following class is missing: " + CanonicalNameConstants.ROBO_CONTEXT);
-		}
-
-		if (elementUtils.getTypeElement(CanonicalNameConstants.ROBO_APPLICATION) != null) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "It seems you are using an old version of RoboGuice. Be sure to use version 3.0!");
-		}
-
-		if (elementUtils.getTypeElement(CanonicalNameConstants.ON_START_EVENT_OLD) != null) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "It seems you are using an old version of RoboGuice. Be sure to use version 3.0!");
-		}
-	}
-
-	public void hasSpringAndroidJars(Element element, IsValid valid) {
-		Elements elementUtils = annotationHelper.getElementUtils();
-
-		if (elementUtils.getTypeElement(CanonicalNameConstants.REST_TEMPLATE) == null) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "Could not find the SpringAndroid framework in the classpath, the following class is missing: " + CanonicalNameConstants.REST_TEMPLATE);
-		}
-	}
-
-	public void hasOrmLiteJars(Element element, IsValid valid) {
-		Elements elementUtils = annotationHelper.getElementUtils();
-
-		if (elementUtils.getTypeElement(CanonicalNameConstants.DAO) == null) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "Could not find the OrmLite framework in the classpath, the following class is missing: " + CanonicalNameConstants.DAO);
-		}
-	}
-
-	public void androidService(AndroidSystemServices androidSystemServices, Element element, IsValid valid) {
-		TypeMirror serviceType = element.asType();
-		if (!androidSystemServices.contains(serviceType)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "Unknown service type: " + serviceType.toString());
-		}
-	}
-
-	public void isDeclaredType(Element element, IsValid valid) {
-		if (!(element.asType() instanceof DeclaredType)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s can only be used on a field which is a declared type");
-		}
-	}
-
-	public void isPrefMethod(Element element, IsValid valid) {
-		if (!element.getKind().equals(ElementKind.METHOD)) {
-			annotationHelper.printError(element, "Only methods are allowed in an " + annotationHelper.annotationName() + " annotated interface");
-		} else {
-			ExecutableElement executableElement = (ExecutableElement) element;
-			String methodName = executableElement.getSimpleName().toString();
-			if (executableElement.getParameters().size() > 0) {
-				annotationHelper.printError(element, "Method " + methodName + " should have no parameters in an " + annotationHelper.annotationName() + " annotated interface");
-			} else {
-
-				String returnType = executableElement.getReturnType().toString();
-
-				if (!VALID_PREF_RETURN_TYPES.contains(returnType)) {
-					annotationHelper.printError(element, "Method " + methodName + " should only return preference simple types in an " + annotationHelper.annotationName() + " annotated interface");
-				} else {
-					if (INVALID_PREF_METHOD_NAMES.contains(methodName)) {
-						annotationHelper.printError(element, "The method name " + methodName + " is forbidden in an " + annotationHelper.annotationName() + " annotated interface");
-					} else {
-						return;
-					}
-				}
-			}
-		}
-		valid.invalidate();
-	}
-
-	public void hasCorrectDefaultAnnotation(ExecutableElement method, IsValid valid) {
-		checkDefaultAnnotation(method, DefaultBoolean.class, "boolean", new TypeKindAnnotationCondition(TypeKind.BOOLEAN), valid);
-		checkDefaultAnnotation(method, DefaultFloat.class, "float", new TypeKindAnnotationCondition(TypeKind.FLOAT), valid);
-		checkDefaultAnnotation(method, DefaultInt.class, "int", new TypeKindAnnotationCondition(TypeKind.INT), valid);
-		checkDefaultAnnotation(method, DefaultLong.class, "long", new TypeKindAnnotationCondition(TypeKind.LONG), valid);
-		checkDefaultAnnotation(method, DefaultString.class, "String", new DefaultAnnotationCondition() {
-			@Override
-			public boolean correctReturnType(TypeMirror returnType) {
-				return returnType.toString().equals(CanonicalNameConstants.STRING);
-			}
-		}, valid);
-	}
-
-	private interface DefaultAnnotationCondition {
-		boolean correctReturnType(TypeMirror returnType);
-	}
-
-	private class TypeKindAnnotationCondition implements DefaultAnnotationCondition {
-
-		private final TypeKind typeKind;
-
-		public TypeKindAnnotationCondition(TypeKind typeKind) {
-			this.typeKind = typeKind;
-		}
-
-		@Override
-		public boolean correctReturnType(TypeMirror returnType) {
-			return returnType.getKind() == typeKind;
-		}
-
-	}
-
-	private <T extends Annotation> void checkDefaultAnnotation(ExecutableElement method, Class<T> annotationClass, String expectedReturnType, DefaultAnnotationCondition condition, IsValid valid) {
-		T defaultAnnotation = method.getAnnotation(annotationClass);
-		if (defaultAnnotation != null) {
-			if (!condition.correctReturnType(method.getReturnType())) {
-				annotationHelper.printAnnotationError(method, annotationClass.getName(), TargetAnnotationHelper.annotationName(annotationClass) + " can only be used on a method that returns a "
-						+ expectedReturnType);
-				valid.invalidate();
-			}
-		}
-	}
-
-	private static final List<Class<? extends Annotation>> REST_ANNOTATION_CLASSES = Arrays.asList(Get.class, Head.class, Options.class, Post.class, Put.class, Delete.class);
-
-	public void unannotatedMethodReturnsRestTemplate(TypeElement typeElement, IsValid valid) {
-		List<? extends Element> enclosedElements = typeElement.getEnclosedElements();
-		boolean foundGetRestTemplateMethod = false;
-		boolean foundSetRestTemplateMethod = false;
-		boolean foundSetAuthenticationMethod = false;
-		boolean foundSetBearerAuthMethod = false;
-		boolean foundSetRootUrlMethod = false;
-		boolean foundGetCookieMethod = false;
-		boolean foundGetHeaderMethod = false;
-		boolean foundGetRootUrlMethod = false;
-
-		for (Element enclosedElement : enclosedElements) {
-			if (enclosedElement.getKind() != ElementKind.METHOD) {
-				valid.invalidate();
-				annotationHelper.printError(enclosedElement, "Only methods are allowed in a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
-			} else {
-
-				boolean hasRestAnnotation = false;
-				for (Class<? extends Annotation> annotationClass : REST_ANNOTATION_CLASSES) {
-					if (enclosedElement.getAnnotation(annotationClass) != null) {
-						hasRestAnnotation = true;
-						break;
-					}
-				}
-
-				if (!hasRestAnnotation) {
-
-					ExecutableElement executableElement = (ExecutableElement) enclosedElement;
-					TypeMirror returnType = executableElement.getReturnType();
-					String simpleName = executableElement.getSimpleName().toString();
-
-					if (returnType.toString().equals(CanonicalNameConstants.REST_TEMPLATE)) {
-						if (executableElement.getParameters().size() > 0) {
-							valid.invalidate();
-							annotationHelper.printError(enclosedElement,
-									"The method returning a RestTemplate should not declare any parameter in a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
-						} else {
-							if (foundGetRestTemplateMethod) {
-								valid.invalidate();
-								annotationHelper.printError(enclosedElement, "Only one method should declare returning a RestTemplate in a " + TargetAnnotationHelper.annotationName(Rest.class)
-										+ " annotated interface");
-							} else {
-								foundGetRestTemplateMethod = true;
-							}
-						}
-					} else if (simpleName.equals(METHOD_NAME_GET_ROOT_URL)) {
-						if (!returnType.toString().equals(CanonicalNameConstants.STRING)) {
-							valid.invalidate();
-							annotationHelper.printError(enclosedElement, "The method getRootUrl must return String on a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
-						}
-
-						if (executableElement.getParameters().size() != 0) {
-							valid.invalidate();
-							annotationHelper.printError(enclosedElement, "The method getRootUrl cannot have parameters on a " + TargetAnnotationHelper.annotationName(Rest.class)
-									+ " annotated interface");
-						}
-
-						if (!foundGetRootUrlMethod) {
-							foundGetRootUrlMethod = true;
-						} else {
-							valid.invalidate();
-							annotationHelper.printError(enclosedElement, "The can be only one getRootUrl method on a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
-						}
-					} else if (returnType.getKind() == TypeKind.VOID) {
-						List<? extends VariableElement> parameters = executableElement.getParameters();
-						if (parameters.size() == 1) {
-							VariableElement firstParameter = parameters.get(0);
-							if (firstParameter.asType().toString().equals(CanonicalNameConstants.REST_TEMPLATE)) {
-								if (!foundSetRestTemplateMethod) {
-									foundSetRestTemplateMethod = true;
-								} else {
-									valid.invalidate();
-									annotationHelper.printError(enclosedElement, "You can only have oneRestTemplate setter method on a " + TargetAnnotationHelper.annotationName(Rest.class)
-											+ " annotated interface");
-
-								}
-							} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_SET_ROOT_URL) && !foundSetRootUrlMethod) {
-								foundSetRootUrlMethod = true;
-							} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_SET_AUTHENTICATION) && !foundSetAuthenticationMethod) {
-								foundSetAuthenticationMethod = true;
-							} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_SET_BEARER_AUTH) && !foundSetBearerAuthMethod) {
-								foundSetBearerAuthMethod = true;
-							} else {
-								valid.invalidate();
-								annotationHelper.printError(enclosedElement,
-										"The method to set a RestTemplate should have only one RestTemplate parameter on a " + TargetAnnotationHelper.annotationName(Rest.class)
-												+ " annotated interface");
-
-							}
-						} else if (parameters.size() == 2) {
-							VariableElement firstParameter = parameters.get(0);
-							VariableElement secondParameter = parameters.get(1);
-							if (!(firstParameter.asType().toString().equals(CanonicalNameConstants.STRING) && secondParameter.asType().toString().equals(CanonicalNameConstants.STRING))) {
-								valid.invalidate();
-								annotationHelper.printError(enclosedElement,
-										"The method to set headers, cookies, or HTTP Basic Auth should have only String parameters on a " + TargetAnnotationHelper.annotationName(Rest.class)
-												+ " annotated interface");
-							}
-						} else {
-							valid.invalidate();
-							annotationHelper.printError(enclosedElement,
-									"The method to set a RestTemplate should have only one RestTemplate parameter on a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
-						}
-					} else if (returnType.toString().equals(CanonicalNameConstants.STRING)) {
-						List<? extends VariableElement> parameters = executableElement.getParameters();
-						if (parameters.size() == 1) {
-							VariableElement firstParameter = parameters.get(0);
-							if (firstParameter.asType().toString().equals(CanonicalNameConstants.STRING)) {
-								if (executableElement.getSimpleName().toString().equals(METHOD_NAME_GET_COOKIE) && !foundGetCookieMethod) {
-									foundGetCookieMethod = true;
-								} else if (executableElement.getSimpleName().toString().equals(METHOD_NAME_GET_HEADER) && !foundGetHeaderMethod) {
-									foundGetHeaderMethod = true;
-								} else {
-									valid.invalidate();
-									annotationHelper.printError(enclosedElement,
-											"Only one getCookie(String) and one getHeader(String) method are allowed on a " + TargetAnnotationHelper.annotationName(Rest.class)
-													+ " annotated interface");
-								}
-							} else {
-								valid.invalidate();
-								annotationHelper.printError(enclosedElement,
-										"Only getCookie(String) and getHeader(String) can return a String on a " + TargetAnnotationHelper.annotationName(Rest.class) + " annotated interface");
-							}
-
-						} else {
-							valid.invalidate();
-							annotationHelper.printError(enclosedElement, "The only methods that can return a String on a " + TargetAnnotationHelper.annotationName(Rest.class)
-									+ " annotated interface are getCookie(String) and getHeader(String)");
-						}
-					} else {
-						valid.invalidate();
-						annotationHelper.printError(enclosedElement, "All methods should be annotated in a " + TargetAnnotationHelper.annotationName(Rest.class)
-								+ " annotated interface, except the ones that returns or set a RestTemplate");
-					}
-				}
-			}
-		}
-	}
-
-	public void notAlreadyValidated(Element element, AnnotationElements validatedElements, IsValid valid) {
-		if (validatedElements.getAllElements().contains(element)) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "%s annotated element cannot be used with the other annotations used on this element.");
-		}
-	}
-
-	public void isAbstractOrHasEmptyOrContextConstructor(Element element, IsValid valid) {
-		List<ExecutableElement> constructors = ElementFilter.constructorsIn(element.getEnclosedElements());
-
-		if (!annotationHelper.isAbstract(element)) {
-			if (constructors.size() == 1) {
-				ExecutableElement constructor = constructors.get(0);
-
-				if (!annotationHelper.isPrivate(constructor)) {
-					if (constructor.getParameters().size() > 1) {
-						annotationHelper.printAnnotationError(element, "%s annotated element should have a constructor with one parameter max, of type " + CanonicalNameConstants.CONTEXT);
-						valid.invalidate();
-					} else if (constructor.getParameters().size() == 1) {
-						VariableElement parameter = constructor.getParameters().get(0);
-						if (!parameter.asType().toString().equals(CanonicalNameConstants.CONTEXT)) {
-							annotationHelper.printAnnotationError(element, "%s annotated element should have a constructor with one parameter max, of type " + CanonicalNameConstants.CONTEXT);
-							valid.invalidate();
-						}
-					}
-				} else {
-					annotationHelper.printAnnotationError(element, "%s annotated element should not have a private constructor");
-					valid.invalidate();
-				}
-			} else {
-				annotationHelper.printAnnotationError(element, "%s annotated element should have only one constructor");
-				valid.invalidate();
-			}
-		}
-	}
-
-	public void isAbstractOrHasEmptyConstructor(Element element, IsValid valid) {
-		List<ExecutableElement> constructors = ElementFilter.constructorsIn(element.getEnclosedElements());
-
-		if (!annotationHelper.isAbstract(element)) {
-			if (constructors.size() == 1) {
-				ExecutableElement constructor = constructors.get(0);
-
-				if (!annotationHelper.isPrivate(constructor)) {
-					if (constructor.getParameters().size() != 0) {
-						annotationHelper.printAnnotationError(element, "%s annotated element should have an empty constructor");
-						valid.invalidate();
-					}
-				} else {
-					annotationHelper.printAnnotationError(element, "%s annotated element should not have a private constructor");
-					valid.invalidate();
-				}
-			} else {
-				annotationHelper.printAnnotationError(element, "%s annotated element should have only one constructor");
-				valid.invalidate();
-			}
-		}
-	}
-
-	public void hasValidLogLevel(Element element, IsValid isValid) {
-
-		Trace annotation = element.getAnnotation(Trace.class);
-		Integer level = annotation.level();
-
-		if (!VALID_LOG_LEVELS.contains(level)) {
-			annotationHelper.printError(element, "Unrecognized log level.");
-			isValid.invalidate();
-		}
-
-	}
-
-	public void canBePutInABundle(Element element, IsValid isValid) {
-		TypeMirror typeMirror = element.asType();
-		String typeString = element.asType().toString();
-
-		if (!isKnownBundleCompatibleType(typeString)) {
-
-			if (typeMirror instanceof ArrayType) {
-				ArrayType arrayType = (ArrayType) element.asType();
-				typeMirror = arrayType.getComponentType();
-			}
-
-			if (typeMirror.getKind() != TypeKind.NONE) {
-				TypeMirror parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE).asType();
-				TypeMirror serializableType = annotationHelper.typeElementFromQualifiedName("java.io.Serializable").asType();
-				if (!annotationHelper.isSubtype(typeMirror, parcelableType) && !annotationHelper.isSubtype(typeMirror, serializableType)) {
-					annotationHelper.printAnnotationError(element, "Unrecognized type. Please let your attribute be primitive or implement Serializable or Parcelable");
-					isValid.invalidate();
-				}
-			}
-		}
-	}
-
-	private TypeElement getArrayEnclosingType(String typeString) {
-		typeString = typeString.replace("[]", "");
-		return annotationHelper.typeElementFromQualifiedName(typeString);
-	}
-
-	private boolean isKnownBundleCompatibleType(String type) {
-		return BundleHelper.METHOD_SUFFIX_BY_TYPE_NAME.containsKey(type);
-	}
-
-	public void componentRegistered(Element element, AndroidManifest androidManifest, IsValid valid) {
-		componentRegistered(element, androidManifest, true, valid);
-	}
-
-	public void componentRegistered(Element element, AndroidManifest androidManifest, boolean printWarning, IsValid valid) {
-		TypeElement typeElement = (TypeElement) element;
-
-		if (typeElement.getModifiers().contains(Modifier.ABSTRACT)) {
-			return;
-		}
-
-		if (androidManifest.isLibraryProject()) {
-			return;
-		}
-
-		String componentQualifiedName = typeElement.getQualifiedName().toString();
-		String generatedComponentQualifiedName = componentQualifiedName + classSuffix();
-
-		List<String> componentQualifiedNames = androidManifest.getComponentQualifiedNames();
-		if (!componentQualifiedNames.contains(generatedComponentQualifiedName)) {
-			String simpleName = typeElement.getSimpleName().toString();
-			String generatedSimpleName = simpleName + classSuffix();
-			if (componentQualifiedNames.contains(componentQualifiedName)) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "The AndroidManifest.xml file contains the original component, and not the AndroidAnnotations generated component. Please register "
-						+ generatedSimpleName + " instead of " + simpleName);
-			} else {
-				if (printWarning) {
-					annotationHelper.printAnnotationWarning(element, "The component " + generatedSimpleName + " is not registered in the AndroidManifest.xml file.");
-				}
-			}
-		}
-
-	}
-
-	public void validateConverters(Element element, IsValid valid) {
-		TypeMirror httpMessageConverterType = annotationHelper.typeElementFromQualifiedName(HTTP_MESSAGE_CONVERTER).asType();
-		TypeMirror httpMessageConverterTypeErased = annotationHelper.getTypeUtils().erasure(httpMessageConverterType);
-		List<DeclaredType> converters = annotationHelper.extractAnnotationClassArrayParameter(element, annotationHelper.getTarget(), "converters");
-
-		if (converters == null || converters.isEmpty()) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "At least one converter is required");
-			return;
-		}
-
-		for (DeclaredType converterType : converters) {
-			TypeMirror erasedConverterType = annotationHelper.getTypeUtils().erasure(converterType);
-			if (annotationHelper.isSubtype(erasedConverterType, httpMessageConverterTypeErased)) {
-				Element converterElement = converterType.asElement();
-				if (converterElement.getKind().isClass()) {
-					if (!annotationHelper.isAbstract(converterElement)) {
-						if (converterElement.getAnnotation(EBean.class) == null) {
-							List<ExecutableElement> constructors = ElementFilter.constructorsIn(converterElement.getEnclosedElements());
-							boolean hasPublicWithNoArgumentConstructor = false;
-							for (ExecutableElement constructor : constructors) {
-								if (annotationHelper.isPublic(constructor) && constructor.getParameters().isEmpty()) {
-									hasPublicWithNoArgumentConstructor = true;
-								}
-							}
-							if (!hasPublicWithNoArgumentConstructor) {
-								valid.invalidate();
-								annotationHelper.printAnnotationError(element, "The converter class must have a public no argument constructor");
-							}
-						}
-					} else {
-						valid.invalidate();
-						annotationHelper.printAnnotationError(element, "The converter class must not be abstract");
-					}
-				} else {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "The converter class must be a class");
-				}
-			} else {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "The converter class must be a subtype of " + HTTP_MESSAGE_CONVERTER);
-			}
-		}
-	}
-
-	public void validateInterceptors(Element element, IsValid valid) {
-		TypeMirror clientHttpRequestInterceptorType = annotationHelper.typeElementFromQualifiedName(CLIENT_HTTP_REQUEST_INTERCEPTOR).asType();
-		TypeMirror clientHttpRequestInterceptorTypeErased = annotationHelper.getTypeUtils().erasure(clientHttpRequestInterceptorType);
-		List<DeclaredType> interceptors = annotationHelper.extractAnnotationClassArrayParameter(element, annotationHelper.getTarget(), "interceptors");
-		if (interceptors == null) {
-			return;
-		}
-		for (DeclaredType interceptorType : interceptors) {
-			TypeMirror erasedInterceptorType = annotationHelper.getTypeUtils().erasure(interceptorType);
-			if (annotationHelper.isSubtype(erasedInterceptorType, clientHttpRequestInterceptorTypeErased)) {
-				Element interceptorElement = interceptorType.asElement();
-				if (interceptorElement.getKind().isClass()) {
-					if (!annotationHelper.isAbstract(interceptorElement)) {
-						if (interceptorElement.getAnnotation(EBean.class) == null) {
-							List<ExecutableElement> constructors = ElementFilter.constructorsIn(interceptorElement.getEnclosedElements());
-							boolean hasPublicWithNoArgumentConstructor = false;
-							for (ExecutableElement constructor : constructors) {
-								if (annotationHelper.isPublic(constructor) && constructor.getParameters().isEmpty()) {
-									hasPublicWithNoArgumentConstructor = true;
-								}
-							}
-							if (!hasPublicWithNoArgumentConstructor) {
-								valid.invalidate();
-								annotationHelper.printAnnotationError(element, "The interceptor class must have a public no argument constructor or be annotated with @EBean");
-							}
-						}
-					} else {
-						valid.invalidate();
-						annotationHelper.printAnnotationError(element, "The interceptor class must not be abstract");
-					}
-				} else {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "The interceptor class must be a class");
-				}
-			} else {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "The interceptor class must be a subtype of " + CLIENT_HTTP_REQUEST_INTERCEPTOR);
-			}
-		}
-	}
-
-	public void isDebuggable(Element element, AndroidManifest androidManifest, IsValid valid) {
-		if (!androidManifest.isDebuggable()) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "The application must be in debuggable mode. Please set android:debuggable to true in your AndroidManifest.xml file.");
-		}
-	}
-
-	public void hasInternetPermission(Element element, AndroidManifest androidManifest, IsValid valid) {
-		hasPermission(element, androidManifest, valid, INTERNET_PERMISSION);
-	}
-
-	public void hasWakeLockPermission(Element element, AndroidManifest androidManifest, IsValid valid) {
-		hasPermission(element, androidManifest, valid, WAKELOCK_PERMISSION);
-	}
-
-	public void hasPermission(Element element, AndroidManifest androidManifest, IsValid valid, String permissionQualifiedName) {
-		List<String> permissionQualifiedNames = androidManifest.getPermissionQualifiedNames();
-		if (!permissionQualifiedNames.contains(permissionQualifiedName)) {
-			if (androidManifest.isLibraryProject()) {
-				annotationHelper.printAnnotationWarning(element, "Your library should require the " + permissionQualifiedName + " permission.");
-			} else {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "Your application must require the " + permissionQualifiedName + " permission.");
-			}
-		}
-	}
-
-	public void validateRequestFactory(Element element, IsValid valid) {
-		TypeMirror clientHttpRequestFactoryType = annotationHelper.typeElementFromQualifiedName(CLIENT_HTTP_REQUEST_FACTORY).asType();
-		DeclaredType requestFactory = annotationHelper.extractAnnotationClassParameter(element, annotationHelper.getTarget(), "requestFactory");
-		if (requestFactory != null) {
-			if (annotationHelper.isSubtype(requestFactory, clientHttpRequestFactoryType)) {
-				Element requestFactoryElement = requestFactory.asElement();
-				if (requestFactoryElement.getKind().isClass()) {
-					if (!annotationHelper.isAbstract(requestFactoryElement)) {
-						if (requestFactoryElement.getAnnotation(EBean.class) != null) {
-							return;
-						}
-						List<ExecutableElement> constructors = ElementFilter.constructorsIn(requestFactoryElement.getEnclosedElements());
-						for (ExecutableElement constructor : constructors) {
-							if (annotationHelper.isPublic(constructor) && constructor.getParameters().isEmpty()) {
-								return;
-							}
-						}
-						valid.invalidate();
-						annotationHelper.printAnnotationError(element, "The requestFactory class must have a public no argument constructor or must be annotated with @EBean");
-					} else {
-						valid.invalidate();
-						annotationHelper.printAnnotationError(element, "The requestFactory class must not be abstract");
-					}
-				} else {
-					valid.invalidate();
-					annotationHelper.printAnnotationError(element, "The requestFactory class must be a class");
-				}
-			} else {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "The requestFactory class must be a subtype of " + CLIENT_HTTP_REQUEST_FACTORY);
-			}
-		}
-	}
-
-	public void hasBeforeTextChangedMethodParameters(ExecutableElement executableElement, IsValid valid) {
-		List<? extends VariableElement> parameters = executableElement.getParameters();
-		boolean charSequenceParameterFound = false;
-		boolean textViewParameterFound = false;
-		for (VariableElement parameter : parameters) {
-			String parameterType = parameter.asType().toString();
-			if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) {
-				if (charSequenceParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence");
-					valid.invalidate();
-				}
-				charSequenceParameterFound = true;
-				continue;
-			}
-			if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
-				if (textViewParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
-					valid.invalidate();
-				}
-				textViewParameterFound = true;
-				continue;
-			}
-			if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
-				String parameterName = parameter.toString();
-				if ("start".equals(parameterName) || "count".equals(parameterName) || "after".equals(parameterName)) {
-					continue;
-				}
-				annotationHelper.printAnnotationError(executableElement,
-						"Unrecognized parameter name. You can only have start, before, or count parameter name. Try to pick a parameter from android.text.TextWatcher.beforeTextChanged() method.");
-				valid.invalidate();
-				continue;
-			}
-			annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter (" + parameter.toString()
-					+ "). %s can only have a android.widget.TextView parameter and/or parameters from android.text.TextWatcher.beforeTextChanged() method.");
-			valid.invalidate();
-		}
-	}
-
-	public void hasTextChangedMethodParameters(ExecutableElement executableElement, IsValid valid) {
-		List<? extends VariableElement> parameters = executableElement.getParameters();
-		boolean charSequenceParameterFound = false;
-		boolean textViewParameterFound = false;
-		for (VariableElement parameter : parameters) {
-			String parameterType = parameter.asType().toString();
-			if (parameterType.equals(CanonicalNameConstants.CHAR_SEQUENCE)) {
-				if (charSequenceParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type java.lang.CharSequence");
-					valid.invalidate();
-				}
-				charSequenceParameterFound = true;
-				continue;
-			}
-			if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
-				if (textViewParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
-					valid.invalidate();
-				}
-				textViewParameterFound = true;
-				continue;
-			}
-			if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
-				String parameterName = parameter.toString();
-				if ("start".equals(parameterName) || "before".equals(parameterName) || "count".equals(parameterName)) {
-					continue;
-				}
-				annotationHelper.printAnnotationError(executableElement,
-						"Unrecognized parameter name. You can only have start, before, or count parameter name. Try to pick a prameter from the android.text.TextWatcher.onTextChanged() method.");
-				valid.invalidate();
-				continue;
-			}
-			annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter (" + parameter.toString()
-					+ "). %s can only have a android.widget.TextView parameter and/or parameters from android.text.TextWatcher.onTextChanged() method.");
-			valid.invalidate();
-		}
-	}
-
-	public void hasAfterTextChangedMethodParameters(ExecutableElement executableElement, IsValid valid) {
-		List<? extends VariableElement> parameters = executableElement.getParameters();
-		boolean editableParameterFound = false;
-		boolean textViewParameterFound = false;
-		for (VariableElement parameter : parameters) {
-			String parameterType = parameter.asType().toString();
-			if (parameterType.equals(CanonicalNameConstants.EDITABLE)) {
-				if (editableParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.text.Editable");
-					valid.invalidate();
-				}
-				editableParameterFound = true;
-				continue;
-			}
-			if (parameterType.equals(CanonicalNameConstants.TEXT_VIEW)) {
-				if (textViewParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.widget.TextView");
-					valid.invalidate();
-				}
-				textViewParameterFound = true;
-				continue;
-			}
-			valid.invalidate();
-			annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter type. %s can only have a android.widget.TextView parameter and/or an android.text.Editable parameter."
-					+ " See android.text.TextWatcher.afterTextChanged() for more informations.");
-		}
-	}
-
-	public void hasSeekBarProgressChangeMethodParameters(ExecutableElement executableElement, IsValid valid) {
-		List<? extends VariableElement> parameters = executableElement.getParameters();
-		boolean seekBarParameterFound = false;
-		boolean fromUserParameterFound = false;
-		boolean progressParameterFound = false;
-		for (VariableElement parameter : parameters) {
-			String parameterType = parameter.asType().toString();
-			if (parameterType.equals(CanonicalNameConstants.SEEKBAR)) {
-				if (seekBarParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. You can declare only one parameter of type " + CanonicalNameConstants.SEEKBAR);
-					valid.invalidate();
-				}
-				seekBarParameterFound = true;
-				continue;
-			}
-			if (parameter.asType().getKind() == TypeKind.INT || CanonicalNameConstants.INTEGER.equals(parameterType)) {
-				if (progressParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "You can have only one parameter of type " + CanonicalNameConstants.INTEGER);
-					valid.invalidate();
-				}
-				progressParameterFound = true;
-				continue;
-			}
-			if (parameter.asType().getKind() == TypeKind.BOOLEAN || CanonicalNameConstants.BOOLEAN.equals(parameterType)) {
-				if (fromUserParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "You can have only one parameter of type " + CanonicalNameConstants.BOOLEAN);
-					valid.invalidate();
-				}
-				fromUserParameterFound = true;
-				continue;
-			}
-			annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter '" + parameter.toString() + "'. %s signature should be " + executableElement.getSimpleName() + "("
-					+ CanonicalNameConstants.SEEKBAR + " seekBar, int progress, boolean fromUser). The 'fromUser' and 'progress' parameters are optional.");
-			valid.invalidate();
-		}
-	}
-
-	public void hasSeekBarTouchTrackingMethodParameters(ExecutableElement executableElement, IsValid valid) {
-		List<? extends VariableElement> parameters = executableElement.getParameters();
-
-		if (parameters.size() > 1) {
-			annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. You can only have one parameter of type " + CanonicalNameConstants.SEEKBAR
-					+ ". Try declaring " + executableElement.getSimpleName() + "(" + CanonicalNameConstants.SEEKBAR + " seekBar);");
-			valid.invalidate();
-			return;
-		}
-
-		if (parameters.size() == 1) {
-			String parameterType = parameters.get(0).asType().toString();
-			if (!parameterType.equals(CanonicalNameConstants.SEEKBAR)) {
-				annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. You can only have one parameter of type " + CanonicalNameConstants.SEEKBAR
-						+ ". Try declaring " + executableElement.getSimpleName() + "(" + CanonicalNameConstants.SEEKBAR + " seekBar);");
-				valid.invalidate();
-			}
-		}
-
-	}
-
-	public void hasOnResultMethodParameters(ExecutableElement executableElement, IsValid valid) {
-		List<? extends VariableElement> parameters = executableElement.getParameters();
-		boolean resultCodeParameterFound = false;
-		boolean intentParameterFound = false;
-		for (VariableElement parameter : parameters) {
-			TypeMirror parameterType = parameter.asType();
-			if (parameter.getAnnotation(OnActivityResult.Extra.class) != null) {
-				continue;
-			}
-			if (parameterType.toString().equals(CanonicalNameConstants.INTEGER) //
-					|| parameterType.getKind().equals(TypeKind.INT)) {
-				if (resultCodeParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type int or java.lang.Integer");
-					valid.invalidate();
-				}
-				resultCodeParameterFound = true;
-				continue;
-			}
-			if (parameterType.toString().equals(CanonicalNameConstants.INTENT)) {
-				if (intentParameterFound) {
-					annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter declaration. you can declare only one parameter of type android.content.Intent");
-					valid.invalidate();
-				}
-				intentParameterFound = true;
-				continue;
-			}
-			valid.invalidate();
-			annotationHelper.printAnnotationError(executableElement, "Unrecognized parameter type. %s can only have a android.content.Intent parameter and/or an Integer parameter");
-		}
-	}
-
-	public void hasNotMultipleAnnotatedMethodWithSameName(Element element, IsValid valid, Class<? extends Annotation> annotation) {
-		Set<String> actionNames = new TreeSet<>();
-
-		List<? extends Element> enclosedElements = element.getEnclosedElements();
-		for (Element enclosedElement : enclosedElements) {
-			if (enclosedElement.getKind() != ElementKind.METHOD || !annotationHelper.hasOneOfClassAnnotations(enclosedElement, annotation)) {
-				continue;
-			}
-
-			String enclosedElementName = enclosedElement.getSimpleName().toString();
-			if (actionNames.contains(enclosedElementName)) {
-				valid.invalidate();
-				annotationHelper.printError(enclosedElement, "The " + TargetAnnotationHelper.annotationName(annotation)
-						+ " annotated method must have unique name even if the signature is not the same");
-			} else {
-				actionNames.add(enclosedElementName);
-			}
-		}
-	}
-
-	public void hasRightRegisterAtValueDependingOnEnclosingElement(Element element, IsValid valid) {
-		Element enclosingElement = element.getEnclosingElement();
-		Receiver.RegisterAt registerAt = element.getAnnotation(Receiver.class).registerAt();
-
-		Map<String, List<Receiver.RegisterAt>> validRegisterAts = new HashMap<>();
-		validRegisterAts.put(CanonicalNameConstants.ACTIVITY, VALID_ACTIVITY_REGISTER_AT);
-		validRegisterAts.put(CanonicalNameConstants.SERVICE, VALID_SERVICE_REGISTER_AT);
-		validRegisterAts.put(CanonicalNameConstants.FRAGMENT, VALID_FRAGMENT_REGISTER_AT);
-
-		for (Map.Entry<String, List<Receiver.RegisterAt>> validRegisterAt : validRegisterAts.entrySet()) {
-			String enclosingType = validRegisterAt.getKey();
-			Collection<Receiver.RegisterAt> validRegisterAtValues = validRegisterAt.getValue();
-			if (extendsType(enclosingElement, enclosingType) && !validRegisterAtValues.contains(registerAt)) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "The parameter registerAt of @Receiver in " + enclosingType + " can only be one of the following values : " + validRegisterAtValues);
-			}
-		}
-	}
-
-	public void hasSupportV4JarIfLocal(Element element, IsValid valid) {
-		boolean local = element.getAnnotation(Receiver.class).local();
-		if (local) {
-
-			Elements elementUtils = annotationHelper.getElementUtils();
-			if (elementUtils.getTypeElement(CanonicalNameConstants.LOCAL_BROADCAST_MANAGER) == null) {
-				valid.invalidate();
-				annotationHelper.printAnnotationError(element, "To use the LocalBroadcastManager, you MUST include the android-support-v4 jar");
-			}
-		}
-	}
-
-	public void extendsPreferenceActivityOrPreferenceFragment(Element element, IsValid valid) {
-		extendsOneOfTypes(element, VALID_PREFERENCE_CLASSES, valid);
-	}
-
-	public void extendsPreferenceActivity(Element element, IsValid valid) {
-		extendsType(element, CanonicalNameConstants.PREFERENCE_ACTIVITY, valid);
-	}
-
-	public void enclosingElementExtendsPreferenceActivityOrPreferenceFragment(Element element, IsValid valid) {
-		extendsOneOfTypes(element.getEnclosingElement(), VALID_PREFERENCE_CLASSES, valid);
-	}
-
-	public void isPreferenceFragmentClassPresent(Element element, IsValid valid) {
-		TypeElement preferenceFragmentElement = annotationHelper.getElementUtils().getTypeElement(CanonicalNameConstants.PREFERENCE_FRAGMENT);
-
-		if (preferenceFragmentElement == null) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "The class " + CanonicalNameConstants.PREFERENCE_FRAGMENT + " cannot be found. You have to use at least API 11");
-		}
-	}
-
-	public void usesEnqueueIfHasId(Element element, IsValid valid) {
-		UiThread annotation = element.getAnnotation(UiThread.class);
-
-		if (!"".equals(annotation.id()) && annotation.propagation() == Propagation.REUSE) {
-			valid.invalidate();
-			annotationHelper.printAnnotationError(element, "An id only can be used with Propagation.ENQUEUE");
-		}
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/RoboGuiceDelegate.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/RoboGuiceDelegate.java
deleted file mode 100644
index deca407d68..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/RoboGuiceDelegate.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.holder;
-
-import com.sun.codemodel.JBlock;
-import com.sun.codemodel.JFieldVar;
-import com.sun.codemodel.JMethod;
-import com.sun.codemodel.JVar;
-
-public class RoboGuiceDelegate extends GeneratedClassHolderDelegate<EActivityHolder> {
-
-	// TODO access for these fields should be refactored
-
-	protected JFieldVar scopedObjects;
-	protected JFieldVar scope;
-	protected JFieldVar eventManager;
-	public JFieldVar contentViewListenerField;
-	protected JBlock onRestartBeforeSuperBlock;
-	protected JBlock onRestartAfterSuperBlock;
-	protected JBlock onStartBeforeSuperBlock;
-	protected JBlock onResumeBeforeSuperBlock;
-	protected JBlock onPauseAfterSuperBlock;
-	protected JBlock onNewIntentAfterSuperBlock;
-	protected JMethod onStop;
-	protected JMethod onDestroy;
-	protected JVar newConfig;
-	protected JVar currentConfig;
-	protected JBlock onConfigurationChangedAfterSuperBlock;
-	protected JBlock onContentChangedAfterSuperBlock;
-
-	public RoboGuiceDelegate(EActivityHolder holder) {
-		super(holder);
-	}
-
-	public JFieldVar getEventManagerField() {
-		if (eventManager == null) {
-			holder.setEventManagerField();
-		}
-		return eventManager;
-	}
-
-	public JFieldVar getScopedObjectsField() {
-		if (scopedObjects == null) {
-			holder.setScopedObjectsField();
-		}
-		return scopedObjects;
-	}
-
-	public JFieldVar getScopeField() {
-		if (scope == null) {
-			holder.setScopeField();
-		}
-		return scope;
-	}
-
-	public JFieldVar getContentViewListenerField() {
-		if (contentViewListenerField == null) {
-			holder.setContentViewListenerField();
-		}
-		return contentViewListenerField;
-	}
-
-	public JBlock getOnRestartBeforeSuperBlock() {
-		if (onRestartBeforeSuperBlock == null) {
-			holder.setOnRestart();
-		}
-		return onRestartBeforeSuperBlock;
-	}
-
-	public JBlock getOnRestartAfterSuperBlock() {
-		if (onRestartAfterSuperBlock == null) {
-			holder.setOnRestart();
-		}
-		return onRestartAfterSuperBlock;
-	}
-
-	public JBlock getOnStartBeforeSuperBlock() {
-		if (onStartBeforeSuperBlock == null) {
-			holder.setOnStart();
-		}
-		return onStartBeforeSuperBlock;
-	}
-
-	public JBlock getOnStartAfterSuperBlock() {
-		return holder.getOnStartAfterSuperBlock();
-	}
-
-	public JBlock getOnResumeBeforeSuperBlock() {
-		if (onResumeBeforeSuperBlock == null) {
-			holder.setOnResume();
-		}
-		return onResumeBeforeSuperBlock;
-	}
-
-	public JBlock getOnResumeAfterSuperBlock() {
-		return holder.getOnResumeAfterSuperBlock();
-	}
-
-	public JBlock getOnPauseAfterSuperBlock() {
-		if (onPauseAfterSuperBlock == null) {
-			holder.setOnPause();
-		}
-		return onPauseAfterSuperBlock;
-	}
-
-	public JBlock getOnNewIntentAfterSuperBlock() {
-		if (onNewIntentAfterSuperBlock == null) {
-			holder.setOnNewIntent();
-		}
-		return onNewIntentAfterSuperBlock;
-	}
-
-	public JMethod getOnStop() {
-		if (onStop == null) {
-			holder.setOnStop();
-		}
-		return onStop;
-	}
-
-	public JMethod getOnDestroy() {
-		if (onDestroy == null) {
-			holder.setOnDestroy();
-		}
-		return onDestroy;
-	}
-
-	public JVar getNewConfig() {
-		if (newConfig == null) {
-			holder.setOnConfigurationChanged();
-		}
-		return newConfig;
-	}
-
-	public JVar getCurrentConfig() {
-		if (currentConfig == null) {
-			holder.setOnConfigurationChanged();
-		}
-		return currentConfig;
-	}
-
-	public JBlock getOnConfigurationChangedAfterSuperBlock() {
-		if (onConfigurationChangedAfterSuperBlock == null) {
-			holder.setOnConfigurationChanged();
-		}
-		return onConfigurationChangedAfterSuperBlock;
-	}
-
-	public JBlock getOnContentChangedAfterSuperBlock() {
-		if (onContentChangedAfterSuperBlock == null) {
-			holder.setOnContentChanged();
-		}
-		return onContentChangedAfterSuperBlock;
-	}
-
-	public JBlock getOnActivityResultAfterSuperBlock() {
-		return holder.getOnActivityResultAfterSuperBlock();
-	}
-
-	public JVar getRequestCode() {
-		return holder.getOnActivityResultRequestCodeParam();
-	}
-
-	public JVar getResultCode() {
-		return holder.getOnActivityResultResultCodeParam();
-	}
-
-	public JVar getData() {
-		return holder.getOnActivityResultDataParam();
-	}
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ManifestPackageExtractor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ManifestPackageExtractor.java
deleted file mode 100644
index daea417fb9..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ManifestPackageExtractor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.rclass;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ManifestPackageExtractor {
-
-	private static final Pattern PATTERN = Pattern.compile("package\\s*=\\s*\"([^\"]+)\"");
-	private Matcher matcher;
-	private boolean matches;
-
-	public ManifestPackageExtractor(String manifestLine) {
-		if (manifestLine != null) {
-			matcher = PATTERN.matcher(manifestLine);
-			matches = matcher.find();
-		} else {
-			matches = false;
-		}
-	}
-
-	public boolean matches() {
-		return matches;
-	}
-
-	public String extract() {
-		return matches ? matcher.group(1) : null;
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/AndroidAnnotations/androidannotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 647346a011..0000000000
--- a/AndroidAnnotations/androidannotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1 +0,0 @@
-org.androidannotations.AndroidAnnotationProcessor
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java
deleted file mode 100644
index da4104ff77..0000000000
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.generation;
-
-import java.io.IOException;
-
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
-import org.junit.Before;
-import org.junit.Test;
-
-public class OnBackPressedApiDependenciesTest extends AAProcessorTestHelper {
-
-	@Before
-	public void setUp() {
-		addManifestProcessorParameter(OnBackPressedApiDependenciesTest.class);
-		addProcessor(AndroidAnnotationProcessor.class);
-		ensureOutputDirectoryIsEmpty();
-	}
-
-	@Test
-	public void activityWithOnBackPressedGeneratesApiDependency() throws IOException {
-		CompileResult result = compileFiles(ActivityWithOnBackPressedMethod.class);
-		assertCompilationSuccessful(result);
-	}
-
-	@Test
-	public void activityWithoutOnBackPressedDoesNotGenerateApiDependency() throws IOException {
-		CompileResult result = compileFiles(ActivityWithBackgroundMethod.class);
-		assertCompilationSuccessful(result);
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java
deleted file mode 100644
index 84b84dd85e..0000000000
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.generation;
-
-import java.io.IOException;
-
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.utils.AAProcessorTestHelper;
-import org.junit.Before;
-import org.junit.Test;
-
-public class OnBackgroundApiDependenciesTest extends AAProcessorTestHelper {
-
-	@Before
-	public void setUp() {
-		addManifestProcessorParameter(OnBackgroundApiDependenciesTest.class);
-		addProcessor(AndroidAnnotationProcessor.class);
-		ensureOutputDirectoryIsEmpty();
-	}
-
-	@Test
-	public void activityWithBackgroundAnnotatedMethodGenerateApiDependency() throws IOException {
-		CompileResult result = compileFiles(ActivityWithBackgroundMethod.class);
-		assertCompilationSuccessful(result);
-	}
-
-	@Test
-	public void activityWithoutBackgroundAnnotatedMethodGenerateApiDependency() throws IOException {
-		CompileResult result = compileFiles(ActivityWithOnBackPressedMethod.class);
-		assertCompilationSuccessful(result);
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefs.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefs.java
deleted file mode 100644
index 1addfe5482..0000000000
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefs.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.generation;
-
-import org.androidannotations.annotations.sharedpreferences.DefaultInt;
-import org.androidannotations.annotations.sharedpreferences.DefaultString;
-import org.androidannotations.annotations.sharedpreferences.SharedPref;
-
-@SharedPref
-public interface SharedPrefs {
-
-	// The field name will have default value "John"
-	@DefaultString("John")
-	String name();
-
-	// The field age will have default value 42
-	@DefaultInt(42)
-	int age();
-
-	// The field lastUpdated will have default value 0
-	long lastUpdated();
-
-}
\ No newline at end of file
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefsApiDependenciesTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefsApiDependenciesTest.java
deleted file mode 100644
index c0c85fb453..0000000000
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefsApiDependenciesTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.generation;
-
-import java.io.IOException;
-
-import org.androidannotations.AndroidAnnotationProcessor;
-import org.androidannotations.api.sharedpreferences.AbstractPrefEditorField;
-import org.androidannotations.api.sharedpreferences.AbstractPrefField;
-import org.androidannotations.api.sharedpreferences.BooleanPrefEditorField;
-import org.androidannotations.api.sharedpreferences.BooleanPrefField;
-import org.androidannotations.api.sharedpreferences.EditorHelper;
-import org.androidannotations.api.sharedpreferences.FloatPrefEditorField;
-import org.androidannotations.api.sharedpreferences.FloatPrefField;
-import org.androidannotations.api.sharedpreferences.IntPrefEditorField;
-import org.androidannotations.api.sharedpreferences.IntPrefField;
-import org.androidannotations.api.sharedpreferences.LongPrefEditorField;
-import org.androidannotations.api.sharedpreferences.LongPrefField;
-import org.androidannotations.api.sharedpreferences.SharedPreferencesCompat;
-import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
-import org.androidannotations.api.sharedpreferences.StringPrefEditorField;
-import org.androidannotations.api.sharedpreferences.StringPrefField;
-import org.androidannotations.api.sharedpreferences.StringSetPrefEditorField;
-import org.androidannotations.api.sharedpreferences.StringSetPrefField;
-import org.androidannotations.manifest.SomeClass;
-import org.androidannotations.utils.AAProcessorTestHelper;
-import org.junit.Before;
-import org.junit.Test;
-
-public class SharedPrefsApiDependenciesTest extends AAProcessorTestHelper {
-
-	private static final Class<?>[] SHARED_PREF_API_DEPENDENCIES = new Class<?>[] { AbstractPrefEditorField.class, //
-		AbstractPrefField.class, //
-		BooleanPrefEditorField.class, //
-		BooleanPrefField.class, //
-		EditorHelper.class, //
-		FloatPrefEditorField.class, //
-		FloatPrefField.class, //
-		IntPrefEditorField.class, //
-		IntPrefField.class, //
-		LongPrefEditorField.class, //
-		LongPrefField.class, //
-		SharedPreferencesCompat.class, //
-		SharedPreferencesHelper.class, //
-		StringPrefEditorField.class, //
-		StringPrefField.class, //
-		StringSetPrefEditorField.class, //
-		StringSetPrefField.class, //
-	};
-
-	@Before
-	public void setUp() {
-		addManifestProcessorParameter(SharedPrefsApiDependenciesTest.class);
-		addProcessor(AndroidAnnotationProcessor.class);
-		ensureOutputDirectoryIsEmpty();
-	}
-
-	@Test
-	public void classWithPrefsDoesNotGenerateApiDependencies() throws IOException {
-		compileFiles(SharedPrefs.class);
-		for (Class<?> apiDependency : SHARED_PREF_API_DEPENDENCIES) {
-			assertClassSourcesNotGeneratedToOutput(apiDependency);
-		}
-	}
-
-	@Test
-	public void classWithoutPrefsDoesNotGenerateApiDependencies() throws IOException {
-		compileFiles(SomeClass.class);
-		for (Class<?> apiDependency : SHARED_PREF_API_DEPENDENCIES) {
-			assertClassSourcesNotGeneratedToOutput(apiDependency);
-		}
-	}
-
-}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/ManifestPackageExtractorTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/ManifestPackageExtractorTest.java
deleted file mode 100644
index 2016839159..0000000000
--- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/ManifestPackageExtractorTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
- *
- * 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 org.androidannotations.rclass;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class ManifestPackageExtractorTest {
-
-	@Test
-	public void simpleMatches() {
-		ManifestPackageExtractor extractor = new ManifestPackageExtractor("package=\"com.toto\"");
-		assertTrue(extractor.matches());
-	}
-
-	@Test
-	public void spacesMatches() {
-		ManifestPackageExtractor extractor = new ManifestPackageExtractor("    package    =    \"com.toto\"    ");
-		assertTrue(extractor.matches());
-	}
-
-	@Test
-	public void fooDoesNotMatch() {
-		ManifestPackageExtractor extractor = new ManifestPackageExtractor("Hello you");
-		assertFalse(extractor.matches());
-	}
-
-	@Test
-	public void emptyPackageDoesNotMatch() {
-		ManifestPackageExtractor extractor = new ManifestPackageExtractor("package=\"\"");
-		assertFalse(extractor.matches());
-	}
-
-	@Test
-	public void simpleExtract() {
-		ManifestPackageExtractor extractor = new ManifestPackageExtractor("package=\"com.toto\"");
-		assertEquals("com.toto", extractor.extract());
-	}
-
-	@Test
-	public void fooExtractsNull() {
-		ManifestPackageExtractor extractor = new ManifestPackageExtractor("Hello you");
-		assertNull(extractor.extract());
-	}
-
-	@Test
-	public void inputIsNull() {
-		new ManifestPackageExtractor(null).extract();
-	}
-
-}
diff --git a/AndroidAnnotations/checkstyle-checks-ci.xml b/AndroidAnnotations/checkstyle-checks-ci.xml
index 5264f85bc0..bd657c6040 100644
--- a/AndroidAnnotations/checkstyle-checks-ci.xml
+++ b/AndroidAnnotations/checkstyle-checks-ci.xml
@@ -30,7 +30,9 @@
         <module name="IllegalInstantiation" />
         <module name="OneTopLevelClass" />
 		<module name="AnnotationUseStyle" />
-		<module name="AnnotationLocation" />
+		<module name="AnnotationLocation" >
+			<property name="allowSamelineSingleParameterlessAnnotation" value="false" />
+		</module>
 		<module name="ClassTypeParameterName" />
 		<module name="ConstantName" />
 		<module name="LocalVariableName" />
@@ -45,10 +47,13 @@
 		<module name="MissingOverride" />
 		<module name="AvoidStarImport" />
 		<module name="IllegalImport" />
-		<!-- unfortunetaly could not synchronize with eclipse -->
-		<!-- <module name="ImportOrder"> <property name="separated" value="true"/> 
-			<property name="groups" value="java,javax,/com\..*/,/org\..*/,android"/> 
-			<property name="option" value="top"/> </module> -->
+		<module name="ImportOrder">
+			<property name="groups" value="/^javax?\./,org"/>
+			<property name="ordered" value="true"/>
+			<property name="separated" value="true"/>
+			<property name="option" value="top"/>
+			<property name="sortStaticImportsAlphabetically" value="true"/>
+		</module>
 		<module name="RedundantImport" />
 		<module name="UnusedImports" />
 
@@ -149,6 +154,7 @@
         <module name="AtclauseOrder" />
         <module name="NonEmptyAtclauseDescription" />
         <module name="SingleLineJavadoc" />
+		<module name="CommentsIndentation" />
 	</module>
 	<module name="FileLength" />
 	<module name="SuppressionCommentFilter" />
diff --git a/AndroidAnnotations/checkstyle-checks.xml b/AndroidAnnotations/checkstyle-checks.xml
index baf37c670f..8afe47cb67 100644
--- a/AndroidAnnotations/checkstyle-checks.xml
+++ b/AndroidAnnotations/checkstyle-checks.xml
@@ -30,7 +30,9 @@
         <module name="IllegalInstantiation" />
         <module name="OneTopLevelClass" />
 		<module name="AnnotationUseStyle" />
-		<module name="AnnotationLocation" />
+		<module name="AnnotationLocation" >
+			<property name="allowSamelineSingleParameterlessAnnotation" value="false" />
+		</module>
 		<module name="ClassTypeParameterName" />
 		<module name="ConstantName" />
 		<module name="LocalVariableName" />
@@ -45,10 +47,13 @@
 		<module name="MissingOverride" />
 		<module name="AvoidStarImport" />
 		<module name="IllegalImport" />
-		<!-- unfortunetaly could not synchronize with eclipse -->
-		<!-- <module name="ImportOrder"> <property name="separated" value="true"/> 
-			<property name="groups" value="java,javax,/com\..*/,/org\..*/,android"/> 
-			<property name="option" value="top"/> </module> -->
+		<module name="ImportOrder">
+			<property name="groups" value="/^javax?\./,org"/>
+			<property name="ordered" value="true"/>
+			<property name="separated" value="true"/>
+			<property name="option" value="top"/>
+			<property name="sortStaticImportsAlphabetically" value="true"/>
+		</module>
 		<module name="RedundantImport" />
 		<module name="UnusedImports" />
 
@@ -150,6 +155,7 @@
         <!-- <module name="AtclauseOrder" /> -->
         <!-- <module name="NonEmptyAtclauseDescription" /> -->
         <!-- <module name="SingleLineJavadoc" /> -->
+		<module name="CommentsIndentation" />
 	</module>
 	<module name="FileLength" />
 	<module name="SuppressionCommentFilter" />
diff --git a/AndroidAnnotations/checkstyle-suppressions.xml b/AndroidAnnotations/checkstyle-suppressions.xml
index d5b6deaf63..81a7e84f9e 100644
--- a/AndroidAnnotations/checkstyle-suppressions.xml
+++ b/AndroidAnnotations/checkstyle-suppressions.xml
@@ -20,7 +20,7 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-    <suppress files="org[\\/]androidannotations[\\/](?:[^\\/]+$|(?!annotations)[^\\/]+[\\/])" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle|JavadocTagContinuationIndentation|AtclauseOrder|NonEmptyAtclauseDescription|SingleLineJavadoc" />
+    <suppress files="org[\\/]androidannotations[\\/](?!(([^\\/]+)[\\/])*annotations)" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle|JavadocTagContinuationIndentation|AtclauseOrder|NonEmptyAtclauseDescription|SingleLineJavadoc" />
 	<suppress files="org[\\/]robolectric[\\/]" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle" />
     <suppress files="(com|android)[\\/]" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle" />
     <suppress files="R.java" checks=".*" />
diff --git a/AndroidAnnotations/eclipse-dependencies/.classpath b/AndroidAnnotations/eclipse-dependencies/.classpath
deleted file mode 100644
index ab869b1a39..0000000000
--- a/AndroidAnnotations/eclipse-dependencies/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="codemodel-2.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="android-2.3.1.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/AndroidAnnotations/eclipse-dependencies/.gitignore b/AndroidAnnotations/eclipse-dependencies/.gitignore
deleted file mode 100644
index 2186c64a65..0000000000
--- a/AndroidAnnotations/eclipse-dependencies/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.iml
-.settings
-
diff --git a/AndroidAnnotations/eclipse-dependencies/.project b/AndroidAnnotations/eclipse-dependencies/.project
deleted file mode 100644
index 046e8b0945..0000000000
--- a/AndroidAnnotations/eclipse-dependencies/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eclipse-dependencies</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/AndroidAnnotations/eclipse-dependencies/META-INF/MANIFEST.MF b/AndroidAnnotations/eclipse-dependencies/META-INF/MANIFEST.MF
deleted file mode 100644
index 06ab4d4fec..0000000000
--- a/AndroidAnnotations/eclipse-dependencies/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,67 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: androidannotations-dependencies
-Bundle-SymbolicName: androidannotations-dependencies
-Bundle-Version: 1.0.0
-Bundle-ClassPath: codemodel-2.6.jar,
- android-2.3.1.jar
-Export-Package: android,
- android.accessibilityservice,
- android.accounts,
- android.app,
- android.app.admin,
- android.app.backup,
- android.appwidget,
- android.bluetooth,
- android.content,
- android.content.pm,
- android.content.res,
- android.database,
- android.database.sqlite,
- android.gesture,
- android.graphics,
- android.graphics.drawable,
- android.graphics.drawable.shapes,
- android.hardware,
- android.inputmethodservice,
- android.location,
- android.media,
- android.media.audiofx,
- android.net,
- android.net.http,
- android.net.sip,
- android.net.wifi,
- android.nfc,
- android.opengl,
- android.os,
- android.os.storage,
- android.preference,
- android.provider,
- android.sax,
- android.service.wallpaper,
- android.speech,
- android.speech.tts,
- android.telephony,
- android.telephony.cdma,
- android.telephony.gsm,
- android.text,
- android.text.format,
- android.text.method,
- android.text.style,
- android.text.util,
- android.util,
- android.view,
- android.view.accessibility,
- android.view.animation,
- android.view.inputmethod,
- android.webkit,
- android.widget,
- com.android.internal.util,
- com.sun.codemodel,
- com.sun.codemodel.fmt,
- com.sun.codemodel.util,
- com.sun.codemodel.writer,
- dalvik.annotation,
- dalvik.bytecode,
- dalvik.system
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/AndroidAnnotations/eclipse-dependencies/android-2.3.1.jar b/AndroidAnnotations/eclipse-dependencies/android-2.3.1.jar
deleted file mode 100644
index 9f57cf9f9b..0000000000
Binary files a/AndroidAnnotations/eclipse-dependencies/android-2.3.1.jar and /dev/null differ
diff --git a/AndroidAnnotations/eclipse-dependencies/codemodel-2.6.jar b/AndroidAnnotations/eclipse-dependencies/codemodel-2.6.jar
deleted file mode 100644
index 12e23ce5a5..0000000000
Binary files a/AndroidAnnotations/eclipse-dependencies/codemodel-2.6.jar and /dev/null differ
diff --git a/AndroidAnnotations/eclipse-formatter.xml b/AndroidAnnotations/eclipse-formatter.xml
index 97ad2a0367..20515bea5c 100644
--- a/AndroidAnnotations/eclipse-formatter.xml
+++ b/AndroidAnnotations/eclipse-formatter.xml
@@ -305,7 +305,7 @@
 <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="2000"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="200"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
 </profile>
diff --git a/AndroidAnnotations/functional-test-1-5/.factorypath b/AndroidAnnotations/functional-test-1-5/.factorypath
deleted file mode 100644
index 501daffb0f..0000000000
--- a/AndroidAnnotations/functional-test-1-5/.factorypath
+++ /dev/null
@@ -1,4 +0,0 @@
-<factorypath>
-    <factorypathentry kind="PLUGIN" id="org.androidannotations" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/codemodel/codemodel/2.6/codemodel-2.6.jar" enabled="true" runInBatchMode="false"/>
-</factorypath>
diff --git a/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.apt.core.prefs b/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index 3b4c61b44d..0000000000
--- a/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
-org.eclipse.jdt.apt.processorOptions/logLevel=ERROR
-org.eclipse.jdt.apt.processorOptions/trace=true
-org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.core.prefs b/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7f19470627..0000000000
--- a/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidAnnotations/functional-test-1-5/project.properties b/AndroidAnnotations/functional-test-1-5/project.properties
deleted file mode 100644
index 895c9ce2eb..0000000000
--- a/AndroidAnnotations/functional-test-1-5/project.properties
+++ /dev/null
@@ -1,11 +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 use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-16
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/resources/org.robolectric.Config.properties b/AndroidAnnotations/functional-test-1-5/src/test/resources/org.robolectric.Config.properties
deleted file mode 100644
index 3c9a10838e..0000000000
--- a/AndroidAnnotations/functional-test-1-5/src/test/resources/org.robolectric.Config.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-manifest=AndroidManifest.xml
-resourceDir=src/main/res
\ No newline at end of file
diff --git a/AndroidAnnotations/pom.xml b/AndroidAnnotations/pom.xml
index 0bfb219db8..208261b956 100644
--- a/AndroidAnnotations/pom.xml
+++ b/AndroidAnnotations/pom.xml
@@ -131,28 +131,22 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<main.basedir>${project.basedir}</main.basedir>
 	</properties>
-	
-	
+
+
 	<prerequisites>
-		<maven>3.1.1</maven>
+		<maven>3.2.1</maven>
 	</prerequisites>
 
 	<modules>
-		<module>androidannotations</module>
-		<module>androidannotations-api</module>
-		<module>functional-test-1-5</module>
-		<module>androidannotations-with-codemodel</module>
-		<module>androidannotations-bundle</module>
+		<module>androidannotations-core</module>
+		<module>androidannotations-ormlite</module>
+		<module>androidannotations-otto</module>
+		<module>androidannotations-rest-spring</module>
+		<module>androidannotations-roboguice</module>
 	</modules>
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.androidannotations</groupId>
-				<artifactId>androidannotations</artifactId>
-				<version>${project.version}</version>
-				<scope>compile</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations-api</artifactId>
@@ -160,54 +154,69 @@
 			</dependency>
 			<dependency>
 				<groupId>org.androidannotations</groupId>
-				<artifactId>androidannotations-api</artifactId>
+				<artifactId>androidannotations</artifactId>
 				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
+				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.androidannotations</groupId>
-				<artifactId>androidannotations-api</artifactId>
+				<artifactId>androidannotations-testutils</artifactId>
 				<version>${project.version}</version>
-				<classifier>sources</classifier>
+				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.androidannotations</groupId>
-				<artifactId>androidannotations</artifactId>
-				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
+				<groupId>com.sun.codemodel</groupId>
+				<artifactId>codemodel</artifactId>
+				<version>2.6</version>
 			</dependency>
 			<dependency>
-				<groupId>org.androidannotations</groupId>
-				<artifactId>androidannotations</artifactId>
-				<version>${project.version}</version>
-				<classifier>sources</classifier>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.11</version>
+				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.androidannotations</groupId>
-				<artifactId>androidannotations-with-codemodel</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.hamcrest</groupId>
+				<artifactId>hamcrest-core</artifactId>
+				<version>1.3</version>
+				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.androidannotations</groupId>
-				<artifactId>functional-test-1-5</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.robolectric</groupId>
+				<artifactId>robolectric</artifactId>
+				<version>2.4</version>
+				<scope>test</scope>
+
+				<exclusions>
+					<exclusion>
+						<groupId>com.android.support</groupId>
+						<artifactId>support-v4</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>com.sun.codemodel</groupId>
-				<artifactId>codemodel</artifactId>
-				<version>2.6</version>
+				<groupId>com.squareup</groupId>
+				<artifactId>fest-android</artifactId>
+				<version>1.0.8</version>
+				<scope>test</scope>
+				<exclusions>
+					<exclusion>
+						<groupId>com.android.support</groupId>
+						<artifactId>support-v4</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.11</version>
+				<groupId>org.easytesting</groupId>
+				<artifactId>fest-reflect</artifactId>
+				<version>1.4.1</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.android</groupId>
-				<artifactId>spring-android-rest-template</artifactId>
-				<version>1.0.1.RELEASE</version>
-				<scope>provided</scope>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-core</artifactId>
+				<version>1.10.8</version>
+				<scope>test</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -218,29 +227,24 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.1</version>
+					<version>2.5.2</version>
 					<configuration>
 						<mavenExecutorId>forked-path</mavenExecutorId>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.sonatype.plugins</groupId>
-					<artifactId>jarjar-maven-plugin</artifactId>
-					<version>1.9</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.1</version>
 					<configuration>
-					   <source>1.7</source>
-					   <target>1.7</target>
+						<source>1.7</source>
+						<target>1.7</target>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.6</version>
+					<version>2.7</version>
 					<configuration>
 						<encoding>${project.build.sourceEncoding}</encoding>
 					</configuration>
@@ -248,17 +252,14 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.5</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.5</version>
+					<version>2.6</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.1</version>
+					<version>2.10.3</version>
 					<configuration>
 						<locale>en_US</locale>
+						<quiet>true</quiet>
 					</configuration>
 					<executions>
 						<execution>
@@ -281,7 +282,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>2.15</version>
+					<version>2.16</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -291,7 +292,19 @@
 				<plugin>
 					<groupId>com.mycila</groupId>
 					<artifactId>license-maven-plugin</artifactId>
-					<version>2.6</version>
+					<version>2.11</version>
+				</plugin>
+				<plugin>
+					<groupId>com.simpligility.maven.plugins</groupId>
+					<artifactId>android-maven-plugin</artifactId>
+					<version>4.3.0</version>
+					<configuration>
+						<sdk>
+							<platform>16</platform>
+						</sdk>
+						<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
+					</configuration>
+					<extensions>true</extensions>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -322,7 +335,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.3.1</version>
+				<version>1.4.1</version>
 				<executions>
 					<execution>
 						<id>enforce-maven-version</id>
@@ -332,7 +345,7 @@
 						<configuration>
 							<rules>
 								<requireMavenVersion>
-									<version>3.1.1</version>
+									<version>3.0.5</version>
 								</requireMavenVersion>
 							</rules>
 						</configuration>
@@ -340,45 +353,62 @@
 				</executions>
 			</plugin>
 			<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-checkstyle-plugin</artifactId>
-					<configuration>
-						<configLocation>${main.basedir}/checkstyle-checks.xml</configLocation>
-						<suppressionsLocation>${main.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
-						<consoleOutput>true</consoleOutput>
-						<includeTestSourceDirectory>true</includeTestSourceDirectory>
-					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>com.puppycrawl.tools</groupId>
-							<artifactId>checkstyle</artifactId>
-							<version>6.7</version>
-							<exclusions>
-								<exclusion>
-									<groupId>com.sun</groupId>
-									<artifactId>tools</artifactId>
-								</exclusion>
-							</exclusions>
-					   </dependency>
-					</dependencies>
-					<executions>
-						<execution>
-							<phase>process-sources</phase>
-							<goals>
-								<goal>check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>${main.basedir}/checkstyle-checks.xml</configLocation>
+					<suppressionsLocation>${main.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
+					<consoleOutput>true</consoleOutput>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+					<resourceIncludes>**\/*.java</resourceIncludes>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>com.puppycrawl.tools</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>6.10.1</version>
+						<exclusions>
+							<exclusion>
+								<groupId>com.sun</groupId>
+								<artifactId>tools</artifactId>
+							</exclusion>
+						</exclusions>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
+
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<excludes>
+					<exclude>rebel.xml</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>**/*.properties</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 
 	<scm>
 		<connection>scm:git:git@github.com:excilys/androidannotations.git</connection>
 		<developerConnection>scm:git:git@github.com:excilys/androidannotations.git</developerConnection>
 		<url>https://github.com/excilys/androidannotations</url>
-	  <tag>HEAD</tag>
-  </scm>
+		<tag>HEAD</tag>
+	</scm>
 
 	<profiles>
 		<profile>
@@ -394,7 +424,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>