diff --git a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF b/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF
index 7dae6d0382..de5056e665 100644
--- a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF
+++ b/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: androidannotations-api
-Bundle-SymbolicName: com.googlecode.androidannotations-api;singleton:=true
+Bundle-SymbolicName: org.androidannotations-api;singleton:=true
 Bundle-Version: 1.0.0
-Export-Package: com.googlecode.androidannotations.annotations,
- com.googlecode.androidannotations.annotations.res,
- com.googlecode.androidannotations.annotations.rest,
- com.googlecode.androidannotations.annotations.sharedpreferences,
- com.googlecode.androidannotations.api,
- com.googlecode.androidannotations.api.rest,
- com.googlecode.androidannotations.api.sharedpreferences
+Export-Package: org.androidannotations.annotations,
+ org.androidannotations.annotations.res,
+ org.androidannotations.annotations.rest,
+ org.androidannotations.annotations.sharedpreferences,
+ org.androidannotations.api,
+ org.androidannotations.api.rest,
+ org.androidannotations.api.sharedpreferences
 Bundle-Vendor: androidannotations
-Bundle-Activator: com.googlecode.androidannotations.api.Activator
+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",
diff --git a/AndroidAnnotations/androidannotations-api/build.properties b/AndroidAnnotations/androidannotations-api/build.properties
index 60cb7437e6..c1c40acba9 100644
--- a/AndroidAnnotations/androidannotations-api/build.properties
+++ b/AndroidAnnotations/androidannotations-api/build.properties
@@ -1,19 +1,3 @@
-#
-# 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.
-#
-
 source.. = src/main/java/,\
            src/test/java/,\
            src/main/eclipse/
diff --git a/AndroidAnnotations/androidannotations-api/pom.xml b/AndroidAnnotations/androidannotations-api/pom.xml
index a8ab607cbc..ed85e018cd 100644
--- a/AndroidAnnotations/androidannotations-api/pom.xml
+++ b/AndroidAnnotations/androidannotations-api/pom.xml
@@ -4,7 +4,7 @@
 
 	<parent>
 		<artifactId>androidannotations-parent</artifactId>
-		<groupId>com.googlecode.androidannotations</groupId>
+		<groupId>org.androidannotations</groupId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/AndroidAnnotations/androidannotations/src/main/eclipse/com/googlecode/androidannotations/Activator.java b/AndroidAnnotations/androidannotations-api/src/main/eclipse/org/androidannotations/api/Activator.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/eclipse/com/googlecode/androidannotations/Activator.java
rename to AndroidAnnotations/androidannotations-api/src/main/eclipse/org/androidannotations/api/Activator.java
index 0e44ab39d0..907484e500 100644
--- a/AndroidAnnotations/androidannotations/src/main/eclipse/com/googlecode/androidannotations/Activator.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/eclipse/org/androidannotations/api/Activator.java
@@ -1,3 +1,4 @@
+package org.androidannotations.api;
 /**
  * Copyright (C) 2010-2012 eBusiness Information, Excilys Group
  *
@@ -13,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations;
+
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
@@ -24,7 +25,7 @@
 public class Activator extends Plugin {
 
         // The plug-in ID
-        public static final String PLUGIN_ID = "com.googlecode.androidannotations";
+        public static final String PLUGIN_ID = "org.androidannotations-api";
 
         // The shared instance
         private static Activator plugin;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterInject.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterInject.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java
index 74b840d5e8..f467304fc2 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterInject.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterInject.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterTextChange.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterTextChange.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java
index 2437a0d0eb..01f24c25d1 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterTextChange.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterViews.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterViews.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java
index f2ea765104..9cf211967c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterViews.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/App.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/App.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
index 3e48ee5e84..de7044163c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/App.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Background.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Background.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java
index 3e95ef5b3a..6f7cf3e4ad 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Background.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Bean.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Bean.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
index ec5439629e..6add0bf8f0 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Bean.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/BeforeTextChange.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java
similarity index 98%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/BeforeTextChange.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java
index ef5b051866..cc3078fb2a 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/BeforeTextChange.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/BeforeTextChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Click.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Click.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java
index 0c13f28503..405ff53a54 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Click.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Click.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EActivity.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EActivity.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java
index 1ba7c321e9..7528f2102b 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EActivity.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EApplication.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EApplication.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java
index 534db1cca3..af14ba7fe4 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EApplication.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EApplication.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EBean.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
similarity index 91%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EBean.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
index c1cd43b902..92bc6e6bc2 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EBean.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EBean.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.api.Scope;
+import org.androidannotations.api.Scope;
 
 /**
  * Should be used on custom classes to enable usage of AndroidAnnotations
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EFragment.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EFragment.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
index ecff5287a1..b0aebf7f64 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EFragment.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EProvider.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EProvider.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java
index e7410174fd..965fb6a36e 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EProvider.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EReceiver.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EReceiver.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java
index c35a7def79..7e7b3b6cb6 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EReceiver.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EReceiver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EService.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EService.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java
index 11e20fa534..6899af0fe3 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EService.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EView.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EView.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java
index dd87483922..a846a3491f 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EView.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EViewGroup.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EViewGroup.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java
index ce9947dfd1..ad0aec51cb 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/EViewGroup.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EViewGroup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Extra.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Extra.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
index 700536c20d..bc7d874fb7 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Extra.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentArg.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentArg.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
index 1d4155986e..3849a9ce10 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentArg.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentById.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentById.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
index 94d28e206d..9641f2c126 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentById.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentByTag.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentByTag.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
index 4537e17512..f2ec43346a 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FragmentByTag.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FromHtml.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FromHtml.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java
index a7540f9c90..66abc01458 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/FromHtml.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Fullscreen.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Fullscreen.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java
index c879dcf2e3..104a940619 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Fullscreen.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/HttpsClient.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/HttpsClient.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
index d3329e5dd7..200e91fd1e 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/HttpsClient.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -70,4 +70,4 @@
 	String keyStorePwd() default DEFAULT_PASSWD;
 
 	boolean allowAllHostnames() default true;
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/InstanceState.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/InstanceState.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java
index 914a80bbf1..f78d193e05 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/InstanceState.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/InstanceState.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemClick.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemClick.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java
index 2c5b2f74d7..348932b9a0 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemClick.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemClick.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemLongClick.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemLongClick.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java
index 32f593377f..b07596f904 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemLongClick.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemLongClick.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemSelect.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemSelect.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java
index b1b014108f..64aff7d2eb 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ItemSelect.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ItemSelect.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/LongClick.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/LongClick.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java
index 92824ea825..899447815f 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/LongClick.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/LongClick.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/NoTitle.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/NoTitle.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java
index 1531e7a7c1..3860d6189d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/NoTitle.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/NonConfigurationInstance.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/NonConfigurationInstance.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java
index f42e65b0e2..8ee9fda2a0 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/NonConfigurationInstance.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NonConfigurationInstance.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OnActivityResult.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OnActivityResult.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java
index 33b7f8570b..f08aad9d52 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OnActivityResult.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OptionsItem.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OptionsItem.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java
index 19cf6eeb92..1a0acafdf5 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OptionsItem.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsItem.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OptionsMenu.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OptionsMenu.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java
index 25e2766dff..c15f3dbc38 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OptionsMenu.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenu.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OrmLiteDao.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OrmLiteDao.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java
index c81489e693..9efc8af7af 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/OrmLiteDao.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,4 +31,4 @@
 
 	Class<?> model();
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ResId.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ResId.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java
index 4bdee63b3f..f310f32c07 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ResId.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ResId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 public abstract class ResId {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/RoboGuice.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RoboGuice.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/RoboGuice.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RoboGuice.java
index f9d8f11ef3..bf3ae644fe 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/RoboGuice.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RoboGuice.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/RootContext.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/RootContext.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
index df03eb23f0..b9d062e71d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/RootContext.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarProgressChange.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarProgressChange.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java
index 7a2380f5ce..0342573b9d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarProgressChange.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarProgressChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -86,8 +86,8 @@
  * 
  * @since 2.7
  * 
- * @see com.googlecode.androidannotations.annotations.SeekBarTouchStart
- * @see com.googlecode.androidannotations.annotations.SeekBarTouchStop
+ * @see org.androidannotations.annotations.SeekBarTouchStart
+ * @see org.androidannotations.annotations.SeekBarTouchStop
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarTouchStart.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarTouchStart.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java
index 84b5c01386..6805ab1685 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarTouchStart.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -44,8 +44,8 @@
  * 
  * @since 2.7
  * 
- * @see com.googlecode.androidannotations.annotations.SeekBarTouchStop
- * @see com.googlecode.androidannotations.annotations.SeekBarProgressChange
+ * @see org.androidannotations.annotations.SeekBarTouchStop
+ * @see org.androidannotations.annotations.SeekBarProgressChange
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarTouchStop.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java
similarity index 88%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarTouchStop.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java
index 6ccfbe1676..70bf1886e0 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SeekBarTouchStop.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -44,8 +44,8 @@
  * 
  * @since 2.7
  * 
- * @see com.googlecode.androidannotations.annotations.SeekBarTouchStart
- * @see com.googlecode.androidannotations.annotations.SeekBarProgressChange
+ * @see org.androidannotations.annotations.SeekBarTouchStart
+ * @see org.androidannotations.annotations.SeekBarProgressChange
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SystemService.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SystemService.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
index 85c829f6ea..e4bee1e70b 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/SystemService.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/TextChange.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java
similarity index 98%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/TextChange.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java
index 942a358946..7adcc88ac8 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/TextChange.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/TextChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Touch.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Touch.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java
index b8cafae147..f4c8c5b3c1 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Touch.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Trace.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Trace.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java
index 42cf62bd2b..bada65457b 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Trace.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Transactional.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Transactional.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
index 5dab2ac86b..96935ca263 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/Transactional.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Transactional.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/UiThread.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/UiThread.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
index 495e4ffe05..f0c3e73c52 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/UiThread.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ViewById.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ViewById.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java
index d4fad72b26..84a6b3e371 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/ViewById.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/ViewById.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/AnimationRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/AnimationRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java
index 8075fb089b..3439f1e47c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/AnimationRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/BooleanRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/BooleanRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java
index d7d3cbb46f..dce9c55a29 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/BooleanRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/ColorRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java
similarity index 91%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/ColorRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java
index fe803727c0..0571bb2029 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/ColorRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with values from
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/ColorStateListRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/ColorStateListRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java
index 9d92aa2fb8..2bde813b97 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/ColorStateListRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelOffsetRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelOffsetRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java
index 146dc5fd77..d03f516972 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelOffsetRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelSizeRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelSizeRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java
index 2c1e511a32..4e970052b6 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelSizeRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java
index 67fc85a902..ae5a7001f9 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DrawableRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DrawableRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java
index 00fac3cf23..42743043e4 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/DrawableRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DrawableRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/HtmlRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java
similarity index 88%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/HtmlRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java
index c6ab1b9a53..ca437e9e9b 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/HtmlRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/HtmlRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.FIELD)
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/IntArrayRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/IntArrayRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java
index 550bf251a2..672da5a452 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/IntArrayRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntArrayRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/IntegerRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/IntegerRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java
index e823082c59..41734841ee 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/IntegerRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/IntegerRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/LayoutRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/LayoutRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java
index 2d42b7a3da..3a0db1af41 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/LayoutRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/LayoutRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/MovieRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/MovieRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java
index 517498aadd..b6deb283d7 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/MovieRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/MovieRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/StringArrayRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java
similarity index 91%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/StringArrayRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java
index 6664f48ea8..e433b73a80 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/StringArrayRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringArrayRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with values from
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/StringRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/StringRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java
index fdef8498a3..0474661c67 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/StringRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/StringRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with values from
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/TextArrayRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/TextArrayRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java
index e00d77f3fa..0c166f5924 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/TextArrayRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextArrayRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/TextRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java
similarity index 89%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/TextRes.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java
index cf0c12b6b3..ebfa42a9a7 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/res/TextRes.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/TextRes.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.res;
+package org.androidannotations.annotations.res;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.annotations.ResId;
+import org.androidannotations.annotations.ResId;
 
 /**
  * Use on fields in activity classes that should be injected with this specific
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Accept.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Accept.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Accept.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Accept.java
index 68b8d707a8..6d4c88db10 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Accept.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Accept.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Delete.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Delete.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Delete.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Delete.java
index ef5f2f6785..6000a60068 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Delete.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Delete.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Get.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Get.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Get.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Get.java
index 1b9d859c09..1b07162029 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Get.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Get.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Head.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Head.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Head.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Head.java
index 4e467b5a9a..0a30c9f79c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Head.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Head.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Options.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Options.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Options.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Options.java
index c33f0c756f..3ac6f6ed59 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Options.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Options.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Post.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Post.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Post.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Post.java
index e3b3e8f4a2..cb831cf8a7 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Post.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Post.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Put.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Put.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Put.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Put.java
index 5f0da06547..163e0ba197 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Put.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Put.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Rest.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Rest.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Rest.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Rest.java
index c57ad32e07..57965cb0c0 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/Rest.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/Rest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/RestService.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RestService.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/RestService.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RestService.java
index ad3f108ab4..d4c0169f9c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/rest/RestService.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RestService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.rest;
+package org.androidannotations.annotations.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultBoolean.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
index c767c67e08..366c4961fd 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultBoolean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultFloat.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultFloat.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java
index ed15ec28bc..48e0cca0f4 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultFloat.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultFloat.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultInt.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultInt.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java
index 2ce916984c..b4767ca328 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultInt.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultInt.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultLong.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultLong.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java
index ffa2160449..3d18a4063f 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultLong.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultLong.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultString.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultString.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java
index 4e42a0428a..4de0024511 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/DefaultString.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultString.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/Pref.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java
similarity index 86%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/Pref.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java
index a5c42eab84..2e4ea20499 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/Pref.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
+import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
 
 /**
  * Injects a {@link SharedPref}
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/SharedPref.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/SharedPref.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
index d71fedc081..e30931dfa7 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/sharedpreferences/SharedPref.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/SharedPref.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations.sharedpreferences;
+package org.androidannotations.annotations.sharedpreferences;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/BackgroundExecutor.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/BackgroundExecutor.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
index 2e4595574a..251c139e26 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/BackgroundExecutor.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api;
+package org.androidannotations.api;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/Scope.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/Scope.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/Scope.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/Scope.java
index 2a8206b9a5..c632d0a2c0 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/Scope.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/Scope.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api;
+package org.androidannotations.api;
 
 public enum Scope {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/SdkVersionHelper.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/SdkVersionHelper.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/SdkVersionHelper.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/SdkVersionHelper.java
index b588390f38..f813e51655 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/SdkVersionHelper.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/SdkVersionHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api;
+package org.androidannotations.api;
 
 import android.os.Build;
 import android.os.Build.VERSION;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/rest/MediaType.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/MediaType.java
similarity index 97%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/rest/MediaType.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/MediaType.java
index a19300c14e..1ab765a905 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/rest/MediaType.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/rest/MediaType.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.rest;
+package org.androidannotations.api.rest;
 
 public final class MediaType {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
index 02ce2d1448..d06a69453c 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 
 public abstract class AbstractPrefEditorField<T extends EditorHelper<T>> {
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/AbstractPrefField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java
similarity index 95%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/AbstractPrefField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java
index faa8af08da..6b4ca509c8 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/AbstractPrefField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
index 6266b438f8..ce165a1734 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 public final class BooleanPrefEditorField<T extends EditorHelper<T>> extends AbstractPrefEditorField<T> {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/BooleanPrefField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/BooleanPrefField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java
index 15ee59f3f4..4ae8368297 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/BooleanPrefField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/EditorHelper.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/EditorHelper.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java
index b059d1a6db..c9c42c3528 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/EditorHelper.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/EditorHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/FloatPrefEditorField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
index e987e53970..1cf4a7e77a 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefEditorField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 public final class FloatPrefEditorField<T extends EditorHelper<T>> extends AbstractPrefEditorField<T> {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/FloatPrefField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/FloatPrefField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java
index fddd5465cb..a00a74b993 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/FloatPrefField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/FloatPrefField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/IntPrefEditorField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/IntPrefEditorField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java
index d80e1666eb..9fdfa7ee50 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/IntPrefEditorField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefEditorField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 public final class IntPrefEditorField<T extends EditorHelper<T>> extends AbstractPrefEditorField<T> {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/IntPrefField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/IntPrefField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java
index b9001894a5..cdd7a92f73 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/IntPrefField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/IntPrefField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/LongPrefEditorField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/LongPrefEditorField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java
index a087ff821f..f12b25abe2 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/LongPrefEditorField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefEditorField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 public final class LongPrefEditorField<T extends EditorHelper<T>> extends AbstractPrefEditorField<T> {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/LongPrefField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/LongPrefField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java
index e5ca47dce8..78746872eb 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/LongPrefField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/LongPrefField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
index 82de42ff52..eeb4ea5420 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesCompat.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
similarity index 96%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
index 5765e09f4a..cdb8831d62 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SharedPreferencesHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/StringPrefEditorField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java
similarity index 93%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/StringPrefEditorField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java
index dddae0b052..8efabcf7ab 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/StringPrefEditorField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefEditorField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 public final class StringPrefEditorField<T extends EditorHelper<T>> extends AbstractPrefEditorField<T> {
 
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/StringPrefField.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java
similarity index 94%
rename from AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/StringPrefField.java
rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java
index 8a5c563d20..74afe4db7d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/api/sharedpreferences/StringPrefField.java
+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/StringPrefField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.api.sharedpreferences;
+package org.androidannotations.api.sharedpreferences;
 
 import android.content.SharedPreferences;
 
diff --git a/AndroidAnnotations/androidannotations-bundle/pom.xml b/AndroidAnnotations/androidannotations-bundle/pom.xml
index 2e15f64f78..1b518871a3 100644
--- a/AndroidAnnotations/androidannotations-bundle/pom.xml
+++ b/AndroidAnnotations/androidannotations-bundle/pom.xml
@@ -4,7 +4,7 @@
 
 	<parent>
 		<artifactId>androidannotations-parent</artifactId>
-		<groupId>com.googlecode.androidannotations</groupId>
+		<groupId>org.androidannotations</groupId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
 
@@ -16,26 +16,26 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations-with-codemodel</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations-api</artifactId>
 			<classifier>javadoc</classifier>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations-api</artifactId>
 			<classifier>sources</classifier>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations</artifactId>
 			<classifier>javadoc</classifier>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations</artifactId>
 			<classifier>sources</classifier>
 		</dependency>
diff --git a/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml b/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml
index 8023b5a0dd..2a749399f9 100644
--- a/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml
+++ b/AndroidAnnotations/androidannotations-bundle/src/main/assembly/bundle.xml
@@ -27,17 +27,17 @@
 	    <dependencySet>
 	    	<useProjectArtifact>false</useProjectArtifact>
 	        <includes>
-	            <include>com.googlecode.androidannotations:androidannotations-api</include>
+	            <include>org.androidannotations:androidannotations-api</include>
 	        </includes>
 	        <excludes>
-	        	<exclude>com.googlecode.androidannotations:androidannotations-api:*:javadoc</exclude>
-	        	<exclude>com.googlecode.androidannotations:androidannotations-api:*:sources</exclude>
+	        	<exclude>org.androidannotations:androidannotations-api:*:javadoc</exclude>
+	        	<exclude>org.androidannotations:androidannotations-api:*:sources</exclude>
 	        </excludes>
 	    </dependencySet>
 	    <dependencySet>
 	    	<useProjectArtifact>false</useProjectArtifact>
 	        <includes>
-	            <include>com.googlecode.androidannotations:androidannotations-with-codemodel</include>
+	            <include>org.androidannotations:androidannotations-with-codemodel</include>
 	        </includes>
 	        <outputFileNameMapping>androidannotations-${artifact.version}.jar</outputFileNameMapping>
 	    </dependencySet>
@@ -45,16 +45,16 @@
 			<useProjectArtifact>false</useProjectArtifact>
 			<outputDirectory>javadoc</outputDirectory>
 	        <includes>
-	            <include>com.googlecode.androidannotations:androidannotations-api:*:javadoc</include>
-	            <include>com.googlecode.androidannotations:androidannotations:*:javadoc</include>
+	            <include>org.androidannotations:androidannotations-api:*:javadoc</include>
+	            <include>org.androidannotations:androidannotations:*:javadoc</include>
 	        </includes>
 		</dependencySet>
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<outputDirectory>sources</outputDirectory>
 	        <includes>
-	            <include>com.googlecode.androidannotations:androidannotations-api:*:sources</include>
-	            <include>com.googlecode.androidannotations:androidannotations:*:sources</include>
+	            <include>org.androidannotations:androidannotations-api:*:sources</include>
+	            <include>org.androidannotations:androidannotations:*:sources</include>
 	        </includes>
 		</dependencySet>
 	</dependencySets>
diff --git a/AndroidAnnotations/androidannotations-with-codemodel/pom.xml b/AndroidAnnotations/androidannotations-with-codemodel/pom.xml
index bd5831dd8f..4e915e7b26 100644
--- a/AndroidAnnotations/androidannotations-with-codemodel/pom.xml
+++ b/AndroidAnnotations/androidannotations-with-codemodel/pom.xml
@@ -4,7 +4,7 @@
 
 	<parent>
 		<artifactId>androidannotations-parent</artifactId>
-		<groupId>com.googlecode.androidannotations</groupId>
+		<groupId>org.androidannotations</groupId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
 
@@ -16,7 +16,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations</artifactId>
 		</dependency>
 	</dependencies>
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
index 64a0bb4d75..1f1bcfa5fb 100644
--- a/AndroidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml
+++ b/AndroidAnnotations/androidannotations-with-codemodel/src/main/assembly/jar-with-codemodel.xml
@@ -31,8 +31,8 @@
 			<useProjectArtifact>false</useProjectArtifact>
 			<includes>
 				<include>com.sun.codemodel:codemodel</include>
-				<include>com.googlecode.androidannotations:androidannotations</include>
-				<include>com.googlecode.androidannotations:androidannotations-api</include>
+				<include>org.androidannotations:androidannotations</include>
+				<include>org.androidannotations:androidannotations-api</include>
 			</includes>
 		</dependencySet>	
 	</dependencySets>
diff --git a/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF b/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF
index 7b02d66c12..b07aa615d7 100644
--- a/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF
+++ b/AndroidAnnotations/androidannotations/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: androidannotations
-Bundle-SymbolicName: com.googlecode.androidannotations;singleton:=true
+Bundle-SymbolicName: org.androidannotations;singleton:=true
 Bundle-Version: 1.0.0
-Export-Package: com.googlecode.androidannotations,
- com.googlecode.androidannotations.annotationprocessor,
- com.googlecode.androidannotations.annotations,
- com.googlecode.androidannotations.annotations.res,
- com.googlecode.androidannotations.annotations.rest,
- com.googlecode.androidannotations.annotations.sharedpreferences,
- com.googlecode.androidannotations.api,
- com.googlecode.androidannotations.api.sharedpreferences,
- com.googlecode.androidannotations.generation,
- com.googlecode.androidannotations.helper,
- com.googlecode.androidannotations.model,
- com.googlecode.androidannotations.processing,
- com.googlecode.androidannotations.processing.rest,
- com.googlecode.androidannotations.rclass,
- com.googlecode.androidannotations.validation,
- com.googlecode.androidannotations.validation.rest
+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.api.sharedpreferences,
+ 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",
- com.googlecode.androidannotations-api;bundle-version="1.0.0"
-Import-Package: com.googlecode.androidannotations
-Bundle-Activator: com.googlecode.androidannotations.Activator
+ 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/plugin.xml b/AndroidAnnotations/androidannotations/plugin.xml
index b95ef2a008..f060445255 100644
--- a/AndroidAnnotations/androidannotations/plugin.xml
+++ b/AndroidAnnotations/androidannotations/plugin.xml
@@ -21,7 +21,7 @@
    <extension
          point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
         	<java6processors enableDefault="true">
-                <java6processor class="com.googlecode.androidannotations.AndroidAnnotationProcessor"/>
+                <java6processor class="org.androidannotations.AndroidAnnotationProcessor"/>
          </java6processors>         
    </extension>
 
diff --git a/AndroidAnnotations/androidannotations/pom.xml b/AndroidAnnotations/androidannotations/pom.xml
index 75e2abfd12..95da94706c 100644
--- a/AndroidAnnotations/androidannotations/pom.xml
+++ b/AndroidAnnotations/androidannotations/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.googlecode.androidannotations</groupId>
+		<groupId>org.androidannotations</groupId>
 		<artifactId>androidannotations-parent</artifactId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
@@ -14,7 +14,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations-api</artifactId>
 		</dependency>
 		<dependency>
diff --git a/AndroidAnnotations/androidannotations-api/src/main/eclipse/com/googlecode/androidannotations/api/Activator.java b/AndroidAnnotations/androidannotations/src/main/eclipse/org/androidannotations/Activator.java
similarity index 92%
rename from AndroidAnnotations/androidannotations-api/src/main/eclipse/com/googlecode/androidannotations/api/Activator.java
rename to AndroidAnnotations/androidannotations/src/main/eclipse/org/androidannotations/Activator.java
index 439220027d..d16a5a4b8d 100644
--- a/AndroidAnnotations/androidannotations-api/src/main/eclipse/com/googlecode/androidannotations/api/Activator.java
+++ b/AndroidAnnotations/androidannotations/src/main/eclipse/org/androidannotations/Activator.java
@@ -1,4 +1,3 @@
-package com.googlecode.androidannotations.api;
 /**
  * Copyright (C) 2010-2012 eBusiness Information, Excilys Group
  *
@@ -14,7 +13,7 @@
  * 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;
@@ -25,7 +24,7 @@
 public class Activator extends Plugin {
 
         // The plug-in ID
-        public static final String PLUGIN_ID = "com.googlecode.androidannotations-api";
+        public static final String PLUGIN_ID = "org.androidannotations";
 
         // The shared instance
         private static Activator plugin;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
similarity index 55%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
index f51b159ab5..8019d074f3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations;
+package org.androidannotations;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -30,216 +30,216 @@
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 
-import com.googlecode.androidannotations.annotationprocessor.AnnotatedAbstractProcessor;
-import com.googlecode.androidannotations.annotationprocessor.SupportedAnnotationClasses;
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.AfterTextChange;
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.App;
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.BeforeTextChange;
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.EApplication;
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.EProvider;
-import com.googlecode.androidannotations.annotations.EReceiver;
-import com.googlecode.androidannotations.annotations.EService;
-import com.googlecode.androidannotations.annotations.EView;
-import com.googlecode.androidannotations.annotations.EViewGroup;
-import com.googlecode.androidannotations.annotations.Extra;
-import com.googlecode.androidannotations.annotations.FragmentArg;
-import com.googlecode.androidannotations.annotations.FragmentById;
-import com.googlecode.androidannotations.annotations.FragmentByTag;
-import com.googlecode.androidannotations.annotations.FromHtml;
-import com.googlecode.androidannotations.annotations.Fullscreen;
-import com.googlecode.androidannotations.annotations.HttpsClient;
-import com.googlecode.androidannotations.annotations.InstanceState;
-import com.googlecode.androidannotations.annotations.ItemClick;
-import com.googlecode.androidannotations.annotations.ItemLongClick;
-import com.googlecode.androidannotations.annotations.ItemSelect;
-import com.googlecode.androidannotations.annotations.LongClick;
-import com.googlecode.androidannotations.annotations.NoTitle;
-import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
-import com.googlecode.androidannotations.annotations.OnActivityResult;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.annotations.OrmLiteDao;
-import com.googlecode.androidannotations.annotations.RoboGuice;
-import com.googlecode.androidannotations.annotations.RootContext;
-import com.googlecode.androidannotations.annotations.SeekBarProgressChange;
-import com.googlecode.androidannotations.annotations.SeekBarTouchStart;
-import com.googlecode.androidannotations.annotations.SeekBarTouchStop;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.TextChange;
-import com.googlecode.androidannotations.annotations.Touch;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.annotations.res.AnimationRes;
-import com.googlecode.androidannotations.annotations.res.BooleanRes;
-import com.googlecode.androidannotations.annotations.res.ColorRes;
-import com.googlecode.androidannotations.annotations.res.ColorStateListRes;
-import com.googlecode.androidannotations.annotations.res.DimensionPixelOffsetRes;
-import com.googlecode.androidannotations.annotations.res.DimensionPixelSizeRes;
-import com.googlecode.androidannotations.annotations.res.DimensionRes;
-import com.googlecode.androidannotations.annotations.res.DrawableRes;
-import com.googlecode.androidannotations.annotations.res.HtmlRes;
-import com.googlecode.androidannotations.annotations.res.IntArrayRes;
-import com.googlecode.androidannotations.annotations.res.IntegerRes;
-import com.googlecode.androidannotations.annotations.res.LayoutRes;
-import com.googlecode.androidannotations.annotations.res.MovieRes;
-import com.googlecode.androidannotations.annotations.res.StringArrayRes;
-import com.googlecode.androidannotations.annotations.res.StringRes;
-import com.googlecode.androidannotations.annotations.res.TextArrayRes;
-import com.googlecode.androidannotations.annotations.res.TextRes;
-import com.googlecode.androidannotations.annotations.rest.Accept;
-import com.googlecode.androidannotations.annotations.rest.Delete;
-import com.googlecode.androidannotations.annotations.rest.Get;
-import com.googlecode.androidannotations.annotations.rest.Head;
-import com.googlecode.androidannotations.annotations.rest.Options;
-import com.googlecode.androidannotations.annotations.rest.Post;
-import com.googlecode.androidannotations.annotations.rest.Put;
-import com.googlecode.androidannotations.annotations.rest.Rest;
-import com.googlecode.androidannotations.annotations.rest.RestService;
-import com.googlecode.androidannotations.annotations.sharedpreferences.Pref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.generation.CodeModelGenerator;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.AndroidManifestFinder;
-import com.googlecode.androidannotations.helper.TimeStats;
-import com.googlecode.androidannotations.model.AndroidRes;
-import com.googlecode.androidannotations.model.AndroidSystemServices;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.model.AnnotationElementsHolder;
-import com.googlecode.androidannotations.model.ModelExtractor;
-import com.googlecode.androidannotations.processing.AfterInjectProcessor;
-import com.googlecode.androidannotations.processing.AfterTextChangeProcessor;
-import com.googlecode.androidannotations.processing.AfterViewsProcessor;
-import com.googlecode.androidannotations.processing.AppProcessor;
-import com.googlecode.androidannotations.processing.BackgroundProcessor;
-import com.googlecode.androidannotations.processing.BeanProcessor;
-import com.googlecode.androidannotations.processing.BeforeTextChangeProcessor;
-import com.googlecode.androidannotations.processing.ClickProcessor;
-import com.googlecode.androidannotations.processing.EActivityProcessor;
-import com.googlecode.androidannotations.processing.EApplicationProcessor;
-import com.googlecode.androidannotations.processing.EBeanProcessor;
-import com.googlecode.androidannotations.processing.EFragmentProcessor;
-import com.googlecode.androidannotations.processing.EProviderProcessor;
-import com.googlecode.androidannotations.processing.EReceiverProcessor;
-import com.googlecode.androidannotations.processing.EServiceProcessor;
-import com.googlecode.androidannotations.processing.EViewGroupProcessor;
-import com.googlecode.androidannotations.processing.EViewProcessor;
-import com.googlecode.androidannotations.processing.ExtraProcessor;
-import com.googlecode.androidannotations.processing.FragmentArgProcessor;
-import com.googlecode.androidannotations.processing.FragmentByIdProcessor;
-import com.googlecode.androidannotations.processing.FragmentByTagProcessor;
-import com.googlecode.androidannotations.processing.FromHtmlProcessor;
-import com.googlecode.androidannotations.processing.FullscreenProcessor;
-import com.googlecode.androidannotations.processing.HttpsClientProcessor;
-import com.googlecode.androidannotations.processing.InstanceStateProcessor;
-import com.googlecode.androidannotations.processing.ItemClickProcessor;
-import com.googlecode.androidannotations.processing.ItemLongClickProcessor;
-import com.googlecode.androidannotations.processing.ItemSelectedProcessor;
-import com.googlecode.androidannotations.processing.LongClickProcessor;
-import com.googlecode.androidannotations.processing.ModelProcessor;
-import com.googlecode.androidannotations.processing.ModelProcessor.ProcessResult;
-import com.googlecode.androidannotations.processing.NoTitleProcessor;
-import com.googlecode.androidannotations.processing.NonConfigurationInstanceProcessor;
-import com.googlecode.androidannotations.processing.OnActivityResultProcessor;
-import com.googlecode.androidannotations.processing.OptionsItemProcessor;
-import com.googlecode.androidannotations.processing.OptionsMenuProcessor;
-import com.googlecode.androidannotations.processing.OrmLiteDaoProcessor;
-import com.googlecode.androidannotations.processing.PrefProcessor;
-import com.googlecode.androidannotations.processing.ResProcessor;
-import com.googlecode.androidannotations.processing.RestServiceProcessor;
-import com.googlecode.androidannotations.processing.RoboGuiceProcessor;
-import com.googlecode.androidannotations.processing.RootContextProcessor;
-import com.googlecode.androidannotations.processing.SeekBarProgressChangeProcessor;
-import com.googlecode.androidannotations.processing.SeekBarTouchStartProcessor;
-import com.googlecode.androidannotations.processing.SeekBarTouchStopProcessor;
-import com.googlecode.androidannotations.processing.SharedPrefProcessor;
-import com.googlecode.androidannotations.processing.SystemServiceProcessor;
-import com.googlecode.androidannotations.processing.TextChangeProcessor;
-import com.googlecode.androidannotations.processing.TouchProcessor;
-import com.googlecode.androidannotations.processing.TraceProcessor;
-import com.googlecode.androidannotations.processing.TransactionalProcessor;
-import com.googlecode.androidannotations.processing.UiThreadProcessor;
-import com.googlecode.androidannotations.processing.ViewByIdProcessor;
-import com.googlecode.androidannotations.processing.rest.DeleteProcessor;
-import com.googlecode.androidannotations.processing.rest.GetProcessor;
-import com.googlecode.androidannotations.processing.rest.HeadProcessor;
-import com.googlecode.androidannotations.processing.rest.OptionsProcessor;
-import com.googlecode.androidannotations.processing.rest.PostProcessor;
-import com.googlecode.androidannotations.processing.rest.PutProcessor;
-import com.googlecode.androidannotations.processing.rest.RestImplementationsHolder;
-import com.googlecode.androidannotations.processing.rest.RestProcessor;
-import com.googlecode.androidannotations.rclass.AndroidRClassFinder;
-import com.googlecode.androidannotations.rclass.CoumpoundRClass;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.ProjectRClassFinder;
-import com.googlecode.androidannotations.validation.AfterInjectValidator;
-import com.googlecode.androidannotations.validation.AfterTextChangeValidator;
-import com.googlecode.androidannotations.validation.AfterViewsValidator;
-import com.googlecode.androidannotations.validation.AppValidator;
-import com.googlecode.androidannotations.validation.BeanValidator;
-import com.googlecode.androidannotations.validation.BeforeTextChangeValidator;
-import com.googlecode.androidannotations.validation.ClickValidator;
-import com.googlecode.androidannotations.validation.EActivityValidator;
-import com.googlecode.androidannotations.validation.EApplicationValidator;
-import com.googlecode.androidannotations.validation.EBeanValidator;
-import com.googlecode.androidannotations.validation.EFragmentValidator;
-import com.googlecode.androidannotations.validation.EProviderValidator;
-import com.googlecode.androidannotations.validation.EReceiverValidator;
-import com.googlecode.androidannotations.validation.EServiceValidator;
-import com.googlecode.androidannotations.validation.EViewGroupValidator;
-import com.googlecode.androidannotations.validation.EViewValidator;
-import com.googlecode.androidannotations.validation.ExtraValidator;
-import com.googlecode.androidannotations.validation.FragmentArgValidator;
-import com.googlecode.androidannotations.validation.FragmentByIdValidator;
-import com.googlecode.androidannotations.validation.FragmentByTagValidator;
-import com.googlecode.androidannotations.validation.FromHtmlValidator;
-import com.googlecode.androidannotations.validation.FullscreenValidator;
-import com.googlecode.androidannotations.validation.HttpsClientValidator;
-import com.googlecode.androidannotations.validation.InstanceStateValidator;
-import com.googlecode.androidannotations.validation.ItemClickValidator;
-import com.googlecode.androidannotations.validation.ItemLongClickValidator;
-import com.googlecode.androidannotations.validation.ItemSelectedValidator;
-import com.googlecode.androidannotations.validation.LongClickValidator;
-import com.googlecode.androidannotations.validation.ModelValidator;
-import com.googlecode.androidannotations.validation.NoTitleValidator;
-import com.googlecode.androidannotations.validation.NonConfigurationInstanceValidator;
-import com.googlecode.androidannotations.validation.OnActivityResultValidator;
-import com.googlecode.androidannotations.validation.OptionsItemValidator;
-import com.googlecode.androidannotations.validation.OptionsMenuValidator;
-import com.googlecode.androidannotations.validation.OrmLiteDaoValidator;
-import com.googlecode.androidannotations.validation.PrefValidator;
-import com.googlecode.androidannotations.validation.ResValidator;
-import com.googlecode.androidannotations.validation.RestServiceValidator;
-import com.googlecode.androidannotations.validation.RoboGuiceValidator;
-import com.googlecode.androidannotations.validation.RootContextValidator;
-import com.googlecode.androidannotations.validation.RunnableValidator;
-import com.googlecode.androidannotations.validation.SeekBarProgressChangeValidator;
-import com.googlecode.androidannotations.validation.SeekBarTouchStartValidator;
-import com.googlecode.androidannotations.validation.SeekBarTouchStopValidator;
-import com.googlecode.androidannotations.validation.SharedPrefValidator;
-import com.googlecode.androidannotations.validation.SystemServiceValidator;
-import com.googlecode.androidannotations.validation.TextChangeValidator;
-import com.googlecode.androidannotations.validation.TouchValidator;
-import com.googlecode.androidannotations.validation.TraceValidator;
-import com.googlecode.androidannotations.validation.TransactionalValidator;
-import com.googlecode.androidannotations.validation.ViewByIdValidator;
-import com.googlecode.androidannotations.validation.rest.AcceptValidator;
-import com.googlecode.androidannotations.validation.rest.DeleteValidator;
-import com.googlecode.androidannotations.validation.rest.GetValidator;
-import com.googlecode.androidannotations.validation.rest.HeadValidator;
-import com.googlecode.androidannotations.validation.rest.OptionsValidator;
-import com.googlecode.androidannotations.validation.rest.PostValidator;
-import com.googlecode.androidannotations.validation.rest.PutValidator;
-import com.googlecode.androidannotations.validation.rest.RestValidator;
+import org.androidannotations.annotationprocessor.AnnotatedAbstractProcessor;
+import org.androidannotations.annotationprocessor.SupportedAnnotationClasses;
+import org.androidannotations.annotations.AfterInject;
+import org.androidannotations.annotations.AfterTextChange;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.App;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.BeforeTextChange;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EApplication;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.EProvider;
+import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.annotations.EService;
+import org.androidannotations.annotations.EView;
+import org.androidannotations.annotations.EViewGroup;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.FragmentArg;
+import org.androidannotations.annotations.FragmentById;
+import org.androidannotations.annotations.FragmentByTag;
+import org.androidannotations.annotations.FromHtml;
+import org.androidannotations.annotations.Fullscreen;
+import org.androidannotations.annotations.HttpsClient;
+import org.androidannotations.annotations.InstanceState;
+import org.androidannotations.annotations.ItemClick;
+import org.androidannotations.annotations.ItemLongClick;
+import org.androidannotations.annotations.ItemSelect;
+import org.androidannotations.annotations.LongClick;
+import org.androidannotations.annotations.NoTitle;
+import org.androidannotations.annotations.NonConfigurationInstance;
+import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.annotations.RoboGuice;
+import org.androidannotations.annotations.RootContext;
+import org.androidannotations.annotations.SeekBarProgressChange;
+import org.androidannotations.annotations.SeekBarTouchStart;
+import org.androidannotations.annotations.SeekBarTouchStop;
+import org.androidannotations.annotations.SystemService;
+import org.androidannotations.annotations.TextChange;
+import org.androidannotations.annotations.Touch;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.Transactional;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.res.AnimationRes;
+import org.androidannotations.annotations.res.BooleanRes;
+import org.androidannotations.annotations.res.ColorRes;
+import org.androidannotations.annotations.res.ColorStateListRes;
+import org.androidannotations.annotations.res.DimensionPixelOffsetRes;
+import org.androidannotations.annotations.res.DimensionPixelSizeRes;
+import org.androidannotations.annotations.res.DimensionRes;
+import org.androidannotations.annotations.res.DrawableRes;
+import org.androidannotations.annotations.res.HtmlRes;
+import org.androidannotations.annotations.res.IntArrayRes;
+import org.androidannotations.annotations.res.IntegerRes;
+import org.androidannotations.annotations.res.LayoutRes;
+import org.androidannotations.annotations.res.MovieRes;
+import org.androidannotations.annotations.res.StringArrayRes;
+import org.androidannotations.annotations.res.StringRes;
+import org.androidannotations.annotations.res.TextArrayRes;
+import org.androidannotations.annotations.res.TextRes;
+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.Rest;
+import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.annotations.sharedpreferences.Pref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.generation.CodeModelGenerator;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.AndroidManifestFinder;
+import org.androidannotations.helper.TimeStats;
+import org.androidannotations.model.AndroidRes;
+import org.androidannotations.model.AndroidSystemServices;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.model.AnnotationElementsHolder;
+import org.androidannotations.model.ModelExtractor;
+import org.androidannotations.processing.AfterInjectProcessor;
+import org.androidannotations.processing.AfterTextChangeProcessor;
+import org.androidannotations.processing.AfterViewsProcessor;
+import org.androidannotations.processing.AppProcessor;
+import org.androidannotations.processing.BackgroundProcessor;
+import org.androidannotations.processing.BeanProcessor;
+import org.androidannotations.processing.BeforeTextChangeProcessor;
+import org.androidannotations.processing.ClickProcessor;
+import org.androidannotations.processing.EActivityProcessor;
+import org.androidannotations.processing.EApplicationProcessor;
+import org.androidannotations.processing.EBeanProcessor;
+import org.androidannotations.processing.EFragmentProcessor;
+import org.androidannotations.processing.EProviderProcessor;
+import org.androidannotations.processing.EReceiverProcessor;
+import org.androidannotations.processing.EServiceProcessor;
+import org.androidannotations.processing.EViewGroupProcessor;
+import org.androidannotations.processing.EViewProcessor;
+import org.androidannotations.processing.ExtraProcessor;
+import org.androidannotations.processing.FragmentArgProcessor;
+import org.androidannotations.processing.FragmentByIdProcessor;
+import org.androidannotations.processing.FragmentByTagProcessor;
+import org.androidannotations.processing.FromHtmlProcessor;
+import org.androidannotations.processing.FullscreenProcessor;
+import org.androidannotations.processing.HttpsClientProcessor;
+import org.androidannotations.processing.InstanceStateProcessor;
+import org.androidannotations.processing.ItemClickProcessor;
+import org.androidannotations.processing.ItemLongClickProcessor;
+import org.androidannotations.processing.ItemSelectedProcessor;
+import org.androidannotations.processing.LongClickProcessor;
+import org.androidannotations.processing.ModelProcessor;
+import org.androidannotations.processing.ModelProcessor.ProcessResult;
+import org.androidannotations.processing.NoTitleProcessor;
+import org.androidannotations.processing.NonConfigurationInstanceProcessor;
+import org.androidannotations.processing.OnActivityResultProcessor;
+import org.androidannotations.processing.OptionsItemProcessor;
+import org.androidannotations.processing.OptionsMenuProcessor;
+import org.androidannotations.processing.OrmLiteDaoProcessor;
+import org.androidannotations.processing.PrefProcessor;
+import org.androidannotations.processing.ResProcessor;
+import org.androidannotations.processing.RestServiceProcessor;
+import org.androidannotations.processing.RoboGuiceProcessor;
+import org.androidannotations.processing.RootContextProcessor;
+import org.androidannotations.processing.SeekBarProgressChangeProcessor;
+import org.androidannotations.processing.SeekBarTouchStartProcessor;
+import org.androidannotations.processing.SeekBarTouchStopProcessor;
+import org.androidannotations.processing.SharedPrefProcessor;
+import org.androidannotations.processing.SystemServiceProcessor;
+import org.androidannotations.processing.TextChangeProcessor;
+import org.androidannotations.processing.TouchProcessor;
+import org.androidannotations.processing.TraceProcessor;
+import org.androidannotations.processing.TransactionalProcessor;
+import org.androidannotations.processing.UiThreadProcessor;
+import org.androidannotations.processing.ViewByIdProcessor;
+import org.androidannotations.processing.rest.DeleteProcessor;
+import org.androidannotations.processing.rest.GetProcessor;
+import org.androidannotations.processing.rest.HeadProcessor;
+import org.androidannotations.processing.rest.OptionsProcessor;
+import org.androidannotations.processing.rest.PostProcessor;
+import org.androidannotations.processing.rest.PutProcessor;
+import org.androidannotations.processing.rest.RestImplementationsHolder;
+import org.androidannotations.processing.rest.RestProcessor;
+import org.androidannotations.rclass.AndroidRClassFinder;
+import org.androidannotations.rclass.CoumpoundRClass;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.ProjectRClassFinder;
+import org.androidannotations.validation.AfterInjectValidator;
+import org.androidannotations.validation.AfterTextChangeValidator;
+import org.androidannotations.validation.AfterViewsValidator;
+import org.androidannotations.validation.AppValidator;
+import org.androidannotations.validation.BeanValidator;
+import org.androidannotations.validation.BeforeTextChangeValidator;
+import org.androidannotations.validation.ClickValidator;
+import org.androidannotations.validation.EActivityValidator;
+import org.androidannotations.validation.EApplicationValidator;
+import org.androidannotations.validation.EBeanValidator;
+import org.androidannotations.validation.EFragmentValidator;
+import org.androidannotations.validation.EProviderValidator;
+import org.androidannotations.validation.EReceiverValidator;
+import org.androidannotations.validation.EServiceValidator;
+import org.androidannotations.validation.EViewGroupValidator;
+import org.androidannotations.validation.EViewValidator;
+import org.androidannotations.validation.ExtraValidator;
+import org.androidannotations.validation.FragmentArgValidator;
+import org.androidannotations.validation.FragmentByIdValidator;
+import org.androidannotations.validation.FragmentByTagValidator;
+import org.androidannotations.validation.FromHtmlValidator;
+import org.androidannotations.validation.FullscreenValidator;
+import org.androidannotations.validation.HttpsClientValidator;
+import org.androidannotations.validation.InstanceStateValidator;
+import org.androidannotations.validation.ItemClickValidator;
+import org.androidannotations.validation.ItemLongClickValidator;
+import org.androidannotations.validation.ItemSelectedValidator;
+import org.androidannotations.validation.LongClickValidator;
+import org.androidannotations.validation.ModelValidator;
+import org.androidannotations.validation.NoTitleValidator;
+import org.androidannotations.validation.NonConfigurationInstanceValidator;
+import org.androidannotations.validation.OnActivityResultValidator;
+import org.androidannotations.validation.OptionsItemValidator;
+import org.androidannotations.validation.OptionsMenuValidator;
+import org.androidannotations.validation.OrmLiteDaoValidator;
+import org.androidannotations.validation.PrefValidator;
+import org.androidannotations.validation.ResValidator;
+import org.androidannotations.validation.RestServiceValidator;
+import org.androidannotations.validation.RoboGuiceValidator;
+import org.androidannotations.validation.RootContextValidator;
+import org.androidannotations.validation.RunnableValidator;
+import org.androidannotations.validation.SeekBarProgressChangeValidator;
+import org.androidannotations.validation.SeekBarTouchStartValidator;
+import org.androidannotations.validation.SeekBarTouchStopValidator;
+import org.androidannotations.validation.SharedPrefValidator;
+import org.androidannotations.validation.SystemServiceValidator;
+import org.androidannotations.validation.TextChangeValidator;
+import org.androidannotations.validation.TouchValidator;
+import org.androidannotations.validation.TraceValidator;
+import org.androidannotations.validation.TransactionalValidator;
+import org.androidannotations.validation.ViewByIdValidator;
+import org.androidannotations.validation.rest.AcceptValidator;
+import org.androidannotations.validation.rest.DeleteValidator;
+import org.androidannotations.validation.rest.GetValidator;
+import org.androidannotations.validation.rest.HeadValidator;
+import org.androidannotations.validation.rest.OptionsValidator;
+import org.androidannotations.validation.rest.PostValidator;
+import org.androidannotations.validation.rest.PutValidator;
+import org.androidannotations.validation.rest.RestValidator;
 
 @SupportedAnnotationClasses({ EActivity.class, //
 		App.class, //
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotationprocessor/AnnotatedAbstractProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/annotationprocessor/AnnotatedAbstractProcessor.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotationprocessor/AnnotatedAbstractProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/annotationprocessor/AnnotatedAbstractProcessor.java
index b33868c694..66dc33b8c7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotationprocessor/AnnotatedAbstractProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/annotationprocessor/AnnotatedAbstractProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotationprocessor;
+package org.androidannotations.annotationprocessor;
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotationprocessor/SupportedAnnotationClasses.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/annotationprocessor/SupportedAnnotationClasses.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotationprocessor/SupportedAnnotationClasses.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/annotationprocessor/SupportedAnnotationClasses.java
index d1aa7064a5..8fb01edc39 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotationprocessor/SupportedAnnotationClasses.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/annotationprocessor/SupportedAnnotationClasses.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotationprocessor;
+package org.androidannotations.annotationprocessor;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/CodeModelGenerator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/CodeModelGenerator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java
index b6c845e47e..2ef6e35225 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/CodeModelGenerator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.generation;
+package org.androidannotations.generation;
 
 import java.io.IOException;
 
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
 
-import com.googlecode.androidannotations.processing.ModelProcessor.ProcessResult;
+import org.androidannotations.processing.ModelProcessor.ProcessResult;
 import com.sun.codemodel.writer.PrologCodeWriter;
 
 public class CodeModelGenerator {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/ResourceCodeWriter.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ResourceCodeWriter.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/ResourceCodeWriter.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ResourceCodeWriter.java
index a0aefd9c66..c5c9891feb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/ResourceCodeWriter.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/ResourceCodeWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.generation;
+package org.androidannotations.generation;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/SourceCodewriter.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/SourceCodewriter.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java
index c4a1e5e0ef..36227c52da 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/generation/SourceCodewriter.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.generation;
+package org.androidannotations.generation;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/APTCodeModelHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/APTCodeModelHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
index 6269bc28d9..f8e79f5f50 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/APTCodeModelHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._this;
@@ -35,8 +35,8 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidConstants.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidConstants.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java
index 33b3e9ad17..7f0de90091 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidConstants.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidConstants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 public abstract class AndroidConstants {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifest.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifest.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java
index 19e67feaca..e0526ff5d7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifest.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifestFinder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifestFinder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java
index 4f7db74f46..162bc4e27a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifestFinder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AndroidManifestFinder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AnnotationHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
index 7370e7d5db..51ad7d8f57 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -37,12 +37,12 @@
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
 
-import com.googlecode.androidannotations.annotations.OnActivityResult;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.ResId;
-import com.googlecode.androidannotations.processing.EBeanHolder;
-import com.googlecode.androidannotations.rclass.IRInnerClass;
-import com.googlecode.androidannotations.rclass.RInnerClass;
+import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.ResId;
+import org.androidannotations.processing.EBeanHolder;
+import org.androidannotations.rclass.IRInnerClass;
+import org.androidannotations.rclass.RInnerClass;
 import com.sun.codemodel.JFieldRef;
 
 public class AnnotationHelper {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/BundleHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/BundleHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
index 9237bf72b1..538ea01ade 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/BundleHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.BUNDLE;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.CHAR_SEQUENCE;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.STRING;
+import static org.androidannotations.helper.CanonicalNameConstants.BUNDLE;
+import static org.androidannotations.helper.CanonicalNameConstants.CHAR_SEQUENCE;
+import static org.androidannotations.helper.CanonicalNameConstants.STRING;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/CanonicalNameConstants.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/CanonicalNameConstants.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
index d37549a7b5..df038444fb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/CanonicalNameConstants.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.net.URI;
 import java.sql.SQLException;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/CaseHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/CaseHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
index 9e258ba768..b2abf339f6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/CaseHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/GreenDroidConstants.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/GreenDroidConstants.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/GreenDroidConstants.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/GreenDroidConstants.java
index a97521311b..f46f19b475 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/GreenDroidConstants.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/GreenDroidConstants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/HasTarget.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/HasTarget.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/HasTarget.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/HasTarget.java
index 60b226bfa0..cd100f25c4 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/HasTarget.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/HasTarget.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/IdAnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/IdAnnotationHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
index a44fdf0266..e2d70b7937 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/IdAnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdAnnotationHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -21,10 +21,10 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
-import com.googlecode.androidannotations.rclass.IRInnerClass;
+import org.androidannotations.processing.EBeanHolder;
+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 {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/IdValidatorHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/IdValidatorHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
index eb4c3ee1ee..e381ae875c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/IdValidatorHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -21,10 +21,10 @@
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.ResId;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.ResId;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.validation.IsValid;
 
 public class IdValidatorHelper extends ValidatorHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ModelConstants.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ModelConstants.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
index 9df5b824e8..2502d06e96 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ModelConstants.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 public abstract class ModelConstants {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/OnSeekBarChangeListenerHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OnSeekBarChangeListenerHelper.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/OnSeekBarChangeListenerHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OnSeekBarChangeListenerHelper.java
index b93d36cb4b..5184e8c857 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/OnSeekBarChangeListenerHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OnSeekBarChangeListenerHelper.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
-import com.googlecode.androidannotations.processing.OnSeekBarChangeListenerHolder;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.OnSeekBarChangeListenerHolder;
+import org.androidannotations.rclass.IRClass;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/RestAnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RestAnnotationHelper.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/RestAnnotationHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RestAnnotationHelper.java
index ed4a73e7b8..eb3d9ce9bb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/RestAnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RestAnnotationHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -25,7 +25,7 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.validation.IsValid;
 
 public class RestAnnotationHelper extends TargetAnnotationHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/RoboGuiceConstants.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RoboGuiceConstants.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/RoboGuiceConstants.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RoboGuiceConstants.java
index 0732cf8a90..4b09125273 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/RoboGuiceConstants.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/RoboGuiceConstants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 public abstract class RoboGuiceConstants {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/SherlockHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/SherlockHelper.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/SherlockHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/SherlockHelper.java
index 443f71e144..01e153fe85 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/SherlockHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/SherlockHelper.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.NoType;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.EBeanHolder;
 
 /**
  * @author Eric Kok
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
index 33de92f6ab..db492d2b79 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TargetAnnotationHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TextWatcherHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TextWatcherHelper.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TextWatcherHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TextWatcherHelper.java
index 49ee8d6c6d..9b42e02751 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TextWatcherHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TextWatcherHelper.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
-import com.googlecode.androidannotations.processing.TextWatcherHolder;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.TextWatcherHolder;
+import org.androidannotations.rclass.IRClass;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TimeStats.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TimeStats.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TimeStats.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TimeStats.java
index 9d3f0e0549..20e2d037ec 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TimeStats.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/TimeStats.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
+package org.androidannotations.helper;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ValidatorHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ValidatorHelper.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
index fa360e2478..020e943b93 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ValidatorHelper.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.helper;
-
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_DEBUG;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_ERROR;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_INFO;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_VERBOSE;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_WARN;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.HTTP_MESSAGE_CONVERTER;
-import static com.googlecode.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
+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.HTTP_MESSAGE_CONVERTER;
+import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -46,35 +46,35 @@
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.EApplication;
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.EProvider;
-import com.googlecode.androidannotations.annotations.EReceiver;
-import com.googlecode.androidannotations.annotations.EService;
-import com.googlecode.androidannotations.annotations.EView;
-import com.googlecode.androidannotations.annotations.EViewGroup;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.annotations.rest.Delete;
-import com.googlecode.androidannotations.annotations.rest.Get;
-import com.googlecode.androidannotations.annotations.rest.Head;
-import com.googlecode.androidannotations.annotations.rest.Options;
-import com.googlecode.androidannotations.annotations.rest.Post;
-import com.googlecode.androidannotations.annotations.rest.Put;
-import com.googlecode.androidannotations.annotations.rest.Rest;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultBoolean;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultFloat;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultInt;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultLong;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultString;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
-import com.googlecode.androidannotations.model.AndroidSystemServices;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.processing.InstanceStateProcessor;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EApplication;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.EProvider;
+import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.annotations.EService;
+import org.androidannotations.annotations.EView;
+import org.androidannotations.annotations.EViewGroup;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.ViewById;
+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.sharedpreferences.SharedPreferencesHelper;
+import org.androidannotations.model.AndroidSystemServices;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.processing.InstanceStateProcessor;
+import org.androidannotations.validation.IsValid;
 
 public class ValidatorHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidRes.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidRes.java
similarity index 72%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidRes.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidRes.java
index f8483e86fd..77df877b3a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidRes.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidRes.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.model;
+package org.androidannotations.model;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -22,24 +22,24 @@
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.res.AnimationRes;
-import com.googlecode.androidannotations.annotations.res.BooleanRes;
-import com.googlecode.androidannotations.annotations.res.ColorRes;
-import com.googlecode.androidannotations.annotations.res.ColorStateListRes;
-import com.googlecode.androidannotations.annotations.res.DimensionPixelOffsetRes;
-import com.googlecode.androidannotations.annotations.res.DimensionPixelSizeRes;
-import com.googlecode.androidannotations.annotations.res.DimensionRes;
-import com.googlecode.androidannotations.annotations.res.DrawableRes;
-import com.googlecode.androidannotations.annotations.res.HtmlRes;
-import com.googlecode.androidannotations.annotations.res.IntArrayRes;
-import com.googlecode.androidannotations.annotations.res.IntegerRes;
-import com.googlecode.androidannotations.annotations.res.LayoutRes;
-import com.googlecode.androidannotations.annotations.res.MovieRes;
-import com.googlecode.androidannotations.annotations.res.StringArrayRes;
-import com.googlecode.androidannotations.annotations.res.StringRes;
-import com.googlecode.androidannotations.annotations.res.TextArrayRes;
-import com.googlecode.androidannotations.annotations.res.TextRes;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.res.AnimationRes;
+import org.androidannotations.annotations.res.BooleanRes;
+import org.androidannotations.annotations.res.ColorRes;
+import org.androidannotations.annotations.res.ColorStateListRes;
+import org.androidannotations.annotations.res.DimensionPixelOffsetRes;
+import org.androidannotations.annotations.res.DimensionPixelSizeRes;
+import org.androidannotations.annotations.res.DimensionRes;
+import org.androidannotations.annotations.res.DrawableRes;
+import org.androidannotations.annotations.res.HtmlRes;
+import org.androidannotations.annotations.res.IntArrayRes;
+import org.androidannotations.annotations.res.IntegerRes;
+import org.androidannotations.annotations.res.LayoutRes;
+import org.androidannotations.annotations.res.MovieRes;
+import org.androidannotations.annotations.res.StringArrayRes;
+import org.androidannotations.annotations.res.StringRes;
+import org.androidannotations.annotations.res.TextArrayRes;
+import org.androidannotations.annotations.res.TextRes;
+import org.androidannotations.rclass.IRClass.Res;
 
 public enum AndroidRes {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidSystemServices.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java
index e54afc7bde..c5e0fca87d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidSystemServices.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.model;
+package org.androidannotations.model;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JFieldRef;
 
 public class AndroidSystemServices {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AnnotationElements.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElements.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AnnotationElements.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElements.java
index 3626fa7461..7909f10390 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AnnotationElements.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElements.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.model;
+package org.androidannotations.model;
 
 import java.util.Set;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AnnotationElementsHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElementsHolder.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AnnotationElementsHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElementsHolder.java
index 9625cd4b52..05f089dff5 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AnnotationElementsHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AnnotationElementsHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.model;
+package org.androidannotations.model;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/ModelExtractor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/ModelExtractor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java
index 90c21c08e4..b623643a64 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/ModelExtractor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.model;
+package org.androidannotations.model;
 
 import java.lang.annotation.Annotation;
 import java.util.HashSet;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AbstractTrackingTouchProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AbstractTrackingTouchProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AbstractTrackingTouchProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AbstractTrackingTouchProcessor.java
index d767f119af..c9793dedd6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AbstractTrackingTouchProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AbstractTrackingTouchProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.util.List;
 
@@ -22,10 +22,10 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.OnSeekBarChangeListenerHelper;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.OnSeekBarChangeListenerHelper;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpression;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterInjectProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterInjectProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterInjectProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterInjectProcessor.java
index b630993764..24819b6c74 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterInjectProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterInjectProcessor.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
+import org.androidannotations.annotations.AfterInject;
 import com.sun.codemodel.JCodeModel;
 
 public class AfterInjectProcessor implements DecoratingElementProcessor {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterTextChangeProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterTextChangeProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java
index dcd89254e3..882a84c688 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterTextChangeProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterTextChangeProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -24,11 +24,11 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.AfterTextChange;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.TextWatcherHelper;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.AfterTextChange;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.TextWatcherHelper;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpression;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterViewsProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterViewsProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterViewsProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterViewsProcessor.java
index 0ea421068e..98f18cc28b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AfterViewsProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AfterViewsProcessor.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.AfterViews;
 import com.sun.codemodel.JCodeModel;
 
 public class AfterViewsProcessor implements DecoratingElementProcessor {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AppProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AppProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AppProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AppProcessor.java
index 24dd4596fe..f11230ca4c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/AppProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/AppProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.APPLICATION;
+import static org.androidannotations.helper.CanonicalNameConstants.APPLICATION;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
 
@@ -24,7 +24,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.App;
+import org.androidannotations.annotations.App;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JInvocation;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BackgroundProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BackgroundProcessor.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BackgroundProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BackgroundProcessor.java
index 7f76ed4802..742290944f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BackgroundProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BackgroundProcessor.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.api.BackgroundExecutor;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.api.BackgroundExecutor;
+import org.androidannotations.helper.APTCodeModelHelper;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BeanProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeanProcessor.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BeanProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeanProcessor.java
index 65ac55bf1d..0f4e896385 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BeanProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeanProcessor.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
-import static com.googlecode.androidannotations.processing.EBeanProcessor.GET_INSTANCE_METHOD_NAME;
+import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
+import static org.androidannotations.processing.EBeanProcessor.GET_INSTANCE_METHOD_NAME;
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
@@ -28,9 +28,9 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.NonConfigurationInstance;
+import org.androidannotations.helper.TargetAnnotationHelper;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BeforeTextChangeProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BeforeTextChangeProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java
index 4dd0e0f025..f32e556403 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/BeforeTextChangeProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/BeforeTextChangeProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,11 +25,11 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.BeforeTextChange;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.TextWatcherHelper;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.BeforeTextChange;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.TextWatcherHelper;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpression;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ClickProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ClickProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ClickProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ClickProcessor.java
index b03ef38445..8874a00705 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ClickProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ClickProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -27,11 +27,11 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JDefinedClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/DecoratingElementProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/DecoratingElementProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/DecoratingElementProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/DecoratingElementProcessor.java
index bea8d0bedb..098a2866db 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/DecoratingElementProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/DecoratingElementProcessor.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.helper.HasTarget;
+import org.androidannotations.helper.HasTarget;
 import com.sun.codemodel.JCodeModel;
 
 /**
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EActivityProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EActivityProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EActivityProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EActivityProcessor.java
index 0ed20e68a3..ac8febafce 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EActivityProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EActivityProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.GreenDroidConstants.GREENDROID_ACTIVITIES_LIST_CLASS;
+import static org.androidannotations.helper.GreenDroidConstants.GREENDROID_ACTIVITIES_LIST_CLASS;
 import static com.sun.codemodel.JExpr._super;
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JMod.PRIVATE;
@@ -33,14 +33,14 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.api.SdkVersionHelper;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.ModelConstants;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.api.SdkVersionHelper;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EApplicationProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EApplicationProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EApplicationProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EApplicationProcessor.java
index edbd422bb0..c3d0921b44 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EApplicationProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EApplicationProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JMod.FINAL;
@@ -25,8 +25,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EApplication;
-import com.googlecode.androidannotations.helper.ModelConstants;
+import org.androidannotations.annotations.EApplication;
+import org.androidannotations.helper.ModelConstants;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeanHolder.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeanHolder.java
index e276226f91..30b815c620 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeanHolder.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.HashMap;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.EViewGroup;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EViewGroup;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCase;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeanProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeanProcessor.java
index fa2fe8edc2..f0763a45d7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeanProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeanProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
+import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.cast;
@@ -32,10 +32,10 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.api.Scope;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.api.Scope;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeansHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeansHolder.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeansHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeansHolder.java
index 056ecb7ac2..1d2e457976 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeansHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EBeansHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -25,7 +25,7 @@
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.CanonicalNameConstants;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JDefinedClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EFragmentProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EFragmentProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EFragmentProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EFragmentProcessor.java
index 099cacc58c..6eaf9f3b2d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EFragmentProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EFragmentProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
+import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
 import static com.sun.codemodel.JExpr.FALSE;
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -32,11 +32,11 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EProviderProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EProviderProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EProviderProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EProviderProcessor.java
index ffee359c32..76394d10c2 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EProviderProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EProviderProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._super;
 import static com.sun.codemodel.JExpr.invoke;
@@ -26,8 +26,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EProvider;
-import com.googlecode.androidannotations.helper.ModelConstants;
+import org.androidannotations.annotations.EProvider;
+import org.androidannotations.helper.ModelConstants;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EReceiverProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EReceiverProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EReceiverProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EReceiverProcessor.java
index c2fcd178d8..0b01bfd914 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EReceiverProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EReceiverProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JMod.FINAL;
 import static com.sun.codemodel.JMod.PRIVATE;
@@ -24,9 +24,9 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EReceiver;
-import com.googlecode.androidannotations.helper.ModelConstants;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EServiceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EServiceProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EServiceProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EServiceProcessor.java
index 74bf57d47b..8c47bdd39e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EServiceProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EServiceProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JMod.FINAL;
@@ -25,9 +25,9 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EService;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.ModelConstants;
+import org.androidannotations.annotations.EService;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.ModelConstants;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EViewGroupProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EViewGroupProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EViewGroupProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EViewGroupProcessor.java
index 2acb7d38c9..797b7b0061 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EViewGroupProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EViewGroupProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JMod.PRIVATE;
@@ -26,13 +26,13 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EViewGroup;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.ModelConstants;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EViewGroup;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EViewProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EViewProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EViewProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EViewProcessor.java
index ace924e477..6875285cd8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EViewProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/EViewProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JMod.PRIVATE;
 import static com.sun.codemodel.JMod.PUBLIC;
@@ -24,10 +24,10 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EView;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.ModelConstants;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.EView;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ExtraProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ExtraProcessor.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ExtraProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ExtraProcessor.java
index 2751c3a7fe..9c93833c5a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ExtraProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ExtraProcessor.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.PARCELABLE;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.STRING;
+import static org.androidannotations.helper.CanonicalNameConstants.PARCELABLE;
+import static org.androidannotations.helper.CanonicalNameConstants.STRING;
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr._super;
 import static com.sun.codemodel.JExpr._this;
@@ -34,9 +34,9 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
-import com.googlecode.androidannotations.annotations.Extra;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentArgProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentArgProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentArgProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentArgProcessor.java
index 0c0cd58b8d..8c0243d883 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentArgProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentArgProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr._this;
@@ -28,11 +28,11 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.FragmentArg;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.helper.BundleHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.FragmentArg;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.BundleHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentByIdProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByIdProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentByIdProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByIdProcessor.java
index 6535cfd80e..071b2861bd 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentByIdProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByIdProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.cast;
@@ -28,12 +28,12 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.FragmentById;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.FragmentById;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentByTagProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentByTagProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java
index e95bd9b435..490968d173 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FragmentByTagProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FragmentByTagProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.cast;
@@ -28,9 +28,9 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.FragmentByTag;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.FragmentByTag;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JMethod;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FromHtmlProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FromHtmlProcessor.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FromHtmlProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FromHtmlProcessor.java
index 66c14f4428..dda34a9d96 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FromHtmlProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FromHtmlProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.ref;
@@ -23,11 +23,11 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.FromHtml;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.FromHtml;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FullscreenProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FullscreenProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FullscreenProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FullscreenProcessor.java
index a5299a525a..54bd7ff69b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/FullscreenProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/FullscreenProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.invoke;
 
@@ -21,7 +21,7 @@
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.Fullscreen;
+import org.androidannotations.annotations.Fullscreen;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
 import com.sun.codemodel.JInvocation;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/GeneratingElementProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/GeneratingElementProcessor.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/GeneratingElementProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/GeneratingElementProcessor.java
index cd55c9c7dc..c1d7d16639 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/GeneratingElementProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/GeneratingElementProcessor.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.helper.HasTarget;
+import org.androidannotations.helper.HasTarget;
 import com.sun.codemodel.JCodeModel;
 
 public interface GeneratingElementProcessor extends HasTarget {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/HttpsClientProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/HttpsClientProcessor.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/HttpsClientProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/HttpsClientProcessor.java
index 17790d6eb3..4980c5654b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/HttpsClientProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/HttpsClientProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -27,12 +27,12 @@
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.HttpsClient;
-import com.googlecode.androidannotations.annotations.ResId;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
-import com.googlecode.androidannotations.rclass.IRInnerClass;
+import org.androidannotations.annotations.HttpsClient;
+import org.androidannotations.annotations.ResId;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.rclass.IRInnerClass;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/InstanceStateProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/InstanceStateProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/InstanceStateProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/InstanceStateProcessor.java
index 6ee2c79612..b128fdd317 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/InstanceStateProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/InstanceStateProcessor.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.BUNDLE;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.CHAR_SEQUENCE;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.STRING;
+import static org.androidannotations.helper.CanonicalNameConstants.BUNDLE;
+import static org.androidannotations.helper.CanonicalNameConstants.CHAR_SEQUENCE;
+import static org.androidannotations.helper.CanonicalNameConstants.STRING;
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr.ref;
 import static com.sun.codemodel.JMod.PRIVATE;
@@ -30,10 +30,10 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.InstanceState;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.helper.BundleHelper;
+import org.androidannotations.annotations.InstanceState;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.BundleHelper;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemClickProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemClickProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemClickProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemClickProcessor.java
index d3258b08df..e9b60172b1 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemClickProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemClickProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,11 +25,11 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.ItemClick;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ItemClick;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemLongClickProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemLongClickProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemLongClickProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemLongClickProcessor.java
index fea7ee23c8..28c0b200e0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemLongClickProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemLongClickProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -30,11 +30,11 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.ItemLongClick;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ItemLongClick;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemSelectedProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemSelectedProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemSelectedProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemSelectedProcessor.java
index 4cecab0946..5d33c5d365 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ItemSelectedProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ItemSelectedProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -31,11 +31,11 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.ItemSelect;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ItemSelect;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/LongClickProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/LongClickProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/LongClickProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/LongClickProcessor.java
index e6089fab6e..f06a242edb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/LongClickProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/LongClickProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,11 +25,11 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.LongClick;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.LongClick;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JDefinedClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ModelProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ModelProcessor.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ModelProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ModelProcessor.java
index e003139b11..b81682ab43 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ModelProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ModelProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -26,8 +26,8 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.model.AnnotationElements.AnnotatedAndRootElements;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.model.AnnotationElements.AnnotatedAndRootElements;
 import com.sun.codemodel.JCodeModel;
 
 public class ModelProcessor {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NoTitleProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NoTitleProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NoTitleProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NoTitleProcessor.java
index 52b43e197e..a4a0dda6ee 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NoTitleProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NoTitleProcessor.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.NoTitle;
+import org.androidannotations.annotations.NoTitle;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NonConfigurationHolder.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NonConfigurationHolder.java
index af818c8e56..673fdc3466 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NonConfigurationHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JDefinedClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationInstanceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NonConfigurationInstanceProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationInstanceProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NonConfigurationInstanceProcessor.java
index 709b4d7248..eaa2426586 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationInstanceProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/NonConfigurationInstanceProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
+import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr._super;
@@ -32,11 +32,11 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.NonConfigurationInstance;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnActivityResultProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OnActivityResultProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnActivityResultProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OnActivityResultProcessor.java
index 005d7cfaf2..0475092d57 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnActivityResultProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OnActivityResultProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,10 +25,10 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.OnActivityResult;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.rclass.IRClass;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCase;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnSeekBarChangeListenerHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OnSeekBarChangeListenerHolder.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnSeekBarChangeListenerHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OnSeekBarChangeListenerHolder.java
index 1752685efb..c24d1975f0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OnSeekBarChangeListenerHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OnSeekBarChangeListenerHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JVar;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OptionsItemProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OptionsItemProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OptionsItemProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OptionsItemProcessor.java
index ed75c173b1..4e9790d8cf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OptionsItemProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OptionsItemProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.FALSE;
 import static com.sun.codemodel.JExpr.TRUE;
@@ -30,12 +30,12 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.SherlockHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.SherlockHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OptionsMenuProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OptionsMenuProcessor.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OptionsMenuProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OptionsMenuProcessor.java
index 0c73f882b8..45c3935479 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OptionsMenuProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OptionsMenuProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.TRUE;
 import static com.sun.codemodel.JExpr._super;
@@ -26,13 +26,13 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.SherlockHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.SherlockHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OrmLiteDaoProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OrmLiteDaoProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OrmLiteDaoProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OrmLiteDaoProcessor.java
index 85d33890e2..0b11a1a40d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/OrmLiteDaoProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/OrmLiteDaoProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.ref;
 import static com.sun.codemodel.JMod.PRIVATE;
@@ -24,9 +24,9 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.OrmLiteDao;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/PrefProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/PrefProcessor.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/PrefProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/PrefProcessor.java
index cd951a10be..36001efd6c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/PrefProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/PrefProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
+import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
@@ -25,9 +25,9 @@
 import javax.lang.model.type.ErrorType;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.Pref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.sharedpreferences.Pref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.model.AnnotationElements;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ResProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ResProcessor.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ResProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ResProcessor.java
index 7f9c1c0a35..78f7a59211 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ResProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ResProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.ref;
@@ -24,13 +24,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.res.HtmlRes;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.model.AndroidRes;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.res.HtmlRes;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.model.AndroidRes;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RestServiceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RestServiceProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RestServiceProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RestServiceProcessor.java
index 1d4a403b88..3f43bad7ce 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RestServiceProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RestServiceProcessor.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.rest.RestService;
-import com.googlecode.androidannotations.helper.ModelConstants;
+import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.helper.ModelConstants;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RoboGuiceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RoboGuiceProcessor.java
similarity index 98%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RoboGuiceProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RoboGuiceProcessor.java
index 078727deeb..284457795c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RoboGuiceProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RoboGuiceProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._super;
@@ -31,8 +31,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.RoboGuice;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.RoboGuice;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RootContextProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RootContextProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RootContextProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RootContextProcessor.java
index 5f55ee8833..535ec4b332 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/RootContextProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/RootContextProcessor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.CONTEXT;
+import static org.androidannotations.helper.CanonicalNameConstants.CONTEXT;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
 
@@ -24,7 +24,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.RootContext;
+import org.androidannotations.annotations.RootContext;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarProgressChangeProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarProgressChangeProcessor.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarProgressChangeProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarProgressChangeProcessor.java
index 1b5f1a488a..f4224e23e8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarProgressChangeProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarProgressChangeProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,12 +25,12 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.SeekBarProgressChange;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.OnSeekBarChangeListenerHelper;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.SeekBarProgressChange;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.OnSeekBarChangeListenerHelper;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpression;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarTouchStartProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarTouchStartProcessor.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarTouchStartProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarTouchStartProcessor.java
index 1a29fddb4c..90f4ae7165 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarTouchStartProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarTouchStartProcessor.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 
-import com.googlecode.androidannotations.annotations.SeekBarTouchStart;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.SeekBarTouchStart;
+import org.androidannotations.rclass.IRClass;
 import com.sun.codemodel.JMethod;
 
 /**
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarTouchStopProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarTouchStopProcessor.java
similarity index 87%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarTouchStopProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarTouchStopProcessor.java
index 9189614b16..0809e71b17 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SeekBarTouchStopProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SeekBarTouchStopProcessor.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 
-import com.googlecode.androidannotations.annotations.SeekBarTouchStop;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.SeekBarTouchStop;
+import org.androidannotations.rclass.IRClass;
 import com.sun.codemodel.JMethod;
 
 /**
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SharedPrefProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SharedPrefProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java
index 9261616a3b..b34d0dfc9f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SharedPrefProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SharedPrefProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.lit;
@@ -31,26 +31,26 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultBoolean;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultFloat;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultInt;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultLong;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultString;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
-import com.googlecode.androidannotations.api.sharedpreferences.BooleanPrefEditorField;
-import com.googlecode.androidannotations.api.sharedpreferences.BooleanPrefField;
-import com.googlecode.androidannotations.api.sharedpreferences.EditorHelper;
-import com.googlecode.androidannotations.api.sharedpreferences.FloatPrefEditorField;
-import com.googlecode.androidannotations.api.sharedpreferences.FloatPrefField;
-import com.googlecode.androidannotations.api.sharedpreferences.IntPrefEditorField;
-import com.googlecode.androidannotations.api.sharedpreferences.IntPrefField;
-import com.googlecode.androidannotations.api.sharedpreferences.LongPrefEditorField;
-import com.googlecode.androidannotations.api.sharedpreferences.LongPrefField;
-import com.googlecode.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
-import com.googlecode.androidannotations.api.sharedpreferences.StringPrefEditorField;
-import com.googlecode.androidannotations.api.sharedpreferences.StringPrefField;
-import com.googlecode.androidannotations.helper.ModelConstants;
+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.annotations.sharedpreferences.SharedPref.Scope;
+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.SharedPreferencesHelper;
+import org.androidannotations.api.sharedpreferences.StringPrefEditorField;
+import org.androidannotations.api.sharedpreferences.StringPrefField;
+import org.androidannotations.helper.ModelConstants;
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SystemServiceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SystemServiceProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SystemServiceProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SystemServiceProcessor.java
index f46a5f7976..11d91b0342 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SystemServiceProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/SystemServiceProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.ref;
@@ -23,8 +23,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.model.AndroidSystemServices;
+import org.androidannotations.annotations.SystemService;
+import org.androidannotations.model.AndroidSystemServices;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TextChangeProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TextChangeProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TextChangeProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TextChangeProcessor.java
index 1f38669128..356ddb5af3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TextChangeProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TextChangeProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,12 +25,12 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.TextChange;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.TextWatcherHelper;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.TextChange;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.TextWatcherHelper;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpression;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TextWatcherHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TextWatcherHolder.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TextWatcherHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TextWatcherHolder.java
index 9847f442a9..67b1b36ad2 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TextWatcherHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TextWatcherHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JVar;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TouchProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TouchProcessor.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TouchProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TouchProcessor.java
index 5a571581bc..4866a07494 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TouchProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TouchProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._null;
@@ -28,11 +28,11 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.Touch;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.Touch;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JDefinedClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TraceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TraceProcessor.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TraceProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TraceProcessor.java
index 32644341cf..0a0b318a92 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TraceProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TraceProcessor.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_DEBUG;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_ERROR;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_INFO;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_VERBOSE;
-import static com.googlecode.androidannotations.helper.AndroidConstants.LOG_WARN;
+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 java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
-import com.googlecode.androidannotations.processing.EBeansHolder.Classes;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.processing.EBeansHolder.Classes;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TransactionalProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TransactionalProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TransactionalProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TransactionalProcessor.java
index b390c9da4a..c24a97a89a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/TransactionalProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/TransactionalProcessor.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import java.lang.annotation.Annotation;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.annotations.Transactional;
+import org.androidannotations.helper.APTCodeModelHelper;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/UiThreadProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/UiThreadProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/UiThreadProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/UiThreadProcessor.java
index 99621f5e3c..23c1fb94a0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/UiThreadProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/UiThreadProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr.lit;
@@ -23,8 +23,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.helper.APTCodeModelHelper;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ViewByIdProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ViewByIdProcessor.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ViewByIdProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ViewByIdProcessor.java
index 6ee1c3ba42..1de6db8173 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ViewByIdProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ViewByIdProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing;
+package org.androidannotations.processing;
 
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.invoke;
@@ -25,10 +25,10 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ViewById;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JFieldRef;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/DeleteProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/DeleteProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
index cad7f42dde..24d20051c9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/DeleteProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,8 +21,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Delete;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Delete;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/GetProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/GetProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/GetProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/GetProcessor.java
index b7c5dd6070..de16597a96 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/GetProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/GetProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -24,9 +24,9 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.rest.Get;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Get;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/HeadProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/HeadProcessor.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/HeadProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/HeadProcessor.java
index ebc09b93b9..abd0c38afc 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/HeadProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/HeadProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -22,8 +22,8 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.rest.Head;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Head;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
index 392411cee7..d140bf77c0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 import java.util.HashMap;
@@ -27,11 +27,11 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Accept;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.processing.DecoratingElementProcessor;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Accept;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.DecoratingElementProcessor;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessorHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessorHolder.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessorHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessorHolder.java
index ef9b583556..4d4e7da010 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessorHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessorHolder.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.util.TreeMap;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/OptionsProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/OptionsProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/OptionsProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/OptionsProcessor.java
index 33bf1b4f88..d463d338c4 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/OptionsProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/OptionsProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -23,9 +23,9 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.rest.Options;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Options;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/PostProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PostProcessor.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/PostProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PostProcessor.java
index 1cfe0ae7c5..d275d752d0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/PostProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PostProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -24,9 +24,9 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.rest.Post;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Post;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/PutProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PutProcessor.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/PutProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PutProcessor.java
index b851329dde..6dcb945b2a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/PutProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PutProcessor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,8 +21,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Put;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.annotations.rest.Put;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestImplementationHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestImplementationHolder.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestImplementationHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestImplementationHolder.java
index f9f56c7bec..b201b194fa 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestImplementationHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestImplementationHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import com.sun.codemodel.JDefinedClass;
 import com.sun.codemodel.JFieldVar;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestImplementationsHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestImplementationsHolder.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestImplementationsHolder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestImplementationsHolder.java
index fb5708ae61..619a3fdce6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestImplementationsHolder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestImplementationsHolder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestProcessor.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestProcessor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestProcessor.java
index e9c0aebb18..301cf1e19a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/RestProcessor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestProcessor.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.processing.rest;
+package org.androidannotations.processing.rest;
 
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE;
-import static com.googlecode.androidannotations.helper.CanonicalNameConstants.STRING;
 import static com.sun.codemodel.JExpr._new;
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JExpr.invoke;
 import static com.sun.codemodel.JExpr.lit;
+import static org.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE;
+import static org.androidannotations.helper.CanonicalNameConstants.STRING;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -34,11 +34,12 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
-import com.googlecode.androidannotations.helper.AnnotationHelper;
-import com.googlecode.androidannotations.helper.ModelConstants;
-import com.googlecode.androidannotations.processing.EBeansHolder;
-import com.googlecode.androidannotations.processing.GeneratingElementProcessor;
+import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.processing.EBeansHolder;
+import org.androidannotations.processing.GeneratingElementProcessor;
+
 import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/AndroidRClassFinder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/AndroidRClassFinder.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/AndroidRClassFinder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/AndroidRClassFinder.java
index beda654d8b..2906bab242 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/AndroidRClassFinder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/AndroidRClassFinder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.TypeElement;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/CoumpoundInnerClass.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundInnerClass.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/CoumpoundInnerClass.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundInnerClass.java
index 965c6626ae..21d97a87a9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/CoumpoundInnerClass.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundInnerClass.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JFieldRef;
 
 public class CoumpoundInnerClass implements IRInnerClass {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/CoumpoundRClass.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundRClass.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/CoumpoundRClass.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundRClass.java
index 6d958ff3c7..ebabc9772c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/CoumpoundRClass.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/CoumpoundRClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRClass.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRClass.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
index 174546a1cf..9a195196a7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRClass.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import java.util.Locale;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRInnerClass.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
similarity index 90%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRInnerClass.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
index 799c8348e9..731ee50aa7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRInnerClass.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/IRInnerClass.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JFieldRef;
 
 public interface IRInnerClass {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/ManifestPackageExtractor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ManifestPackageExtractor.java
similarity index 96%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/ManifestPackageExtractor.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ManifestPackageExtractor.java
index 785a142b61..cd9933f316 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/ManifestPackageExtractor.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ManifestPackageExtractor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/ProjectRClassFinder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ProjectRClassFinder.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/ProjectRClassFinder.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ProjectRClassFinder.java
index 63b702dd32..d405f157dd 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/ProjectRClassFinder.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/ProjectRClassFinder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -21,7 +21,7 @@
 import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic.Kind;
 
-import com.googlecode.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.AndroidManifest;
 
 public class ProjectRClassFinder {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/RClass.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RClass.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/RClass.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RClass.java
index 5df357d60e..15f3a3be1a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/RClass.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/RInnerClass.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RInnerClass.java
similarity index 95%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/RInnerClass.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RInnerClass.java
index eec973220b..52a13bab60 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/RInnerClass.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/rclass/RInnerClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,8 +27,8 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 
-import com.googlecode.androidannotations.helper.CaseHelper;
-import com.googlecode.androidannotations.processing.EBeanHolder;
+import org.androidannotations.helper.CaseHelper;
+import org.androidannotations.processing.EBeanHolder;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JFieldRef;
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AbstractSeekBarTouchValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AbstractSeekBarTouchValidator.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AbstractSeekBarTouchValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AbstractSeekBarTouchValidator.java
index 9acb0e1f21..5bd9feec42 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AbstractSeekBarTouchValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AbstractSeekBarTouchValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.util.List;
 
@@ -22,13 +22,13 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public abstract class AbstractSeekBarTouchValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterInjectValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterInjectValidator.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterInjectValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterInjectValidator.java
index 0fb938a236..e0e14083b2 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterInjectValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterInjectValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,10 +21,10 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.AfterInject;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class AfterInjectValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterTextChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterTextChangeValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java
index a8f2f42086..83ecbf779a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterTextChangeValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterTextChangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -23,13 +23,13 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
-import com.googlecode.androidannotations.annotations.AfterTextChange;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.AfterTextChange;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class AfterTextChangeValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterViewsValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterViewsValidator.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterViewsValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterViewsValidator.java
index 660736ae0b..3599f09c96 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AfterViewsValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AfterViewsValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,10 +21,10 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class AfterViewsValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AppValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AppValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AppValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AppValidator.java
index 6bf3ee7a7d..82358e17ea 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/AppValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/AppValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.App;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.App;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class AppValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/BeanValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeanValidator.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/BeanValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeanValidator.java
index 4f20351d65..bd3e5cc258 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/BeanValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeanValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 
 public class BeanValidator implements ElementValidator {
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/BeforeTextChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/BeforeTextChangeValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java
index 171ed75794..b03c03e6a9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/BeforeTextChangeValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/BeforeTextChangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -24,13 +24,13 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 
-import com.googlecode.androidannotations.annotations.BeforeTextChange;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.BeforeTextChange;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class BeforeTextChangeValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ClickValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ClickValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ClickValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ClickValidator.java
index 17cb69b6be..c46be4031e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ClickValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ClickValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class ClickValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EActivityValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EActivityValidator.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EActivityValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EActivityValidator.java
index ff9835a7c5..c0ded3465b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EActivityValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EActivityValidator.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class EActivityValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EApplicationValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EApplicationValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EApplicationValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EApplicationValidator.java
index 69659ef6aa..e8efb69034 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EApplicationValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EApplicationValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EApplication;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EApplication;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class EApplicationValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EBeanValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EBeanValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EBeanValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EBeanValidator.java
index e9ff132594..1e33dc28b9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EBeanValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EBeanValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class EBeanValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EFragmentValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EFragmentValidator.java
similarity index 76%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EFragmentValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EFragmentValidator.java
index ff438805d9..befcf3bb75 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EFragmentValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EFragmentValidator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class EFragmentValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EProviderValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EProviderValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EProviderValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EProviderValidator.java
index 306b68e01d..f859442cdb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EProviderValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EProviderValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EProvider;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EProvider;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class EProviderValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EReceiverValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EReceiverValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EReceiverValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EReceiverValidator.java
index 7ebe78cc4e..b6c8fa3809 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EReceiverValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EReceiverValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EReceiver;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EReceiver;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class EReceiverValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EServiceValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EServiceValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EServiceValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EServiceValidator.java
index 802998ce87..8f7677b2a7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EServiceValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EServiceValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EService;
-import com.googlecode.androidannotations.helper.AndroidManifest;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EService;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class EServiceValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EViewGroupValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EViewGroupValidator.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EViewGroupValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EViewGroupValidator.java
index f845bfb865..c49b0a8c4c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EViewGroupValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EViewGroupValidator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.EViewGroup;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.EViewGroup;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class EViewGroupValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EViewValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EViewValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EViewValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EViewValidator.java
index 84886d50fc..83bdf179ab 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EViewValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/EViewValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,10 +21,10 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.EView;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.EView;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class EViewValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ElementValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ElementValidator.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ElementValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ElementValidator.java
index 0bb2a62461..022857fe88 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ElementValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ElementValidator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.helper.HasTarget;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.helper.HasTarget;
+import org.androidannotations.model.AnnotationElements;
 
 public interface ElementValidator extends HasTarget {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ExtraValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ExtraValidator.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ExtraValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ExtraValidator.java
index 268754a021..53a491123f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ExtraValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ExtraValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.Extra;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class ExtraValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentArgValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentArgValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentArgValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentArgValidator.java
index 093cfd2e07..325c8d1a8a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentArgValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentArgValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.FragmentArg;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.FragmentArg;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class FragmentArgValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentByIdValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentByIdValidator.java
similarity index 76%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentByIdValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentByIdValidator.java
index b5bc4f2ec4..9c9e6cd327 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentByIdValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentByIdValidator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.FragmentById;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.FragmentById;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class FragmentByIdValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentByTagValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentByTagValidator.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentByTagValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentByTagValidator.java
index bf3ae45232..66fdecd979 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FragmentByTagValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FragmentByTagValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.FragmentByTag;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.FragmentByTag;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class FragmentByTagValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FromHtmlValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FromHtmlValidator.java
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FromHtmlValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FromHtmlValidator.java
index 427958d901..9b13572d64 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FromHtmlValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FromHtmlValidator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.FromHtml;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.FromHtml;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class FromHtmlValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FullscreenValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FullscreenValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FullscreenValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FullscreenValidator.java
index bcc26e8870..60219722c9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/FullscreenValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/FullscreenValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.Fullscreen;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.Fullscreen;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class FullscreenValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/HttpsClientValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/HttpsClientValidator.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/HttpsClientValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/HttpsClientValidator.java
index 78046fb515..c8dd3f533d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/HttpsClientValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/HttpsClientValidator.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.HttpsClient;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.HttpsClient;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 /**
  * @author Nabil Hachicha
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/InstanceStateValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/InstanceStateValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/InstanceStateValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/InstanceStateValidator.java
index 6981528907..7543fa8385 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/InstanceStateValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/InstanceStateValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.InstanceState;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.InstanceState;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class InstanceStateValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/IsValid.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/IsValid.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/IsValid.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/IsValid.java
index 7925e7d0c2..47ca023927 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/IsValid.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/IsValid.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 public class IsValid {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemClickValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemClickValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemClickValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemClickValidator.java
index 3cc3799629..20225dff2f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemClickValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemClickValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.ItemClick;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ItemClick;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 /**
  * @author Benjamin Fellous
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemLongClickValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemLongClickValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemLongClickValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemLongClickValidator.java
index 3c4f7e972a..238f8e8852 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemLongClickValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemLongClickValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.ItemLongClick;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ItemLongClick;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 /**
  * @author Benjamin Fellous
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemSelectedValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemSelectedValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemSelectedValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemSelectedValidator.java
index d126c7b60e..9bf073bcf3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ItemSelectedValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ItemSelectedValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.ItemSelect;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ItemSelect;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 /**
  * @author Pierre-Yves Ricau
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/LongClickValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/LongClickValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/LongClickValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/LongClickValidator.java
index 6bcda606e8..94db9cd681 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/LongClickValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/LongClickValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.LongClick;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.LongClick;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 /**
  * @author Benjamin Fellous
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ModelValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ModelValidator.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ModelValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ModelValidator.java
index 08a56f6686..66a4342ff7 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ModelValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ModelValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -23,8 +23,8 @@
 
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.model.AnnotationElementsHolder;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.model.AnnotationElementsHolder;
 
 public class ModelValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/NoTitleValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/NoTitleValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/NoTitleValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/NoTitleValidator.java
index 643137072a..ac03ab3cb0 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/NoTitleValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/NoTitleValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.NoTitle;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.NoTitle;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class NoTitleValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/NonConfigurationInstanceValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/NonConfigurationInstanceValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/NonConfigurationInstanceValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/NonConfigurationInstanceValidator.java
index db7a35d0d9..abe29944dd 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/NonConfigurationInstanceValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/NonConfigurationInstanceValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.NonConfigurationInstance;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class NonConfigurationInstanceValidator implements ElementValidator {
 	
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OnActivityResultValidator.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OnActivityResultValidator.java
index cc09441ba1..0a6ca575bf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OnActivityResultValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -25,12 +25,12 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.OnActivityResult;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
 
 /**
  * @author Mathieu Boniface
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OptionsItemValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OptionsItemValidator.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OptionsItemValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OptionsItemValidator.java
index 9dd32c49a9..e391cd632b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OptionsItemValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OptionsItemValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 /**
  * @author Pierre-Yves Ricau
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OptionsMenuValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OptionsMenuValidator.java
similarity index 74%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OptionsMenuValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OptionsMenuValidator.java
index d32a200ae0..35d9027735 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OptionsMenuValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OptionsMenuValidator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class OptionsMenuValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OrmLiteDaoValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OrmLiteDaoValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java
index 5104c055dd..35d46cc23d 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OrmLiteDaoValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/OrmLiteDaoValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.OrmLiteDao;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
 
 public class OrmLiteDaoValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/PrefValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/PrefValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/PrefValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/PrefValidator.java
index 5a6f9bd4e8..ac2ddbb273 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/PrefValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/PrefValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.Pref;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.sharedpreferences.Pref;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class PrefValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ResValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ResValidator.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ResValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ResValidator.java
index 1bf4945640..7f2d8a5be8 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ResValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ResValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,12 +21,12 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AndroidRes;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AndroidRes;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
 
 public class ResValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RestServiceValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RestServiceValidator.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RestServiceValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RestServiceValidator.java
index c8ded47fef..2c5dfd6997 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RestServiceValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RestServiceValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
-import com.googlecode.androidannotations.annotations.rest.RestService;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.RestService;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class RestServiceValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RoboGuiceValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RoboGuiceValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RoboGuiceValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RoboGuiceValidator.java
index 443b2ad2c8..043167f803 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RoboGuiceValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RoboGuiceValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.RoboGuice;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.RoboGuice;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class RoboGuiceValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RootContextValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RootContextValidator.java
similarity index 82%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RootContextValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RootContextValidator.java
index 82054cadf5..f395d1d710 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RootContextValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RootContextValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.RootContext;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.RootContext;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class RootContextValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RunnableValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RunnableValidator.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RunnableValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RunnableValidator.java
index 1f05747207..b35f080cc3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/RunnableValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/RunnableValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,9 +21,9 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class RunnableValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarProgressChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarProgressChangeValidator.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarProgressChangeValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarProgressChangeValidator.java
index 83d0d6ad98..cbb0fc7e58 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarProgressChangeValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarProgressChangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -24,14 +24,14 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 
-import com.googlecode.androidannotations.annotations.SeekBarProgressChange;
-import com.googlecode.androidannotations.helper.CanonicalNameConstants;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.SeekBarProgressChange;
+import org.androidannotations.helper.CanonicalNameConstants;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class SeekBarProgressChangeValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarTouchStartValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarTouchStartValidator.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarTouchStartValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarTouchStartValidator.java
index 8dc3e16eae..a3945474d6 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarTouchStartValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarTouchStartValidator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 
-import com.googlecode.androidannotations.annotations.SeekBarTouchStart;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.SeekBarTouchStart;
+import org.androidannotations.rclass.IRClass;
 
 public class SeekBarTouchStartValidator extends AbstractSeekBarTouchValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarTouchStopValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarTouchStopValidator.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarTouchStopValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarTouchStopValidator.java
index 68ca0bfb0c..e6db478d78 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SeekBarTouchStopValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SeekBarTouchStopValidator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 
-import com.googlecode.androidannotations.annotations.SeekBarTouchStop;
-import com.googlecode.androidannotations.rclass.IRClass;
+import org.androidannotations.annotations.SeekBarTouchStop;
+import org.androidannotations.rclass.IRClass;
 
 public class SeekBarTouchStopValidator extends AbstractSeekBarTouchValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SharedPrefValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SharedPrefValidator.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SharedPrefValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SharedPrefValidator.java
index a2a0e7e8bb..e515815b45 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SharedPrefValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SharedPrefValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -24,10 +24,10 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class SharedPrefValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SystemServiceValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SystemServiceValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SystemServiceValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SystemServiceValidator.java
index 68cec5fae3..f61529c132 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/SystemServiceValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/SystemServiceValidator.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AndroidSystemServices;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.SystemService;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AndroidSystemServices;
+import org.androidannotations.model.AnnotationElements;
 
 public class SystemServiceValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TextChangeValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TextChangeValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java
index f12eb2faab..90d9d79d53 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TextChangeValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TextChangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -24,13 +24,13 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 
-import com.googlecode.androidannotations.annotations.TextChange;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.TextChange;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class TextChangeValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TouchValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TouchValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TouchValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TouchValidator.java
index 1e0ce78a34..3f1c4dc460 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TouchValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TouchValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.Touch;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.Touch;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class TouchValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TraceValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TraceValidator.java
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TraceValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TraceValidator.java
index 4f90763d5c..06fe66e8b3 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TraceValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TraceValidator.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class TraceValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TransactionalValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TransactionalValidator.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TransactionalValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TransactionalValidator.java
index 9dabc2f1c2..e83bbd159b 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/TransactionalValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/TransactionalValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,10 +21,10 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
+import org.androidannotations.annotations.Transactional;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
 
 public class TransactionalValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ViewByIdValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ViewByIdValidator.java
similarity index 78%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ViewByIdValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ViewByIdValidator.java
index 2e09e96e78..eacf2e135f 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/ViewByIdValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/ViewByIdValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation;
+package org.androidannotations.validation;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;
 
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.helper.IdAnnotationHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper;
-import com.googlecode.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.rclass.IRClass;
-import com.googlecode.androidannotations.rclass.IRClass.Res;
+import org.androidannotations.annotations.ViewById;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.helper.IdValidatorHelper.FallbackStrategy;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.rclass.IRClass;
+import org.androidannotations.rclass.IRClass.Res;
 
 public class ViewByIdValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/AcceptValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/AcceptValidator.java
similarity index 81%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/AcceptValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/AcceptValidator.java
index 1e38b6553b..9865f4143e 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/AcceptValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/AcceptValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -22,12 +22,12 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.rest.Accept;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Accept;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class AcceptValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/DeleteValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/DeleteValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/DeleteValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/DeleteValidator.java
index 7d6b1233b9..e515ab7dbb 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/DeleteValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/DeleteValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Delete;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Delete;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class DeleteValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/GetValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/GetValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/GetValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/GetValidator.java
index b97dc9307b..3d102b52f9 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/GetValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/GetValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Get;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Get;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class GetValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/HeadValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/HeadValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/HeadValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/HeadValidator.java
index 53d6d7ec0f..9955d21f3a 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/HeadValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/HeadValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Head;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Head;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class HeadValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/OptionsValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/OptionsValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/OptionsValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/OptionsValidator.java
index 331bebd143..3536aba343 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/OptionsValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/OptionsValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Options;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Options;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class OptionsValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/PostValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/PostValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/PostValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/PostValidator.java
index e0badca3fe..38d1695208 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/PostValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/PostValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Post;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Post;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class PostValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/PutValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/PutValidator.java
similarity index 79%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/PutValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/PutValidator.java
index cddef6bce0..8122f0eeaf 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/PutValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/PutValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,13 +21,13 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 
-import com.googlecode.androidannotations.annotations.rest.Put;
-import com.googlecode.androidannotations.helper.RestAnnotationHelper;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Put;
+import org.androidannotations.helper.RestAnnotationHelper;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class PutValidator implements ElementValidator {
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/RestValidator.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/RestValidator.java
similarity index 80%
rename from AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/RestValidator.java
rename to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/RestValidator.java
index fd841cd5e0..3452bc4c5c 100644
--- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/rest/RestValidator.java
+++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/RestValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.validation.rest;
+package org.androidannotations.validation.rest;
 
 import java.lang.annotation.Annotation;
 
@@ -21,12 +21,12 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
-import com.googlecode.androidannotations.helper.TargetAnnotationHelper;
-import com.googlecode.androidannotations.helper.ValidatorHelper;
-import com.googlecode.androidannotations.model.AnnotationElements;
-import com.googlecode.androidannotations.validation.ElementValidator;
-import com.googlecode.androidannotations.validation.IsValid;
+import org.androidannotations.annotations.rest.Rest;
+import org.androidannotations.helper.TargetAnnotationHelper;
+import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.validation.ElementValidator;
+import org.androidannotations.validation.IsValid;
 
 public class RestValidator implements ElementValidator {
 
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
index 1df9148817..647346a011 100644
--- 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
@@ -1 +1 @@
-com.googlecode.androidannotations.AndroidAnnotationProcessor
\ No newline at end of file
+org.androidannotations.AndroidAnnotationProcessor
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/EBeanTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
similarity index 84%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/EBeanTest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
index e49633b623..1a60433840 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/EBeanTest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
@@ -13,14 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.ebean;
+package org.androidannotations.ebean;
 
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.googlecode.androidannotations.AndroidAnnotationProcessor;
-import com.googlecode.androidannotations.utils.AAProcessorTestHelper;
-
 public class EBeanTest extends AAProcessorTestHelper {
 
 	@Before
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeActivity.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
similarity index 76%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeActivity.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
index 06f8e3fbed..c1831c36fd 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeActivity.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.ebean;
+package org.androidannotations.ebean;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.NonConfigurationInstance;
 
 @EActivity
 public class SomeActivity extends Activity {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeImplementation.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeImplementation.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java
index 17d13150ea..5f9c233fb8 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeImplementation.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeImplementation.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.ebean;
+package org.androidannotations.ebean;
 
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class SomeImplementation implements SomeInterface {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeInterface.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeInterface.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java
index b30b9bdb4f..ce5903f3fb 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeInterface.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeInterface.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.ebean;
+package org.androidannotations.ebean;
 
 public interface SomeInterface {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityInManifest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityInManifest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java
index f346746811..eb9c908734 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityInManifest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityInManifest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.manifest;
+package org.androidannotations.manifest;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity
 public class ActivityInManifest extends Activity {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityNotInManifest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityNotInManifest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java
index a68bab0ecd..ce5de48537 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityNotInManifest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivityNotInManifest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.manifest;
+package org.androidannotations.manifest;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity
 public class ActivityNotInManifest extends Activity {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivitySubclassInManifest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivitySubclassInManifest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java
index 083c9fd875..91fe1f2028 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivitySubclassInManifest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/ActivitySubclassInManifest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.manifest;
+package org.androidannotations.manifest;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity
 public class ActivitySubclassInManifest extends Activity {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestErrorsTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
similarity index 89%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestErrorsTest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
index ab13f32939..65b86d1633 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestErrorsTest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
@@ -13,16 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.manifest;
+package org.androidannotations.manifest;
 
 import java.io.IOException;
 
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.googlecode.androidannotations.AndroidAnnotationProcessor;
-import com.googlecode.androidannotations.utils.AAProcessorTestHelper;
-
 public class AndroidManifestErrorsTest extends AAProcessorTestHelper {
 
 	@Before
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestFinderTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestFinderTest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
index 208c0de2aa..431a32d4e4 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestFinderTest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.manifest;
+package org.androidannotations.manifest;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.io.Files;
 import com.google.common.io.InputSupplier;
-import com.googlecode.androidannotations.AndroidAnnotationProcessor;
-import com.googlecode.androidannotations.utils.AAProcessorTestHelper;
 
 public class AndroidManifestFinderTest extends AAProcessorTestHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/SomeClass.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/SomeClass.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java
index 88bd8d52f1..d22f5232da 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/SomeClass.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/SomeClass.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.manifest;
+package org.androidannotations.manifest;
 
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class SomeClass {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rclass/ManifestPackageExtractorTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/ManifestPackageExtractorTest.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rclass/ManifestPackageExtractorTest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/ManifestPackageExtractorTest.java
index 1f799d040d..2c56ff18ac 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rclass/ManifestPackageExtractorTest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rclass/ManifestPackageExtractorTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rclass;
+package org.androidannotations.rclass;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/AbstractConverter.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractConverter.java
similarity index 94%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/AbstractConverter.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractConverter.java
index 2b17d4b0c7..250433edbb 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/AbstractConverter.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/AbstractConverter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
 import org.springframework.http.converter.AbstractHttpMessageConverter;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClassClient.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClassClient.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClassClient.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClassClient.java
index 73a5361a16..a8b810c928 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClassClient.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClassClient.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.Rest;
 
 @Rest(converters = {})
 public class ClassClient {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithAbstractConverter.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractConverter.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithAbstractConverter.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractConverter.java
index 1b0e0e2752..2a142721ea 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithAbstractConverter.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithAbstractConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.Rest;
 
 @Rest(converters = { AbstractConverter.class })
 public interface ClientWithAbstractConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithNoConverters.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNoConverters.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithNoConverters.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNoConverters.java
index 86ffc3b4a2..c9aac9bde2 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithNoConverters.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNoConverters.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.Rest;
 
 @Rest(converters = {})
 public interface ClientWithNoConverters {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithNonConverter.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonConverter.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithNonConverter.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonConverter.java
index 3b0577490e..a18cca901c 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithNonConverter.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithNonConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.Rest;
 
 @Rest(converters = { Object.class })
 public interface ClientWithNonConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithValidConverter.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidConverter.java
similarity index 88%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithValidConverter.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidConverter.java
index 8f0adbc551..3b885b42db 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithValidConverter.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithValidConverter.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.Rest;
 
 @Rest(converters = { MappingJacksonHttpMessageConverter.class })
 public interface ClientWithValidConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithWrongConstructorConverter.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorConverter.java
similarity index 86%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithWrongConstructorConverter.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorConverter.java
index fe4ad419ae..597b8cd1a2 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/ClientWithWrongConstructorConverter.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/ClientWithWrongConstructorConverter.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
-import com.googlecode.androidannotations.annotations.rest.Rest;
+import org.androidannotations.annotations.rest.Rest;
 
 @Rest(converters = { WrongConstructorConverter.class })
 public interface ClientWithWrongConstructorConverter {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/RestConverterTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestConverterTest.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/RestConverterTest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestConverterTest.java
index 5844482443..5e1644b175 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/RestConverterTest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestConverterTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
 import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.googlecode.androidannotations.AndroidAnnotationProcessor;
-import com.googlecode.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
 
 public class RestConverterTest extends AAProcessorTestHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/RestTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java
similarity index 85%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/RestTest.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java
index f14267e664..4d875b88fa 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/RestTest.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
 import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.googlecode.androidannotations.AndroidAnnotationProcessor;
-import com.googlecode.androidannotations.utils.AAProcessorTestHelper;
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
 
 public class RestTest extends AAProcessorTestHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/WrongConstructorConverter.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorConverter.java
similarity index 97%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/WrongConstructorConverter.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorConverter.java
index 983d698e82..e7f03bf497 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/rest/WrongConstructorConverter.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/WrongConstructorConverter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.rest;
+package org.androidannotations.rest;
 
 import java.io.IOException;
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java
similarity index 91%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java
index a4b81b1e53..ee0ab34ced 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.utils;
+package org.androidannotations.utils;
 
 import java.io.File;
 
-import com.googlecode.androidannotations.helper.ModelConstants;
+import org.androidannotations.helper.ModelConstants;
 
 public class AAProcessorTestHelper extends ProcessorTestHelper {
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ClassFinder.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ClassFinder.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java
index 3cc7b8f05e..d18704197d 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ClassFinder.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.utils;
+package org.androidannotations.utils;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -393,4 +393,4 @@ public static void main(String[] args) {
 			System.out.println("No subclasses in package " + args[0] + " found.");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorAssert.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorAssert.java
similarity index 93%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorAssert.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorAssert.java
index 237690a220..f1f89467c5 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorAssert.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorAssert.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.utils;
+package org.androidannotations.utils;
 
 
 public class ProcessorAssert {
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorTestHelper.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
similarity index 99%
rename from AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorTestHelper.java
rename to AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
index f9f09537e4..4980cfe9b6 100644
--- a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorTestHelper.java
+++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.utils;
+package org.androidannotations.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -314,4 +314,4 @@ private boolean isWindows() {
 		return getOsName().startsWith("Windows");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/ebean/AndroidManifest.xml b/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml
similarity index 83%
rename from AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/ebean/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml
index 08a6e4f877..2eb7afd01d 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/ebean/AndroidManifest.xml
+++ b/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/ebean/AndroidManifest.xml
@@ -17,12 +17,12 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googlecode.androidannotations.testprocessor"
+    package="org.androidannotations.testprocessor"
     android:versionCode="1"
     android:versionName="1.0" >
 
     <application>
-        <activity android:name="com.googlecode.androidannotations.ebean.SomeActivity_" />
+        <activity android:name="org.androidannotations.ebean.SomeActivity_" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/manifest/AndroidManifest.xml b/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml
similarity index 75%
rename from AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/manifest/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml
index 87801d2f03..21e186563d 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/manifest/AndroidManifest.xml
+++ b/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/manifest/AndroidManifest.xml
@@ -17,13 +17,13 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googlecode.androidannotations.testprocessor"
+    package="org.androidannotations.testprocessor"
     android:versionCode="1"
     android:versionName="1.0" >
     
     <application>
-    		<activity android:name="com.googlecode.androidannotations.manifest.ActivityInManifest" />
-    		<activity android:name="com.googlecode.androidannotations.manifest.ActivitySubclassInManifest_" />
+    		<activity android:name="org.androidannotations.manifest.ActivityInManifest" />
+    		<activity android:name="org.androidannotations.manifest.ActivitySubclassInManifest_" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/rest/AndroidManifest.xml b/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml
similarity index 92%
rename from AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/rest/AndroidManifest.xml
rename to AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml
index 9082b8a051..2dc195a21d 100644
--- a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/rest/AndroidManifest.xml
+++ b/AndroidAnnotations/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml
@@ -17,11 +17,11 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googlecode.androidannotations.testprocessor"
+    package="org.androidannotations.testprocessor"
     android:versionCode="1"
     android:versionName="1.0" >
 
     <application>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/AndroidAnnotations/functional-test-1-5-tests/pom.xml b/AndroidAnnotations/functional-test-1-5-tests/pom.xml
index 9f08b7d99c..fbfbbe1bd9 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/pom.xml
+++ b/AndroidAnnotations/functional-test-1-5-tests/pom.xml
@@ -4,7 +4,7 @@
 
 	<parent>
 		<artifactId>androidannotations-parent</artifactId>
-		<groupId>com.googlecode.androidannotations</groupId>
+		<groupId>org.androidannotations</groupId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
 
@@ -14,7 +14,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>functional-test-1-5</artifactId>
 		</dependency>
 		<dependency>
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/AbstractActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/AbstractActivityTest.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/AbstractActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/AbstractActivityTest.java
index 241d8ab240..a4740fb374 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/AbstractActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/AbstractActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/AndroidAnnotationsTestRunner.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/AndroidAnnotationsTestRunner.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/AndroidAnnotationsTestRunner.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/AndroidAnnotationsTestRunner.java
index 3971d5fcd2..a628b6ec88 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/AndroidAnnotationsTestRunner.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/AndroidAnnotationsTestRunner.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.io.File;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ApplicationInjectedActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ApplicationInjectedActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java
index 07fc281131..71e30ff381 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ApplicationInjectedActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ApplicationInjectedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/BackpressedActivityTestSkipped.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/BackpressedActivityTestSkipped.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/BackpressedActivityTestSkipped.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/BackpressedActivityTestSkipped.java
index 49a8c0dff9..e4ca1badf8 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/BackpressedActivityTestSkipped.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/BackpressedActivityTestSkipped.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 import android.os.Build;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ClicksHandledActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ClicksHandledActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ClicksHandledActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ClicksHandledActivityTest.java
index 67e6a167ee..e008787fd1 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ClicksHandledActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ClicksHandledActivityTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
-import static com.googlecode.androidannotations.test15.MyAssertions.assertThat;
+import static org.androidannotations.test15.MyAssertions.assertThat;
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Before;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/EmptyActivityWithLayoutTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/EmptyActivityWithLayoutTest.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/EmptyActivityWithLayoutTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/EmptyActivityWithLayoutTest.java
index 8a27594dbf..ba8da650b3 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/EmptyActivityWithLayoutTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/EmptyActivityWithLayoutTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
-import static com.googlecode.androidannotations.test15.MyAssertions.assertThat;
+import static org.androidannotations.test15.MyAssertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/EmptyActivityWithoutLayoutTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
index 23556a1088..df8eb23453 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/EmptyActivityWithoutLayoutTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
-import static com.googlecode.androidannotations.test15.MyAssertions.assertThat;
+import static org.androidannotations.test15.MyAssertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FakeClipboardManager.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/FakeClipboardManager.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FakeClipboardManager.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/FakeClipboardManager.java
index 202f8a5e9d..4ed0000bb4 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FakeClipboardManager.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/FakeClipboardManager.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.text.ClipboardManager;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FromHtmlActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/FromHtmlActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FromHtmlActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/FromHtmlActivityTest.java
index 61a7659cb6..58af3d54a5 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FromHtmlActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/FromHtmlActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/InjectExtraTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/InjectExtraTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/InjectExtraTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/InjectExtraTest.java
index ec15906580..922a42a20b 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/InjectExtraTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/InjectExtraTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ItemClicksHandledActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ItemClicksHandledActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ItemClicksHandledActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ItemClicksHandledActivityTest.java
index f3d3f68ef2..adc96b3e8f 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ItemClicksHandledActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ItemClicksHandledActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/LongClicksHandledActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/LongClicksHandledActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/LongClicksHandledActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/LongClicksHandledActivityTest.java
index 9db2dd89ab..d503721c67 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/LongClicksHandledActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/LongClicksHandledActivityTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
-import static com.googlecode.androidannotations.test15.MyAssertions.assertThat;
+import static org.androidannotations.test15.MyAssertions.assertThat;
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Before;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/MyAssertions.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/MyAssertions.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/MyAssertions.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/MyAssertions.java
index 89996f7e74..d5c0f1fe5a 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/MyAssertions.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/MyAssertions.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.view.View;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/RobolectricParameterized.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/RobolectricParameterized.java
similarity index 99%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/RobolectricParameterized.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/RobolectricParameterized.java
index 1d455cf506..7b925223c9 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/RobolectricParameterized.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/RobolectricParameterized.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/SSLConnectionTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/SSLConnectionTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/SSLConnectionTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/SSLConnectionTest.java
index 1ea4a12190..3592237faa 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/SSLConnectionTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/SSLConnectionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java
index 8e5b8e7da1..d9a0c3754d 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -38,7 +38,7 @@ public void setup() throws Exception {
 		@SuppressWarnings("unchecked")
 		Map<String, String> SYSTEM_SERVICE_MAP = (Map<String, String>) serviceMapField.get(null);
 
-		SYSTEM_SERVICE_MAP.put(Context.CLIPBOARD_SERVICE, "com.googlecode.androidannotations.test15.FakeClipboardManager");
+		SYSTEM_SERVICE_MAP.put(Context.CLIPBOARD_SERVICE, "org.androidannotations.test15.FakeClipboardManager");
 	}
 
 	@Test
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ThreadActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ThreadActivityTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ThreadActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ThreadActivityTest.java
index 0c71343bbb..012550ace7 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ThreadActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ThreadActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 //import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 
-import com.googlecode.androidannotations.api.BackgroundExecutor;
+import org.androidannotations.api.BackgroundExecutor;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class ThreadActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TouchesHandledActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TouchesHandledActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TouchesHandledActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TouchesHandledActivityTest.java
index 85d5baa5bc..6c98677b57 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TouchesHandledActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TouchesHandledActivityTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
-import static com.googlecode.androidannotations.test15.MyAssertions.assertThat;
+import static org.androidannotations.test15.MyAssertions.assertThat;
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Before;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TracedActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TracedActivityTest.java
similarity index 98%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TracedActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TracedActivityTest.java
index 996b559bd7..69e4550495 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TracedActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TracedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Assertions.assertThat;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TransactionalActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TransactionalActivityTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TransactionalActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TransactionalActivityTest.java
index acccc11ed9..ec7b3dfe33 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/TransactionalActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/TransactionalActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyString;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ViewAssert.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ViewAssert.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ViewAssert.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ViewAssert.java
index a8bf4efa5a..59d080e597 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ViewAssert.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ViewAssert.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import static org.fest.assertions.Formatting.inBrackets;
 import static org.fest.util.Strings.concat;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ViewsInjectedActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ViewsInjectedActivityTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ViewsInjectedActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ViewsInjectedActivityTest.java
index 87850f44b4..dccd405e6a 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ViewsInjectedActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ViewsInjectedActivityTest.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 //import static org.fest.assertions.Assertions.assertThat;
-import static com.googlecode.androidannotations.test15.MyAssertions.assertThat;
+import static org.androidannotations.test15.MyAssertions.assertThat;
 
 import org.fest.assertions.Assertions;
 import org.junit.Before;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterinject/AfterInjectActivityTest.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterinject/AfterInjectActivityTest.java
index d0ce7847ab..e73170cd3d 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterinject/AfterInjectActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterinject;
+package org.androidannotations.test15.afterinject;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class AfterInjectActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectBeanTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterinject/AfterInjectBeanTest.java
similarity index 89%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectBeanTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterinject/AfterInjectBeanTest.java
index 7d0ae5bb11..c0150c70bd 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectBeanTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterinject/AfterInjectBeanTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterinject;
+package org.androidannotations.test15.afterinject;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -23,7 +23,7 @@
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class AfterInjectBeanTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterviews/AfterViewsActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterviews/AfterViewsActivityTest.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterviews/AfterViewsActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterviews/AfterViewsActivityTest.java
index 501f8122cf..b2433352d6 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/afterviews/AfterViewsActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/afterviews/AfterViewsActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterviews;
+package org.androidannotations.test15.afterviews;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class AfterViewsActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/application/GeneratedApplicationTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/application/GeneratedApplicationTest.java
similarity index 77%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/application/GeneratedApplicationTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/application/GeneratedApplicationTest.java
index cf32f57d4d..64e8bc5743 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/application/GeneratedApplicationTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/application/GeneratedApplicationTest.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.application;
+package org.androidannotations.test15.application;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.roboguice.InjectedTestRunner;
-import com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication;
-import com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication_;
+import org.androidannotations.test15.roboguice.InjectedTestRunner;
+import org.androidannotations.test15.roboguice.SampleRoboApplication;
+import org.androidannotations.test15.roboguice.SampleRoboApplication_;
 
 @RunWith(InjectedTestRunner.class)
 public class GeneratedApplicationTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/BeanInjectedActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/BeanInjectedActivityTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/BeanInjectedActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/BeanInjectedActivityTest.java
index 79cd7154e4..e4c3c8e5c4 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/BeanInjectedActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/BeanInjectedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class BeanInjectedActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/SomeBeanTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/SomeBeanTest.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/SomeBeanTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/SomeBeanTest.java
index 651b6be263..9e5854f809 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/SomeBeanTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/SomeBeanTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.EmptyActivityWithoutLayout_;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class SomeBeanTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/SomeSingletonTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/SomeSingletonTest.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/SomeSingletonTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/SomeSingletonTest.java
index c32aed60dc..47361582b0 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ebean/SomeSingletonTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ebean/SomeSingletonTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -22,8 +22,8 @@
 
 import android.content.Context;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.EmptyActivityWithoutLayout_;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class SomeSingletonTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/efragment/MyFragmentActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/efragment/MyFragmentActivityTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/efragment/MyFragmentActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/efragment/MyFragmentActivityTest.java
index f5f834b863..19c935f6ae 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/efragment/MyFragmentActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/efragment/MyFragmentActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.efragment;
+package org.androidannotations.test15.efragment;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 /**
  * Those test are disabled for now, we need to update Robolectric version for
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/eview/CustomButtonTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/eview/CustomButtonTest.java
similarity index 86%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/eview/CustomButtonTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/eview/CustomButtonTest.java
index 9e3a03fed8..cd2b2fdb67 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/eview/CustomButtonTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/eview/CustomButtonTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eview;
+package org.androidannotations.test15.eview;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -22,8 +22,8 @@
 
 import android.content.Context;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.EmptyActivityWithoutLayout_;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class CustomButtonTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
index c1373ae181..cee483c03f 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutTest.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eviewgroup;
+package org.androidannotations.test15.eviewgroup;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.EmptyActivityWithoutLayout;
-import com.googlecode.androidannotations.test15.EmptyActivityWithoutLayout_;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.EmptyActivityWithoutLayout;
+import org.androidannotations.test15.EmptyActivityWithoutLayout_;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class CustomFrameLayoutTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/greendroid/MyGreenDroidActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/greendroid/MyGreenDroidActivityTest.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/greendroid/MyGreenDroidActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/greendroid/MyGreenDroidActivityTest.java
index eb8455b3b6..0746e5a819 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/greendroid/MyGreenDroidActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/greendroid/MyGreenDroidActivityTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.greendroid;
+package org.androidannotations.test15.greendroid;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.R;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class MyGreenDroidActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
similarity index 97%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
index fc3ee3b945..0956e830cd 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityParameterizedTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -29,7 +29,7 @@
 import android.os.Bundle;
 
 import com.google.inject.internal.Lists;
-import com.googlecode.androidannotations.test15.RobolectricParameterized;
+import org.androidannotations.test15.RobolectricParameterized;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.shadows.CustomShadowBundle;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
index 89e771db5f..0c2f08740f 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -21,7 +21,7 @@
 
 import android.os.Bundle;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.shadows.CustomShadowBundle;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/menu/OptionsMenuActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/menu/OptionsMenuActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java
index 27fa94a56c..3b16b19ca8 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/menu/OptionsMenuActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/menu/OptionsMenuActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.menu;
+package org.androidannotations.test15.menu;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -25,8 +25,8 @@
 
 import android.view.MenuItem;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.R;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.shadows.ShadowHtml;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java
index 5edbecc132..95ec4f8404 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class OrmLiteActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/prefs/PrefsActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/prefs/PrefsActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java
index d67a29a1e4..0fffe0cea1 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/prefs/PrefsActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/prefs/PrefsActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -23,7 +23,7 @@
 
 import android.content.SharedPreferences;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class PrefsActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/res/ResActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/res/ResActivityTest.java
similarity index 93%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/res/ResActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/res/ResActivityTest.java
index c7544494cc..1c39456154 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/res/ResActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/res/ResActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.res;
+package org.androidannotations.test15.res;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -27,8 +27,8 @@
 import android.text.Html;
 import android.view.animation.AnimationUtils;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.R;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.shadows.ShadowHtml;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/rest/MyServiceTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/rest/MyServiceTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java
index 0a2c8a7c84..a135d3472d 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/rest/MyServiceTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.rest;
+package org.androidannotations.test15.rest;
 
 import static org.mockito.Matchers.startsWith;
 import static org.mockito.Mockito.mock;
@@ -28,7 +28,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.web.client.RestTemplate;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class MyServiceTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/FakeDateProvider.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/FakeDateProvider.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/FakeDateProvider.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/FakeDateProvider.java
index 2fb38e9d3b..d997b607ec 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/FakeDateProvider.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/FakeDateProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/InjectedActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/InjectedActivityTest.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/InjectedActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/InjectedActivityTest.java
index 1447d56283..d21dd7d241 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/InjectedActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/InjectedActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -26,7 +26,7 @@
 import android.widget.TextView;
 
 import com.google.inject.Inject;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.test15.R;
 
 @RunWith(InjectedTestRunner.class)
 public class InjectedActivityTest {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/InjectedTestRunner.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/InjectedTestRunner.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/InjectedTestRunner.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/InjectedTestRunner.java
index 14033739a7..2f566573df 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/InjectedTestRunner.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/InjectedTestRunner.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import org.junit.runners.model.InitializationError;
 
@@ -21,7 +21,7 @@
 import android.app.Application;
 
 import com.google.inject.Injector;
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
 import com.xtremelabs.robolectric.Robolectric;
 
 public class InjectedTestRunner extends AndroidAnnotationsTestRunner {
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/RobolectricSampleTestModule.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
index 51d8a32d2b..5f98a4395f 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/roboguice/RobolectricSampleTestModule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import java.util.Date;
 
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/sherlock/MySherlockActivityTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/sherlock/MySherlockActivityTest.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/sherlock/MySherlockActivityTest.java
rename to AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/sherlock/MySherlockActivityTest.java
index 2dcfc5be3b..6cac39c21a 100644
--- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/sherlock/MySherlockActivityTest.java
+++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/sherlock/MySherlockActivityTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.sherlock;
+package org.androidannotations.test15.sherlock;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -25,8 +25,8 @@
 
 import android.view.MenuItem;
 
-import com.googlecode.androidannotations.test15.AndroidAnnotationsTestRunner;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.test15.AndroidAnnotationsTestRunner;
+import org.androidannotations.test15.R;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.shadows.ShadowHtml;
 
diff --git a/AndroidAnnotations/functional-test-1-5/.factorypath b/AndroidAnnotations/functional-test-1-5/.factorypath
index a16617743d..d285dd6e54 100644
--- a/AndroidAnnotations/functional-test-1-5/.factorypath
+++ b/AndroidAnnotations/functional-test-1-5/.factorypath
@@ -1,4 +1,4 @@
 <factorypath>
     <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="PLUGIN" id="com.googlecode.androidannotations" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="PLUGIN" id="org.androidannotations" enabled="true" runInBatchMode="false"/>
 </factorypath>
diff --git a/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml b/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
index 05561cf08b..6ce1991dfe 100644
--- a/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
+++ b/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googlecode.androidannotations.test15"
+    package="org.androidannotations.test15"
     android:versionCode="1"
     android:versionName="2.1-SNAPSHOT" >
 
@@ -26,10 +26,10 @@
         android:targetSdkVersion="8" />
 
     <application
-        android:name="com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication_"
+        android:name="org.androidannotations.test15.roboguice.SampleRoboApplication_"
         android:icon="@drawable/icon"
         android:label="@string/app_name" >
-        <activity android:name="com.googlecode.androidannotations.test15.eviewgroup.CustomFrameLayoutActivity_" >
+        <activity android:name="org.androidannotations.test15.eviewgroup.CustomFrameLayoutActivity_" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -57,31 +57,31 @@
         <activity android:name=".TracedActivity_" />
         <activity android:name=".TextWatchedActivity_" />
         <activity android:name=".ormlite.OrmLiteActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.menu.OptionsMenuActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.NoTitleFullscreenActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.ExtendingActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.ebean.BeanInjectedActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.rest.MyServiceActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.instancestate.SaveInstanceStateActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.afterinject.AfterInjectActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.greendroid.MyGreenDroidActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.nonconfiguration.NonConfigurationActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.sherlock.MySherlockActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.efragment.MyFragmentActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.afterviews.AfterViewsActivity_" />
+        <activity android:name="org.androidannotations.test15.menu.OptionsMenuActivity_" />
+        <activity android:name="org.androidannotations.test15.NoTitleFullscreenActivity_" />
+        <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.greendroid.MyGreenDroidActivity_" />
+        <activity android:name="org.androidannotations.test15.nonconfiguration.NonConfigurationActivity_" />
+        <activity android:name="org.androidannotations.test15.sherlock.MySherlockActivity_" />
+        <activity android:name="org.androidannotations.test15.efragment.MyFragmentActivity_" />
+        <activity android:name="org.androidannotations.test15.afterviews.AfterViewsActivity_" />
         <activity android:name=".SSLConnection_" />
-        <activity android:name="com.googlecode.androidannotations.test15.SeekBarChangeListenedActivity_" />
-        <activity android:name="com.googlecode.androidannotations.test15.AwaitingResultActivity_" />
+        <activity android:name="org.androidannotations.test15.SeekBarChangeListenedActivity_" />
+        <activity android:name="org.androidannotations.test15.AwaitingResultActivity_" />
 
-        <receiver android:name="com.googlecode.androidannotations.test15.ereceiver.MyReceiver_" />
+        <receiver android:name="org.androidannotations.test15.ereceiver.MyReceiver_" />
 
         <provider
-            android:name="com.googlecode.androidannotations.test15.eprovider.MyProvider_"
+            android:name="org.androidannotations.test15.eprovider.MyProvider_"
             android:authorities=""
             android:exported="false" />
 
         <service
-            android:name="com.googlecode.androidannotations.test15.eservice.MyService_"
+            android:name="org.androidannotations.test15.eservice.MyService_"
             exported="false" />
     </application>
 
diff --git a/AndroidAnnotations/functional-test-1-5/pom.xml b/AndroidAnnotations/functional-test-1-5/pom.xml
index 29433f4964..5649d3f0ee 100644
--- a/AndroidAnnotations/functional-test-1-5/pom.xml
+++ b/AndroidAnnotations/functional-test-1-5/pom.xml
@@ -4,7 +4,7 @@
 
 	<parent>
 		<artifactId>androidannotations-parent</artifactId>
-		<groupId>com.googlecode.androidannotations</groupId>
+		<groupId>org.androidannotations</groupId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
 
@@ -21,12 +21,12 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.androidannotations</groupId>
+			<groupId>org.androidannotations</groupId>
 			<artifactId>androidannotations-api</artifactId>
 		</dependency>
 		<dependency>
diff --git a/AndroidAnnotations/functional-test-1-5/res/layout/fragments.xml b/AndroidAnnotations/functional-test-1-5/res/layout/fragments.xml
index 0f06b35735..0a22cc686e 100644
--- a/AndroidAnnotations/functional-test-1-5/res/layout/fragments.xml
+++ b/AndroidAnnotations/functional-test-1-5/res/layout/fragments.xml
@@ -24,7 +24,7 @@
     <fragment
         android:id="@+id/myFragment"
         android:tag="myFragmentTag"
-        android:name="com.googlecode.androidannotations.test15.efragment.MyFragment_"
+        android:name="org.androidannotations.test15.efragment.MyFragment_"
         android:layout_width="0dp"
         android:layout_height="fill_parent"
         android:layout_weight="1" />
@@ -32,7 +32,7 @@
     <fragment
         android:id="@+id/mySupportFragment"
         android:tag="mySupportFragmentTag"
-        android:name="com.googlecode.androidannotations.test15.efragment.MySupportFragment_"
+        android:name="org.androidannotations.test15.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/java/com/actionbarsherlock/app/SherlockActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/com/actionbarsherlock/app/SherlockActivity.java
index 9fd88a3144..651866592f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/actionbarsherlock/app/SherlockActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/com/actionbarsherlock/app/SherlockActivity.java
@@ -60,4 +60,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return false;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AbstractActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AbstractActivity.java
similarity index 82%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AbstractActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AbstractActivity.java
index c5efd489c5..9527295f0c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AbstractActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AbstractActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.widget.Button;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.ViewById;
 
 @EActivity(R.layout.views_injected)
 public abstract class AbstractActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ActivityWithServices.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ActivityWithServices.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java
index cc5d004978..2df9480677 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ActivityWithServices.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -34,8 +34,8 @@
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.SystemService;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.SystemService;
 
 @EActivity
 public class ActivityWithServices extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ApplicationInjectedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ApplicationInjectedActivity.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ApplicationInjectedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ApplicationInjectedActivity.java
index db99d1b531..8e32506daf 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ApplicationInjectedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ApplicationInjectedActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.App;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication;
+import org.androidannotations.annotations.App;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.test15.roboguice.SampleRoboApplication;
 
 @EActivity
 public class ApplicationInjectedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AwaitingResultActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AwaitingResultActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java
index 1bfaee5c2f..84b5d103ec 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AwaitingResultActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/AwaitingResultActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.OnActivityResult;
 
 @EActivity(R.layout.views_injected)
 public class AwaitingResultActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/BackpressedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/BackpressedActivity.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/BackpressedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/BackpressedActivity.java
index ca67252f85..b9b1bb6e9f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/BackpressedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/BackpressedActivity.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity(R.layout.main)
 public class BackpressedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ClicksHandledActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ClicksHandledActivity.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ClicksHandledActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ClicksHandledActivity.java
index b44bb8e0a5..285338084d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ClicksHandledActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ClicksHandledActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.view.View;
 
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity(R.layout.clickable_widgets)
 public class ClicksHandledActivity extends EventsHandledAbstractActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/CustomData.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomData.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/CustomData.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomData.java
index 557933b990..aff2dca0aa 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/CustomData.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/CustomData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EmptyActivityWithLayout.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithLayout.java
similarity index 86%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EmptyActivityWithLayout.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithLayout.java
index 1af2244a06..79f7eedc33 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EmptyActivityWithLayout.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithLayout.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity(R.layout.main)
 public class EmptyActivityWithLayout extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EmptyActivityWithoutLayout.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithoutLayout.java
similarity index 86%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EmptyActivityWithoutLayout.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithoutLayout.java
index 93cbf4a8fe..defc8cc69d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EmptyActivityWithoutLayout.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EmptyActivityWithoutLayout.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity
 public class EmptyActivityWithoutLayout extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EventsHandledAbstractActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EventsHandledAbstractActivity.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EventsHandledAbstractActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EventsHandledAbstractActivity.java
index d854a946cd..0941c8e041 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/EventsHandledAbstractActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/EventsHandledAbstractActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.view.View;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtendingActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtendingActivity.java
similarity index 86%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtendingActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtendingActivity.java
index 2beefc1e71..6d4797bd82 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtendingActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtendingActivity.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity
 public class ExtendingActivity extends AbstractActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtraInjectedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtraInjectedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java
index e69e1d03b4..d098204830 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtraInjectedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.util.List;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Extra;
 
 @EActivity
 public class ExtraInjectedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/FragmentArguments.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentArguments.java
similarity index 83%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/FragmentArguments.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentArguments.java
index 814443b602..0ea58f5f8f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/FragmentArguments.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FragmentArguments.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.util.ArrayList;
 
 import android.app.Fragment;
 import android.os.Bundle;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.FragmentArg;
-import com.googlecode.androidannotations.test15.instancestate.MyGenericParcelableBean;
-import com.googlecode.androidannotations.test15.instancestate.MyGenericSerializableBean;
-import com.googlecode.androidannotations.test15.instancestate.MyParcelableBean;
-import com.googlecode.androidannotations.test15.instancestate.MySerializableBean;
+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;
 
 @EFragment
 public class FragmentArguments extends Fragment {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/FromHtmlActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FromHtmlActivity.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/FromHtmlActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FromHtmlActivity.java
index 72fd665f20..9c2b731182 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/FromHtmlActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FromHtmlActivity.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.FromHtml;
-import com.googlecode.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.FromHtml;
+import org.androidannotations.annotations.ViewById;
 
 @EActivity(R.layout.views_injected)
 public class FromHtmlActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ItemClicksHandledActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ItemClicksHandledActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java
index a89ba93ce3..9de7566043 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ItemClicksHandledActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Spinner;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.ItemClick;
-import com.googlecode.androidannotations.annotations.ItemLongClick;
-import com.googlecode.androidannotations.annotations.ItemSelect;
-import com.googlecode.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.ItemClick;
+import org.androidannotations.annotations.ItemLongClick;
+import org.androidannotations.annotations.ItemSelect;
+import org.androidannotations.annotations.ViewById;
 
 @EActivity(R.layout.item_clicks_handled)
 public class ItemClicksHandledActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/LongClicksHandledActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/LongClicksHandledActivity.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/LongClicksHandledActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/LongClicksHandledActivity.java
index 468b8cdd4d..2dc2764c20 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/LongClicksHandledActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/LongClicksHandledActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.view.View;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.LongClick;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.LongClick;
 
 @EActivity(R.layout.clickable_widgets)
 public class LongClicksHandledActivity extends EventsHandledAbstractActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/NoTitleFullscreenActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/NoTitleFullscreenActivity.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/NoTitleFullscreenActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/NoTitleFullscreenActivity.java
index 318bb7ef38..afdc25342b 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/NoTitleFullscreenActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/NoTitleFullscreenActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.Fullscreen;
-import com.googlecode.androidannotations.annotations.NoTitle;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Fullscreen;
+import org.androidannotations.annotations.NoTitle;
 
 @EActivity
 @NoTitle
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/SSLConnection.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SSLConnection.java
similarity index 84%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/SSLConnection.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SSLConnection.java
index e46599a2fd..9e30167eb0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/SSLConnection.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SSLConnection.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import org.apache.http.client.HttpClient;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.HttpsClient;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.HttpsClient;
 
 @EActivity
 public class SSLConnection extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/SeekBarChangeListenedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java
similarity index 84%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/SeekBarChangeListenedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java
index 47ec3e3a48..733df83e47 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/SeekBarChangeListenedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.widget.SeekBar;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.SeekBarProgressChange;
-import com.googlecode.androidannotations.annotations.SeekBarTouchStart;
-import com.googlecode.androidannotations.annotations.SeekBarTouchStop;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.SeekBarProgressChange;
+import org.androidannotations.annotations.SeekBarTouchStart;
+import org.androidannotations.annotations.SeekBarTouchStop;
 
 @EActivity(R.layout.seekbars)
 public class SeekBarChangeListenedActivity extends Activity {
@@ -76,4 +76,4 @@ void m11(SeekBar seekBar) {
 	void m12() {
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TextWatchedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TextWatchedActivity.java
similarity index 87%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TextWatchedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TextWatchedActivity.java
index 5b85e278c7..583a13a47c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TextWatchedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TextWatchedActivity.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.text.Editable;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.AfterTextChange;
-import com.googlecode.androidannotations.annotations.BeforeTextChange;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.TextChange;
+import org.androidannotations.annotations.AfterTextChange;
+import org.androidannotations.annotations.BeforeTextChange;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.TextChange;
 
 @EActivity(R.layout.main)
 public class TextWatchedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ThreadActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java
similarity index 83%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ThreadActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java
index 1e9fce294a..ae8aafb32a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ThreadActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.util.List;
 import java.util.Map;
@@ -21,10 +21,10 @@
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.test15.instancestate.MySerializableBean;
 
 @EActivity
 public class ThreadActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TouchesHandledActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TouchesHandledActivity.java
similarity index 90%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TouchesHandledActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TouchesHandledActivity.java
index d5125d7762..6c54b7bc3a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TouchesHandledActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TouchesHandledActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.Touch;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Touch;
 
 @EActivity(R.layout.clickable_widgets)
 public class TouchesHandledActivity extends EventsHandledAbstractActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TracedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TracedActivity.java
similarity index 85%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TracedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TracedActivity.java
index 13d79e584d..aefb9c8684 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TracedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TracedActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.io.IOException;
 import java.util.List;
@@ -24,12 +24,12 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.Transactional;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.test15.instancestate.MySerializableBean;
 
 @EActivity
 public class TracedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TransactionalActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TransactionalActivity.java
similarity index 82%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TransactionalActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TransactionalActivity.java
index 6336d0e628..8bf1c4e3f9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/TransactionalActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/TransactionalActivity.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import java.util.List;
 
 import android.app.Activity;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.test15.instancestate.MySerializableBean;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Transactional;
+import org.androidannotations.test15.instancestate.MySerializableBean;
 
 @EActivity
 public class TransactionalActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ViewsInjectedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ViewsInjectedActivity.java
similarity index 81%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ViewsInjectedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ViewsInjectedActivity.java
index 873717e5bc..75c1fcb8c3 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ViewsInjectedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ViewsInjectedActivity.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15;
+package org.androidannotations.test15;
 
 import android.app.Activity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.ViewById;
 
 @EActivity(R.layout.views_injected)
 public class ViewsInjectedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectActivity.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectActivity.java
index 92db96d22d..8973d700b2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectActivity.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterinject;
+package org.androidannotations.test15.afterinject;
 
 import android.app.Activity;
 import android.app.NotificationManager;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.SystemService;
+import org.androidannotations.annotations.AfterInject;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.SystemService;
 
 @EActivity
 public class AfterInjectActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectBean.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectBean.java
index f0e24a3b81..d9c978b882 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterinject/AfterInjectBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterinject/AfterInjectBean.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterinject;
+package org.androidannotations.test15.afterinject;
 
 import android.app.NotificationManager;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.SystemService;
+import org.androidannotations.annotations.AfterInject;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.SystemService;
 
 @EBean
 public class AfterInjectBean {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterviews/AfterViewBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewBean.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterviews/AfterViewBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewBean.java
index 9dd4a51a6e..233123bcb7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterviews/AfterViewBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewBean.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterviews;
+package org.androidannotations.test15.afterviews;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class AfterViewBean {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterviews/AfterViewsActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewsActivity.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterviews/AfterViewsActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewsActivity.java
index f0067a2c17..87a6de2efe 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/afterviews/AfterViewsActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/afterviews/AfterViewsActivity.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.afterviews;
+package org.androidannotations.test15.afterviews;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.test15.R;
 
 @EActivity(R.layout.main)
 public class AfterViewsActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/BeanInjectedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanInjectedActivity.java
similarity index 83%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/BeanInjectedActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanInjectedActivity.java
index 578c4762a7..134c8e4a2a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/BeanInjectedActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/BeanInjectedActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EActivity;
 
 @EActivity
 public class BeanInjectedActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/EmptyDependency.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EmptyDependency.java
similarity index 85%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/EmptyDependency.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EmptyDependency.java
index 8368c79e4f..cca5580490 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/EmptyDependency.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EmptyDependency.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class EmptyDependency {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/EnhancedClass.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EnhancedClass.java
similarity index 64%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/EnhancedClass.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EnhancedClass.java
index 06f8d528b4..f50c661f3a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/EnhancedClass.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/EnhancedClass.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -22,21 +22,21 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.App;
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.RootContext;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.annotations.res.StringRes;
-import com.googlecode.androidannotations.test15.ThreadActivity;
-import com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication;
+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;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.RootContext;
+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.annotations.res.StringRes;
+import org.androidannotations.test15.ThreadActivity;
+import org.androidannotations.test15.roboguice.SampleRoboApplication;
 
 /**
  * This class doesn't have any test, currently it's just there to show that
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SecondDependency.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SecondDependency.java
similarity index 85%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SecondDependency.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SecondDependency.java
index 4b2a964409..c3158bd01a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SecondDependency.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SecondDependency.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class SecondDependency {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeArrayAdapter.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeArrayAdapter.java
similarity index 88%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeArrayAdapter.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeArrayAdapter.java
index ca2e087ee4..e16e16230a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeArrayAdapter.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeArrayAdapter.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import android.content.Context;
 import android.widget.ArrayAdapter;
 
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class SomeArrayAdapter extends ArrayAdapter<String> {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeBean.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeBean.java
index 517179d18f..04293af3ba 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeBean.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 import android.content.Context;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.RootContext;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.RootContext;
 
 @EBean
 public class SomeBean {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeImplementation.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeImplementation.java
similarity index 85%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeImplementation.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeImplementation.java
index af63511944..e398fa999d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeImplementation.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeImplementation.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
-import com.googlecode.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.EBean;
 
 @EBean
 public class SomeImplementation implements SomeInterface {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeInterface.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeInterface.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeInterface.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeInterface.java
index 58e930e172..822ec68cc1 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeInterface.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeInterface.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
 public interface SomeInterface {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeSingleton.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeSingleton.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeSingleton.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeSingleton.java
index a9c3d5b64a..2ed5458bcd 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ebean/SomeSingleton.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/SomeSingleton.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ebean;
+package org.androidannotations.test15.ebean;
 
-import static com.googlecode.androidannotations.api.Scope.Singleton;
+import static org.androidannotations.api.Scope.Singleton;
 
 import android.content.Context;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.RootContext;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.RootContext;
 
 @EBean(scope = Singleton)
 public class SomeSingleton {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/AbstractFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/AbstractFragment.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/AbstractFragment.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/AbstractFragment.java
index 360a87c976..8b6b9a41c2 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/AbstractFragment.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/AbstractFragment.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.efragment;
+package org.androidannotations.test15.efragment;
 
 import android.app.Fragment;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.test15.ebean.SomeBean;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.test15.ebean.SomeBean;
 
 @EFragment
 public abstract class AbstractFragment extends Fragment {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/BeanWithFragments.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithFragments.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/BeanWithFragments.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithFragments.java
index c3b5917da9..78f1983c26 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/BeanWithFragments.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/BeanWithFragments.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.efragment;
+package org.androidannotations.test15.efragment;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.FragmentById;
-import com.googlecode.androidannotations.annotations.FragmentByTag;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.FragmentById;
+import org.androidannotations.annotations.FragmentByTag;
+import org.androidannotations.test15.R;
 
 @EBean
 public class BeanWithFragments {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MyFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java
similarity index 59%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MyFragment.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java
index 33a190c472..93955387b0 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MyFragment.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragment.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.efragment;
+package org.androidannotations.test15.efragment;
 
 import android.app.ActivityManager;
 import android.database.sqlite.SQLiteDatabase;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.App;
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.test15.R;
-import com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication;
+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.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.roboguice.SampleRoboApplication;
 
 @EFragment(R.layout.injected)
 public class MyFragment extends AbstractFragment {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MyFragmentActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragmentActivity.java
similarity index 78%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MyFragmentActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragmentActivity.java
index 7fd05277de..f32af52640 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MyFragmentActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MyFragmentActivity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.efragment;
+package org.androidannotations.test15.efragment;
 
 import android.support.v4.app.FragmentActivity;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.FragmentById;
-import com.googlecode.androidannotations.annotations.FragmentByTag;
-import com.googlecode.androidannotations.test15.R;
+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;
 
 @EActivity(R.layout.fragments)
 public class MyFragmentActivity extends FragmentActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MySupportFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragment.java
similarity index 58%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MySupportFragment.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragment.java
index 20ad32098d..510d508311 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/efragment/MySupportFragment.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/efragment/MySupportFragment.java
@@ -13,26 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.efragment;
+package org.androidannotations.test15.efragment;
 
 import android.app.ActivityManager;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.v4.app.Fragment;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.AfterInject;
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.App;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.Transactional;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.test15.ebean.SomeBean;
-import com.googlecode.androidannotations.test15.roboguice.SampleRoboApplication;
+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;
+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.ebean.SomeBean;
+import org.androidannotations.test15.roboguice.SampleRoboApplication;
 
 @EFragment
 public class MySupportFragment extends Fragment {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eprovider/MyProvider.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java
similarity index 72%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eprovider/MyProvider.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java
index f8c515e3ca..a074bb1288 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eprovider/MyProvider.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eprovider/MyProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eprovider;
+package org.androidannotations.test15.eprovider;
 
 import android.app.NotificationManager;
 import android.content.ContentProvider;
@@ -23,16 +23,16 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EProvider;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.sharedpreferences.Pref;
-import com.googlecode.androidannotations.test15.ebean.EnhancedClass;
-import com.googlecode.androidannotations.test15.eservice.MyService;
-import com.googlecode.androidannotations.test15.prefs.SomePrefs_;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EProvider;
+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.prefs.SomePrefs_;
 
 @EProvider
 public class MyProvider extends ContentProvider {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ereceiver/MyReceiver.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/MyReceiver.java
similarity index 70%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ereceiver/MyReceiver.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/MyReceiver.java
index 037c609c80..9b3b792857 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ereceiver/MyReceiver.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ereceiver/MyReceiver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ereceiver;
+package org.androidannotations.test15.ereceiver;
 
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
@@ -22,14 +22,14 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EReceiver;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.test15.ebean.EnhancedClass;
-import com.googlecode.androidannotations.test15.eservice.MyService;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EReceiver;
+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;
 
 @EReceiver
 public class MyReceiver extends BroadcastReceiver {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eservice/MyService.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java
similarity index 73%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eservice/MyService.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java
index 8c61f22d17..2ca3704cda 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eservice/MyService.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eservice/MyService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eservice;
+package org.androidannotations.test15.eservice;
 
 import android.app.IntentService;
 import android.app.NotificationManager;
@@ -21,13 +21,13 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EService;
-import com.googlecode.androidannotations.annotations.SystemService;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.test15.ebean.EnhancedClass;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EService;
+import org.androidannotations.annotations.SystemService;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.test15.ebean.EnhancedClass;
 
 @EService
 public class MyService extends IntentService {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eview/CustomButton.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eview/CustomButton.java
similarity index 72%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eview/CustomButton.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eview/CustomButton.java
index 9d633a4a4a..4945456885 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eview/CustomButton.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eview/CustomButton.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eview;
+package org.androidannotations.test15.eview;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.animation.Animation;
 import android.widget.Button;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.EView;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.res.AnimationRes;
-import com.googlecode.androidannotations.annotations.res.StringRes;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.EView;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.annotations.res.AnimationRes;
+import org.androidannotations.annotations.res.StringRes;
+import org.androidannotations.test15.R;
 
 @EView
 public class CustomButton extends Button {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayout.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayout.java
similarity index 66%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayout.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayout.java
index 5a0c607859..2cf50b0fb9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayout.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eviewgroup;
+package org.androidannotations.test15.eviewgroup;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -22,18 +22,18 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.Click;
-import com.googlecode.androidannotations.annotations.EViewGroup;
-import com.googlecode.androidannotations.annotations.LongClick;
-import com.googlecode.androidannotations.annotations.Touch;
-import com.googlecode.androidannotations.annotations.Trace;
-import com.googlecode.androidannotations.annotations.UiThread;
-import com.googlecode.androidannotations.annotations.ViewById;
-import com.googlecode.androidannotations.annotations.res.AnimationRes;
-import com.googlecode.androidannotations.annotations.res.StringRes;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.annotations.EViewGroup;
+import org.androidannotations.annotations.LongClick;
+import org.androidannotations.annotations.Touch;
+import org.androidannotations.annotations.Trace;
+import org.androidannotations.annotations.UiThread;
+import org.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.res.AnimationRes;
+import org.androidannotations.annotations.res.StringRes;
+import org.androidannotations.test15.R;
 
 @EViewGroup(R.layout.component)
 public class CustomFrameLayout extends FrameLayout {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
similarity index 78%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
index 911afe5245..326cf07925 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/eviewgroup/CustomFrameLayoutActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.eviewgroup;
+package org.androidannotations.test15.eviewgroup;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.test15.R;
 
 @EActivity(R.layout.main)
 public class CustomFrameLayoutActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/greendroid/MyGreenDroidActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/greendroid/MyGreenDroidActivity.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/greendroid/MyGreenDroidActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/greendroid/MyGreenDroidActivity.java
index 7f63fe7828..754511847c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/greendroid/MyGreenDroidActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/greendroid/MyGreenDroidActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.greendroid;
+package org.androidannotations.test15.greendroid;
 
 import greendroid.app.GDActivity;
 
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.test15.R;
 
 @EActivity(R.layout.main)
 public class MyGreenDroidActivity extends GDActivity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyGenericParcelableBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericParcelableBean.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyGenericParcelableBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericParcelableBean.java
index 0e571b860e..330521aff5 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyGenericParcelableBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericParcelableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyGenericSerializableBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericSerializableBean.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyGenericSerializableBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericSerializableBean.java
index 53546efa14..c0092d4461 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyGenericSerializableBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyGenericSerializableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyParcelableBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyParcelableBean.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyParcelableBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyParcelableBean.java
index 42c2e1653d..ee9e3816cf 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MyParcelableBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MyParcelableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MySerializableBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MySerializableBean.java
similarity index 94%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MySerializableBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MySerializableBean.java
index 4bcf26856e..df8f3dfdc9 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/MySerializableBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/MySerializableBean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import java.io.Serializable;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
index 33ccdf36aa..4044beee6d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/instancestate/SaveInstanceStateActivity.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.instancestate;
+package org.androidannotations.test15.instancestate;
 
 import java.util.ArrayList;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.InstanceState;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.InstanceState;
+import org.androidannotations.test15.R;
 
 @EActivity(R.layout.main)
 public class SaveInstanceStateActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java
index 31d69afb47..77ea98e0ea 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuActivity.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.menu;
+package org.androidannotations.test15.menu;
 
 import android.app.Activity;
 import android.view.MenuItem;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.test15.R;
 
 @EActivity
 @OptionsMenu({R.menu.my_menu, R.menu.my_menu2})
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuFragment.java
similarity index 76%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuFragment.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuFragment.java
index de5decd157..00e4869532 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuFragment.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuFragment.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.menu;
+package org.androidannotations.test15.menu;
 
 import android.app.Fragment;
 import android.view.MenuItem;
 
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.test15.R;
 
 @EFragment
 @OptionsMenu({R.menu.my_menu, R.menu.my_menu2})
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuSupportFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSupportFragment.java
similarity index 77%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuSupportFragment.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSupportFragment.java
index afd2dfb213..f80d4c9cd4 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/menu/OptionsMenuSupportFragment.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/menu/OptionsMenuSupportFragment.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.menu;
+package org.androidannotations.test15.menu;
 
 import android.support.v4.app.Fragment;
 import android.view.MenuItem;
 
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.test15.R;
 
 @EFragment
 @OptionsMenu({R.menu.my_menu, R.menu.my_menu2})
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
similarity index 68%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
index d7e10437e6..7ffebb6d2c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.nonconfiguration;
+package org.androidannotations.test15.nonconfiguration;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
-import com.googlecode.androidannotations.test15.ebean.EmptyDependency;
-import com.googlecode.androidannotations.test15.ebean.SomeImplementation;
-import com.googlecode.androidannotations.test15.ebean.SomeInterface;
+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;
 
 /**
  * TODO test that on configuration changes, the fields are reinjected
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/Car.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/Car.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/Car.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/Car.java
index df6060b2b2..b1253bf8fe 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/Car.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/Car.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/DatabaseHelper.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/DatabaseHelper.java
similarity index 96%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/DatabaseHelper.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/DatabaseHelper.java
index 86a2307f71..6503eac227 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/DatabaseHelper.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/DatabaseHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import java.sql.SQLException;
 
@@ -49,4 +49,4 @@ public void onCreate(SQLiteDatabase sqliteDatabase, ConnectionSource connectionS
 	public void onUpgrade(SQLiteDatabase sqliteDatabase, ConnectionSource connectionSource, int oldVer, int newVer) {
 	
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteActivity.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteActivity.java
index b7104934d0..abb56590df 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.OrmLiteDao;
 import com.j256.ormlite.dao.Dao;
 
 @EActivity
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteBean.java
similarity index 66%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteBean.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteBean.java
index f71f3ea0bf..8a303c655f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/OrmLiteBean.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteBean.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.OrmLiteDao;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.OrmLiteDao;
 
-import com.googlecode.androidannotations.test15.ormlite.User;
-import com.googlecode.androidannotations.test15.ormlite.UserDao;
-import com.googlecode.androidannotations.test15.ormlite.DatabaseHelper;
+import org.androidannotations.test15.ormlite.User;
+import org.androidannotations.test15.ormlite.UserDao;
+import org.androidannotations.test15.ormlite.DatabaseHelper;
 
 @EBean
 public class OrmLiteBean {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/User.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/User.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/User.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/User.java
index 5b615a0220..3ca5013e84 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/User.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/User.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/UserDao.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDao.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/UserDao.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDao.java
index f16a718ba1..fb0d671169 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/UserDao.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDao.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import com.j256.ormlite.dao.Dao;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/UserDaoImpl.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDaoImpl.java
similarity index 95%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/UserDaoImpl.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDaoImpl.java
index d7992b71d8..be11a977b8 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ormlite/UserDaoImpl.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ormlite/UserDaoImpl.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.ormlite;
+package org.androidannotations.test15.ormlite;
 
 import com.j256.ormlite.dao.BaseDaoImpl;
 import com.j256.ormlite.support.ConnectionSource;
@@ -29,4 +29,4 @@ public UserDaoImpl(ConnectionSource connectionSource, Class<User> dataClass) thr
 	public UserDaoImpl(ConnectionSource connectionSource, DatabaseTableConfig<User> tableConfig) throws SQLException {
 		super(connectionSource, tableConfig);
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ActivityDefaultPrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityDefaultPrefs.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ActivityDefaultPrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityDefaultPrefs.java
index 7e45de026c..4b8763f164 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ActivityDefaultPrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityDefaultPrefs.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
 
 @SharedPref(Scope.ACTIVITY_DEFAULT)
 public interface ActivityDefaultPrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ActivityPrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityPrefs.java
similarity index 82%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ActivityPrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityPrefs.java
index 401dbc197a..552d125b77 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ActivityPrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ActivityPrefs.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
 @SharedPref
 public interface ActivityPrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ApplicationDefaultPrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
index 4d9f7c1c7a..1bdc069a1f 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/ApplicationDefaultPrefs.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
 
 @SharedPref(Scope.APPLICATION_DEFAULT)
 public interface ApplicationDefaultPrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/DefaultPrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/DefaultPrefs.java
similarity index 82%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/DefaultPrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/DefaultPrefs.java
index 41fd786225..a047a8e734 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/DefaultPrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/DefaultPrefs.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
 @SharedPref
 public interface DefaultPrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/PrefsActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PrefsActivity.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/PrefsActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PrefsActivity.java
index 22078fe356..0399e2300a 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/PrefsActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PrefsActivity.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.sharedpreferences.Pref;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.sharedpreferences.Pref;
+import org.androidannotations.test15.R;
 
 @EActivity(R.layout.main)
 public class PrefsActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/PublicPrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PublicPrefs.java
similarity index 84%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/PublicPrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PublicPrefs.java
index e7a18a176b..154d443811 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/PublicPrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/PublicPrefs.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
 import android.content.Context;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
 
 @SharedPref(mode = Context.MODE_WORLD_WRITEABLE)
 public interface PublicPrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/SomePrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java
similarity index 66%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/SomePrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java
index f7626529e4..8323f35e90 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/SomePrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/SomePrefs.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultInt;
-import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultString;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
+import org.androidannotations.annotations.sharedpreferences.DefaultInt;
+import org.androidannotations.annotations.sharedpreferences.DefaultString;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
 
 @SharedPref(Scope.UNIQUE)
 public interface SomePrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/UniquePrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/UniquePrefs.java
similarity index 75%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/UniquePrefs.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/UniquePrefs.java
index 3d8706aa3a..804f95d46d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/UniquePrefs.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/prefs/UniquePrefs.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.prefs;
+package org.androidannotations.test15.prefs;
 
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
-import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
+import org.androidannotations.annotations.sharedpreferences.SharedPref;
+import org.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
 
 @SharedPref(Scope.UNIQUE)
 public interface UniquePrefs {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/res/ResActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/res/ResActivity.java
similarity index 78%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/res/ResActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/res/ResActivity.java
index 2594b27b4c..21146e3e32 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/res/ResActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/res/ResActivity.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.res;
+package org.androidannotations.test15.res;
 
 import android.app.Activity;
 import android.content.res.XmlResourceParser;
 import android.text.Spanned;
 import android.view.animation.Animation;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.res.HtmlRes;
-import com.googlecode.androidannotations.annotations.res.StringRes;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.res.HtmlRes;
+import org.androidannotations.annotations.res.StringRes;
+import org.androidannotations.test15.R;
 
 @EActivity(R.layout.main)
 public class ResActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/EBeanUsingService.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanUsingService.java
similarity index 76%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/EBeanUsingService.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanUsingService.java
index 380d5635ef..74fe22e509 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/EBeanUsingService.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EBeanUsingService.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.rest;
+package org.androidannotations.test15.rest;
 
-import com.googlecode.androidannotations.annotations.Background;
-import com.googlecode.androidannotations.annotations.EBean;
-import com.googlecode.androidannotations.annotations.rest.RestService;
+import org.androidannotations.annotations.Background;
+import org.androidannotations.annotations.EBean;
+import org.androidannotations.annotations.rest.RestService;
 
 @EBean
 public class EBeanUsingService {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/Event.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/Event.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/Event.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/Event.java
index af05d79b2a..2502aa0133 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/Event.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/Event.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.rest;
+package org.androidannotations.test15.rest;
 
 public class Event {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/EventList.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EventList.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/EventList.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EventList.java
index 5cc92b0332..6976999152 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/EventList.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/EventList.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.rest;
+package org.androidannotations.test15.rest;
 
 public class EventList {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/MyService.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
similarity index 84%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/MyService.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
index 5f99e46d5a..e79a256c2c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/MyService.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.rest;
+package org.androidannotations.test15.rest;
 
 import java.util.Set;
 
@@ -24,15 +24,15 @@
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-import com.googlecode.androidannotations.annotations.rest.Accept;
-import com.googlecode.androidannotations.annotations.rest.Delete;
-import com.googlecode.androidannotations.annotations.rest.Get;
-import com.googlecode.androidannotations.annotations.rest.Head;
-import com.googlecode.androidannotations.annotations.rest.Options;
-import com.googlecode.androidannotations.annotations.rest.Post;
-import com.googlecode.androidannotations.annotations.rest.Put;
-import com.googlecode.androidannotations.annotations.rest.Rest;
-import com.googlecode.androidannotations.api.rest.MediaType;
+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.Rest;
+import org.androidannotations.api.rest.MediaType;
 
 // if defined, the rootUrl will be added as a prefix to every request
 @Rest(rootUrl = "http://company.com/ajax/services", converters = { MappingJacksonHttpMessageConverter.class })
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/MyServiceActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyServiceActivity.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/MyServiceActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyServiceActivity.java
index 767be910e2..a8c64c2288 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/rest/MyServiceActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyServiceActivity.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.rest;
+package org.androidannotations.test15.rest;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.rest.RestService;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.rest.RestService;
 
 @EActivity
 public class MyServiceActivity extends Activity {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/ActivityWithRoboGuice.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
similarity index 82%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
index 430a3c6bf8..d2d28a9cf7 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/ActivityWithRoboGuice.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import java.text.DateFormat;
 import java.util.Date;
@@ -25,10 +25,10 @@
 import android.widget.TextView;
 
 import com.google.inject.Inject;
-import com.googlecode.androidannotations.annotations.AfterViews;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.RoboGuice;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.RoboGuice;
+import org.androidannotations.test15.R;
 
 /**
  * Adapted from http://pivotal.github.com/robolectric/roboguice.html
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/Counter.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/Counter.java
similarity index 91%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/Counter.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/Counter.java
index 81638abb37..f91e6f5c1e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/Counter.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/Counter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 public class Counter {
 	public int count = 0;
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
similarity index 82%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
index 35b21451a5..700573a943 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/MapActivityWithRoboGuice.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import android.app.Activity;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.RoboGuice;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.RoboGuice;
 
 //Commented because Maps is not Open Source
 @RoboGuice
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/RobolectricSampleModule.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/RobolectricSampleModule.java
similarity index 92%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/RobolectricSampleModule.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/RobolectricSampleModule.java
index 3e40fb4bea..426063544d 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/RobolectricSampleModule.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/RobolectricSampleModule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import roboguice.config.AbstractAndroidModule;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/SampleRoboApplication.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java
similarity index 80%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/SampleRoboApplication.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java
index aa59aae15e..631e5b7bbf 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/roboguice/SampleRoboApplication.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/roboguice/SampleRoboApplication.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.roboguice;
+package org.androidannotations.test15.roboguice;
 
 import java.util.List;
 
 import roboguice.application.RoboApplication;
 
 import com.google.inject.Module;
-import com.googlecode.androidannotations.annotations.Bean;
-import com.googlecode.androidannotations.annotations.EApplication;
-import com.googlecode.androidannotations.test15.ebean.EmptyDependency;
+import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.EApplication;
+import org.androidannotations.test15.ebean.EmptyDependency;
 
 @EApplication
 public class SampleRoboApplication extends RoboApplication {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/sherlock/MySherlockActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/sherlock/MySherlockActivity.java
similarity index 79%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/sherlock/MySherlockActivity.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/sherlock/MySherlockActivity.java
index 720645f576..49f2d23e7e 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/sherlock/MySherlockActivity.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/sherlock/MySherlockActivity.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.sherlock;
+package org.androidannotations.test15.sherlock;
 
 
 
 import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.MenuItem;
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.test15.R;
 
 @EActivity
 @OptionsMenu(R.menu.my_menu)
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/sherlock/MySherlockFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/sherlock/MySherlockFragment.java
similarity index 77%
rename from AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/sherlock/MySherlockFragment.java
rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/sherlock/MySherlockFragment.java
index bca711bce0..916e260d7c 100644
--- a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/sherlock/MySherlockFragment.java
+++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/sherlock/MySherlockFragment.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.test15.sherlock;
+package org.androidannotations.test15.sherlock;
 
 
 import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.MenuItem;
-import com.googlecode.androidannotations.annotations.EFragment;
-import com.googlecode.androidannotations.annotations.OptionsItem;
-import com.googlecode.androidannotations.annotations.OptionsMenu;
-import com.googlecode.androidannotations.test15.R;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.test15.R;
 
 @EFragment
 @OptionsMenu(R.menu.my_menu)
diff --git a/AndroidAnnotations/pom.xml b/AndroidAnnotations/pom.xml
index 36b18e859b..3bdc8c646f 100644
--- a/AndroidAnnotations/pom.xml
+++ b/AndroidAnnotations/pom.xml
@@ -8,7 +8,7 @@
 		<version>7</version>
 	</parent>
 
-	<groupId>com.googlecode.androidannotations</groupId>
+	<groupId>org.androidannotations</groupId>
 	<artifactId>androidannotations-parent</artifactId>
 	<version>3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -98,47 +98,47 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations</artifactId>
 				<version>${project.version}</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations-api</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations-api</artifactId>
 				<version>${project.version}</version>
 				<classifier>javadoc</classifier>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations-api</artifactId>
 				<version>${project.version}</version>
 				<classifier>sources</classifier>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations</artifactId>
 				<version>${project.version}</version>
 				<classifier>javadoc</classifier>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations</artifactId>
 				<version>${project.version}</version>
 				<classifier>sources</classifier>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>androidannotations-with-codemodel</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>com.googlecode.androidannotations</groupId>
+				<groupId>org.androidannotations</groupId>
 				<artifactId>functional-test-1-5</artifactId>
 				<version>${project.version}</version>
 			</dependency>