126 files changed, 391 insertions, 390 deletions
diff --git a/Android.mk b/Android.mk
index 0e3249e..2fe0643 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Jorge Ruesga
+# Copyright (C) 2013 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b35236d..a660dc3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ruesga.android.wallpapers.photophase"
+    package="org.cyanogenmod.wallpapers.photophase"
     android:versionCode="1005"
     android:versionName="1.0.3"
     android:installLocation="auto">
 
-    <original-package android:name="com.ruesga.android.wallpapers.photophase" />
+    <original-package android:name="org.cyanogenmod.wallpapers.photophase" />
 
     <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="18" />
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 741fd99..a7c94bf 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -1,5 +1,5 @@
 # Copyright (C) 2007 The Android Open Source Project
-# Copyright (C) 2013 Jorge Ruesga
+# Copyright (C) 2013 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index 633a606..e60324c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 
-   Copyright (c) 2012-2013, Jorge Ruesga
+   Copyright (c) 2012-2013, The CyanogenMod Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index ecefa3b..8deeadf 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@ transitions and effects.
 This source was released under the terms of
 [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license.
 
-Visit [Github](https://github.com/jruesga/PhotoPhase) to get the source and
-submit patches.
+Visit [CyanogenMod Github](https://github.com/CyanogenMod/android_packages_wallpapers_PhotoPhase)
+and [CyanogenMod Code Review](http://review.cyanogenmod.org/) to get the source
+and submit patches.
 
-Copyright © 2013 Jorge Ruesga
+Copyright © 2013 The CyanogenMod Project
diff --git a/libs/color-picker-view/README.md b/libs/color-picker-view/README.md
index 639745c..b26ef5a 100644
--- a/libs/color-picker-view/README.md
+++ b/libs/color-picker-view/README.md
@@ -15,4 +15,4 @@ This library is released under the [Apache 2.0]
 http://www.apache.org/licenses/LICENSE-2.0.html) license.
 
 Copyright © 2010 Daniel Nilsson
-Copyright © 2013 Jorge Ruesga
+Copyright © 2013 The CyanogenMod Project
diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java
index 5160057..ad0b9cf 100644
--- a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java
+++ b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/anim/cards_animation_up_left.xml b/res/anim/cards_animation_up_left.xml
index 4394e04..8ed954a 100644
--- a/res/anim/cards_animation_up_left.xml
+++ b/res/anim/cards_animation_up_left.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/anim/cards_animation_up_right.xml b/res/anim/cards_animation_up_right.xml
index ef97c49..0d04ec3 100644
--- a/res/anim/cards_animation_up_right.xml
+++ b/res/anim/cards_animation_up_right.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/anim/display_with_bounce.xml b/res/anim/display_with_bounce.xml
index 0aae381..e887968 100644
--- a/res/anim/display_with_bounce.xml
+++ b/res/anim/display_with_bounce.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/drawable-nodpi/bg_cid_oops.png b/res/drawable-nodpi/bg_cid_oops.png
new file mode 100644
index 0000000..f8486fb
--- /dev/null
+++ b/res/drawable-nodpi/bg_cid_oops.png
diff --git a/res/drawable-nodpi/bg_oops.png b/res/drawable-nodpi/bg_oops.png
deleted file mode 100644
index 095a6a6..0000000
--- a/res/drawable-nodpi/bg_oops.png
+++ /dev/null
diff --git a/res/drawable/card.xml b/res/drawable/card.xml
index 0e72cb1..f7b2b18 100644
--- a/res/drawable/card.xml
+++ b/res/drawable/card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/drawable/frame.xml b/res/drawable/frame.xml
index 90d7cff..fc4248f 100644
--- a/res/drawable/frame.xml
+++ b/res/drawable/frame.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/drawable/holo_selector.xml b/res/drawable/holo_selector.xml
index 4ec00a2..8f52dd4 100644
--- a/res/drawable/holo_selector.xml
+++ b/res/drawable/holo_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/album.xml b/res/layout/album.xml
index 43d8506..ea98e14 100644
--- a/res/layout/album.xml
+++ b/res/layout/album.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/album_info.xml b/res/layout/album_info.xml
index 3671871..a060a07 100644
--- a/res/layout/album_info.xml
+++ b/res/layout/album_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.ruesga.android.wallpapers.photophase.widgets.AlbumInfo
+<org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -76,4 +76,4 @@
         android:contentDescription="@null"
         style="@style/PhotoPhase.Album.MenuBar.Overflow" />
 
-</com.ruesga.android.wallpapers.photophase.widgets.AlbumInfo>
+</org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo>
diff --git a/res/layout/album_pictures.xml b/res/layout/album_pictures.xml
index b1c1372..d09291c 100644
--- a/res/layout/album_pictures.xml
+++ b/res/layout/album_pictures.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.ruesga.android.wallpapers.photophase.widgets.AlbumPictures xmlns:android="http://schemas.android.com/apk/res/android"
+<org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/card"
@@ -55,7 +55,7 @@
             style="@style/PhotoPhase.Album.MenuBar.Overflow" />
     </LinearLayout>
 
-    <com.ruesga.android.wallpapers.photophase.widgets.PicturesView
+    <org.cyanogenmod.wallpapers.photophase.widgets.PicturesView
         android:id="@+id/album_pictures_scroller"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -74,6 +74,6 @@
             <!-- Pictures go here -->
 
         </LinearLayout>
-    </com.ruesga.android.wallpapers.photophase.widgets.PicturesView>
+    </org.cyanogenmod.wallpapers.photophase.widgets.PicturesView>
 
-</com.ruesga.android.wallpapers.photophase.widgets.AlbumPictures>
+</org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures>
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml
index c23be5d..fe0e36c 100644
--- a/res/layout/choose_disposition_fragment.xml
+++ b/res/layout/choose_disposition_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/pref_disposition_description" />
 
-    <com.ruesga.android.wallpapers.photophase.widgets.DispositionView
+    <org.cyanogenmod.wallpapers.photophase.widgets.DispositionView
         android:id="@+id/disposition_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -49,11 +49,11 @@
         android:layout_alignRight="@id/disposition_view"
         android:layout_alignTop="@id/disposition_view"
         android:layout_alignBottom="@id/disposition_view">
-        <com.ruesga.android.wallpapers.photophase.widgets.ResizeFrame
+        <org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame
             android:id="@+id/resize_frame"
             android:layout_width="1dp"
             android:layout_height="1dp">
-        </com.ruesga.android.wallpapers.photophase.widgets.ResizeFrame>
+        </org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame>
     </FrameLayout>
 
 </RelativeLayout>
diff --git a/res/layout/choose_picture_fragment.xml b/res/layout/choose_picture_fragment.xml
index aabf55a..402f381 100644
--- a/res/layout/choose_picture_fragment.xml
+++ b/res/layout/choose_picture_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.ruesga.android.wallpapers.photophase.widgets.VerticalEndlessScroller
+<org.cyanogenmod.wallpapers.photophase.widgets.VerticalEndlessScroller
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -22,12 +22,12 @@
     android:fillViewport="true"
     android:scrollbars="none">
 
-    <com.ruesga.android.wallpapers.photophase.widgets.CardLayout
+    <org.cyanogenmod.wallpapers.photophase.widgets.CardLayout
         android:id="@+id/albums_panel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingTop="@dimen/small_margin" />
 
-</com.ruesga.android.wallpapers.photophase.widgets.VerticalEndlessScroller>
+</org.cyanogenmod.wallpapers.photophase.widgets.VerticalEndlessScroller>
 
diff --git a/res/layout/color_picker_pref_item.xml b/res/layout/color_picker_pref_item.xml
index f841cbe..a3d4a6c 100644
--- a/res/layout/color_picker_pref_item.xml
+++ b/res/layout/color_picker_pref_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/picture_item.xml b/res/layout/picture_item.xml
index 24bb5eb..28ee0d5 100644
--- a/res/layout/picture_item.xml
+++ b/res/layout/picture_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/preference_widget_seekbar.xml b/res/layout/preference_widget_seekbar.xml
index c76ab06..ba4dc5c 100644
--- a/res/layout/preference_widget_seekbar.xml
+++ b/res/layout/preference_widget_seekbar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2013 The Android Open Source Project
-     Copyright (C) 2013 Jorge Ruesga
+     Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/preference_widget_seekbar_progress.xml b/res/layout/preference_widget_seekbar_progress.xml
index 4fe5248..b17b04c 100644
--- a/res/layout/preference_widget_seekbar_progress.xml
+++ b/res/layout/preference_widget_seekbar_progress.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2013 The Android Open Source Project
-     Copyright (C) 2013 Jorge Ruesga
+     Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/menu/album_actions.xml b/res/menu/album_actions.xml
index 8cb8324..a01d014 100644
--- a/res/menu/album_actions.xml
+++ b/res/menu/album_actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/menu/albums.xml b/res/menu/albums.xml
index 4777b2d..b2c5cb8 100644
--- a/res/menu/albums.xml
+++ b/res/menu/albums.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/menu/dispositions.xml b/res/menu/dispositions.xml
index 401116b..e167992 100644
--- a/res/menu/dispositions.xml
+++ b/res/menu/dispositions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/menu/main.xml b/res/menu/main.xml
index ac72da5..772ec04 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/menu/pictures_actions.xml b/res/menu/pictures_actions.xml
index ba57eb3..f1eecc5 100644
--- a/res/menu/pictures_actions.xml
+++ b/res/menu/pictures_actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/raw/color_fragment_shader.glsl b/res/raw/color_fragment_shader.glsl
index fcae83e..d1ad102 100644
--- a/res/raw/color_fragment_shader.glsl
+++ b/res/raw/color_fragment_shader.glsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/raw/color_vertex_shader.glsl b/res/raw/color_vertex_shader.glsl
index 7f07bfd..c1143e5 100644
--- a/res/raw/color_vertex_shader.glsl
+++ b/res/raw/color_vertex_shader.glsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/raw/default_fragment_shader.glsl b/res/raw/default_fragment_shader.glsl
index b66a3de..55cbf0b 100644
--- a/res/raw/default_fragment_shader.glsl
+++ b/res/raw/default_fragment_shader.glsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/raw/default_vertex_shader.glsl b/res/raw/default_vertex_shader.glsl
index 9572607..dad4d5a 100644
--- a/res/raw/default_vertex_shader.glsl
+++ b/res/raw/default_vertex_shader.glsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/raw/mix_fragment_shader.glsl b/res/raw/mix_fragment_shader.glsl
index fb253e4..df80f89 100644
--- a/res/raw/mix_fragment_shader.glsl
+++ b/res/raw/mix_fragment_shader.glsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/raw/mix_vertex_shader.glsl b/res/raw/mix_vertex_shader.glsl
index 9572607..dad4d5a 100644
--- a/res/raw/mix_vertex_shader.glsl
+++ b/res/raw/mix_vertex_shader.glsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/values-es/plurals.xml b/res/values-es/plurals.xml
index 951a797..f7dd946 100644
--- a/res/values-es/plurals.xml
+++ b/res/values-es/plurals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6f4dc14..ab57466 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@
     <string name="pref_disposition_description">Presiona una celda durante un segundo para seleccionarla. Entonces arrastra y suelta los bordes de la celda para redimensionarla</string>
     <string name="pref_disposition_unable_delete_advise">No es posible borrar la celda seleccionada</string>
     <string name="pref_about">Acerca de</string>
-    <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 Jorge Ruesga</string>
+    <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>
     <string name="refresh_intervals_disabled">Deshabilitado</string>
     <string name="refresh_intervals_1h">1 hora</string>
     <string name="refresh_intervals_2h">2 horas</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 557bb1a..0973569 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index 705cf4e..1c94cab 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values-sw720dp-w1280dp/dimens.xml b/res/values-sw720dp-w1280dp/dimens.xml
index f5fa5d2..c0d9720 100644
--- a/res/values-sw720dp-w1280dp/dimens.xml
+++ b/res/values-sw720dp-w1280dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 4844e48..4868a22 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ca7a10f..9375747 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d605c22..a944c45 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/config.xml b/res/values/config.xml
index 1ca11e8..41eab32 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fcf7aec..92e4643 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 3174290..5611ae7 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/plurals.xml b/res/values/plurals.xml
index 4e514fa..e78ea99 100644
--- a/res/values/plurals.xml
+++ b/res/values/plurals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 854d79c..7b76a66 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@
     <string name="pref_disposition_unable_delete_advise">Unable to delete the selected frame</string>
 
     <string name="pref_about">About</string>
-    <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 Jorge Ruesga</string>
+    <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>
 
     <!-- Refresh intervals -->
     <string name="refresh_intervals_disabled">Disabled</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6586043..45387e5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 19c9e70..666828e 100644
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
         android:title="@string/pref_general_settings">
 
         <!-- Dim screen -->
-        <com.ruesga.android.wallpapers.photophase.preferences.SeekBarProgressPreference
+        <org.cyanogenmod.wallpapers.photophase.preferences.SeekBarProgressPreference
             android:key="ui_wallpaper_dim"
             android:title="@string/pref_general_settings_wallpaper_dim"
             android:summary="@string/pref_general_settings_wallpaper_dim_summary"
@@ -30,7 +30,7 @@
             android:defaultValue="0" />
 
         <!-- Background color -->
-        <com.ruesga.android.wallpapers.photophase.widgets.ColorPickerPreference
+        <org.cyanogenmod.wallpapers.photophase.widgets.ColorPickerPreference
             android:key="ui_background_color"
             android:title="@string/pref_general_settings_background_color"
             android:summary="@string/pref_general_settings_background_color_summary"
@@ -73,7 +73,7 @@
             android:defaultValue="@array/transitions_default" />
 
         <!-- Transitions Interval -->
-        <com.ruesga.android.wallpapers.photophase.preferences.SeekBarProgressPreference
+        <org.cyanogenmod.wallpapers.photophase.preferences.SeekBarProgressPreference
             android:key="ui_transition_interval"
             android:title="@string/pref_general_transitions_interval"
             android:summary="@string/pref_general_transitions_interval_summary"
diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml
index f63528f..db45326 100644
--- a/res/xml/preferences_headers.xml
+++ b/res/xml/preferences_headers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
         android:title="@string/pref_general"
-        android:fragment="com.ruesga.android.wallpapers.photophase.preferences.GeneralPreferenceFragment"
+        android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.GeneralPreferenceFragment"
         android:summary="@string/pref_general_summary" />
     <header
         android:title="@string/pref_media"
-        android:fragment="com.ruesga.android.wallpapers.photophase.preferences.MediaPreferenceFragment"
+        android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.MediaPreferenceFragment"
         android:summary="@string/pref_media_summary" />
     <header
         android:title="@string/pref_layout"
-        android:fragment="com.ruesga.android.wallpapers.photophase.preferences.LayoutPreferenceFragment"
+        android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.LayoutPreferenceFragment"
         android:summary="@string/pref_layout_summary" />
     <header
         android:title="@string/pref_about"
diff --git a/res/xml/preferences_layout.xml b/res/xml/preferences_layout.xml
index 5445f09..7d2a9f2 100644
--- a/res/xml/preferences_layout.xml
+++ b/res/xml/preferences_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:photophase="http://schemas.android.com/apk/res/com.ruesga.android.wallpapers.photophase">
+    xmlns:photophase="http://schemas.android.com/apk/res/org.cyanogenmod.wallpapers.photophase">
 
     <!-- Disposition -->
     <PreferenceCategory
@@ -28,7 +28,7 @@
             android:key="ui_disposition_portrait"
             android:title="@string/pref_disposition_portrait"
             android:summary="@string/pref_disposition_portrait_summary"
-            android:fragment="com.ruesga.android.wallpapers.photophase.preferences.PortraitDispositionFragment"
+            android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.PortraitDispositionFragment"
             android:persistent="false" />
 
         <!-- Landscape -->
@@ -36,7 +36,7 @@
             android:key="ui_disposition_landscape"
             android:title="@string/pref_disposition_landscape"
             android:summary="@string/pref_disposition_landscape_summary"
-            android:fragment="com.ruesga.android.wallpapers.photophase.preferences.LandscapeDispositionFragment"
+            android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.LandscapeDispositionFragment"
             android:persistent="false" />
 
     </PreferenceCategory>
diff --git a/res/xml/preferences_media.xml b/res/xml/preferences_media.xml
index d07f8a9..f37379f 100644
--- a/res/xml/preferences_media.xml
+++ b/res/xml/preferences_media.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
             android:key="ui_media_albums"
             android:title="@string/pref_media_albums"
             android:summary="@string/pref_media_albums_summary"
-            android:fragment="com.ruesga.android.wallpapers.photophase.preferences.ChoosePicturesFragment"
+            android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.ChoosePicturesFragment"
             android:persistent="false" />
 
         <!--  Auto select new albums -->
diff --git a/res/xml/wallpaper.xml b/res/xml/wallpaper.xml
index facccfe..93e7698 100644
--- a/res/xml/wallpaper.xml
+++ b/res/xml/wallpaper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 Jorge Ruesga
+<!-- Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,4 +17,4 @@
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
     android:thumbnail="@drawable/wallpaper_thumb"
     android:description="@string/app_description"
-    android:settingsActivity="com.ruesga.android.wallpapers.photophase.preferences.PhotoPhasePreferences" />
-\ No newline at end of file
+    android:settingsActivity="org.cyanogenmod.wallpapers.photophase.preferences.PhotoPhasePreferences" />
+\ No newline at end of file
diff --git a/src/com/ruesga/android/wallpapers/photophase/AndroidHelper.java b/src/org/cyanogenmod/wallpapers/photophase/AndroidHelper.java
index b7b7bfd..5b3aff1 100644
--- a/src/com/ruesga/android/wallpapers/photophase/AndroidHelper.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/AndroidHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/com/ruesga/android/wallpapers/photophase/Colors.java b/src/org/cyanogenmod/wallpapers/photophase/Colors.java
index 94de590..925e058 100644
--- a/src/com/ruesga/android/wallpapers/photophase/Colors.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/Colors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.Context;
 import android.content.res.Resources;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 
 /**
  * A class that defines some wallpaper GLColor colors.
diff --git a/src/com/ruesga/android/wallpapers/photophase/EGLWallpaperService.java b/src/org/cyanogenmod/wallpapers/photophase/EGLWallpaperService.java
index 896a758..9effe8c 100644
--- a/src/com/ruesga/android/wallpapers/photophase/EGLWallpaperService.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/EGLWallpaperService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.Context;
 import android.opengl.GLSurfaceView;
diff --git a/src/com/ruesga/android/wallpapers/photophase/FixedQueue.java b/src/org/cyanogenmod/wallpapers/photophase/FixedQueue.java
index b59d7ba..398785f 100644
--- a/src/com/ruesga/android/wallpapers/photophase/FixedQueue.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/FixedQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/ruesga/android/wallpapers/photophase/GLES20WallpaperService.java b/src/org/cyanogenmod/wallpapers/photophase/GLES20WallpaperService.java
index f872d8e..fdd8b5b 100644
--- a/src/com/ruesga/android/wallpapers/photophase/GLES20WallpaperService.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/GLES20WallpaperService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/GLESSurfaceDispatcher.java b/src/org/cyanogenmod/wallpapers/photophase/GLESSurfaceDispatcher.java
index 96b889f..7634a63 100644
--- a/src/com/ruesga/android/wallpapers/photophase/GLESSurfaceDispatcher.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/GLESSurfaceDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.opengl.GLSurfaceView;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/GLESWallpaperService.java b/src/org/cyanogenmod/wallpapers/photophase/GLESWallpaperService.java
index f2c9627..8ddb443 100644
--- a/src/com/ruesga/android/wallpapers/photophase/GLESWallpaperService.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/GLESWallpaperService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.opengl.GLSurfaceView;
 import android.opengl.GLSurfaceView.Renderer;
diff --git a/src/com/ruesga/android/wallpapers/photophase/MediaPictureDiscoverer.java b/src/org/cyanogenmod/wallpapers/photophase/MediaPictureDiscoverer.java
index c2aa116..4228abf 100644
--- a/src/com/ruesga/android/wallpapers/photophase/MediaPictureDiscoverer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/MediaPictureDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -25,7 +25,7 @@ import android.os.AsyncTask.Status;
 import android.provider.MediaStore;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/ruesga/android/wallpapers/photophase/PhotoFrame.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
index a2a1f6c..78fc265 100644
--- a/src/com/ruesga/android/wallpapers/photophase/PhotoFrame.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.Context;
 import android.graphics.RectF;
 import android.opengl.GLES20;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseActivity.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseActivity.java
index 052bbcb..973618d 100644
--- a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseActivity.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -30,8 +30,8 @@ import android.view.View.OnTouchListener;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.ruesga.android.wallpapers.photophase.preferences.PhotoPhasePreferences;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider;
+import org.cyanogenmod.wallpapers.photophase.preferences.PhotoPhasePreferences;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider;
 
 /**
  * A testing activity to simulate the PhotoPhase Live Wallpaper inside an GLES activity.
diff --git a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseRenderer.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
index 0df0ace..f57d53b 100644
--- a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseRenderer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -36,16 +36,16 @@ import android.opengl.Matrix;
 import android.os.Handler;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.preferences.TouchAction;
-import com.ruesga.android.wallpapers.photophase.shapes.ColorShape;
-import com.ruesga.android.wallpapers.photophase.shapes.OopsShape;
-import com.ruesga.android.wallpapers.photophase.transitions.Transition;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.preferences.TouchAction;
+import org.cyanogenmod.wallpapers.photophase.shapes.ColorShape;
+import org.cyanogenmod.wallpapers.photophase.shapes.OopsShape;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transition;
 
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
diff --git a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseWallpaper.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaper.java
index f2ceeed..625212c 100644
--- a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseWallpaper.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.app.ActivityManager;
 import android.app.WallpaperManager;
@@ -26,8 +26,8 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.ViewConfiguration;
 
-import com.ruesga.android.wallpapers.photophase.GLESWallpaperService.GLESEngineListener;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider;
+import org.cyanogenmod.wallpapers.photophase.GLESWallpaperService.GLESEngineListener;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseWallpaperWorld.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
index e44e250..0310b58 100644
--- a/src/com/ruesga/android/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -22,12 +22,12 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.transitions.Transition;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transition;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/ruesga/android/wallpapers/photophase/StorageHelper.java b/src/org/cyanogenmod/wallpapers/photophase/StorageHelper.java
index f8b95a3..9d73313 100644
--- a/src/com/ruesga/android/wallpapers/photophase/StorageHelper.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/StorageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.util.Log;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/TextureManager.java b/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java
index 45c14ca..6c8de05 100644
--- a/src/com/ruesga/android/wallpapers/photophase/TextureManager.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -28,13 +28,13 @@ import android.os.Handler;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.ruesga.android.wallpapers.photophase.FixedQueue.EmptyQueueException;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
-import com.ruesga.android.wallpapers.photophase.MediaPictureDiscoverer.OnMediaPictureDiscoveredListener;
-import com.ruesga.android.wallpapers.photophase.effects.Effects;
+import org.cyanogenmod.wallpapers.photophase.FixedQueue.EmptyQueueException;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.MediaPictureDiscoverer.OnMediaPictureDiscoveredListener;
+import org.cyanogenmod.wallpapers.photophase.effects.Effects;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/ruesga/android/wallpapers/photophase/TextureRequestor.java b/src/org/cyanogenmod/wallpapers/photophase/TextureRequestor.java
index 7836dd1..9c62eb2 100644
--- a/src/com/ruesga/android/wallpapers/photophase/TextureRequestor.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/TextureRequestor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase;
 
 import android.graphics.RectF;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 
 /**
  * An interface that defines an object as able to request textures.
diff --git a/src/com/ruesga/android/wallpapers/photophase/animations/AlbumsFlip3dAnimationController.java b/src/org/cyanogenmod/wallpapers/photophase/animations/AlbumsFlip3dAnimationController.java
index 0188d84..228f827 100644
--- a/src/com/ruesga/android/wallpapers/photophase/animations/AlbumsFlip3dAnimationController.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/animations/AlbumsFlip3dAnimationController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ruesga.android.wallpapers.photophase.animations;
+package org.cyanogenmod.wallpapers.photophase.animations;
 
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -21,10 +21,10 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
 
-import com.ruesga.android.wallpapers.photophase.model.Album;
-import com.ruesga.android.wallpapers.photophase.widgets.AlbumInfo;
-import com.ruesga.android.wallpapers.photophase.widgets.AlbumPictures;
-import com.ruesga.android.wallpapers.photophase.widgets.AlbumPictures.CallbacksListener;
+import org.cyanogenmod.wallpapers.photophase.model.Album;
+import org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo;
+import org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures;
+import org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures.CallbacksListener;
 
 /**
  * A class that manages a flip 3d effect of an album
diff --git a/src/com/ruesga/android/wallpapers/photophase/animations/Evaluators.java b/src/org/cyanogenmod/wallpapers/photophase/animations/Evaluators.java
index b78f265..a0e52aa 100644
--- a/src/com/ruesga/android/wallpapers/photophase/animations/Evaluators.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/animations/Evaluators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.animations;
+package org.cyanogenmod.wallpapers.photophase.animations;
 
 import android.animation.IntEvaluator;
 import android.view.View;
diff --git a/src/com/ruesga/android/wallpapers/photophase/animations/Flip3dAnimation.java b/src/org/cyanogenmod/wallpapers/photophase/animations/Flip3dAnimation.java
index 786f1ef..0196dc5 100644
--- a/src/com/ruesga/android/wallpapers/photophase/animations/Flip3dAnimation.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/animations/Flip3dAnimation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ruesga.android.wallpapers.photophase.animations;
+package org.cyanogenmod.wallpapers.photophase.animations;
 
 import android.graphics.Camera;
 import android.graphics.Matrix;
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/BlurEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/BlurEffect.java
index 857fdc6..465cb99 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/BlurEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/BlurEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/Effects.java b/src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java
index 796cc2d..0ab3f6c 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/Effects.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.graphics.Color;
 import android.media.effect.Effect;
 import android.media.effect.EffectContext;
 import android.media.effect.EffectFactory;
 
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/EmbossEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/EmbossEffect.java
index b67458b..691ef39 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/EmbossEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/EmbossEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/GlowEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/GlowEffect.java
index 25f1143..8520e09 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/GlowEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/GlowEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/HalftoneEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java
index 7f7bb4c..07da491 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/HalftoneEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,13 +19,13 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 import android.opengl.GLES20;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 
 /**
  * A halftone effect<br/>
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/MirrorEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/MirrorEffect.java
index d9fef06..27233d2 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/MirrorEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/MirrorEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/NullEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/NullEffect.java
index 8bc6c42..5a8b520 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/NullEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/NullEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/OutlineEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/OutlineEffect.java
index 2652b89..8dc7854 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/OutlineEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/OutlineEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/PhotoPhaseEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/PhotoPhaseEffect.java
index 3d2c0fd..2fd0e2b 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/PhotoPhaseEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/PhotoPhaseEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.Effect;
 import android.media.effect.EffectContext;
@@ -22,7 +22,7 @@ import android.media.effect.EffectFactory;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/PhotoPhaseEffectFactory.java b/src/org/cyanogenmod/wallpapers/photophase/effects/PhotoPhaseEffectFactory.java
index 0e3a027..450bb47 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/PhotoPhaseEffectFactory.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/PhotoPhaseEffectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 /**
  * A class that defines the own PhotoPhase's effects implementation. This class follows the
@@ -29,7 +29,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_BLUR = "com.ruesga.android.wallpapers.photophase.effects.BlurEffect";
+    public static final String EFFECT_BLUR = "org.cyanogenmod.wallpapers.photophase.effects.BlurEffect";
 
     /**
      * <p>Applies an emboss effect to the image.</p>
@@ -38,7 +38,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_EMBOSS = "com.ruesga.android.wallpapers.photophase.effects.EmbossEffect";
+    public static final String EFFECT_EMBOSS = "org.cyanogenmod.wallpapers.photophase.effects.EmbossEffect";
 
     /**
      * <p>Applies a glow effect to the image.</p>
@@ -47,7 +47,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_GLOW = "com.ruesga.android.wallpapers.photophase.effects.GlowEffect";
+    public static final String EFFECT_GLOW = "org.cyanogenmod.wallpapers.photophase.effects.GlowEffect";
 
     /**
      * <p>Applies a halftone effect to the image.</p>
@@ -61,7 +61,7 @@ public class PhotoPhaseEffectFactory {
      * </tr>
      * </table>
      */
-    public static final String EFFECT_HALFTONE = "com.ruesga.android.wallpapers.photophase.effects.HalftoneEffect";
+    public static final String EFFECT_HALFTONE = "org.cyanogenmod.wallpapers.photophase.effects.HalftoneEffect";
 
     /**
      * <p>Applies a mirror effect to the image.</p>
@@ -70,7 +70,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_MIRROR = "com.ruesga.android.wallpapers.photophase.effects.MirrorEffect";
+    public static final String EFFECT_MIRROR = "org.cyanogenmod.wallpapers.photophase.effects.MirrorEffect";
 
     /**
      * <p>Doesn't apply any effect.</p>
@@ -79,7 +79,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_NULL = "com.ruesga.android.wallpapers.photophase.effects.NullEffect";
+    public static final String EFFECT_NULL = "org.cyanogenmod.wallpapers.photophase.effects.NullEffect";
 
     /**
      * <p>Applies an outline effect to the image.</p>
@@ -88,7 +88,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_OUTLINE = "com.ruesga.android.wallpapers.photophase.effects.OutlineEffect";
+    public static final String EFFECT_OUTLINE = "org.cyanogenmod.wallpapers.photophase.effects.OutlineEffect";
 
     /**
      * <p>Applies a pixelate effect to the image.</p>
@@ -102,7 +102,7 @@ public class PhotoPhaseEffectFactory {
      * </tr>
      * </table>
      */
-    public static final String EFFECT_PIXELATE = "com.ruesga.android.wallpapers.photophase.effects.PixelateEffect";
+    public static final String EFFECT_PIXELATE = "org.cyanogenmod.wallpapers.photophase.effects.PixelateEffect";
 
     /**
      * <p>Applies a pop art (Warhol) effect to the image.</p>
@@ -111,7 +111,7 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_POPART = "com.ruesga.android.wallpapers.photophase.effects.PopArtEffect";
+    public static final String EFFECT_POPART = "org.cyanogenmod.wallpapers.photophase.effects.PopArtEffect";
 
     /**
      * <p>Applies a TV scan line effect to the image.</p>
@@ -120,5 +120,5 @@ public class PhotoPhaseEffectFactory {
      * <tr><td>Parameter name</td><td>Meaning</td><td>Valid values</td></tr>
      * </table>
      */
-    public static final String EFFECT_SCANLINES = "com.ruesga.android.wallpapers.photophase.effects.ScanlinesEffect";
+    public static final String EFFECT_SCANLINES = "org.cyanogenmod.wallpapers.photophase.effects.ScanlinesEffect";
 }
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/PixelateEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/PixelateEffect.java
index 1f7ea70..fe37d4c 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/PixelateEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/PixelateEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,13 +19,13 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 import android.opengl.GLES20;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 
 /**
  * A pixelate effect<br/>
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/PopArtEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/PopArtEffect.java
index cda5fb0..df2b18c 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/PopArtEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/PopArtEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://kodemongki.blogspot.com.es/2011/06/kameraku-custom-shader-effects-example.html
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/effects/ScanlinesEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java
index 8343ed2..cd78307 100644
--- a/src/com/ruesga/android/wallpapers/photophase/effects/ScanlinesEffect.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 //   http://cpansearch.perl.org/src/CORION/App-VideoMixer-0.02/filters/scanlines.glsl
 //
 
-package com.ruesga.android.wallpapers.photophase.effects;
+package org.cyanogenmod.wallpapers.photophase.effects;
 
 import android.media.effect.EffectContext;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/model/Album.java b/src/org/cyanogenmod/wallpapers/photophase/model/Album.java
index e7a015c..83f067d 100644
--- a/src/com/ruesga/android/wallpapers/photophase/model/Album.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/model/Album.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.model;
+package org.cyanogenmod.wallpapers.photophase.model;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/model/Disposition.java b/src/org/cyanogenmod/wallpapers/photophase/model/Disposition.java
index 2a1b6b2..35cc0e9 100644
--- a/src/com/ruesga/android/wallpapers/photophase/model/Disposition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/model/Disposition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.model;
+package org.cyanogenmod.wallpapers.photophase.model;
 
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 
 /**
  * A class that holds a {@link PhotoFrame} disposition.
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/ChoosePicturesFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
index dad1982..6e41308 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/ChoosePicturesFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -34,15 +34,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.animations.AlbumsFlip3dAnimationController;
-import com.ruesga.android.wallpapers.photophase.model.Album;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.widgets.AlbumInfo;
-import com.ruesga.android.wallpapers.photophase.widgets.AlbumPictures;
-import com.ruesga.android.wallpapers.photophase.widgets.CardLayout;
-import com.ruesga.android.wallpapers.photophase.widgets.VerticalEndlessScroller;
-import com.ruesga.android.wallpapers.photophase.widgets.VerticalEndlessScroller.OnEndScrollListener;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.animations.AlbumsFlip3dAnimationController;
+import org.cyanogenmod.wallpapers.photophase.model.Album;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo;
+import org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures;
+import org.cyanogenmod.wallpapers.photophase.widgets.CardLayout;
+import org.cyanogenmod.wallpapers.photophase.widgets.VerticalEndlessScroller;
+import org.cyanogenmod.wallpapers.photophase.widgets.VerticalEndlessScroller.OnEndScrollListener;
 
 import java.io.File;
 import java.text.DateFormat;
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/DispositionFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java
index 5ce902e..b0204c3 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/DispositionFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.content.Intent;
@@ -27,11 +27,11 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
-import com.ruesga.android.wallpapers.photophase.widgets.DispositionView;
-import com.ruesga.android.wallpapers.photophase.widgets.DispositionView.OnFrameSelectedListener;
-import com.ruesga.android.wallpapers.photophase.widgets.ResizeFrame;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.widgets.DispositionView;
+import org.cyanogenmod.wallpapers.photophase.widgets.DispositionView.OnFrameSelectedListener;
+import org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame;
 
 import java.util.List;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/GeneralPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
index 02cf741..4dd6da8 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,12 +29,12 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceFragment;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.Colors;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.preferences.SeekBarProgressPreference.OnDisplayProgress;
-import com.ruesga.android.wallpapers.photophase.widgets.ColorPickerPreference;
+import org.cyanogenmod.wallpapers.photophase.Colors;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.preferences.SeekBarProgressPreference.OnDisplayProgress;
+import org.cyanogenmod.wallpapers.photophase.widgets.ColorPickerPreference;
 
 /**
  * A fragment class with all the general settings
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/LandscapeDispositionFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/LandscapeDispositionFragment.java
index 5dd2abc..77267e6 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/LandscapeDispositionFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/LandscapeDispositionFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
-import com.ruesga.android.wallpapers.photophase.utils.DispositionUtil;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.utils.DispositionUtil;
 
 import java.util.List;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/LayoutPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/LayoutPreferenceFragment.java
index e7a78e1..564c425 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/LayoutPreferenceFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/LayoutPreferenceFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 /**
  * A fragment class with the layout disposition
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/MediaPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/MediaPreferenceFragment.java
index b15a771..e03116e 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/MediaPreferenceFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/MediaPreferenceFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,8 +26,8 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
 import android.util.Log;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 
 /**
  * A fragment class with all the media settings
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/PhotoPhasePreferences.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PhotoPhasePreferences.java
index 8fbc2d2..4e8c46e 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/PhotoPhasePreferences.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PhotoPhasePreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.app.ActionBar;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.MenuItem;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 import java.util.List;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/PortraitDispositionFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PortraitDispositionFragment.java
index 7b55c69..8763e1e 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/PortraitDispositionFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PortraitDispositionFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.utils.DispositionUtil;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.utils.DispositionUtil;
 
 import java.util.List;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/PreferencesProvider.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
index f134516..1bf8359 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/PreferencesProvider.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.effects.Effects.EFFECTS;
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
-import com.ruesga.android.wallpapers.photophase.utils.DispositionUtil;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.effects.Effects.EFFECTS;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.DispositionUtil;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -45,7 +45,7 @@ public final class PreferencesProvider {
      * @see #EXTRA_FLAG_REDRAW
      * {@hide}
      */
-    public static final String ACTION_SETTINGS_CHANGED = "com.ruesga.android.wallpapers.photophase.actions.SETTINGS_CHANGED";
+    public static final String ACTION_SETTINGS_CHANGED = "org.cyanogenmod.wallpapers.photophase.actions.SETTINGS_CHANGED";
 
     /**
      * An extra setting that indicates that the changed setting request a whole recreation of the wallpaper world
@@ -89,7 +89,7 @@ public final class PreferencesProvider {
     /**
      * The shared preferences file
      */
-    public static final String PREFERENCES_FILE = "com.ruesga.android.wallpapers.photophase";
+    public static final String PREFERENCES_FILE = "org.cyanogenmod.wallpapers.photophase";
 
     private static Map<String, ?> mPreferences = new HashMap<String, Object>();
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/SeekBarPreference.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarPreference.java
index 362f54e..e8b6d2e 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/SeekBarPreference.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarPreference.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 The Android Open Source Project
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -28,7 +28,7 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 /**
  * A preference with a seekbar widget
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/SeekBarProgressPreference.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java
index d48c788..64b9b90 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/SeekBarProgressPreference.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/SeekBarProgressPreference.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 The Android Open Source Project
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 /**
  * A preference with a seekbar widget that display the progress
diff --git a/src/com/ruesga/android/wallpapers/photophase/preferences/TouchAction.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/TouchAction.java
index bfbb2b2..498c1bd 100644
--- a/src/com/ruesga/android/wallpapers/photophase/preferences/TouchAction.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/TouchAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.preferences;
+package org.cyanogenmod.wallpapers.photophase.preferences;
 
 /**
  * An enumeration with all the touch actions supported
diff --git a/src/com/ruesga/android/wallpapers/photophase/shapes/ColorShape.java b/src/org/cyanogenmod/wallpapers/photophase/shapes/ColorShape.java
index c771ba5..20b5fa4 100644
--- a/src/com/ruesga/android/wallpapers/photophase/shapes/ColorShape.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/shapes/ColorShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.shapes;
+package org.cyanogenmod.wallpapers.photophase.shapes;
 
 import android.content.Context;
 import android.opengl.GLES20;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/com/ruesga/android/wallpapers/photophase/shapes/DrawableShape.java b/src/org/cyanogenmod/wallpapers/photophase/shapes/DrawableShape.java
index 8ca1521..7866dcc 100644
--- a/src/com/ruesga/android/wallpapers/photophase/shapes/DrawableShape.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/shapes/DrawableShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.shapes;
+package org.cyanogenmod.wallpapers.photophase.shapes;
 
 /**
  * An interface that defines an object as a drawable shape.
diff --git a/src/com/ruesga/android/wallpapers/photophase/shapes/OopsShape.java b/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java
index c765db8..ad69687 100644
--- a/src/com/ruesga/android/wallpapers/photophase/shapes/OopsShape.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.shapes;
+package org.cyanogenmod.wallpapers.photophase.shapes;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -25,11 +25,11 @@ import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.opengl.GLES20;
 
-import com.ruesga.android.wallpapers.photophase.Colors;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLColor;
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.Colors;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -136,7 +136,7 @@ public class OopsShape implements DrawableShape {
         mMessage = ctx.getString(resourceMessageId);
 
         // Load the textures
-        mOopsImageTexture = GLESUtil.loadTexture(ctx, R.drawable.bg_oops, null, null, false);
+        mOopsImageTexture = GLESUtil.loadTexture(ctx, R.drawable.bg_cid_oops, null, null, false);
         Bitmap textBitmap = text2Bitmap(ctx, mMessage);
         mOopsTextTexture = GLESUtil.loadTexture(textBitmap, null, null);
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java b/src/org/cyanogenmod/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java
index ad76b2d..bc07b17 100644
--- a/src/com/ruesga/android/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.tasks;
+package org.cyanogenmod.wallpapers.photophase.tasks;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -23,7 +23,7 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.widget.ImageView;
 
-import com.ruesga.android.wallpapers.photophase.utils.BitmapUtils;
+import org.cyanogenmod.wallpapers.photophase.utils.BitmapUtils;
 
 import java.io.File;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/CubeTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/CubeTransition.java
index 6acbf6b..bfe300b 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/CubeTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/CubeTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLES20;
@@ -22,12 +22,12 @@ import android.opengl.GLException;
 import android.opengl.Matrix;
 import android.os.SystemClock;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/FadeTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/FadeTransition.java
index 061c90e..ce50fa4 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/FadeTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/FadeTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLException;
 import android.os.SystemClock;
 
-import com.ruesga.android.wallpapers.photophase.Colors;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.shapes.ColorShape;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.Colors;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.shapes.ColorShape;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 /**
  * A transition that applies a fade transition to the picture.
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/FlipTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
index f70fe95..8d0bf79 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/FlipTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLES20;
@@ -22,12 +22,12 @@ import android.opengl.GLException;
 import android.opengl.Matrix;
 import android.os.SystemClock;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.nio.FloatBuffer;
 
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/NullTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
index 6a28f2f..24344d6 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/NullTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLES20;
 import android.opengl.GLException;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.nio.FloatBuffer;
 /**
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/SwapTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/SwapTransition.java
index 7a40eeb..d5cf15f 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/SwapTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/SwapTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLException;
 import android.os.SystemClock;
 
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 /**
  * A simple transition that swap an image after the transition time is ended.
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/Transition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transition.java
index db468ef..cdd5438 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/Transition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLES20;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 /**
  * The base class of all transitions that can be applied to the {@link PhotoFrame} classes.
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/Transitions.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transitions.java
index 964893a..86dfeb8 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/Transitions.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transitions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/TranslateTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
index 3e3471e..eb1080b 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/TranslateTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLES20;
@@ -22,12 +22,12 @@ import android.opengl.GLException;
 import android.opengl.Matrix;
 import android.os.SystemClock;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.nio.FloatBuffer;
 import java.util.ArrayList;
diff --git a/src/com/ruesga/android/wallpapers/photophase/transitions/WindowTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/WindowTransition.java
index 255e829..b09cfaa 100644
--- a/src/com/ruesga/android/wallpapers/photophase/transitions/WindowTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/WindowTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.transitions;
+package org.cyanogenmod.wallpapers.photophase.transitions;
 
 import android.content.Context;
 import android.opengl.GLES20;
@@ -23,12 +23,12 @@ import android.opengl.Matrix;
 import android.os.SystemClock;
 import android.view.animation.AccelerateInterpolator;
 
-import com.ruesga.android.wallpapers.photophase.utils.GLESUtil;
-import com.ruesga.android.wallpapers.photophase.utils.Utils;
-import com.ruesga.android.wallpapers.photophase.PhotoFrame;
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.TextureManager;
-import com.ruesga.android.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
+import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.TextureManager;
+import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/com/ruesga/android/wallpapers/photophase/utils/BitmapUtils.java b/src/org/cyanogenmod/wallpapers/photophase/utils/BitmapUtils.java
index 4fb7257..f7b32b5 100644
--- a/src/com/ruesga/android/wallpapers/photophase/utils/BitmapUtils.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/BitmapUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.utils;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/src/com/ruesga/android/wallpapers/photophase/utils/DispositionUtil.java b/src/org/cyanogenmod/wallpapers/photophase/utils/DispositionUtil.java
index 9d6b383..ddd8d3a 100644
--- a/src/com/ruesga/android/wallpapers/photophase/utils/DispositionUtil.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/DispositionUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.utils;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.graphics.Rect;
 
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/ruesga/android/wallpapers/photophase/utils/GLESUtil.java b/src/org/cyanogenmod/wallpapers/photophase/utils/GLESUtil.java
index 51b7b74..4707431 100644
--- a/src/com/ruesga/android/wallpapers/photophase/utils/GLESUtil.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/GLESUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.utils;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/ruesga/android/wallpapers/photophase/utils/MERAlgorithm.java b/src/org/cyanogenmod/wallpapers/photophase/utils/MERAlgorithm.java
index 43701e1..53d44f3 100644
--- a/src/com/ruesga/android/wallpapers/photophase/utils/MERAlgorithm.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/MERAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.utils;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.graphics.Rect;
 import java.util.Stack;
diff --git a/src/com/ruesga/android/wallpapers/photophase/utils/Utils.java b/src/org/cyanogenmod/wallpapers/photophase/utils/Utils.java
index 296b96a..65d7f97 100644
--- a/src/com/ruesga/android/wallpapers/photophase/utils/Utils.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.utils;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.content.Context;
 import android.content.res.Configuration;
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/AlbumInfo.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumInfo.java
index e930521..8e335c3 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/AlbumInfo.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -31,9 +31,9 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.model.Album;
-import com.ruesga.android.wallpapers.photophase.tasks.AsyncPictureLoaderTask;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.model.Album;
+import org.cyanogenmod.wallpapers.photophase.tasks.AsyncPictureLoaderTask;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/AlbumPictures.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumPictures.java
index 3a9866c..5d0c60f 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/AlbumPictures.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumPictures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.content.Context;
 import android.os.Handler;
@@ -30,8 +30,8 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.model.Album;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.model.Album;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/CardLayout.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/CardLayout.java
index 9d7c524..e1953cd 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/CardLayout.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/CardLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -22,7 +22,7 @@ import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 /**
  * A "Google Now Card Layout" like layout
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/ColorPickerPreference.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/ColorPickerPreference.java
index 6db4b44..42e701d 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/ColorPickerPreference.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/ColorPickerPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import afzkl.development.mColorPicker.views.ColorDialogView;
 import afzkl.development.mColorPicker.views.ColorPanelView;
@@ -32,7 +32,7 @@ import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 /**
  * A {@link Preference} that allow to select/pick a color in a new window dialog.
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/DispositionView.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/DispositionView.java
index 674482d..22d00a6 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/DispositionView.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/DispositionView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
@@ -37,12 +37,12 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.widget.ImageView.ScaleType;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.animations.Evaluators;
-import com.ruesga.android.wallpapers.photophase.model.Disposition;
-import com.ruesga.android.wallpapers.photophase.utils.DispositionUtil;
-import com.ruesga.android.wallpapers.photophase.utils.MERAlgorithm;
-import com.ruesga.android.wallpapers.photophase.widgets.ResizeFrame.OnResizeListener;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.animations.Evaluators;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
+import org.cyanogenmod.wallpapers.photophase.utils.DispositionUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.MERAlgorithm;
+import org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame.OnResizeListener;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/PicturesView.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/PicturesView.java
index 172bed4..0744751 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/PicturesView.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/PicturesView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -25,8 +25,8 @@ import android.view.ViewGroup;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 
-import com.ruesga.android.wallpapers.photophase.R;
-import com.ruesga.android.wallpapers.photophase.tasks.AsyncPictureLoaderTask;
+import org.cyanogenmod.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.tasks.AsyncPictureLoaderTask;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/ResizeFrame.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/ResizeFrame.java
index d59db31..218a4e4 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/ResizeFrame.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/ResizeFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.content.Context;
 import android.graphics.BitmapFactory;
@@ -27,7 +27,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import com.ruesga.android.wallpapers.photophase.R;
+import org.cyanogenmod.wallpapers.photophase.R;
 
 /**
  * The hold view to resize a frame. A square with 4 handles in every border
diff --git a/src/com/ruesga/android/wallpapers/photophase/widgets/VerticalEndlessScroller.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/VerticalEndlessScroller.java
index c82cf8c..67a1f17 100644
--- a/src/com/ruesga/android/wallpapers/photophase/widgets/VerticalEndlessScroller.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/VerticalEndlessScroller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jorge Ruesga
+ * Copyright (C) 2013 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ruesga.android.wallpapers.photophase.widgets;
+package org.cyanogenmod.wallpapers.photophase.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;