diff --git a/Makefile b/Makefile
index d269055c47448d9824225773e3f4d49d90d56dd1..1c7a4e4b5603ce136e9c50d0ca1e819810ea7b88 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ export ANDROID_HOME=$(ANDROID_SDK)
 
 ARCH = $(ANDROID_ABI)
 
-SRC=sflphone-android
-LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h
-LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so
+SRC=ring-android
+LIBRINGJNI_H=ring/src/dring/dring.h
+LIBRINGJNI=$(SRC)/obj/local/$(ARCH)/libring.so
 
 JAVA_SOURCES=$(shell find $(SRC)/src/org/sflphone/ -type f -name "*.java")
 
@@ -21,17 +21,17 @@ endif
 
 ifeq ($(RELEASE),1)
 ANT_TARGET = release
-SFLPHONE_APK=$(SRC)/bin/SFLphone-release-unsigned.apk
+RING_APK=$(SRC)/bin/Ring-release-unsigned.apk
 NDK_DEBUG=0
 else
 ANT_TARGET = debug
-SFLPHONE_APK=$(SRC)/bin/SFLphone-debug.apk
+RING_APK=$(SRC)/bin/Ring-debug.apk
 NDK_DEBUG=1
 endif
 
 define build_apk
 	@echo
-	@echo "=== Building $(SFLPHONE_APK) for $(ARCH) ==="
+	@echo "=== Building $(RING_APK) for $(ARCH) ==="
 	@echo
 	date +"%Y-%m-%d" > $(SRC)/assets/builddate.txt
 	echo `id -u -n`@`hostname` > $(SRC)/assets/builder.txt
@@ -40,7 +40,7 @@ define build_apk
 	$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
 endef
 
-$(SFLPHONE_APK): $(LIBSFLPHONEJNI) $(JAVA_SOURCES)
+$(RING_APK): $(LIBRINGJNI) $(JAVA_SOURCES)
 	@echo
 	@echo "=== Building $@ for $(ARCH) ==="
 	@echo
@@ -49,56 +49,56 @@ $(SFLPHONE_APK): $(LIBSFLPHONEJNI) $(JAVA_SOURCES)
 	git rev-parse --short HEAD > $(SRC)/assets/revision.txt
 	$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
 
-$(LIBSFLPHONEJNI): $(LIBSFLPHONEJNI_H)
-	@if [ -z "$(SFLPHONE_BUILD_DIR)" ]; then echo "SFLPHONE_BUILD_DIR not defined" ; exit 1; fi
+$(LIBRINGJNI): $(LIBRINGJNI_H)
+	@if [ -z "$(RING_BUILD_DIR)" ]; then echo "RING_BUILD_DIR not defined" ; exit 1; fi
 	@if [ -z "$(ANDROID_NDK)" ]; then echo "ANDROID_NDK not defined" ; exit 1; fi
 	@echo
-	@echo "=== Building libsflphonejni ==="
+	@echo "=== Building libringjni ==="
 	@echo
-	$(VERBOSE)if [ -z "$(SFLPHONE_SRC_DIR)" ] ; then SFLPHONE_SRC_DIR=./sflphone; fi ; \
-	if [ -z "$(SFLPHONE_CONTRIB)" ] ; then SFLPHONE_CONTRIB="$$SFLPHONE_SRC_DIR/daemon/contrib/$(TARGET_TUPLE)"; fi ; \
-	if [ `echo "$(SFLPHONE_BUILD_DIR)" | head -c 1` != "/" ] ; then \
-        SFLPHONE_BUILD_DIR="../$(SFLPHONE_BUILD_DIR)"; \
+	$(VERBOSE)if [ -z "$(RING_SRC_DIR)" ] ; then RING_SRC_DIR=./ring; fi ; \
+	if [ -z "$(RING_CONTRIB)" ] ; then RING_CONTRIB="$$RING_SRC_DIR/daemon/contrib/$(TARGET_TUPLE)"; fi ; \
+	if [ `echo "$(RING_BUILD_DIR)" | head -c 1` != "/" ] ; then \
+        RING_BUILD_DIR="../$(RING_BUILD_DIR)"; \
 	fi ; \
-	[ `echo "$$SFLPHONE_CONTRIB" | head -c 1` != "/" ] && SFLPHONE_CONTRIB="../$$SFLPHONE_CONTRIB"; \
-	[ `echo "$$SFLPHONE_SRC_DIR" | head -c 1` != "/" ] && SFLPHONE_SRC_DIR="../$$SFLPHONE_SRC_DIR"; \
+	[ `echo "$$RING_CONTRIB" | head -c 1` != "/" ] && RING_CONTRIB="../$$RING_CONTRIB"; \
+	[ `echo "$$RING_SRC_DIR" | head -c 1` != "/" ] && RING_SRC_DIR="../$$RING_SRC_DIR"; \
 	$(ANDROID_NDK)/ndk-build -C $(SRC) \
-		SFLPHONE_SRC_DIR="$$SFLPHONE_SRC_DIR" \
-		SFLPHONE_CONTRIB="$$SFLPHONE_CONTRIB" \
-		SFLPHONE_BUILD_DIR="$$SFLPHONE_BUILD_DIR" \
+		RING_SRC_DIR="$$RING_SRC_DIR" \
+		RING_CONTRIB="$$RING_CONTRIB" \
+		RING_BUILD_DIR="$$RING_BUILD_DIR" \
 		NDK_DEBUG=$(NDK_DEBUG) \
-		TARGET_CFLAGS="$$SFLPHONE_EXTRA_CFLAGS"
+		TARGET_CFLAGS="$$RING_EXTRA_CFLAGS"
 
 apk:
 	$(call build_apk)
 
 apkclean:
-	rm -f $(SFLPHONE_APK)
+	rm -f $(RING_APK)
 
 lightclean:
-	cd $(SRC) && rm -rf libs/armeabi-v7a libs/x86 libs/mips obj bin $(SFLPHONE_APK)
+	cd $(SRC) && rm -rf libs/armeabi-v7a libs/x86 libs/mips obj bin $(RING_APK)
 
 clean: lightclean
 	rm -rf $(SRC)/gen java-libs/*/gen java-libs/*/bin .sdk
 
 jniclean: lightclean
-	rm -f $(LIBSFLPHONEJNI)
+	rm -f $(LIBRINGJNI)
 
 distclean: clean jniclean
 
-install: $(SFLPHONE_APK)
+install: $(RING_APK)
 	@echo "=== Installing SFLphone on device ==="
 	adb wait-for-device
-	adb install -r $(SFLPHONE_APK)
+	adb install -r $(RING_APK)
 
 uninstall:
 	adb wait-for-device
-	adb uninstall org.sflphone
+	adb uninstall cx.ring
 
 run:
 	@echo "=== Running SFLphone on device ==="
 	adb wait-for-device
-	adb shell am start -n org.sflphone/org.sflphone.client.HomeActivity
+	adb shell am start -n cx.ring/cx.ring.client.HomeActivity
 
 build-and-run: install run
 
diff --git a/compile.sh b/compile.sh
index 5715e462397d4b8edeae8a02fe707f04880d88df..4c28c23cc5186c340604a7f23bf18cfb056921d0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # Read the Android Wiki http://wiki.videolan.org/AndroidCompile
 # Setup all that stuff correctly.
@@ -62,11 +62,11 @@ if [ `set -- ${ANDROID_ABI}; echo $#` -gt 1 ]; then
             NO_FPU=$NO_FPU NO_ARMV6=$NO_ARMV6 ANDROID_ABI=$i \
             ./compile.sh $* --jni || { echo "$i build KO"; exit 1; }
         mkdir -p obj/
-        cp -r sflphone-android/libs/$i obj
+        cp -r ring-android/libs/$i obj
         echo "$i build OK"
     done
     for i in ${ANDROID_ABI_LIST}; do
-        cp -r obj/$i sflphone-android/libs/
+        cp -r obj/$i ring-android/libs/
         rm -rf obj/$i
     done
     make -b -j1 RELEASE=$RELEASE apk || exit 1
@@ -110,15 +110,14 @@ else
 fi
 
 # try to detect NDK version
+GCCVER=4.9
 REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
 case "$REL" in
     10*)
         if [ "${HAVE_64}" = 1 ];then
-            GCCVER=4.9
             ANDROID_API=android-21
         else
-            GCCVER=4.8
-            ANDROID_API=android-9
+            ANDROID_API=android-15
         fi
         CXXSTL="/"${GCCVER}
     ;;
@@ -127,8 +126,7 @@ case "$REL" in
             echo "You need the NDKv10 or later for 64 bits build"
             exit 1
         fi
-        GCCVER=4.8
-        ANDROID_API=android-9
+        ANDROID_API=android-15
         CXXSTL="/"${GCCVER}
     ;;
     7|8|*)
@@ -166,32 +164,32 @@ export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
 
 ANDROID_PATH="`pwd`"
 
-# Fetch sflphone daemon source
+# Fetch ring daemon source
 if [ "$FETCH" = 1 ]
 then
-    # 1/ libsflphone
-    TESTED_HASH=d78665cf2bd708822fb3c2e5b211493f4a1a7e6a
-    if [ ! -d "sflphone" ]; then
-        echo "sflphone daemon source not found, cloning"
-        git clone https://gerrit-sflphone.savoirfairelinux.com/sflphone
-        cd sflphone
+    # 1/ dring
+    TESTED_HASH=64ed36af424b0e2e18e419be904926b591c58d61
+    if [ ! -d "ring" ]; then
+        echo "ring daemon source not found, cloning"
+        git clone https://gerrit-ring.savoirfairelinux.com/ring
+        cd ring
         echo android/ >> .git/info/exclude
         echo contrib/android/ >> .git/info/exclude
 	    git checkout $TESTED_HASH
     else
-        echo "sflphone daemon source found"
-        cd sflphone
+        echo "ring daemon source found"
+        cd ring
 	    git fetch
         git checkout ${TESTED_HASH}
 #        if ! git cat-file -e ${TESTED_HASH}; then
 #            cat << EOF
 #***
-#*** Error: Your sflphone checkout does not contain the latest tested commit ***
+#*** Error: Your ring checkout does not contain the latest tested commit ***
 #***
 #
 #Please update your source with something like:
 #
-#cd sflphone
+#cd ring
 #git reset --hard origin
 #git pull origin master
 #git checkout -B android ${TESTED_HASH}
@@ -203,7 +201,7 @@ then
 #        fi
     fi
 else
-    cd sflphone
+    cd ring
 fi
 
 if [ -z "$BUILD" ]
@@ -213,12 +211,13 @@ then
 fi
 
 # Setup CFLAGS
-if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
-    EXTRA_CFLAGS="-mfpu=vfpv3-d16 -mcpu=cortex-a8"
-    EXTRA_CFLAGS="${EXTRA_CFLAGS} -mthumb -mfloat-abi=softfp"
+if [ ${ANDROID_ABI} = "armeabi-v7a-hard" ] ; then
+    EXTRA_CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mcpu=cortex-a8 -D_NDK_MATH_NO_SOFTFP=1"
+elif [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
+    EXTRA_CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mthumb -mcpu=cortex-a8"
 elif [ ${ANDROID_ABI} = "armeabi" ] ; then
     if [ -n "${NO_ARMV6}" ]; then
-        EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float"
+        EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float "
     else
         if [ -n "${NO_FPU}" ]; then
             EXTRA_CFLAGS="-march=armv6j -mtune=arm1136j-s -msoft-float"
@@ -242,12 +241,17 @@ else
     exit 2
 fi
 
-EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2"
+EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2 -DHAVE_PTHREADS"
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include"
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
 
 # Setup LDFLAGS
-EXTRA_LDFLAGS="-L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI} -lgnustl_static"
+if [ ${ANDROID_ABI} = "armeabi-v7a-hard" ] ; then
+    EXTRA_LDFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mcpu=cortex-a8 -lm_hard -D_NDK_MATH_NO_SOFTFP=1"
+elif [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
+    EXTRA_LDFLAGS=""
+fi
+EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI} -lgnustl_static"
 
 # Make in //
 UNAMES=$(uname -s)
@@ -261,21 +265,21 @@ MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
 fi
 
 # Build buildsystem tools
-export PATH=`pwd`/daemon/extras/tools/build/bin:$PATH
+export PATH=`pwd`/extras/tools/build/bin:$PATH
 echo "Building tools"
-cd daemon/extras/tools
+pushd extras/tools
 ./bootstrap
 make $MAKEFLAGS
 #FIXME
 echo "HACK for old Jenkins builder...forcing libtool to be built"
 make .libtool
-cd ../../..
+popd
 
 ############
 # Contribs #
 ############
 echo "Building the contribs"
-mkdir -p daemon/contrib/native
+mkdir -p contrib/native
 
 gen_pc_file() {
     echo "Generating $1 pkg-config file"
@@ -283,17 +287,18 @@ gen_pc_file() {
 Description: $1
 Version: $2
 Libs: -l$1
-Cflags:" > daemon/contrib/${TARGET_TUPLE}/lib/pkgconfig/`echo $1|tr 'A-Z' 'a-z'`.pc
+Cflags:" > contrib/${TARGET_TUPLE}/lib/pkgconfig/`echo $1|tr 'A-Z' 'a-z'`.pc
 }
 
-mkdir -p daemon/contrib/${TARGET_TUPLE}/lib/pkgconfig
+mkdir -p contrib/${TARGET_TUPLE}/lib/pkgconfig
 
-cd daemon/contrib/native
+pushd contrib/native
 ../bootstrap --host=${TARGET_TUPLE}
 
 # Some libraries have arm assembly which won't build in thumb mode
 # We append -marm to the CFLAGS of these libs to disable thumb mode
 [ ${ANDROID_ABI} = "armeabi-v7a" ] && echo "NOTHUMB := -marm" >> config.mak
+[ ${ANDROID_ABI} = "armeabi-v7a-hard" ] && echo "NOTHUMB := -marm" >> config.mak
 
 # Release or not?
 if [ $# -ne 0 ] && [ "$1" = "release" ]; then
@@ -309,9 +314,10 @@ fi
 echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_CXXFLAGS= -g ${EXTRA_CXXFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS= ${EXTRA_LDFLAGS}" >> config.mak
-export SFLPHONE_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
-export SFLPHONE_EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS}"
-export SFLPHONE_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}"
+export RING_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
+export RING_EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS}"
+export RING_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}"
+#export LOCAL_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}"
 
 make list
 make install
@@ -321,16 +327,16 @@ echo ${PWD}
 which autopoint >/dev/null || make $MAKEFLAGS .gettext
 export PATH="$PATH:$PWD/../$TARGET_TUPLE/bin"
 
-export SFLPHONE_BUILD_DIR=sflphone/daemon/build-android-${TARGET_TUPLE}
+export RING_BUILD_DIR=ring/build-android-${TARGET_TUPLE}
 
 ############
-# Make SFLPHONE #
+# Make Ring #
 ############
-cd ../.. && mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE}
+popd && mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE}
 
 if [ "$JNI" = 1 ]; then
     CLEAN="jniclean"
-    TARGET="sflphone-android/obj/local/${ANDROID_ABI}/libsflphone.so"
+    TARGET="ring-android/obj/local/${ANDROID_ABI}/libdring.so"
 else
     CLEAN="distclean"
     TARGET=
@@ -340,10 +346,10 @@ if [ ! -f config.h ]; then
     echo "Bootstraping"
     cd ../
     ./autogen.sh
-    cd ../../
-    cd sflphone-android
+    cd ../
+    cd ring-android
     ./make-swig.sh
-    cd ../sflphone/daemon/build-android-${TARGET_TUPLE}
+    cd ../ring/build-android-${TARGET_TUPLE}
     echo "Configuring"
     ${ANDROID_PATH}/configure.sh ${OPTS}
 fi
@@ -375,7 +381,7 @@ if [ ${ANDROID_API} = "android-21" ] ; then
 fi
 # END OF ANDROID NDK FIXUP
 
-echo "Building libsflphone"
+echo "Building dring"
 make $MAKEFLAGS
 
 ####################################
diff --git a/configure.sh b/configure.sh
index 3fb5609a7b9eed12ab67ea9a0c94e58011d8db09..904a050af3a234a392650c80fb8b1a215cdf463e 100755
--- a/configure.sh
+++ b/configure.sh
@@ -16,7 +16,7 @@ if [ -z "$ANDROID_API" ];then
     exit 1
 fi
 
-SFLPHONE_SOURCEDIR=`cd ..; pwd`
+RING_SOURCEDIR=`cd ..; pwd`
 
 CFLAGS="-g -O2 -fstrict-aliasing -funsafe-math-optimizations"
 if [ -n "$HAVE_ARM" -a ! -n "$HAVE_64" ]; then
@@ -35,20 +35,21 @@ CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include -I${AN
 LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}"
 
 SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
-ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
+#ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
+ANDROID_BIN=${NDK_TOOLCHAIN_PATH}
 CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
 
 CPPFLAGS="$CPPFLAGS" \
-CFLAGS="$CFLAGS ${SFLPHONE_EXTRA_CFLAGS}" \
-CXXFLAGS="$CXXFLAGS ${SFLPHONE_EXTRA_CXXFLAGS}" \
-LDFLAGS="$LDFLAGS ${SFLPHONE_EXTRA_LDFLAGS}" \
+CFLAGS="$CFLAGS ${RING_EXTRA_CFLAGS}" \
+CXXFLAGS="$CXXFLAGS ${RING_EXTRA_CXXFLAGS}" \
+LDFLAGS="$LDFLAGS ${RING_EXTRA_LDFLAGS}" \
 CC="${CROSS_COMPILE}gcc --sysroot=${SYSROOT}" \
 CXX="${CROSS_COMPILE}g++ --sysroot=${SYSROOT}" \
 NM="${CROSS_COMPILE}nm" \
 STRIP="${CROSS_COMPILE}strip" \
 RANLIB="${CROSS_COMPILE}ranlib" \
 AR="${CROSS_COMPILE}ar" \
-PKG_CONFIG_LIBDIR=$SFLPHONE_SOURCEDIR/contrib/$TARGET_TUPLE/lib/pkgconfig \
-sh $SFLPHONE_SOURCEDIR/configure --host=$TARGET_TUPLE $EXTRA_PARAMS \
-                   --disable-shared --disable-video --with-opensl --without-zrtp --without-dbus --without-alsa --without-pulse \
+PKG_CONFIG_LIBDIR=$RING_SOURCEDIR/contrib/$TARGET_TUPLE/lib/pkgconfig \
+sh $RING_SOURCEDIR/configure --host=$TARGET_TUPLE $EXTRA_PARAMS \
+                   --disable-shared --disable-video --with-opensl --without-dbus --without-alsa --without-pulse \
                    $*
diff --git a/sflphone-android/.gitignore b/ring-android/.gitignore
similarity index 100%
rename from sflphone-android/.gitignore
rename to ring-android/.gitignore
diff --git a/sflphone-android/.idea/.name b/ring-android/.idea/.name
similarity index 100%
rename from sflphone-android/.idea/.name
rename to ring-android/.idea/.name
diff --git a/sflphone-android/.idea/compiler.xml b/ring-android/.idea/compiler.xml
similarity index 100%
rename from sflphone-android/.idea/compiler.xml
rename to ring-android/.idea/compiler.xml
diff --git a/sflphone-android/.idea/copyright/profiles_settings.xml b/ring-android/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from sflphone-android/.idea/copyright/profiles_settings.xml
rename to ring-android/.idea/copyright/profiles_settings.xml
diff --git a/sflphone-android/.idea/encodings.xml b/ring-android/.idea/encodings.xml
similarity index 100%
rename from sflphone-android/.idea/encodings.xml
rename to ring-android/.idea/encodings.xml
diff --git a/sflphone-android/.idea/libraries/libs.xml b/ring-android/.idea/libraries/libs.xml
similarity index 100%
rename from sflphone-android/.idea/libraries/libs.xml
rename to ring-android/.idea/libraries/libs.xml
diff --git a/ring-android/.idea/misc.xml b/ring-android/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ce05366268a5071aa5fbc54d2f9479c66feb68a4
--- /dev/null
+++ b/ring-android/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+
diff --git a/sflphone-android/.idea/modules.xml b/ring-android/.idea/modules.xml
similarity index 69%
rename from sflphone-android/.idea/modules.xml
rename to ring-android/.idea/modules.xml
index 821cb901d716703f610e611e4d1665c5d8c299cb..5ef5875557af3cccfca178a869c8293aa0dd01bc 100644
--- a/sflphone-android/.idea/modules.xml
+++ b/ring-android/.idea/modules.xml
@@ -3,7 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Tests/Tests.iml" filepath="$PROJECT_DIR$/Tests/Tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/sflphone-android.iml" filepath="$PROJECT_DIR$/sflphone-android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ring-android.iml" filepath="$PROJECT_DIR$/ring-android.iml" />
     </modules>
   </component>
 </project>
diff --git a/sflphone-android/.idea/scopes/scope_settings.xml b/ring-android/.idea/scopes/scope_settings.xml
similarity index 100%
rename from sflphone-android/.idea/scopes/scope_settings.xml
rename to ring-android/.idea/scopes/scope_settings.xml
diff --git a/sflphone-android/.idea/uiDesigner.xml b/ring-android/.idea/uiDesigner.xml
similarity index 100%
rename from sflphone-android/.idea/uiDesigner.xml
rename to ring-android/.idea/uiDesigner.xml
diff --git a/sflphone-android/.idea/vcs.xml b/ring-android/.idea/vcs.xml
similarity index 100%
rename from sflphone-android/.idea/vcs.xml
rename to ring-android/.idea/vcs.xml
diff --git a/sflphone-android/AndroidManifest.xml b/ring-android/AndroidManifest.xml
similarity index 92%
rename from sflphone-android/AndroidManifest.xml
rename to ring-android/AndroidManifest.xml
index 51c0f0bfdd6a62b12aff5944102604142e510417..445efcc7f340453ece5ea57979bc278b5b3023c3 100644
--- a/sflphone-android/AndroidManifest.xml
+++ b/ring-android/AndroidManifest.xml
@@ -31,7 +31,7 @@ shall include the source code for the parts of OpenSSL used as well
 as that of the covered work.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.sflphone"
+    package="cx.ring"
     android:installLocation="auto"
     android:versionCode="13"
     android:versionName="1.4.0" >
@@ -45,7 +45,7 @@ as that of the covered work.
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="20" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -90,7 +90,7 @@ as that of the covered work.
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
-            android:name="org.sflphone.client.HomeActivity"
+            android:name="cx.ring.client.HomeActivity"
             android:label="@string/title_activity_sflphone_home"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithOverlay"
@@ -102,25 +102,25 @@ as that of the covered work.
             </intent-filter>
         </activity>
         <activity
-            android:name="org.sflphone.client.AccountWizard"
+            android:name="cx.ring.client.AccountWizard"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithoutOverlay" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.sflphone.client.AccountPreferenceActivity" />
+                android:value="cx.ring.client.AccountPreferenceActivity" />
         </activity>
         <activity
-            android:name="org.sflphone.client.AccountEditionActivity"
+            android:name="cx.ring.client.AccountEditionActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithoutOverlay" />
         <activity
-            android:name="org.sflphone.client.DetailHistoryActivity"
+            android:name="cx.ring.client.DetailHistoryActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithoutOverlay" />
         <activity
-            android:name="org.sflphone.client.CallActivity"
+            android:name="cx.ring.client.CallActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithoutOverlay"
@@ -135,7 +135,7 @@ as that of the covered work.
         </activity>
 
         <service
-            android:name="org.sflphone.service.SipService"
+            android:name="cx.ring.service.SipService"
             android:exported="false" >
             <intent-filter>
                 <action android:name=".service.SipService" />
diff --git a/sflphone-android/NOTES b/ring-android/NOTES
similarity index 100%
rename from sflphone-android/NOTES
rename to ring-android/NOTES
diff --git a/sflphone-android/Tests/AndroidManifest.xml b/ring-android/Tests/AndroidManifest.xml
similarity index 84%
rename from sflphone-android/Tests/AndroidManifest.xml
rename to ring-android/Tests/AndroidManifest.xml
index 28379ff3d427e9e5dca4c530045e13f559acbc41..4312c42da049d6e0f3052ac94fb143600bac3f66 100644
--- a/sflphone-android/Tests/AndroidManifest.xml
+++ b/ring-android/Tests/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.sflphone.tests"
+          package="cx.ring.tests"
           android:versionCode="1"
           android:versionName="1.0">
     <!-- We add an application tag here just so that we can indicate that
@@ -13,7 +13,7 @@
 
     <uses-sdk
             android:minSdkVersion="14"
-            android:targetSdkVersion="19" />
+            android:targetSdkVersion="21" />
     <!--
     This declares that this application uses the instrumentation test runner targeting
     the package of org.sflphone.  To run the tests use the command:
@@ -21,6 +21,6 @@
     -->
     <instrumentation
             android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="org.sflphone"
-            android:label="Tests for org.sflphone"/>
+            android:targetPackage="cx.ring"
+            android:label="Tests for cx.ring"/>
 </manifest>
diff --git a/sflphone-android/Tests/Tests.iml b/ring-android/Tests/Tests.iml
similarity index 91%
rename from sflphone-android/Tests/Tests.iml
rename to ring-android/Tests/Tests.iml
index a11a481e8234c674fbea018fa4ced1839e432d76..8ee77ba12a1d403f6be9ae2a8ed4e473430275fc 100644
--- a/sflphone-android/Tests/Tests.iml
+++ b/ring-android/Tests/Tests.iml
@@ -14,7 +14,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="libs" level="project" />
-    <orderEntry type="module" module-name="sflphone-android" />
+    <orderEntry type="module" module-name="ring-android" />
   </component>
 </module>
 
diff --git a/sflphone-android/Tests/build.xml b/ring-android/Tests/build.xml
similarity index 100%
rename from sflphone-android/Tests/build.xml
rename to ring-android/Tests/build.xml
diff --git a/sflphone-android/Tests/proguard-project.txt b/ring-android/Tests/proguard-project.txt
similarity index 100%
rename from sflphone-android/Tests/proguard-project.txt
rename to ring-android/Tests/proguard-project.txt
diff --git a/sflphone-android/project.properties b/ring-android/Tests/project.properties
similarity index 96%
rename from sflphone-android/project.properties
rename to ring-android/Tests/project.properties
index 4ab125693c7c484a0252ee7eca9616e0f9b1ac67..6e18427a424c3cf39957ac812bf4dcc07cfd2865 100644
--- a/sflphone-android/project.properties
+++ b/ring-android/Tests/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
diff --git a/sflphone-android/Tests/src/org/sflphone/client/HomeActivityTest.java b/ring-android/Tests/src/cx/ring/client/HomeActivityTest.java
similarity index 92%
rename from sflphone-android/Tests/src/org/sflphone/client/HomeActivityTest.java
rename to ring-android/Tests/src/cx/ring/client/HomeActivityTest.java
index 587a1c91e5a62e11fe60af4c6a47c1ad50f795c6..194a0a7a8ea61f505c260fa7de22c50cbcc82322 100644
--- a/sflphone-android/Tests/src/org/sflphone/client/HomeActivityTest.java
+++ b/ring-android/Tests/src/cx/ring/client/HomeActivityTest.java
@@ -1,11 +1,11 @@
-package org.sflphone.client;
+package cx.ring.client;
 
 import android.test.ActivityInstrumentationTestCase2;
 import com.robotium.solo.Solo;
 import junit.framework.Assert;
-import org.sflphone.fragments.AboutFragment;
-import org.sflphone.fragments.AccountsManagementFragment;
-import org.sflphone.fragments.HomeFragment;
+import cx.ring.fragments.AboutFragment;
+import cx.ring.fragments.AccountsManagementFragment;
+import cx.ring.fragments.HomeFragment;
 
 /**
  * This is a simple framework for a test of an Application.  See
diff --git a/sflphone-android/assets/.gitignore b/ring-android/assets/.gitignore
similarity index 100%
rename from sflphone-android/assets/.gitignore
rename to ring-android/assets/.gitignore
diff --git a/sflphone-android/assets/fonts/Roboto-Thin.ttf b/ring-android/assets/fonts/Roboto-Thin.ttf
similarity index 100%
rename from sflphone-android/assets/fonts/Roboto-Thin.ttf
rename to ring-android/assets/fonts/Roboto-Thin.ttf
diff --git a/sflphone-android/assets/ringtones/konga.ul b/ring-android/assets/ringtones/konga.ul
similarity index 100%
rename from sflphone-android/assets/ringtones/konga.ul
rename to ring-android/assets/ringtones/konga.ul
diff --git a/sflphone-android/assets/ringtones/phone.au b/ring-android/assets/ringtones/phone.au
similarity index 100%
rename from sflphone-android/assets/ringtones/phone.au
rename to ring-android/assets/ringtones/phone.au
diff --git a/sflphone-android/assets/ringtones/phone2.au b/ring-android/assets/ringtones/phone2.au
similarity index 100%
rename from sflphone-android/assets/ringtones/phone2.au
rename to ring-android/assets/ringtones/phone2.au
diff --git a/sflphone-android/build.xml b/ring-android/build.xml
similarity index 100%
rename from sflphone-android/build.xml
rename to ring-android/build.xml
diff --git a/sflphone-android/ic_launcher-web.png b/ring-android/ic_launcher-web.png
similarity index 100%
rename from sflphone-android/ic_launcher-web.png
rename to ring-android/ic_launcher-web.png
diff --git a/sflphone-android/jni/.gitignore b/ring-android/jni/.gitignore
similarity index 100%
rename from sflphone-android/jni/.gitignore
rename to ring-android/jni/.gitignore
diff --git a/sflphone-android/jni/Android.mk b/ring-android/jni/Android.mk
similarity index 61%
rename from sflphone-android/jni/Android.mk
rename to ring-android/jni/Android.mk
index efcaac73590ad16b08cf3f848566b6bf777c87ec..d451a89820ba154f82e5343f4b17ea7ac21b27c3 100644
--- a/sflphone-android/jni/Android.mk
+++ b/ring-android/jni/Android.mk
@@ -30,9 +30,9 @@
 LOCAL_PATH:= $(call my-dir)
 
 $(info PWD=$(PWD))
-$(info SFLPHONE_CONTRIB=$(SFLPHONE_CONTRIB))
-$(info SFLPHONE_SRC_DIR=$(SFLPHONE_SRC_DIR))
-$(info SFLPHONE_BUILD_DIR=$(SFLPHONE_BUILD_DIR))
+$(info RING_CONTRIB=$(RING_CONTRIB))
+$(info RING_SRC_DIR=$(RING_SRC_DIR))
+$(info RING_BUILD_DIR=$(RING_BUILD_DIR))
 
 include $(CLEAR_VARS)
 
@@ -43,34 +43,34 @@ MY_DATADIR=/data/data
 ARCH=$(ANDROID_ABI)
 
 CPP_STATIC= $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++$(CXXSTL)/libs/$(ARCH)/libgnustl_static.a \
-			$(SFLPHONE_CONTRIB)/lib/libucommon.a \
-			$(SFLPHONE_CONTRIB)/lib/libccrtp.a \
-			$(SFLPHONE_CONTRIB)/lib/libogg.a \
-			$(SFLPHONE_CONTRIB)/lib/libFLAC.a \
-			$(SFLPHONE_CONTRIB)/lib/libgcrypt.a \
-			$(SFLPHONE_CONTRIB)/lib/libgpg-error.a \
+			$(RING_CONTRIB)/lib/libucommon.a \
+			$(RING_CONTRIB)/lib/libccrtp.a \
+			$(RING_CONTRIB)/lib/libogg.a \
+			$(RING_CONTRIB)/lib/libFLAC.a \
+			$(RING_CONTRIB)/lib/libgcrypt.a \
+			$(RING_CONTRIB)/lib/libgpg-error.a \
 
 ifeq ($(ARCH),$(filter $(ARCH),x86))
-CPP_STATIC += $(SFLPHONE_CONTRIB)/lib/libpjlib-util-i686-pc-linux-android.a \
-			$(SFLPHONE_CONTRIB)/lib/libpj-i686-pc-linux-android.a
+CPP_STATIC += $(RING_CONTRIB)/lib/libpjlib-util-i686-pc-linux-android.a \
+			$(RING_CONTRIB)/lib/libpj-i686-pc-linux-android.a
 else
-CPP_STATIC += $(SFLPHONE_CONTRIB)/lib/libpjlib-util-arm-unknown-linux-androideabi.a \
-			$(SFLPHONE_CONTRIB)/lib/libpj-arm-unknown-linux-androideabi.a
+CPP_STATIC += $(RING_CONTRIB)/lib/libpjlib-util-arm-unknown-linux-androideabi.a \
+			$(RING_CONTRIB)/lib/libpj-arm-unknown-linux-androideabi.a
 endif
 
-LOCAL_SRC_FILES :=  sflphone_wrapper.cpp
+LOCAL_SRC_FILES :=  ring_wrapper.cpp
 
-# SFLPHONE_BUILD_DIR contains config.h, which we need
+# RING_BUILD_DIR contains config.h, which we need
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
-					$(SFLPHONE_BUILD_DIR) \
-					$(SFLPHONE_SRC_DIR)/daemon \
-					$(SFLPHONE_SRC_DIR)/daemon/src \
-					$(SFLPHONE_SRC_DIR)/daemon/contrib/$(TARGET_TUPLE)/include
+					$(RING_BUILD_DIR) \
+					$(RING_SRC_DIR) \
+					$(RING_SRC_DIR)/src \
+					$(RING_SRC_DIR)/contrib/$(TARGET_TUPLE)/include
 
-LOCAL_MODULE := libsflphonejni
+LOCAL_MODULE := libringjni
 
 LOCAL_CPPFLAGS += 	-DCCPP_PREFIX \
-					-DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \
+					-DPROGSHAREDIR=\"${MY_DATADIR}/ring\" \
 					-DHAVE_CONFIG_H \
 					-DHAVE_SPEEX_CODEC \
 					-DHAVE_GSM_CODEC \
@@ -81,12 +81,12 @@ LOCAL_CPPFLAGS += 	-DCCPP_PREFIX \
 					-DDEBUG_DIRECTOR_OWNED \
 					-DPJ_AUTOCONF=1
 
-LOCAL_LDFLAGS := -L$(SFLPHONE_CONTRIB)/lib \
+LOCAL_LDFLAGS := -L$(RING_CONTRIB)/lib \
 
 LOCAL_LDLIBS  += 	-lz \
 					-llog \
 					-lOpenSLES \
-					$(SFLPHONE_BUILD_DIR)/src/.libs/libsflphone.a \
+					$(RING_BUILD_DIR)/src/.libs/libdring.a \
 
 
 ifeq ($(ARCH),$(filter $(ARCH),x86))
@@ -129,37 +129,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 ########### Codecs ###############
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := ulaw
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_ulaw.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := alaw
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_alaw.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := g722
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_g722.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := speex
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_speex.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := opus
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_opus.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := gsm
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_gsm.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := g729
-LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_g729.so
-include $(PREBUILT_SHARED_LIBRARY)
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := ulaw
+#LOCAL_SRC_FILES := ../$(RING_BUILD_DIR)/src/audio/codecs/libcodec_ulaw.so
+#include $(PREBUILT_SHARED_LIBRARY)
diff --git a/sflphone-android/jni/Application.mk b/ring-android/jni/Application.mk
similarity index 87%
rename from sflphone-android/jni/Application.mk
rename to ring-android/jni/Application.mk
index 6cb9a6154729e38eb33cf448939b124a419588ce..687227df39df58b83a0d6427b79a8c4bbeeca812 100644
--- a/sflphone-android/jni/Application.mk
+++ b/ring-android/jni/Application.mk
@@ -30,16 +30,16 @@
 
 
 
-APP_PLATFORM := android-14
+APP_PLATFORM := android-15
 APP_OPTIM := debug
 APP_ABI := ${ANDROID_ABI}
-NDK_TOOLCHAIN_VERSION := 4.8
+NDK_TOOLCHAIN_VERSION := 4.9
 
-APP_MODULES += ulaw
-APP_MODULES += alaw
-APP_MODULES += g722
-APP_MODULES += g729
-APP_MODULES += speex
-APP_MODULES += gsm
-APP_MODULES += opus
-APP_MODULES += libsflphonejni
+#APP_MODULES += ulaw
+#APP_MODULES += alaw
+#APP_MODULES += g722
+#APP_MODULES += g729
+#APP_MODULES += speex
+#APP_MODULES += gsm
+#APP_MODULES += opus
+APP_MODULES += libringjni
diff --git a/sflphone-android/jni/JavaJNI2CJNI_Load.py b/ring-android/jni/JavaJNI2CJNI_Load.py
similarity index 100%
rename from sflphone-android/jni/JavaJNI2CJNI_Load.py
rename to ring-android/jni/JavaJNI2CJNI_Load.py
diff --git a/sflphone-android/jni/callmanager.i b/ring-android/jni/callmanager.i
similarity index 99%
rename from sflphone-android/jni/callmanager.i
rename to ring-android/jni/callmanager.i
index 029c9f431deb966eaf4e65c0d66c81dd4922a888..0ea1ab565167fdb2dfdc0143af4c4d2f4fcea6ce 100644
--- a/sflphone-android/jni/callmanager.i
+++ b/ring-android/jni/callmanager.i
@@ -30,7 +30,7 @@
 
 %header %{
 
-#include "sflphone.h"
+#include "dring/dring.h"
 
 class Callback {
 public:
diff --git a/sflphone-android/jni/configurationmanager.i b/ring-android/jni/configurationmanager.i
similarity index 99%
rename from sflphone-android/jni/configurationmanager.i
rename to ring-android/jni/configurationmanager.i
index fb76f19f7243f05af2a808de5664c54cf84498bf..2be3627d89a40ce9a09f206c59a178491a1ad763 100644
--- a/sflphone-android/jni/configurationmanager.i
+++ b/ring-android/jni/configurationmanager.i
@@ -28,7 +28,7 @@
  */
 
 %header %{
-#include "sflphone.h"
+#include "dring/dring.h"
 
 class ConfigurationCallback {
 public:
diff --git a/sflphone-android/jni/jni-xml2cpp.py b/ring-android/jni/jni-xml2cpp.py
similarity index 100%
rename from sflphone-android/jni/jni-xml2cpp.py
rename to ring-android/jni/jni-xml2cpp.py
diff --git a/sflphone-android/jni/jni_interface.i b/ring-android/jni/jni_interface.i
similarity index 99%
rename from sflphone-android/jni/jni_interface.i
rename to ring-android/jni/jni_interface.i
index f14e7640b6f78159718eeb92fb175f4647896ef3..2933ae48b41b301ece0d71692cc543e7ae246efe 100644
--- a/sflphone-android/jni/jni_interface.i
+++ b/ring-android/jni/jni_interface.i
@@ -28,7 +28,7 @@
  */
 
 /* File : jni_interface.i */
-%module (directors="1") SFLPhoneservice
+%module (directors="1") Ringservice
 
 #define SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON
 %include "typemaps.i"
diff --git a/sflphone-android/jni/managerimpl.i b/ring-android/jni/managerimpl.i
similarity index 98%
rename from sflphone-android/jni/managerimpl.i
rename to ring-android/jni/managerimpl.i
index bcce621850089120b81ab6cbab46ede87ddcd981..59b89c87382cf77a5b42deb819afe801b7fbf200 100644
--- a/sflphone-android/jni/managerimpl.i
+++ b/ring-android/jni/managerimpl.i
@@ -30,7 +30,7 @@
 /* %nodefaultctor ManagerImpl;
 %nodefaultdtor ManagerImpl; */
 %header %{
-#include "sflphone.h"
+#include "dring/dring.h"
 %}
 
 
diff --git a/sflphone-android/jni/sflphoneservice.c.template b/ring-android/jni/ringservice.c.template
similarity index 79%
rename from sflphone-android/jni/sflphoneservice.c.template
rename to ring-android/jni/ringservice.c.template
index 9775374b7ad245a00377349e66ce9a6ebb8f7dd6..847a0353c15f949e7e1c95538a210903e4ee41b6 100644
--- a/sflphone-android/jni/sflphoneservice.c.template
+++ b/ring-android/jni/ringservice.c.template
@@ -1,7 +1,7 @@
 #include "logger.h"
 
 JavaVM *gJavaVM;
-const char *ksflphoneservicePath = "org/sflphone/service/SFLPhoneserviceJNI";
+const char *ksflphoneservicePath = "cx/ring/service/RingserviceJNI";
 
 void deinitClassHelper(JNIEnv *env, jobject obj) {
 	SFL_INFO("deinitClassHelper");
@@ -21,14 +21,14 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 	//Assume it is c++
 	r = vm->GetEnv ((void **) &env, JNI_VERSION_1_6);
     if (r != JNI_OK) {
-		SFL_ERR("JNI_OnLoad: failed to get the environment using GetEnv()");
+		RING_ERR("JNI_OnLoad: failed to get the environment using GetEnv()");
         return -1;
     }
 	SFL_INFO("JNI_Onload: GetEnv %p", env);
 
 	clazz = env->FindClass (ksflphoneservicePath);
 	if (!clazz) {
-        SFL_ERR("JNI_Onload: whoops, %s class not found!", ksflphoneservicePath);
+        RING_ERR("JNI_Onload: whoops, %s class not found!", ksflphoneservicePath);
 	}
 	gJavaVM = vm;
 	SFL_INFO("JNI_Onload: JavaVM %p", gJavaVM);
@@ -54,7 +54,7 @@ void JNI_OnUnLoad(JavaVM* vm, void* reserved) {
 
 	/* get env */
     if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
-		SFL_ERR("JNI_OnUnLoad: failed to get the environment using GetEnv()");
+		RING_ERR("JNI_OnUnLoad: failed to get the environment using GetEnv()");
         return;
     }
 	SFL_INFO("JNI_OnUnLoad: GetEnv %p", env);
@@ -62,7 +62,7 @@ void JNI_OnUnLoad(JavaVM* vm, void* reserved) {
     /* Get jclass with env->FindClass */
 	clazz = env->FindClass(ksflphoneservicePath);
 	if (!clazz) {
-        SFL_ERR("JNI_OnUnLoad: whoops, %s class not found!", ksflphoneservicePath);
+        RING_ERR("JNI_OnUnLoad: whoops, %s class not found!", ksflphoneservicePath);
 	}
 
 	/* remove instances of class object we need into cache */
diff --git a/ring-android/libs/android-support-v13.jar b/ring-android/libs/android-support-v13.jar
new file mode 100644
index 0000000000000000000000000000000000000000..eb5eca3d93552fb49211b3988b5f52da1a30577b
Binary files /dev/null and b/ring-android/libs/android-support-v13.jar differ
diff --git a/sflphone-android/libs/ormlite-android-4.48.jar b/ring-android/libs/ormlite-android-4.48.jar
similarity index 100%
rename from sflphone-android/libs/ormlite-android-4.48.jar
rename to ring-android/libs/ormlite-android-4.48.jar
diff --git a/sflphone-android/libs/ormlite-core-4.48.jar b/ring-android/libs/ormlite-core-4.48.jar
similarity index 100%
rename from sflphone-android/libs/ormlite-core-4.48.jar
rename to ring-android/libs/ormlite-core-4.48.jar
diff --git a/sflphone-android/libs/robotium-solo-5.0.1.jar b/ring-android/libs/robotium-solo-5.0.1.jar
similarity index 100%
rename from sflphone-android/libs/robotium-solo-5.0.1.jar
rename to ring-android/libs/robotium-solo-5.0.1.jar
diff --git a/sflphone-android/make-swig.sh b/ring-android/make-swig.sh
similarity index 83%
rename from sflphone-android/make-swig.sh
rename to ring-android/make-swig.sh
index fb682d12e8a50bff4adf1ace4925e685bc7b0a33..cef37915cc50aeed3648c4bb039847827677ff5e 100755
--- a/sflphone-android/make-swig.sh
+++ b/ring-android/make-swig.sh
@@ -31,15 +31,15 @@
 #
 
 # input: jni/jni_interface.i
-# output: sflphoneservice_loader.c
-#         sflphone_wrapper.cpp
-#         sflphoneservice.java
-#         sflphoneserviceJNI.java
+# output: ringservice_loader.c
+#         ring_wrapper.cpp
+#         ringservice.java
+#         ringserviceJNI.java
 #         ManagerImpl.java
 
 SRCDIR=jni
-PACKAGE=org.sflphone.service
-PACKAGEDIR=src/org/sflphone/service
+PACKAGE=cx.ring.service
+PACKAGEDIR=src/cx/ring/service
 ROOT=`pwd`
 
 echo "in $ROOT"
@@ -81,23 +81,23 @@ else
     exit 3
 fi
 
-echo "Generating sflphone_wrapper.cpp..."
+echo "Generating ring_wrapper.cpp..."
 
 swig -v -c++ -java \
 -package $PACKAGE \
 -outdir $PACKAGEDIR \
--o $SRCDIR/sflphone_wrapper.cpp $SRCDIR/jni_interface.i
+-o $SRCDIR/ring_wrapper.cpp $SRCDIR/jni_interface.i
 
-echo "Generating sflphoneservice_loader.c..."
+echo "Generating ringservice_loader.c..."
 python $SRCDIR/JavaJNI2CJNI_Load.py \
--i $ROOT/$PACKAGEDIR/SFLPhoneserviceJNI.java \
--o $SRCDIR/sflphoneservice_loader.c \
--t $SRCDIR/sflphoneservice.c.template \
--m SFLPhoneservice \
+-i $ROOT/$PACKAGEDIR/RingserviceJNI.java \
+-o $SRCDIR/ringservice_loader.c \
+-t $SRCDIR/ringservice.c.template \
+-m Ringservice \
 -p $PACKAGE
 
 echo "Appending sflphone_wrapper.cpp..."
-cat $SRCDIR/sflphoneservice_loader.c >> $SRCDIR/sflphone_wrapper.cpp
+cat $SRCDIR/ringservice_loader.c >> $SRCDIR/ring_wrapper.cpp
 
 echo -n "in "
 echo "Done"
diff --git a/sflphone-android/proguard-project.txt b/ring-android/proguard-project.txt
similarity index 100%
rename from sflphone-android/proguard-project.txt
rename to ring-android/proguard-project.txt
diff --git a/sflphone-android/Tests/project.properties b/ring-android/project.properties
similarity index 100%
rename from sflphone-android/Tests/project.properties
rename to ring-android/project.properties
diff --git a/sflphone-android/res/animator/slidein_up.xml b/ring-android/res/animator/slidein_up.xml
similarity index 100%
rename from sflphone-android/res/animator/slidein_up.xml
rename to ring-android/res/animator/slidein_up.xml
diff --git a/sflphone-android/res/animator/slideout_down.xml b/ring-android/res/animator/slideout_down.xml
similarity index 100%
rename from sflphone-android/res/animator/slideout_down.xml
rename to ring-android/res/animator/slideout_down.xml
diff --git a/sflphone-android/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png b/ring-android/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png
rename to ring-android/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png
diff --git a/sflphone-android/res/drawable-hdpi/box_border.9.png b/ring-android/res/drawable-hdpi/box_border.9.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/box_border.9.png
rename to ring-android/res/drawable-hdpi/box_border.9.png
diff --git a/sflphone-android/res/drawable-hdpi/call_pause.png b/ring-android/res/drawable-hdpi/call_pause.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/call_pause.png
rename to ring-android/res/drawable-hdpi/call_pause.png
diff --git a/sflphone-android/res/drawable-hdpi/drawer_shadow.9.png b/ring-android/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/drawer_shadow.9.png
rename to ring-android/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/sflphone-android/res/drawable-hdpi/green_lock.png b/ring-android/res/drawable-hdpi/green_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/green_lock.png
rename to ring-android/res/drawable-hdpi/green_lock.png
diff --git a/sflphone-android/res/drawable-hdpi/handle.png b/ring-android/res/drawable-hdpi/handle.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/handle.png
rename to ring-android/res/drawable-hdpi/handle.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_accept.png b/ring-android/res/drawable-hdpi/ic_action_accept.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_accept.png
rename to ring-android/res/drawable-hdpi/ic_action_accept.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_call.png b/ring-android/res/drawable-hdpi/ic_action_call.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_call.png
rename to ring-android/res/drawable-hdpi/ic_action_call.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_chat.png b/ring-android/res/drawable-hdpi/ic_action_chat.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_chat.png
rename to ring-android/res/drawable-hdpi/ic_action_chat.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_dial_pad.png b/ring-android/res/drawable-hdpi/ic_action_dial_pad.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_dial_pad.png
rename to ring-android/res/drawable-hdpi/ic_action_dial_pad.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_dial_pad_light.png b/ring-android/res/drawable-hdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_dial_pad_light.png
rename to ring-android/res/drawable-hdpi/ic_action_dial_pad_light.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_discard.png b/ring-android/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_discard.png
rename to ring-android/res/drawable-hdpi/ic_action_discard.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_edit.png b/ring-android/res/drawable-hdpi/ic_action_edit.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_edit.png
rename to ring-android/res/drawable-hdpi/ic_action_edit.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_end_call.png b/ring-android/res/drawable-hdpi/ic_action_end_call.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_end_call.png
rename to ring-android/res/drawable-hdpi/ic_action_end_call.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_expand.png b/ring-android/res/drawable-hdpi/ic_action_expand.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_expand.png
rename to ring-android/res/drawable-hdpi/ic_action_expand.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_expand_light.png b/ring-android/res/drawable-hdpi/ic_action_expand_light.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_expand_light.png
rename to ring-android/res/drawable-hdpi/ic_action_expand_light.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_forward.png b/ring-android/res/drawable-hdpi/ic_action_forward.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_forward.png
rename to ring-android/res/drawable-hdpi/ic_action_forward.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_group.png b/ring-android/res/drawable-hdpi/ic_action_group.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_group.png
rename to ring-android/res/drawable-hdpi/ic_action_group.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_important.png b/ring-android/res/drawable-hdpi/ic_action_important.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_important.png
rename to ring-android/res/drawable-hdpi/ic_action_important.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_keyboard.png b/ring-android/res/drawable-hdpi/ic_action_keyboard.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_keyboard.png
rename to ring-android/res/drawable-hdpi/ic_action_keyboard.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_keyboard_light.png b/ring-android/res/drawable-hdpi/ic_action_keyboard_light.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_keyboard_light.png
rename to ring-android/res/drawable-hdpi/ic_action_keyboard_light.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_mic.png b/ring-android/res/drawable-hdpi/ic_action_mic.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_mic.png
rename to ring-android/res/drawable-hdpi/ic_action_mic.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_mic_muted.png b/ring-android/res/drawable-hdpi/ic_action_mic_muted.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_mic_muted.png
rename to ring-android/res/drawable-hdpi/ic_action_mic_muted.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_new.png b/ring-android/res/drawable-hdpi/ic_action_new.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_new.png
rename to ring-android/res/drawable-hdpi/ic_action_new.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_new_dark.png b/ring-android/res/drawable-hdpi/ic_action_new_dark.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_new_dark.png
rename to ring-android/res/drawable-hdpi/ic_action_new_dark.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_not_important.png b/ring-android/res/drawable-hdpi/ic_action_not_important.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_not_important.png
rename to ring-android/res/drawable-hdpi/ic_action_not_important.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_pause_over_video.png b/ring-android/res/drawable-hdpi/ic_action_pause_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_pause_over_video.png
rename to ring-android/res/drawable-hdpi/ic_action_pause_over_video.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_play_over_video.png b/ring-android/res/drawable-hdpi/ic_action_play_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_play_over_video.png
rename to ring-android/res/drawable-hdpi/ic_action_play_over_video.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_remove.png b/ring-android/res/drawable-hdpi/ic_action_remove.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_remove.png
rename to ring-android/res/drawable-hdpi/ic_action_remove.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_reveal.png b/ring-android/res/drawable-hdpi/ic_action_reveal.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_reveal.png
rename to ring-android/res/drawable-hdpi/ic_action_reveal.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_time.png b/ring-android/res/drawable-hdpi/ic_action_time.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_time.png
rename to ring-android/res/drawable-hdpi/ic_action_time.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_action_volume_on.png b/ring-android/res/drawable-hdpi/ic_action_volume_on.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_action_volume_on.png
rename to ring-android/res/drawable-hdpi/ic_action_volume_on.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_bg.png b/ring-android/res/drawable-hdpi/ic_bg.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_bg.png
rename to ring-android/res/drawable-hdpi/ic_bg.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_bg_sel.png b/ring-android/res/drawable-hdpi/ic_bg_sel.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_bg_sel.png
rename to ring-android/res/drawable-hdpi/ic_bg_sel.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_btn_search.png b/ring-android/res/drawable-hdpi/ic_btn_search.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_btn_search.png
rename to ring-android/res/drawable-hdpi/ic_btn_search.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_btn_speak_now.png b/ring-android/res/drawable-hdpi/ic_btn_speak_now.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_btn_speak_now.png
rename to ring-android/res/drawable-hdpi/ic_btn_speak_now.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_drawer.png b/ring-android/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_drawer.png
rename to ring-android/res/drawable-hdpi/ic_drawer.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_error.png b/ring-android/res/drawable-hdpi/ic_error.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_error.png
rename to ring-android/res/drawable-hdpi/ic_error.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_good.png b/ring-android/res/drawable-hdpi/ic_good.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_good.png
rename to ring-android/res/drawable-hdpi/ic_good.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_incomingcall.png b/ring-android/res/drawable-hdpi/ic_incomingcall.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_incomingcall.png
rename to ring-android/res/drawable-hdpi/ic_incomingcall.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_launcher.png b/ring-android/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_launcher.png
rename to ring-android/res/drawable-hdpi/ic_launcher.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_menu_search.png b/ring-android/res/drawable-hdpi/ic_menu_search.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_menu_search.png
rename to ring-android/res/drawable-hdpi/ic_menu_search.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_tab_call.png b/ring-android/res/drawable-hdpi/ic_tab_call.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_tab_call.png
rename to ring-android/res/drawable-hdpi/ic_tab_call.png
diff --git a/sflphone-android/res/drawable-hdpi/ic_warning.png b/ring-android/res/drawable-hdpi/ic_warning.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/ic_warning.png
rename to ring-android/res/drawable-hdpi/ic_warning.png
diff --git a/sflphone-android/res/drawable-hdpi/recordpressed.png b/ring-android/res/drawable-hdpi/recordpressed.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/recordpressed.png
rename to ring-android/res/drawable-hdpi/recordpressed.png
diff --git a/sflphone-android/res/drawable-hdpi/red_lock.png b/ring-android/res/drawable-hdpi/red_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-hdpi/red_lock.png
rename to ring-android/res/drawable-hdpi/red_lock.png
diff --git a/sflphone-android/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png b/ring-android/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png
rename to ring-android/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png
diff --git a/sflphone-android/res/drawable-mdpi/drawer_shadow.9.png b/ring-android/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/drawer_shadow.9.png
rename to ring-android/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/sflphone-android/res/drawable-mdpi/green_lock.png b/ring-android/res/drawable-mdpi/green_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/green_lock.png
rename to ring-android/res/drawable-mdpi/green_lock.png
diff --git a/sflphone-android/res/drawable-mdpi/handle.png b/ring-android/res/drawable-mdpi/handle.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/handle.png
rename to ring-android/res/drawable-mdpi/handle.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_accept.png b/ring-android/res/drawable-mdpi/ic_action_accept.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_accept.png
rename to ring-android/res/drawable-mdpi/ic_action_accept.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_call.png b/ring-android/res/drawable-mdpi/ic_action_call.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_call.png
rename to ring-android/res/drawable-mdpi/ic_action_call.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_chat.png b/ring-android/res/drawable-mdpi/ic_action_chat.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_chat.png
rename to ring-android/res/drawable-mdpi/ic_action_chat.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_dial_pad.png b/ring-android/res/drawable-mdpi/ic_action_dial_pad.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_dial_pad.png
rename to ring-android/res/drawable-mdpi/ic_action_dial_pad.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_dial_pad_light.png b/ring-android/res/drawable-mdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_dial_pad_light.png
rename to ring-android/res/drawable-mdpi/ic_action_dial_pad_light.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_discard.png b/ring-android/res/drawable-mdpi/ic_action_discard.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_discard.png
rename to ring-android/res/drawable-mdpi/ic_action_discard.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_edit.png b/ring-android/res/drawable-mdpi/ic_action_edit.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_edit.png
rename to ring-android/res/drawable-mdpi/ic_action_edit.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_end_call.png b/ring-android/res/drawable-mdpi/ic_action_end_call.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_end_call.png
rename to ring-android/res/drawable-mdpi/ic_action_end_call.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_expand.png b/ring-android/res/drawable-mdpi/ic_action_expand.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_expand.png
rename to ring-android/res/drawable-mdpi/ic_action_expand.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_expand_light.png b/ring-android/res/drawable-mdpi/ic_action_expand_light.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_expand_light.png
rename to ring-android/res/drawable-mdpi/ic_action_expand_light.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_forward.png b/ring-android/res/drawable-mdpi/ic_action_forward.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_forward.png
rename to ring-android/res/drawable-mdpi/ic_action_forward.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_group.png b/ring-android/res/drawable-mdpi/ic_action_group.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_group.png
rename to ring-android/res/drawable-mdpi/ic_action_group.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_important.png b/ring-android/res/drawable-mdpi/ic_action_important.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_important.png
rename to ring-android/res/drawable-mdpi/ic_action_important.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_keyboard.png b/ring-android/res/drawable-mdpi/ic_action_keyboard.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_keyboard.png
rename to ring-android/res/drawable-mdpi/ic_action_keyboard.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_keyboard_light.png b/ring-android/res/drawable-mdpi/ic_action_keyboard_light.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_keyboard_light.png
rename to ring-android/res/drawable-mdpi/ic_action_keyboard_light.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_mic.png b/ring-android/res/drawable-mdpi/ic_action_mic.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_mic.png
rename to ring-android/res/drawable-mdpi/ic_action_mic.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_mic_muted.png b/ring-android/res/drawable-mdpi/ic_action_mic_muted.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_mic_muted.png
rename to ring-android/res/drawable-mdpi/ic_action_mic_muted.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_new.png b/ring-android/res/drawable-mdpi/ic_action_new.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_new.png
rename to ring-android/res/drawable-mdpi/ic_action_new.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_new_dark.png b/ring-android/res/drawable-mdpi/ic_action_new_dark.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_new_dark.png
rename to ring-android/res/drawable-mdpi/ic_action_new_dark.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_not_important.png b/ring-android/res/drawable-mdpi/ic_action_not_important.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_not_important.png
rename to ring-android/res/drawable-mdpi/ic_action_not_important.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_pause_over_video.png b/ring-android/res/drawable-mdpi/ic_action_pause_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_pause_over_video.png
rename to ring-android/res/drawable-mdpi/ic_action_pause_over_video.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_play_over_video.png b/ring-android/res/drawable-mdpi/ic_action_play_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_play_over_video.png
rename to ring-android/res/drawable-mdpi/ic_action_play_over_video.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_remove.png b/ring-android/res/drawable-mdpi/ic_action_remove.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_remove.png
rename to ring-android/res/drawable-mdpi/ic_action_remove.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_reveal.png b/ring-android/res/drawable-mdpi/ic_action_reveal.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_reveal.png
rename to ring-android/res/drawable-mdpi/ic_action_reveal.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_time.png b/ring-android/res/drawable-mdpi/ic_action_time.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_time.png
rename to ring-android/res/drawable-mdpi/ic_action_time.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_action_volume_on.png b/ring-android/res/drawable-mdpi/ic_action_volume_on.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_action_volume_on.png
rename to ring-android/res/drawable-mdpi/ic_action_volume_on.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_btn_search.png b/ring-android/res/drawable-mdpi/ic_btn_search.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_btn_search.png
rename to ring-android/res/drawable-mdpi/ic_btn_search.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_btn_speak_now.png b/ring-android/res/drawable-mdpi/ic_btn_speak_now.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_btn_speak_now.png
rename to ring-android/res/drawable-mdpi/ic_btn_speak_now.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_drawer.png b/ring-android/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_drawer.png
rename to ring-android/res/drawable-mdpi/ic_drawer.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_error.png b/ring-android/res/drawable-mdpi/ic_error.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_error.png
rename to ring-android/res/drawable-mdpi/ic_error.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_good.png b/ring-android/res/drawable-mdpi/ic_good.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_good.png
rename to ring-android/res/drawable-mdpi/ic_good.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_incomingcall.png b/ring-android/res/drawable-mdpi/ic_incomingcall.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_incomingcall.png
rename to ring-android/res/drawable-mdpi/ic_incomingcall.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_launcher.png b/ring-android/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_launcher.png
rename to ring-android/res/drawable-mdpi/ic_launcher.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_menu_search.png b/ring-android/res/drawable-mdpi/ic_menu_search.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_menu_search.png
rename to ring-android/res/drawable-mdpi/ic_menu_search.png
diff --git a/sflphone-android/res/drawable-mdpi/ic_warning.png b/ring-android/res/drawable-mdpi/ic_warning.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/ic_warning.png
rename to ring-android/res/drawable-mdpi/ic_warning.png
diff --git a/sflphone-android/res/drawable-mdpi/recordpressed.png b/ring-android/res/drawable-mdpi/recordpressed.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/recordpressed.png
rename to ring-android/res/drawable-mdpi/recordpressed.png
diff --git a/sflphone-android/res/drawable-mdpi/red_lock.png b/ring-android/res/drawable-mdpi/red_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-mdpi/red_lock.png
rename to ring-android/res/drawable-mdpi/red_lock.png
diff --git a/sflphone-android/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png b/ring-android/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png
rename to ring-android/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png
diff --git a/sflphone-android/res/drawable-xhdpi/device_access_call.png b/ring-android/res/drawable-xhdpi/device_access_call.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/device_access_call.png
rename to ring-android/res/drawable-xhdpi/device_access_call.png
diff --git a/sflphone-android/res/drawable-xhdpi/drawer_shadow.9.png b/ring-android/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/drawer_shadow.9.png
rename to ring-android/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/sflphone-android/res/drawable-xhdpi/green_lock.png b/ring-android/res/drawable-xhdpi/green_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/green_lock.png
rename to ring-android/res/drawable-xhdpi/green_lock.png
diff --git a/sflphone-android/res/drawable-xhdpi/handle.png b/ring-android/res/drawable-xhdpi/handle.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/handle.png
rename to ring-android/res/drawable-xhdpi/handle.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_accept.png b/ring-android/res/drawable-xhdpi/ic_action_accept.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_accept.png
rename to ring-android/res/drawable-xhdpi/ic_action_accept.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_call.png b/ring-android/res/drawable-xhdpi/ic_action_call.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_call.png
rename to ring-android/res/drawable-xhdpi/ic_action_call.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_chat.png b/ring-android/res/drawable-xhdpi/ic_action_chat.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_chat.png
rename to ring-android/res/drawable-xhdpi/ic_action_chat.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_dial_pad.png b/ring-android/res/drawable-xhdpi/ic_action_dial_pad.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_dial_pad.png
rename to ring-android/res/drawable-xhdpi/ic_action_dial_pad.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_dial_pad_light.png b/ring-android/res/drawable-xhdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_dial_pad_light.png
rename to ring-android/res/drawable-xhdpi/ic_action_dial_pad_light.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_discard.png b/ring-android/res/drawable-xhdpi/ic_action_discard.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_discard.png
rename to ring-android/res/drawable-xhdpi/ic_action_discard.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_edit.png b/ring-android/res/drawable-xhdpi/ic_action_edit.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_edit.png
rename to ring-android/res/drawable-xhdpi/ic_action_edit.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_end_call.png b/ring-android/res/drawable-xhdpi/ic_action_end_call.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_end_call.png
rename to ring-android/res/drawable-xhdpi/ic_action_end_call.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_expand.png b/ring-android/res/drawable-xhdpi/ic_action_expand.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_expand.png
rename to ring-android/res/drawable-xhdpi/ic_action_expand.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_expand_light.png b/ring-android/res/drawable-xhdpi/ic_action_expand_light.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_expand_light.png
rename to ring-android/res/drawable-xhdpi/ic_action_expand_light.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_forward.png b/ring-android/res/drawable-xhdpi/ic_action_forward.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_forward.png
rename to ring-android/res/drawable-xhdpi/ic_action_forward.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_group.png b/ring-android/res/drawable-xhdpi/ic_action_group.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_group.png
rename to ring-android/res/drawable-xhdpi/ic_action_group.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_important.png b/ring-android/res/drawable-xhdpi/ic_action_important.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_important.png
rename to ring-android/res/drawable-xhdpi/ic_action_important.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_keyboard.png b/ring-android/res/drawable-xhdpi/ic_action_keyboard.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_keyboard.png
rename to ring-android/res/drawable-xhdpi/ic_action_keyboard.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_keyboard_light.png b/ring-android/res/drawable-xhdpi/ic_action_keyboard_light.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_keyboard_light.png
rename to ring-android/res/drawable-xhdpi/ic_action_keyboard_light.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_mic.png b/ring-android/res/drawable-xhdpi/ic_action_mic.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_mic.png
rename to ring-android/res/drawable-xhdpi/ic_action_mic.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_mic_muted.png b/ring-android/res/drawable-xhdpi/ic_action_mic_muted.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_mic_muted.png
rename to ring-android/res/drawable-xhdpi/ic_action_mic_muted.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_new.png b/ring-android/res/drawable-xhdpi/ic_action_new.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_new.png
rename to ring-android/res/drawable-xhdpi/ic_action_new.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_new_dark.png b/ring-android/res/drawable-xhdpi/ic_action_new_dark.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_new_dark.png
rename to ring-android/res/drawable-xhdpi/ic_action_new_dark.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_not_important.png b/ring-android/res/drawable-xhdpi/ic_action_not_important.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_not_important.png
rename to ring-android/res/drawable-xhdpi/ic_action_not_important.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_pause_over_video.png b/ring-android/res/drawable-xhdpi/ic_action_pause_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_pause_over_video.png
rename to ring-android/res/drawable-xhdpi/ic_action_pause_over_video.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_play_over_video.png b/ring-android/res/drawable-xhdpi/ic_action_play_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_play_over_video.png
rename to ring-android/res/drawable-xhdpi/ic_action_play_over_video.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_remove.png b/ring-android/res/drawable-xhdpi/ic_action_remove.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_remove.png
rename to ring-android/res/drawable-xhdpi/ic_action_remove.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_reveal.png b/ring-android/res/drawable-xhdpi/ic_action_reveal.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_reveal.png
rename to ring-android/res/drawable-xhdpi/ic_action_reveal.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_time.png b/ring-android/res/drawable-xhdpi/ic_action_time.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_time.png
rename to ring-android/res/drawable-xhdpi/ic_action_time.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_action_volume_on.png b/ring-android/res/drawable-xhdpi/ic_action_volume_on.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_action_volume_on.png
rename to ring-android/res/drawable-xhdpi/ic_action_volume_on.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_btn_search.png b/ring-android/res/drawable-xhdpi/ic_btn_search.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_btn_search.png
rename to ring-android/res/drawable-xhdpi/ic_btn_search.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_btn_speak_now.png b/ring-android/res/drawable-xhdpi/ic_btn_speak_now.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_btn_speak_now.png
rename to ring-android/res/drawable-xhdpi/ic_btn_speak_now.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_drawer.png b/ring-android/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_drawer.png
rename to ring-android/res/drawable-xhdpi/ic_drawer.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_error.png b/ring-android/res/drawable-xhdpi/ic_error.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_error.png
rename to ring-android/res/drawable-xhdpi/ic_error.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_good.png b/ring-android/res/drawable-xhdpi/ic_good.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_good.png
rename to ring-android/res/drawable-xhdpi/ic_good.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_incomingcall.png b/ring-android/res/drawable-xhdpi/ic_incomingcall.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_incomingcall.png
rename to ring-android/res/drawable-xhdpi/ic_incomingcall.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_launcher.png b/ring-android/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_launcher.png
rename to ring-android/res/drawable-xhdpi/ic_launcher.png
diff --git a/sflphone-android/res/drawable-xhdpi/ic_warning.png b/ring-android/res/drawable-xhdpi/ic_warning.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/ic_warning.png
rename to ring-android/res/drawable-xhdpi/ic_warning.png
diff --git a/sflphone-android/res/drawable-xhdpi/recordpressed.png b/ring-android/res/drawable-xhdpi/recordpressed.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/recordpressed.png
rename to ring-android/res/drawable-xhdpi/recordpressed.png
diff --git a/sflphone-android/res/drawable-xhdpi/red_lock.png b/ring-android/res/drawable-xhdpi/red_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-xhdpi/red_lock.png
rename to ring-android/res/drawable-xhdpi/red_lock.png
diff --git a/sflphone-android/res/drawable-xxhdpi/green_lock.png b/ring-android/res/drawable-xxhdpi/green_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/green_lock.png
rename to ring-android/res/drawable-xxhdpi/green_lock.png
diff --git a/sflphone-android/res/drawable-xxhdpi/handle.png b/ring-android/res/drawable-xxhdpi/handle.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/handle.png
rename to ring-android/res/drawable-xxhdpi/handle.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_accept.png b/ring-android/res/drawable-xxhdpi/ic_action_accept.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_accept.png
rename to ring-android/res/drawable-xxhdpi/ic_action_accept.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_call.png b/ring-android/res/drawable-xxhdpi/ic_action_call.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_call.png
rename to ring-android/res/drawable-xxhdpi/ic_action_call.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_chat.png b/ring-android/res/drawable-xxhdpi/ic_action_chat.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_chat.png
rename to ring-android/res/drawable-xxhdpi/ic_action_chat.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_dial_pad.png b/ring-android/res/drawable-xxhdpi/ic_action_dial_pad.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_dial_pad.png
rename to ring-android/res/drawable-xxhdpi/ic_action_dial_pad.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_dial_pad_light.png b/ring-android/res/drawable-xxhdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_dial_pad_light.png
rename to ring-android/res/drawable-xxhdpi/ic_action_dial_pad_light.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_discard.png b/ring-android/res/drawable-xxhdpi/ic_action_discard.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_discard.png
rename to ring-android/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_edit.png b/ring-android/res/drawable-xxhdpi/ic_action_edit.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_edit.png
rename to ring-android/res/drawable-xxhdpi/ic_action_edit.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_end_call.png b/ring-android/res/drawable-xxhdpi/ic_action_end_call.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_end_call.png
rename to ring-android/res/drawable-xxhdpi/ic_action_end_call.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_expand.png b/ring-android/res/drawable-xxhdpi/ic_action_expand.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_expand.png
rename to ring-android/res/drawable-xxhdpi/ic_action_expand.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_expand_light.png b/ring-android/res/drawable-xxhdpi/ic_action_expand_light.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_expand_light.png
rename to ring-android/res/drawable-xxhdpi/ic_action_expand_light.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_forward.png b/ring-android/res/drawable-xxhdpi/ic_action_forward.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_forward.png
rename to ring-android/res/drawable-xxhdpi/ic_action_forward.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_group.png b/ring-android/res/drawable-xxhdpi/ic_action_group.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_group.png
rename to ring-android/res/drawable-xxhdpi/ic_action_group.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_important.png b/ring-android/res/drawable-xxhdpi/ic_action_important.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_important.png
rename to ring-android/res/drawable-xxhdpi/ic_action_important.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_keyboard.png b/ring-android/res/drawable-xxhdpi/ic_action_keyboard.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_keyboard.png
rename to ring-android/res/drawable-xxhdpi/ic_action_keyboard.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_keyboard_light.png b/ring-android/res/drawable-xxhdpi/ic_action_keyboard_light.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_keyboard_light.png
rename to ring-android/res/drawable-xxhdpi/ic_action_keyboard_light.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_mic.png b/ring-android/res/drawable-xxhdpi/ic_action_mic.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_mic.png
rename to ring-android/res/drawable-xxhdpi/ic_action_mic.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_mic_muted.png b/ring-android/res/drawable-xxhdpi/ic_action_mic_muted.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_mic_muted.png
rename to ring-android/res/drawable-xxhdpi/ic_action_mic_muted.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_new.png b/ring-android/res/drawable-xxhdpi/ic_action_new.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_new.png
rename to ring-android/res/drawable-xxhdpi/ic_action_new.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_new_dark.png b/ring-android/res/drawable-xxhdpi/ic_action_new_dark.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_new_dark.png
rename to ring-android/res/drawable-xxhdpi/ic_action_new_dark.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_not_important.png b/ring-android/res/drawable-xxhdpi/ic_action_not_important.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_not_important.png
rename to ring-android/res/drawable-xxhdpi/ic_action_not_important.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_pause_over_video.png b/ring-android/res/drawable-xxhdpi/ic_action_pause_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_pause_over_video.png
rename to ring-android/res/drawable-xxhdpi/ic_action_pause_over_video.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_play_over_video.png b/ring-android/res/drawable-xxhdpi/ic_action_play_over_video.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_play_over_video.png
rename to ring-android/res/drawable-xxhdpi/ic_action_play_over_video.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_remove.png b/ring-android/res/drawable-xxhdpi/ic_action_remove.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_remove.png
rename to ring-android/res/drawable-xxhdpi/ic_action_remove.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_reveal.png b/ring-android/res/drawable-xxhdpi/ic_action_reveal.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_reveal.png
rename to ring-android/res/drawable-xxhdpi/ic_action_reveal.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_time.png b/ring-android/res/drawable-xxhdpi/ic_action_time.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_time.png
rename to ring-android/res/drawable-xxhdpi/ic_action_time.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_action_volume_on.png b/ring-android/res/drawable-xxhdpi/ic_action_volume_on.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_action_volume_on.png
rename to ring-android/res/drawable-xxhdpi/ic_action_volume_on.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_btn_search.png b/ring-android/res/drawable-xxhdpi/ic_btn_search.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_btn_search.png
rename to ring-android/res/drawable-xxhdpi/ic_btn_search.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_error.png b/ring-android/res/drawable-xxhdpi/ic_error.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_error.png
rename to ring-android/res/drawable-xxhdpi/ic_error.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_good.png b/ring-android/res/drawable-xxhdpi/ic_good.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_good.png
rename to ring-android/res/drawable-xxhdpi/ic_good.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_launcher.png b/ring-android/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_launcher.png
rename to ring-android/res/drawable-xxhdpi/ic_launcher.png
diff --git a/sflphone-android/res/drawable-xxhdpi/ic_warning.png b/ring-android/res/drawable-xxhdpi/ic_warning.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/ic_warning.png
rename to ring-android/res/drawable-xxhdpi/ic_warning.png
diff --git a/sflphone-android/res/drawable-xxhdpi/recordpressed.png b/ring-android/res/drawable-xxhdpi/recordpressed.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/recordpressed.png
rename to ring-android/res/drawable-xxhdpi/recordpressed.png
diff --git a/sflphone-android/res/drawable-xxhdpi/red_lock.png b/ring-android/res/drawable-xxhdpi/red_lock.png
similarity index 100%
rename from sflphone-android/res/drawable-xxhdpi/red_lock.png
rename to ring-android/res/drawable-xxhdpi/red_lock.png
diff --git a/sflphone-android/res/drawable/background_tabs.xml b/ring-android/res/drawable/background_tabs.xml
similarity index 100%
rename from sflphone-android/res/drawable/background_tabs.xml
rename to ring-android/res/drawable/background_tabs.xml
diff --git a/sflphone-android/res/drawable/bg_108.png b/ring-android/res/drawable/bg_108.png
similarity index 100%
rename from sflphone-android/res/drawable/bg_108.png
rename to ring-android/res/drawable/bg_108.png
diff --git a/sflphone-android/res/drawable/bg_144.png b/ring-android/res/drawable/bg_144.png
similarity index 100%
rename from sflphone-android/res/drawable/bg_144.png
rename to ring-android/res/drawable/bg_144.png
diff --git a/sflphone-android/res/drawable/bg_72.png b/ring-android/res/drawable/bg_72.png
similarity index 100%
rename from sflphone-android/res/drawable/bg_72.png
rename to ring-android/res/drawable/bg_72.png
diff --git a/sflphone-android/res/drawable/bubble_left_selector.xml b/ring-android/res/drawable/bubble_left_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/bubble_left_selector.xml
rename to ring-android/res/drawable/bubble_left_selector.xml
diff --git a/sflphone-android/res/drawable/bubble_right_selector.xml b/ring-android/res/drawable/bubble_right_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/bubble_right_selector.xml
rename to ring-android/res/drawable/bubble_right_selector.xml
diff --git a/sflphone-android/res/drawable/call_button.xml b/ring-android/res/drawable/call_button.xml
similarity index 100%
rename from sflphone-android/res/drawable/call_button.xml
rename to ring-android/res/drawable/call_button.xml
diff --git a/sflphone-android/res/drawable/defaultshadowtop.xml b/ring-android/res/drawable/defaultshadowtop.xml
similarity index 100%
rename from sflphone-android/res/drawable/defaultshadowtop.xml
rename to ring-android/res/drawable/defaultshadowtop.xml
diff --git a/sflphone-android/res/drawable/dialer_selector.xml b/ring-android/res/drawable/dialer_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/dialer_selector.xml
rename to ring-android/res/drawable/dialer_selector.xml
diff --git a/sflphone-android/res/drawable/divider.xml b/ring-android/res/drawable/divider.xml
similarity index 100%
rename from sflphone-android/res/drawable/divider.xml
rename to ring-android/res/drawable/divider.xml
diff --git a/sflphone-android/res/drawable/drawer_disc_handle.xml b/ring-android/res/drawable/drawer_disc_handle.xml
similarity index 100%
rename from sflphone-android/res/drawable/drawer_disc_handle.xml
rename to ring-android/res/drawable/drawer_disc_handle.xml
diff --git a/sflphone-android/res/drawable/hangup_button.xml b/ring-android/res/drawable/hangup_button.xml
similarity index 100%
rename from sflphone-android/res/drawable/hangup_button.xml
rename to ring-android/res/drawable/hangup_button.xml
diff --git a/sflphone-android/res/drawable/hold_button.xml b/ring-android/res/drawable/hold_button.xml
similarity index 100%
rename from sflphone-android/res/drawable/hold_button.xml
rename to ring-android/res/drawable/hold_button.xml
diff --git a/sflphone-android/res/drawable/ic_contact_picture.png b/ring-android/res/drawable/ic_contact_picture.png
similarity index 100%
rename from sflphone-android/res/drawable/ic_contact_picture.png
rename to ring-android/res/drawable/ic_contact_picture.png
diff --git a/sflphone-android/res/drawable/item_contact_selector.xml b/ring-android/res/drawable/item_contact_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/item_contact_selector.xml
rename to ring-android/res/drawable/item_contact_selector.xml
diff --git a/sflphone-android/res/drawable/item_generic_selector.xml b/ring-android/res/drawable/item_generic_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/item_generic_selector.xml
rename to ring-android/res/drawable/item_generic_selector.xml
diff --git a/sflphone-android/res/drawable/item_history_selector.xml b/ring-android/res/drawable/item_history_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/item_history_selector.xml
rename to ring-android/res/drawable/item_history_selector.xml
diff --git a/sflphone-android/res/drawable/item_keyboard_choice_selector.xml b/ring-android/res/drawable/item_keyboard_choice_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/item_keyboard_choice_selector.xml
rename to ring-android/res/drawable/item_keyboard_choice_selector.xml
diff --git a/sflphone-android/res/drawable/logo_sfl_coul_rgb.png b/ring-android/res/drawable/logo_sfl_coul_rgb.png
similarity index 100%
rename from sflphone-android/res/drawable/logo_sfl_coul_rgb.png
rename to ring-android/res/drawable/logo_sfl_coul_rgb.png
diff --git a/sflphone-android/res/drawable/navigation_selector.xml b/ring-android/res/drawable/navigation_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/navigation_selector.xml
rename to ring-android/res/drawable/navigation_selector.xml
diff --git a/sflphone-android/res/drawable/toggle_speaker_selector.xml b/ring-android/res/drawable/toggle_speaker_selector.xml
similarity index 100%
rename from sflphone-android/res/drawable/toggle_speaker_selector.xml
rename to ring-android/res/drawable/toggle_speaker_selector.xml
diff --git a/sflphone-android/res/layout/activity_account_settings.xml b/ring-android/res/layout/activity_account_settings.xml
similarity index 90%
rename from sflphone-android/res/layout/activity_account_settings.xml
rename to ring-android/res/layout/activity_account_settings.xml
index e53d1a7f9b13b4397f69ec692a858f1f219c37e1..63faced3bb6fdcf40f3d8bae9ae1cff928cffd8f 100644
--- a/sflphone-android/res/layout/activity_account_settings.xml
+++ b/ring-android/res/layout/activity_account_settings.xml
@@ -1,10 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/org.sflphone"
+    xmlns:app="http://schemas.android.com/apk/res/cx.ring"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <org.sflphone.views.PagerSlidingTabStrip
+    <cx.ring.views.PagerSlidingTabStrip
         android:id="@+id/pager_sliding_strip"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
diff --git a/sflphone-android/res/layout/activity_call_layout.xml b/ring-android/res/layout/activity_call_layout.xml
similarity index 94%
rename from sflphone-android/res/layout/activity_call_layout.xml
rename to ring-android/res/layout/activity_call_layout.xml
index fd13570052c66e2cf746ea9db122c2db0141c23f..8f1878a6638e85d52ad8304525abdeb3548fed3f 100644
--- a/sflphone-android/res/layout/activity_call_layout.xml
+++ b/ring-android/res/layout/activity_call_layout.xml
@@ -30,7 +30,7 @@ shall include the source code for the parts of OpenSSL used as well
 as that of the covered work.
 -->
 
-<org.sflphone.views.CallPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<cx.ring.views.CallPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/slidingpanelayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -45,4 +45,4 @@ as that of the covered work.
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</org.sflphone.views.CallPaneLayout>
\ No newline at end of file
+</cx.ring.views.CallPaneLayout>
\ No newline at end of file
diff --git a/sflphone-android/res/layout/activity_holder.xml b/ring-android/res/layout/activity_holder.xml
similarity index 100%
rename from sflphone-android/res/layout/activity_holder.xml
rename to ring-android/res/layout/activity_holder.xml
diff --git a/sflphone-android/res/layout/activity_home.xml b/ring-android/res/layout/activity_home.xml
similarity index 97%
rename from sflphone-android/res/layout/activity_home.xml
rename to ring-android/res/layout/activity_home.xml
index f5e614c53bc13d46ec35dbf13731f60e4d0bf6f0..66422c9ccbc2636332b023a51fe5dbdc296fdf09 100644
--- a/sflphone-android/res/layout/activity_home.xml
+++ b/ring-android/res/layout/activity_home.xml
@@ -35,7 +35,7 @@ as that of the covered work.
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <org.sflphone.views.SlidingUpPanelLayout
+    <cx.ring.views.SlidingUpPanelLayout
         android:id="@+id/contact_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -55,7 +55,7 @@ as that of the covered work.
             android:clickable="true"
             android:focusable="true"
             android:focusableInTouchMode="true" />
-    </org.sflphone.views.SlidingUpPanelLayout>
+    </cx.ring.views.SlidingUpPanelLayout>
 
     <FrameLayout
         android:id="@+id/left_drawer"
diff --git a/sflphone-android/res/layout/activity_mgmt_accounts.xml b/ring-android/res/layout/activity_mgmt_accounts.xml
similarity index 100%
rename from sflphone-android/res/layout/activity_mgmt_accounts.xml
rename to ring-android/res/layout/activity_mgmt_accounts.xml
diff --git a/sflphone-android/res/layout/activity_wizard.xml b/ring-android/res/layout/activity_wizard.xml
similarity index 100%
rename from sflphone-android/res/layout/activity_wizard.xml
rename to ring-android/res/layout/activity_wizard.xml
diff --git a/sflphone-android/res/layout/clearable_edit_text.xml b/ring-android/res/layout/clearable_edit_text.xml
similarity index 100%
rename from sflphone-android/res/layout/clearable_edit_text.xml
rename to ring-android/res/layout/clearable_edit_text.xml
diff --git a/sflphone-android/res/layout/credentials_pref.xml b/ring-android/res/layout/credentials_pref.xml
similarity index 98%
rename from sflphone-android/res/layout/credentials_pref.xml
rename to ring-android/res/layout/credentials_pref.xml
index ff7c0089aba44f1e77d64ded9d47cc87dbf34f8a..8a7c57f7cf1dc8d147b13b761f98da96c7c863a4 100644
--- a/sflphone-android/res/layout/credentials_pref.xml
+++ b/ring-android/res/layout/credentials_pref.xml
@@ -46,7 +46,7 @@ as that of the covered work.
         <requestFocus />
     </EditText>
 
-    <org.sflphone.views.PasswordEditText
+    <cx.ring.views.PasswordEditText
         android:id="@+id/credentials_password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/sflphone-android/res/layout/dialog_conference.xml b/ring-android/res/layout/dialog_conference.xml
similarity index 100%
rename from sflphone-android/res/layout/dialog_conference.xml
rename to ring-android/res/layout/dialog_conference.xml
diff --git a/sflphone-android/res/layout/dialog_transfer.xml b/ring-android/res/layout/dialog_transfer.xml
similarity index 100%
rename from sflphone-android/res/layout/dialog_transfer.xml
rename to ring-android/res/layout/dialog_transfer.xml
diff --git a/sflphone-android/res/layout/frag_about.xml b/ring-android/res/layout/frag_about.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_about.xml
rename to ring-android/res/layout/frag_about.xml
diff --git a/sflphone-android/res/layout/frag_account_creation.xml b/ring-android/res/layout/frag_account_creation.xml
similarity index 98%
rename from sflphone-android/res/layout/frag_account_creation.xml
rename to ring-android/res/layout/frag_account_creation.xml
index ee605ee5ef778b26cdea24ef50d218660cf6e381..05829b978ab6cc9de23f1f941b35a3fcd8ec8b67 100644
--- a/sflphone-android/res/layout/frag_account_creation.xml
+++ b/ring-android/res/layout/frag_account_creation.xml
@@ -44,7 +44,7 @@
             android:singleLine="true"
             android:typeface="monospace" />
 
-        <org.sflphone.views.PasswordEditText
+        <cx.ring.views.PasswordEditText
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/sflphone-android/res/layout/frag_accounts_list.xml b/ring-android/res/layout/frag_accounts_list.xml
similarity index 96%
rename from sflphone-android/res/layout/frag_accounts_list.xml
rename to ring-android/res/layout/frag_accounts_list.xml
index e364ec5307b28c6b1b5be4c0ae25a1be44971c14..c0fee129da689afa7e8c729b59fa9992822e1484 100644
--- a/sflphone-android/res/layout/frag_accounts_list.xml
+++ b/ring-android/res/layout/frag_accounts_list.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dslv="http://schemas.android.com/apk/res/org.sflphone"
+    xmlns:dslv="http://schemas.android.com/apk/res/cx.ring"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -20,7 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
-        <org.sflphone.views.dragsortlv.DragSortListView
+        <cx.ring.views.dragsortlv.DragSortListView
             android:id="@+id/accounts_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/sflphone-android/res/layout/frag_audio_mgmt.xml b/ring-android/res/layout/frag_audio_mgmt.xml
similarity index 94%
rename from sflphone-android/res/layout/frag_audio_mgmt.xml
rename to ring-android/res/layout/frag_audio_mgmt.xml
index 9149e37d7c9976ec925ebd5cfcb5dfff2dcd4f33..672492bf0bf9dce3b7e7741fcc386b369893da5b 100644
--- a/sflphone-android/res/layout/frag_audio_mgmt.xml
+++ b/ring-android/res/layout/frag_audio_mgmt.xml
@@ -44,8 +44,8 @@
             android:orientation="vertical"
             android:weightSum="1" >
 
-            <org.sflphone.views.dragsortlv.DragSortListView
-                xmlns:dslv="http://schemas.android.com/apk/res/org.sflphone"
+            <cx.ring.views.dragsortlv.DragSortListView
+                xmlns:dslv="http://schemas.android.com/apk/res/cx.ring"
                 android:id="@+id/dndlistview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/sflphone-android/res/layout/frag_call.xml b/ring-android/res/layout/frag_call.xml
similarity index 98%
rename from sflphone-android/res/layout/frag_call.xml
rename to ring-android/res/layout/frag_call.xml
index 18eeaec96e72c66c10502b87e5ae40f8456c2509..ce4d2b06aab10b18cbd7f11bf2f2bdfcfd2dc83d 100644
--- a/sflphone-android/res/layout/frag_call.xml
+++ b/ring-android/res/layout/frag_call.xml
@@ -5,7 +5,7 @@
                 android:background="@drawable/bg_72"
                 android:divider="@drawable/divider">
 
-    <org.sflphone.model.BubblesView
+    <cx.ring.model.BubblesView
             android:id="@+id/main_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/sflphone-android/res/layout/frag_call_list.xml b/ring-android/res/layout/frag_call_list.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_call_list.xml
rename to ring-android/res/layout/frag_call_list.xml
diff --git a/sflphone-android/res/layout/frag_contact_list.xml b/ring-android/res/layout/frag_contact_list.xml
similarity index 97%
rename from sflphone-android/res/layout/frag_contact_list.xml
rename to ring-android/res/layout/frag_contact_list.xml
index faf066781ad09e57b6d642bcf87d0564c69b6b6b..740e72f7f53cfa9f5ead7f5aa97d63e08e397f9f 100644
--- a/sflphone-android/res/layout/frag_contact_list.xml
+++ b/ring-android/res/layout/frag_contact_list.xml
@@ -74,7 +74,7 @@ as that of the covered work.
 
         <!-- Declared after for implicit z order -->
 
-        <org.sflphone.views.HalfCircleImageView
+        <cx.ring.views.HalfCircleImageView
             android:id="@+id/hello"
             android:layout_width="112dp"
             android:layout_height="68dp"
@@ -83,7 +83,7 @@ as that of the covered work.
             android:src="@drawable/ic_action_group" />
     </RelativeLayout>
 
-    <org.sflphone.views.stickylistheaders.StickyListHeadersListView
+    <cx.ring.views.stickylistheaders.StickyListHeadersListView
         android:id="@+id/contacts_stickylv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/sflphone-android/res/layout/frag_contact_list_header.xml b/ring-android/res/layout/frag_contact_list_header.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_contact_list_header.xml
rename to ring-android/res/layout/frag_contact_list_header.xml
diff --git a/sflphone-android/res/layout/frag_dialing.xml b/ring-android/res/layout/frag_dialing.xml
similarity index 97%
rename from sflphone-android/res/layout/frag_dialing.xml
rename to ring-android/res/layout/frag_dialing.xml
index fc45622f291515a021e3098fcb6107e06633258c..a31bb4021320f38085598d5d40478b8483d4cdf0 100644
--- a/sflphone-android/res/layout/frag_dialing.xml
+++ b/ring-android/res/layout/frag_dialing.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
-    <org.sflphone.views.ClearableEditText
+    <cx.ring.views.ClearableEditText
         android:id="@+id/textField"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
                 android:textColor="@color/white"
                 android:textSize="15sp" />
 
-            <org.sflphone.views.CircularImageView
+            <cx.ring.views.CircularImageView
                 android:id="@+id/fake_dar_band"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
diff --git a/sflphone-android/res/layout/frag_gestures.xml b/ring-android/res/layout/frag_gestures.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_gestures.xml
rename to ring-android/res/layout/frag_gestures.xml
diff --git a/sflphone-android/res/layout/frag_history.xml b/ring-android/res/layout/frag_history.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_history.xml
rename to ring-android/res/layout/frag_history.xml
diff --git a/sflphone-android/res/layout/frag_history_detail.xml b/ring-android/res/layout/frag_history_detail.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_history_detail.xml
rename to ring-android/res/layout/frag_history_detail.xml
diff --git a/sflphone-android/res/layout/frag_home.xml b/ring-android/res/layout/frag_home.xml
similarity index 90%
rename from sflphone-android/res/layout/frag_home.xml
rename to ring-android/res/layout/frag_home.xml
index f0bc66cc8542eddba746bc2474e2f0d51687d4a0..c66626626959a248ce57a3c92b130bc1190f98c1 100644
--- a/sflphone-android/res/layout/frag_home.xml
+++ b/ring-android/res/layout/frag_home.xml
@@ -1,5 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/org.sflphone"
+    xmlns:app="http://schemas.android.com/apk/res/cx.ring"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -10,7 +10,7 @@
         android:layout_alignParentTop="true"
         android:background="@color/sfl_dark_blue" />
 
-    <org.sflphone.views.PagerSlidingTabStrip
+    <cx.ring.views.PagerSlidingTabStrip
         android:id="@+id/pts_main"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
diff --git a/sflphone-android/res/layout/frag_imessaging.xml b/ring-android/res/layout/frag_imessaging.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_imessaging.xml
rename to ring-android/res/layout/frag_imessaging.xml
diff --git a/sflphone-android/res/layout/frag_menu.xml b/ring-android/res/layout/frag_menu.xml
similarity index 100%
rename from sflphone-android/res/layout/frag_menu.xml
rename to ring-android/res/layout/frag_menu.xml
diff --git a/sflphone-android/res/layout/header.xml b/ring-android/res/layout/header.xml
similarity index 100%
rename from sflphone-android/res/layout/header.xml
rename to ring-android/res/layout/header.xml
diff --git a/sflphone-android/res/layout/item_account.xml b/ring-android/res/layout/item_account.xml
similarity index 100%
rename from sflphone-android/res/layout/item_account.xml
rename to ring-android/res/layout/item_account.xml
diff --git a/sflphone-android/res/layout/item_account_pref.xml b/ring-android/res/layout/item_account_pref.xml
similarity index 100%
rename from sflphone-android/res/layout/item_account_pref.xml
rename to ring-android/res/layout/item_account_pref.xml
diff --git a/sflphone-android/res/layout/item_calllist.xml b/ring-android/res/layout/item_calllist.xml
similarity index 100%
rename from sflphone-android/res/layout/item_calllist.xml
rename to ring-android/res/layout/item_calllist.xml
diff --git a/sflphone-android/res/layout/item_codec.xml b/ring-android/res/layout/item_codec.xml
similarity index 100%
rename from sflphone-android/res/layout/item_codec.xml
rename to ring-android/res/layout/item_codec.xml
diff --git a/sflphone-android/res/layout/item_contact.xml b/ring-android/res/layout/item_contact.xml
similarity index 100%
rename from sflphone-android/res/layout/item_contact.xml
rename to ring-android/res/layout/item_contact.xml
diff --git a/sflphone-android/res/layout/item_contact_starred.xml b/ring-android/res/layout/item_contact_starred.xml
similarity index 100%
rename from sflphone-android/res/layout/item_contact_starred.xml
rename to ring-android/res/layout/item_contact_starred.xml
diff --git a/sflphone-android/res/layout/item_history.xml b/ring-android/res/layout/item_history.xml
similarity index 100%
rename from sflphone-android/res/layout/item_history.xml
rename to ring-android/res/layout/item_history.xml
diff --git a/sflphone-android/res/layout/item_history_call.xml b/ring-android/res/layout/item_history_call.xml
similarity index 100%
rename from sflphone-android/res/layout/item_history_call.xml
rename to ring-android/res/layout/item_history_call.xml
diff --git a/sflphone-android/res/layout/item_menu.xml b/ring-android/res/layout/item_menu.xml
similarity index 100%
rename from sflphone-android/res/layout/item_menu.xml
rename to ring-android/res/layout/item_menu.xml
diff --git a/sflphone-android/res/layout/item_menu_header.xml b/ring-android/res/layout/item_menu_header.xml
similarity index 100%
rename from sflphone-android/res/layout/item_menu_header.xml
rename to ring-android/res/layout/item_menu_header.xml
diff --git a/sflphone-android/res/layout/item_message.xml b/ring-android/res/layout/item_message.xml
similarity index 100%
rename from sflphone-android/res/layout/item_message.xml
rename to ring-android/res/layout/item_message.xml
diff --git a/sflphone-android/res/layout/number_picker_dialog.xml b/ring-android/res/layout/number_picker_dialog.xml
similarity index 100%
rename from sflphone-android/res/layout/number_picker_dialog.xml
rename to ring-android/res/layout/number_picker_dialog.xml
diff --git a/sflphone-android/res/layout/password_edittext.xml b/ring-android/res/layout/password_edittext.xml
similarity index 100%
rename from sflphone-android/res/layout/password_edittext.xml
rename to ring-android/res/layout/password_edittext.xml
diff --git a/sflphone-android/res/layout/quad_number_picker_dialog.xml b/ring-android/res/layout/quad_number_picker_dialog.xml
similarity index 100%
rename from sflphone-android/res/layout/quad_number_picker_dialog.xml
rename to ring-android/res/layout/quad_number_picker_dialog.xml
diff --git a/sflphone-android/res/menu/ac_call.xml b/ring-android/res/menu/ac_call.xml
similarity index 100%
rename from sflphone-android/res/menu/ac_call.xml
rename to ring-android/res/menu/ac_call.xml
diff --git a/sflphone-android/res/menu/account_creation.xml b/ring-android/res/menu/account_creation.xml
similarity index 100%
rename from sflphone-android/res/menu/account_creation.xml
rename to ring-android/res/menu/account_creation.xml
diff --git a/sflphone-android/res/menu/account_edition.xml b/ring-android/res/menu/account_edition.xml
similarity index 100%
rename from sflphone-android/res/menu/account_edition.xml
rename to ring-android/res/menu/account_edition.xml
diff --git a/sflphone-android/res/menu/activity_holder.xml b/ring-android/res/menu/activity_holder.xml
similarity index 100%
rename from sflphone-android/res/menu/activity_holder.xml
rename to ring-android/res/menu/activity_holder.xml
diff --git a/sflphone-android/res/menu/contact_list_menu.xml b/ring-android/res/menu/contact_list_menu.xml
similarity index 100%
rename from sflphone-android/res/menu/contact_list_menu.xml
rename to ring-android/res/menu/contact_list_menu.xml
diff --git a/sflphone-android/res/menu/history.xml b/ring-android/res/menu/history.xml
similarity index 100%
rename from sflphone-android/res/menu/history.xml
rename to ring-android/res/menu/history.xml
diff --git a/sflphone-android/res/values-fr/strings.xml b/ring-android/res/values-fr/strings.xml
similarity index 100%
rename from sflphone-android/res/values-fr/strings.xml
rename to ring-android/res/values-fr/strings.xml
diff --git a/sflphone-android/res/values-fr/strings_account.xml b/ring-android/res/values-fr/strings_account.xml
similarity index 100%
rename from sflphone-android/res/values-fr/strings_account.xml
rename to ring-android/res/values-fr/strings_account.xml
diff --git a/sflphone-android/res/values-fr/strings_content_description.xml b/ring-android/res/values-fr/strings_content_description.xml
similarity index 100%
rename from sflphone-android/res/values-fr/strings_content_description.xml
rename to ring-android/res/values-fr/strings_content_description.xml
diff --git a/sflphone-android/res/values-sw600dp-xhdpi/dimens.xml b/ring-android/res/values-sw600dp-xhdpi/dimens.xml
similarity index 100%
rename from sflphone-android/res/values-sw600dp-xhdpi/dimens.xml
rename to ring-android/res/values-sw600dp-xhdpi/dimens.xml
diff --git a/sflphone-android/res/values/arrays.xml b/ring-android/res/values/arrays.xml
similarity index 100%
rename from sflphone-android/res/values/arrays.xml
rename to ring-android/res/values/arrays.xml
diff --git a/sflphone-android/res/values/attrs.xml b/ring-android/res/values/attrs.xml
similarity index 100%
rename from sflphone-android/res/values/attrs.xml
rename to ring-android/res/values/attrs.xml
diff --git a/sflphone-android/res/values/colors.xml b/ring-android/res/values/colors.xml
similarity index 100%
rename from sflphone-android/res/values/colors.xml
rename to ring-android/res/values/colors.xml
diff --git a/sflphone-android/res/values/dimens.xml b/ring-android/res/values/dimens.xml
similarity index 100%
rename from sflphone-android/res/values/dimens.xml
rename to ring-android/res/values/dimens.xml
diff --git a/sflphone-android/res/values/ids.xml b/ring-android/res/values/ids.xml
similarity index 100%
rename from sflphone-android/res/values/ids.xml
rename to ring-android/res/values/ids.xml
diff --git a/sflphone-android/res/values/strings.xml b/ring-android/res/values/strings.xml
similarity index 100%
rename from sflphone-android/res/values/strings.xml
rename to ring-android/res/values/strings.xml
diff --git a/sflphone-android/res/values/strings_account.xml b/ring-android/res/values/strings_account.xml
similarity index 100%
rename from sflphone-android/res/values/strings_account.xml
rename to ring-android/res/values/strings_account.xml
diff --git a/sflphone-android/res/values/strings_content_description.xml b/ring-android/res/values/strings_content_description.xml
similarity index 100%
rename from sflphone-android/res/values/strings_content_description.xml
rename to ring-android/res/values/strings_content_description.xml
diff --git a/sflphone-android/res/values/styles.xml b/ring-android/res/values/styles.xml
similarity index 100%
rename from sflphone-android/res/values/styles.xml
rename to ring-android/res/values/styles.xml
diff --git a/sflphone-android/res/xml/account_advanced_prefs.xml b/ring-android/res/xml/account_advanced_prefs.xml
similarity index 95%
rename from sflphone-android/res/xml/account_advanced_prefs.xml
rename to ring-android/res/xml/account_advanced_prefs.xml
index bd427dce3f9d3c20369731fc7e384c38c6b713be..c779ef4b2b83dc5d2de6e31e927699535fcbd44e 100644
--- a/sflphone-android/res/xml/account_advanced_prefs.xml
+++ b/ring-android/res/xml/account_advanced_prefs.xml
@@ -31,9 +31,9 @@ as that of the covered work.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/org.sflphone" >
+    xmlns:app="http://schemas.android.com/apk/res/cx.ring" >
 
-        <org.sflphone.views.QuadNumberPickerPreference
+        <cx.ring.views.QuadNumberPickerPreference
             android:id="@+id/account_registration_expire"
             android:key="Account.registrationExpire"
             android:persistent="false"
@@ -57,7 +57,7 @@ as that of the covered work.
             android:persistent="false"
             android:title="@string/account_local_interface_label" />
 
-        <org.sflphone.views.QuadNumberPickerPreference
+        <cx.ring.views.QuadNumberPickerPreference
             android:id="@+id/account_local_port"
             android:key="Account.localPort"
             android:persistent="false"
@@ -102,7 +102,7 @@ as that of the covered work.
             android:persistent="false"
             android:title="@string/account_published_same_as_local_label" />
 
-        <org.sflphone.views.QuadNumberPickerPreference
+        <cx.ring.views.QuadNumberPickerPreference
             android:id="@+id/account_published_port"
             android:enabled="false"
             android:key="Account.publishedPort"
@@ -132,7 +132,7 @@ as that of the covered work.
             android:id="@+id/account_rtp_port_range"
             android:title="@string/account_rtp_port_range" >
 
-        <org.sflphone.views.QuadNumberPickerPreference
+        <cx.ring.views.QuadNumberPickerPreference
                 android:id="@+id/account_rtp_min_port"
                 android:key="Account.audioPortMin"
                 android:persistent="false"
@@ -150,7 +150,7 @@ as that of the covered work.
                 app:min3="0"
                 app:min4="0"/>
 
-        <org.sflphone.views.QuadNumberPickerPreference
+        <cx.ring.views.QuadNumberPickerPreference
                 android:id="@+id/account_rtp_max_port"
                 android:key="Account.audioPortMax"
                 android:persistent="false"
diff --git a/sflphone-android/res/xml/account_audio_prefs.xml b/ring-android/res/xml/account_audio_prefs.xml
similarity index 100%
rename from sflphone-android/res/xml/account_audio_prefs.xml
rename to ring-android/res/xml/account_audio_prefs.xml
diff --git a/sflphone-android/res/xml/account_credentials.xml b/ring-android/res/xml/account_credentials.xml
similarity index 95%
rename from sflphone-android/res/xml/account_credentials.xml
rename to ring-android/res/xml/account_credentials.xml
index ccc0375db3da6e9cbb791ed804a467fbde617ff4..bc59bac6984d598af4cc394f4fb5c6f490a9d8fc 100644
--- a/sflphone-android/res/xml/account_credentials.xml
+++ b/ring-android/res/xml/account_credentials.xml
@@ -32,11 +32,11 @@ as that of the covered work.
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <org.sflphone.views.CredentialsPreference
+    <cx.ring.views.CredentialsPreference
         android:id="@+id/account_credential_number"
         android:key="Add.credentials"
         android:title="Add Credentials"
         android:icon="@drawable/ic_action_new_dark" >
-    </org.sflphone.views.CredentialsPreference>
+    </cx.ring.views.CredentialsPreference>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/sflphone-android/res/xml/account_general_prefs.xml b/ring-android/res/xml/account_general_prefs.xml
similarity index 98%
rename from sflphone-android/res/xml/account_general_prefs.xml
rename to ring-android/res/xml/account_general_prefs.xml
index b1ddbf6b62e5db24163cc9f4c41dd8017e90eb2a..ddc86494de7af2df6c1c395b52a64fbb215bf4ac 100644
--- a/sflphone-android/res/xml/account_general_prefs.xml
+++ b/ring-android/res/xml/account_general_prefs.xml
@@ -60,7 +60,7 @@ as that of the covered work.
             android:persistent="false"
             android:summary=""
             android:title="@string/account_username_label" />
-        <org.sflphone.views.PasswordPreference
+        <cx.ring.views.PasswordPreference
             android:id="@+id/account_password"
             android:key="Account.password"
             android:persistent="false"
diff --git a/sflphone-android/res/xml/account_sdes.xml b/ring-android/res/xml/account_sdes.xml
similarity index 100%
rename from sflphone-android/res/xml/account_sdes.xml
rename to ring-android/res/xml/account_sdes.xml
diff --git a/sflphone-android/res/xml/account_security_prefs.xml b/ring-android/res/xml/account_security_prefs.xml
similarity index 100%
rename from sflphone-android/res/xml/account_security_prefs.xml
rename to ring-android/res/xml/account_security_prefs.xml
diff --git a/sflphone-android/res/xml/account_tls.xml b/ring-android/res/xml/account_tls.xml
similarity index 96%
rename from sflphone-android/res/xml/account_tls.xml
rename to ring-android/res/xml/account_tls.xml
index dd064725214ea5b7bba338ec0a3654b091cd0f0a..7495b4b2d047a89d734579813ed647d83cf223fd 100644
--- a/sflphone-android/res/xml/account_tls.xml
+++ b/ring-android/res/xml/account_tls.xml
@@ -31,13 +31,13 @@ as that of the covered work.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/org.sflphone" >
+    xmlns:app="http://schemas.android.com/apk/res/cx.ring" >
     <CheckBoxPreference
         android:id="@+id/account_tls_switch_tls"
         android:key="TLS.enable"
         android:title="@string/account_tls_transport_switch_label" />
 
-    <org.sflphone.views.QuadNumberPickerPreference
+    <cx.ring.views.QuadNumberPickerPreference
             android:id="@+id/account_tls_port"
             android:key="TLS.listenerPort"
             android:persistent="false"
@@ -99,7 +99,7 @@ as that of the covered work.
         android:singleLine="true"
         android:title="@string/account_tls_server_name_label" />
 
-    <org.sflphone.views.NumberPickerPreference
+    <cx.ring.views.NumberPickerPreference
         android:id="@+id/account_tls_timeout_sec"
         android:key="TLS.negotiationTimeoutSec"
         android:persistent="false"
diff --git a/sflphone-android/res/xml/account_zrtp.xml b/ring-android/res/xml/account_zrtp.xml
similarity index 100%
rename from sflphone-android/res/xml/account_zrtp.xml
rename to ring-android/res/xml/account_zrtp.xml
diff --git a/sflphone-android/sflphone-android.iml b/ring-android/ring-android.iml
similarity index 100%
rename from sflphone-android/sflphone-android.iml
rename to ring-android/ring-android.iml
diff --git a/sflphone-android/src/org/sflphone/adapters/AccountSelectionAdapter.java b/ring-android/src/cx/ring/adapters/AccountSelectionAdapter.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/adapters/AccountSelectionAdapter.java
rename to ring-android/src/cx/ring/adapters/AccountSelectionAdapter.java
index 91fdeeff64010ea9ec57c8f0813e934ae4f81d84..9b480bf967aea8be9c6bab1e0ae86d268dae05cf 100644
--- a/sflphone-android/src/org/sflphone/adapters/AccountSelectionAdapter.java
+++ b/ring-android/src/cx/ring/adapters/AccountSelectionAdapter.java
@@ -29,12 +29,12 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.adapters;
+package cx.ring.adapters;
 
 import java.io.File;
 import java.util.ArrayList;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.content.Context;
 import android.util.Log;
@@ -44,7 +44,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.sflphone.model.account.Account;
+import cx.ring.model.account.Account;
 
 public class AccountSelectionAdapter extends BaseAdapter {
 
diff --git a/sflphone-android/src/org/sflphone/adapters/ContactPictureTask.java b/ring-android/src/cx/ring/adapters/ContactPictureTask.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/adapters/ContactPictureTask.java
rename to ring-android/src/cx/ring/adapters/ContactPictureTask.java
index 2a4f373fd71e968b0791b952043db1f34f6e7090..5596a0636e381288f9f9517222cc614dae9e542c 100644
--- a/sflphone-android/src/org/sflphone/adapters/ContactPictureTask.java
+++ b/ring-android/src/cx/ring/adapters/ContactPictureTask.java
@@ -29,12 +29,12 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.adapters;
+package cx.ring.adapters;
 
 import java.io.InputStream;
 
-import org.sflphone.R;
-import org.sflphone.model.CallContact;
+import cx.ring.R;
+import cx.ring.model.CallContact;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
diff --git a/sflphone-android/src/org/sflphone/adapters/ContactsAdapter.java b/ring-android/src/cx/ring/adapters/ContactsAdapter.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/adapters/ContactsAdapter.java
rename to ring-android/src/cx/ring/adapters/ContactsAdapter.java
index 777660b7126e4750c3776b5716eb42a1fd1c31b7..de47d94b42496941b22774543b2c994af2ebf47d 100644
--- a/sflphone-android/src/org/sflphone/adapters/ContactsAdapter.java
+++ b/ring-android/src/cx/ring/adapters/ContactsAdapter.java
@@ -29,17 +29,17 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.adapters;
+package cx.ring.adapters;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.sflphone.R;
-import org.sflphone.fragments.ContactListFragment;
-import org.sflphone.model.CallContact;
-import org.sflphone.views.stickylistheaders.StickyListHeadersAdapter;
+import cx.ring.R;
+import cx.ring.fragments.ContactListFragment;
+import cx.ring.model.CallContact;
+import cx.ring.views.stickylistheaders.StickyListHeadersAdapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/sflphone-android/src/org/sflphone/adapters/DiscussArrayAdapter.java b/ring-android/src/cx/ring/adapters/DiscussArrayAdapter.java
similarity index 95%
rename from sflphone-android/src/org/sflphone/adapters/DiscussArrayAdapter.java
rename to ring-android/src/cx/ring/adapters/DiscussArrayAdapter.java
index f7489ae0fe7dfa03566883a37a1fb1f4db1c7160..9cdfc411b0436f6550333432811ca470a70c0365 100644
--- a/sflphone-android/src/org/sflphone/adapters/DiscussArrayAdapter.java
+++ b/ring-android/src/cx/ring/adapters/DiscussArrayAdapter.java
@@ -29,17 +29,15 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.adapters;
+package cx.ring.adapters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.sflphone.R;
-import org.sflphone.model.SipMessage;
+import cx.ring.R;
+import cx.ring.model.SipMessage;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/sflphone-android/src/org/sflphone/adapters/SectionsPagerAdapter.java b/ring-android/src/cx/ring/adapters/SectionsPagerAdapter.java
similarity index 94%
rename from sflphone-android/src/org/sflphone/adapters/SectionsPagerAdapter.java
rename to ring-android/src/cx/ring/adapters/SectionsPagerAdapter.java
index 3c1da6876b3600dda10e09f7ddb255923122702e..e9a4e15ddc3cbcc23690c232fe7b864f330697ed 100644
--- a/sflphone-android/src/org/sflphone/adapters/SectionsPagerAdapter.java
+++ b/ring-android/src/cx/ring/adapters/SectionsPagerAdapter.java
@@ -29,18 +29,18 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.adapters;
+package cx.ring.adapters;
 
 import java.util.ArrayList;
 import java.util.Locale;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import org.sflphone.R;
-import org.sflphone.fragments.CallListFragment;
-import org.sflphone.fragments.DialingFragment;
-import org.sflphone.fragments.HistoryFragment;
-import org.sflphone.views.PagerSlidingTabStrip;
+import cx.ring.R;
+import cx.ring.fragments.CallListFragment;
+import cx.ring.fragments.DialingFragment;
+import cx.ring.fragments.HistoryFragment;
+import cx.ring.views.PagerSlidingTabStrip;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/sflphone-android/src/org/sflphone/adapters/StarredContactsAdapter.java b/ring-android/src/cx/ring/adapters/StarredContactsAdapter.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/adapters/StarredContactsAdapter.java
rename to ring-android/src/cx/ring/adapters/StarredContactsAdapter.java
index 1defc73db74e74b602739cd37b4720b2fc9919d0..6690341a0817e50340d05a94b2fe53eb71811136 100644
--- a/sflphone-android/src/org/sflphone/adapters/StarredContactsAdapter.java
+++ b/ring-android/src/cx/ring/adapters/StarredContactsAdapter.java
@@ -29,14 +29,14 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.adapters;
+package cx.ring.adapters;
 
 import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.sflphone.R;
-import org.sflphone.model.CallContact;
+import cx.ring.R;
+import cx.ring.model.CallContact;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/sflphone-android/src/org/sflphone/client/AccountEditionActivity.java b/ring-android/src/cx/ring/client/AccountEditionActivity.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/client/AccountEditionActivity.java
rename to ring-android/src/cx/ring/client/AccountEditionActivity.java
index 8d8af4edd46d54cf78fb685bbc76b652dd3dc7e5..6433049c22f6da13220037844ec4460fba5aa574 100644
--- a/sflphone-android/src/org/sflphone/client/AccountEditionActivity.java
+++ b/ring-android/src/cx/ring/client/AccountEditionActivity.java
@@ -30,7 +30,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.client;
+package cx.ring.client;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -46,18 +46,23 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import org.sflphone.R;
-import org.sflphone.fragments.*;
-import org.sflphone.model.account.Account;
-import org.sflphone.service.ISipService;
-import org.sflphone.service.SipService;
-import org.sflphone.views.PagerSlidingTabStrip;
+import cx.ring.R;
+import cx.ring.fragments.AdvancedAccountFragment;
+import cx.ring.fragments.AudioManagementFragment;
+import cx.ring.fragments.NestedSettingsFragment;
+import cx.ring.fragments.SecurityAccountFragment;
+import cx.ring.model.account.Account;
+import cx.ring.service.ISipService;
+import cx.ring.service.SipService;
+import cx.ring.views.PagerSlidingTabStrip;
 
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Observable;
 import java.util.Observer;
 
+import cx.ring.fragments.GeneralAccountFragment;
+
 public class AccountEditionActivity extends Activity implements GeneralAccountFragment.Callbacks, AudioManagementFragment.Callbacks,
         AdvancedAccountFragment.Callbacks, SecurityAccountFragment.Callbacks, NestedSettingsFragment.Callbacks {
     private static final String TAG = AccountEditionActivity.class.getSimpleName();
diff --git a/sflphone-android/src/org/sflphone/client/AccountWizard.java b/ring-android/src/cx/ring/client/AccountWizard.java
similarity index 94%
rename from sflphone-android/src/org/sflphone/client/AccountWizard.java
rename to ring-android/src/cx/ring/client/AccountWizard.java
index 85f30dfeac62e8975bf0e088b891440d9bbd0079..43cd2ba70b4a2d68daffda4a8dfac4cd395c45ea 100644
--- a/sflphone-android/src/org/sflphone/client/AccountWizard.java
+++ b/ring-android/src/cx/ring/client/AccountWizard.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.client;
+package cx.ring.client;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -44,16 +44,15 @@ import android.support.v13.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.view.MenuItem;
-import org.sflphone.R;
-import org.sflphone.fragments.AccountCreationFragment;
-import org.sflphone.fragments.AccountCreationFragment.Callbacks;
-import org.sflphone.service.ISipService;
-import org.sflphone.service.SipService;
+import cx.ring.R;
+import cx.ring.fragments.AccountCreationFragment;
+import cx.ring.service.ISipService;
+import cx.ring.service.SipService;
 
 import java.util.ArrayList;
 import java.util.Locale;
 
-public class AccountWizard extends Activity implements Callbacks {
+public class AccountWizard extends Activity implements AccountCreationFragment.Callbacks {
     static final String TAG = "AccountWizard";
     private boolean mBound = false;
     private ISipService service;
diff --git a/sflphone-android/src/org/sflphone/client/CallActivity.java b/ring-android/src/cx/ring/client/CallActivity.java
similarity index 94%
rename from sflphone-android/src/org/sflphone/client/CallActivity.java
rename to ring-android/src/cx/ring/client/CallActivity.java
index 69a1c39fbccc30a6dc212bdf0e832d7a5a6e0be5..8f664cd3933346c27d7ff2efd91b0168dd433fed 100644
--- a/sflphone-android/src/org/sflphone/client/CallActivity.java
+++ b/ring-android/src/cx/ring/client/CallActivity.java
@@ -31,25 +31,24 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.client;
+package cx.ring.client;
 
 import java.util.*;
 
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
-import org.sflphone.R;
-import org.sflphone.fragments.CallFragment;
-import org.sflphone.fragments.IMFragment;
-import org.sflphone.model.account.Account;
-import org.sflphone.model.CallContact;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipCall;
-import org.sflphone.model.SipMessage;
-import org.sflphone.service.ISipService;
-import org.sflphone.service.SipService;
-import org.sflphone.utils.CallProximityManager;
-import org.sflphone.utils.CallProximityManager.ProximityDirector;
-import org.sflphone.views.CallPaneLayout;
+import cx.ring.R;
+import cx.ring.fragments.CallFragment;
+import cx.ring.fragments.IMFragment;
+import cx.ring.model.account.Account;
+import cx.ring.model.CallContact;
+import cx.ring.model.Conference;
+import cx.ring.model.SipCall;
+import cx.ring.model.SipMessage;
+import cx.ring.service.ISipService;
+import cx.ring.service.SipService;
+import cx.ring.utils.CallProximityManager;
+import cx.ring.views.CallPaneLayout;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -69,7 +68,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
-public class CallActivity extends FragmentActivity implements IMFragment.Callbacks, CallFragment.Callbacks, ProximityDirector {
+public class CallActivity extends FragmentActivity implements IMFragment.Callbacks, CallFragment.Callbacks, CallProximityManager.ProximityDirector {
 
     @SuppressWarnings("unused")
     static final String TAG = "CallActivity";
diff --git a/sflphone-android/src/org/sflphone/client/DetailHistoryActivity.java b/ring-android/src/cx/ring/client/DetailHistoryActivity.java
similarity index 93%
rename from sflphone-android/src/org/sflphone/client/DetailHistoryActivity.java
rename to ring-android/src/cx/ring/client/DetailHistoryActivity.java
index c9610671bf14a2b3917617d240e8c1007d7bf765..89625f4896eb6de20d959d7327118e04e76064b9 100644
--- a/sflphone-android/src/org/sflphone/client/DetailHistoryActivity.java
+++ b/ring-android/src/cx/ring/client/DetailHistoryActivity.java
@@ -29,15 +29,15 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.client;
-
-import org.sflphone.R;
-import org.sflphone.fragments.DetailsHistoryEntryFragment;
-import org.sflphone.fragments.HistoryFragment;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipCall;
-import org.sflphone.service.ISipService;
-import org.sflphone.service.SipService;
+package cx.ring.client;
+
+import cx.ring.R;
+import cx.ring.fragments.DetailsHistoryEntryFragment;
+import cx.ring.fragments.HistoryFragment;
+import cx.ring.model.Conference;
+import cx.ring.model.SipCall;
+import cx.ring.service.ISipService;
+import cx.ring.service.SipService;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/sflphone-android/src/org/sflphone/client/HomeActivity.java b/ring-android/src/cx/ring/client/HomeActivity.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/client/HomeActivity.java
rename to ring-android/src/cx/ring/client/HomeActivity.java
index 033cec645323935a0fbb7ab6bfc7bacf79d4ba86..fdcb022732e704358e2780e8263f83ee2db38257 100644
--- a/sflphone-android/src/org/sflphone/client/HomeActivity.java
+++ b/ring-android/src/cx/ring/client/HomeActivity.java
@@ -29,7 +29,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.client;
+package cx.ring.client;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -43,24 +43,24 @@ import java.util.TimerTask;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.support.v4.app.*;
-import org.sflphone.R;
-import org.sflphone.fragments.AboutFragment;
-import org.sflphone.fragments.AccountsManagementFragment;
-import org.sflphone.fragments.CallListFragment;
-import org.sflphone.fragments.ContactListFragment;
-import org.sflphone.fragments.DialingFragment;
-import org.sflphone.fragments.HistoryFragment;
-import org.sflphone.fragments.HomeFragment;
-import org.sflphone.fragments.MenuFragment;
-import org.sflphone.history.HistoryEntry;
-import org.sflphone.model.account.Account;
-import org.sflphone.model.CallContact;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipCall;
-import org.sflphone.service.ISipService;
-import org.sflphone.service.SipService;
-import org.sflphone.views.SlidingUpPanelLayout;
-import org.sflphone.views.SlidingUpPanelLayout.PanelSlideListener;
+import cx.ring.R;
+import cx.ring.fragments.AboutFragment;
+import cx.ring.fragments.AccountsManagementFragment;
+import cx.ring.fragments.CallListFragment;
+import cx.ring.fragments.ContactListFragment;
+import cx.ring.fragments.DialingFragment;
+import cx.ring.fragments.HistoryFragment;
+import cx.ring.fragments.HomeFragment;
+import cx.ring.fragments.MenuFragment;
+import cx.ring.history.HistoryEntry;
+import cx.ring.model.account.Account;
+import cx.ring.model.CallContact;
+import cx.ring.model.Conference;
+import cx.ring.model.SipCall;
+import cx.ring.service.ISipService;
+import cx.ring.service.SipService;
+import cx.ring.views.SlidingUpPanelLayout;
+import cx.ring.views.SlidingUpPanelLayout.PanelSlideListener;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/fragments/AboutFragment.java b/ring-android/src/cx/ring/fragments/AboutFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/AboutFragment.java
rename to ring-android/src/cx/ring/fragments/AboutFragment.java
index 1a13d815cfe8f21e6044d50440179610841f8bbf..be1037c7c72af7eae446c52205d04759276a2bc0 100644
--- a/sflphone-android/src/org/sflphone/fragments/AboutFragment.java
+++ b/ring-android/src/cx/ring/fragments/AboutFragment.java
@@ -1,4 +1,4 @@
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.content.pm.PackageManager;
 import android.os.Bundle;
@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import org.sflphone.R;
+import cx.ring.R;
 
 public class AboutFragment extends Fragment {
 
diff --git a/sflphone-android/src/org/sflphone/fragments/AccountCreationFragment.java b/ring-android/src/cx/ring/fragments/AccountCreationFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/AccountCreationFragment.java
rename to ring-android/src/cx/ring/fragments/AccountCreationFragment.java
index 9f44ad90bbb6ae1338b7750531f3e2b5da0634c9..c6c272afc6e8cba1bedd95ee563b360c9b89762f 100644
--- a/sflphone-android/src/org/sflphone/fragments/AccountCreationFragment.java
+++ b/ring-android/src/cx/ring/fragments/AccountCreationFragment.java
@@ -1,11 +1,11 @@
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.util.HashMap;
 
-import org.sflphone.R;
-import org.sflphone.model.account.AccountDetailBasic;
-import org.sflphone.client.HomeActivity;
-import org.sflphone.service.ISipService;
+import cx.ring.R;
+import cx.ring.model.account.AccountDetailBasic;
+import cx.ring.client.HomeActivity;
+import cx.ring.service.ISipService;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -22,7 +22,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
-import org.sflphone.views.PasswordEditText;
+import cx.ring.views.PasswordEditText;
 
 public class AccountCreationFragment extends Fragment {
 
diff --git a/sflphone-android/src/org/sflphone/fragments/AccountWrapperFragment.java b/ring-android/src/cx/ring/fragments/AccountWrapperFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/AccountWrapperFragment.java
rename to ring-android/src/cx/ring/fragments/AccountWrapperFragment.java
index 646f0e0c35d4420ae864a6cc78a92d206c17ef07..61727084e2cd2f95f9dcb420e3618865a6280249 100644
--- a/sflphone-android/src/org/sflphone/fragments/AccountWrapperFragment.java
+++ b/ring-android/src/cx/ring/fragments/AccountWrapperFragment.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -38,8 +38,8 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
-import org.sflphone.interfaces.AccountsInterface;
-import org.sflphone.service.ConfigurationManagerCallback;
+import cx.ring.interfaces.AccountsInterface;
+import cx.ring.service.ConfigurationManagerCallback;
 
 public abstract class AccountWrapperFragment extends Fragment implements AccountsInterface {
 
diff --git a/sflphone-android/src/org/sflphone/fragments/AccountsManagementFragment.java b/ring-android/src/cx/ring/fragments/AccountsManagementFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/AccountsManagementFragment.java
rename to ring-android/src/cx/ring/fragments/AccountsManagementFragment.java
index 0f846c794888b377d486acbd5320c60a0913806c..09da403cadf1312334fe4fbcadc0f033dd771bbb 100644
--- a/sflphone-android/src/org/sflphone/fragments/AccountsManagementFragment.java
+++ b/ring-android/src/cx/ring/fragments/AccountsManagementFragment.java
@@ -30,7 +30,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -47,14 +47,14 @@ import android.view.*;
 import android.view.View.OnClickListener;
 import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
-import org.sflphone.R;
-import org.sflphone.client.AccountEditionActivity;
-import org.sflphone.client.AccountWizard;
-import org.sflphone.loaders.AccountsLoader;
-import org.sflphone.loaders.LoaderConstants;
-import org.sflphone.model.account.Account;
-import org.sflphone.service.ISipService;
-import org.sflphone.views.dragsortlv.DragSortListView;
+import cx.ring.R;
+import cx.ring.client.AccountEditionActivity;
+import cx.ring.client.AccountWizard;
+import cx.ring.loaders.AccountsLoader;
+import cx.ring.loaders.LoaderConstants;
+import cx.ring.model.account.Account;
+import cx.ring.service.ISipService;
+import cx.ring.views.dragsortlv.DragSortListView;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/sflphone-android/src/org/sflphone/fragments/AdvancedAccountFragment.java b/ring-android/src/cx/ring/fragments/AdvancedAccountFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/AdvancedAccountFragment.java
rename to ring-android/src/cx/ring/fragments/AdvancedAccountFragment.java
index 7ec2b7d02106457e8606265e6689073125b7e034..71e7da4c5237416b8709eadde64ed2748e473baa 100644
--- a/sflphone-android/src/org/sflphone/fragments/AdvancedAccountFragment.java
+++ b/ring-android/src/cx/ring/fragments/AdvancedAccountFragment.java
@@ -28,14 +28,14 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -45,9 +45,9 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceFragment;
 import android.util.Log;
-import org.sflphone.model.account.AccountDetail;
-import org.sflphone.model.account.AccountDetailAdvanced;
-import org.sflphone.model.account.Account;
+import cx.ring.model.account.AccountDetail;
+import cx.ring.model.account.AccountDetailAdvanced;
+import cx.ring.model.account.Account;
 
 public class AdvancedAccountFragment extends PreferenceFragment {
 
diff --git a/sflphone-android/src/org/sflphone/fragments/AudioManagementFragment.java b/ring-android/src/cx/ring/fragments/AudioManagementFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/AudioManagementFragment.java
rename to ring-android/src/cx/ring/fragments/AudioManagementFragment.java
index 876a04c1d8fa724e69b83160fcc14d3c272578ff..71789e4269ad8b2b030382ca8fa3783846cf1ff6 100644
--- a/sflphone-android/src/org/sflphone/fragments/AudioManagementFragment.java
+++ b/ring-android/src/cx/ring/fragments/AudioManagementFragment.java
@@ -30,19 +30,19 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.io.File;
 import java.util.ArrayList;
 
 import android.content.Intent;
-import org.sflphone.R;
-import org.sflphone.model.account.AccountDetail;
-import org.sflphone.model.account.AccountDetailAdvanced;
-import org.sflphone.model.account.Account;
-import org.sflphone.model.Codec;
-import org.sflphone.service.ISipService;
-import org.sflphone.views.dragsortlv.DragSortListView;
+import cx.ring.R;
+import cx.ring.model.account.AccountDetail;
+import cx.ring.model.account.AccountDetailAdvanced;
+import cx.ring.model.account.Account;
+import cx.ring.model.Codec;
+import cx.ring.service.ISipService;
+import cx.ring.views.dragsortlv.DragSortListView;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/fragments/CallFragment.java b/ring-android/src/cx/ring/fragments/CallFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/CallFragment.java
rename to ring-android/src/cx/ring/fragments/CallFragment.java
index 3943b340676af318ad674b1523b6d9ac4daa95a4..b2b24063e4b493aa62659be77820d65d0af15700 100644
--- a/sflphone-android/src/org/sflphone/fragments/CallFragment.java
+++ b/ring-android/src/cx/ring/fragments/CallFragment.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -55,15 +55,24 @@ import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import org.sflphone.R;
-import org.sflphone.interfaces.CallInterface;
-import org.sflphone.model.*;
-import org.sflphone.model.BubbleModel.ActionGroup;
-import org.sflphone.service.ISipService;
+import cx.ring.R;
+import cx.ring.interfaces.CallInterface;
+import cx.ring.service.ISipService;
 
 import java.util.ArrayList;
 import java.util.Locale;
 
+import cx.ring.model.Attractor;
+import cx.ring.model.Bubble;
+import cx.ring.model.BubbleContact;
+import cx.ring.model.BubbleModel;
+import cx.ring.model.BubbleUser;
+import cx.ring.model.BubblesView;
+import cx.ring.model.CallContact;
+import cx.ring.model.Conference;
+import cx.ring.model.SecureSipCall;
+import cx.ring.model.SipCall;
+
 public class CallFragment extends CallableWrapperFragment implements CallInterface, Callback {
 
     static final String TAG = "CallFragment";
@@ -170,11 +179,11 @@ public class CallFragment extends CallableWrapperFragment implements CallInterfa
             }
         };
 
-        userActions = new ActionGroup(cb, attractorMargin, .4f, .25f);
+        userActions = new BubbleModel.ActionGroup(cb, attractorMargin, .4f, .25f);
         userActions.addAction(BTN_HOLD_IDX, buttonHold, getString(R.string.action_call_hold), attractorSize);
         userActions.addAction(BTN_HUNGUP_IDX, buttonHangUp, getString(R.string.action_call_hangup), attractorSize);
 
-        callActions = new ActionGroup(cb, attractorMargin, .4f, .25f);
+        callActions = new BubbleModel.ActionGroup(cb, attractorMargin, .4f, .25f);
         callActions.addAction(BTN_HOLD_IDX, buttonHold, getString(R.string.action_call_hold), attractorSize);
         callActions.addAction(BTN_TRANSFER_IDX, buttonTransfer, getString(R.string.action_call_attended_transfer), attractorSize);
         callActions.addAction(BTN_HUNGUP_IDX, buttonHangUp, getString(R.string.action_call_hangup), attractorSize);
diff --git a/sflphone-android/src/org/sflphone/fragments/CallListFragment.java b/ring-android/src/cx/ring/fragments/CallListFragment.java
similarity index 89%
rename from sflphone-android/src/org/sflphone/fragments/CallListFragment.java
rename to ring-android/src/cx/ring/fragments/CallListFragment.java
index 1c6de5b2c48bd46f5f2b1750dc6c5bb996904496..997085ea4e785be29ea587988eca53bf68ef39e1 100644
--- a/sflphone-android/src/org/sflphone/fragments/CallListFragment.java
+++ b/ring-android/src/cx/ring/fragments/CallListFragment.java
@@ -28,7 +28,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.app.Activity;
 import android.content.ClipData;
@@ -47,11 +47,11 @@ import android.view.ViewGroup;
 import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
-import org.sflphone.R;
-import org.sflphone.client.CallActivity;
-import org.sflphone.client.HomeActivity;
-import org.sflphone.model.Conference;
-import org.sflphone.service.ISipService;
+
+import cx.ring.client.CallActivity;
+import cx.ring.client.HomeActivity;
+import cx.ring.model.Conference;
+import cx.ring.service.ISipService;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -164,7 +164,7 @@ public class CallListFragment extends CallableWrapperFragment {
     public void updateLists() {
         try {
             HashMap<String, Conference> confs = (HashMap<String, Conference>) mCallbacks.getService().getConferenceList();
-            String newTitle = getResources().getQuantityString(R.plurals.home_conferences_title, confs.size(), confs.size());
+            String newTitle = getResources().getQuantityString(cx.ring.R.plurals.home_conferences_title, confs.size(), confs.size());
             mConversationsTitleTextView.setText(newTitle);
             mConferenceAdapter.updateDataset(new ArrayList<Conference>(confs.values()));
         } catch (RemoteException e) {
@@ -198,14 +198,14 @@ public class CallListFragment extends CallableWrapperFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         Log.i(TAG, "onCreateView");
-        View inflatedView = inflater.inflate(R.layout.frag_call_list, container, false);
+        View inflatedView = inflater.inflate(cx.ring.R.layout.frag_call_list, container, false);
 
-        mConversationsTitleTextView = (TextView) inflatedView.findViewById(R.id.confs_counter);
+        mConversationsTitleTextView = (TextView) inflatedView.findViewById(cx.ring.R.id.confs_counter);
 
         mConferenceAdapter = new CallListAdapter(getActivity());
-        ((ListView) inflatedView.findViewById(R.id.confs_list)).setAdapter(mConferenceAdapter);
-        ((ListView) inflatedView.findViewById(R.id.confs_list)).setOnItemClickListener(callClickListener);
-        ((ListView) inflatedView.findViewById(R.id.confs_list)).setOnItemLongClickListener(mItemLongClickListener);
+        ((ListView) inflatedView.findViewById(cx.ring.R.id.confs_list)).setAdapter(mConferenceAdapter);
+        ((ListView) inflatedView.findViewById(cx.ring.R.id.confs_list)).setOnItemClickListener(callClickListener);
+        ((ListView) inflatedView.findViewById(cx.ring.R.id.confs_list)).setOnItemLongClickListener(mItemLongClickListener);
 
         return inflatedView;
     }
@@ -277,22 +277,22 @@ public class CallListFragment extends CallableWrapperFragment {
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             if (convertView == null)
-                convertView = LayoutInflater.from(mContext).inflate(R.layout.item_calllist, null);
+                convertView = LayoutInflater.from(mContext).inflate(cx.ring.R.layout.item_calllist, null);
 
             Conference call = calls.get(position);
             if (call.getParticipants().size() == 1) {
-                ((TextView) convertView.findViewById(R.id.call_title)).setText(call.getParticipants().get(0).getmContact().getmDisplayName());
+                ((TextView) convertView.findViewById(cx.ring.R.id.call_title)).setText(call.getParticipants().get(0).getmContact().getmDisplayName());
 
                 long duration = (System.currentTimeMillis() - (call.getParticipants().get(0).getTimestampStart_())) / 1000;
 
-                ((TextView) convertView.findViewById(R.id.call_time)).setText(String.format("%d:%02d:%02d", duration / 3600, (duration % 3600) / 60,
+                ((TextView) convertView.findViewById(cx.ring.R.id.call_time)).setText(String.format("%d:%02d:%02d", duration / 3600, (duration % 3600) / 60,
                         (duration % 60)));
             } else {
 //                String tmp = "Conference with " + call.getParticipants().size() + " participants";
-                ((TextView) convertView.findViewById(R.id.call_title)).setText(getString(R.string.home_conf_item, call.getParticipants().size()));
+                ((TextView) convertView.findViewById(cx.ring.R.id.call_title)).setText(getString(cx.ring.R.string.home_conf_item, call.getParticipants().size()));
             }
             // ((TextView) convertView.findViewById(R.id.num_participants)).setText("" + call.getParticipants().size());
-            ((TextView) convertView.findViewById(R.id.call_status)).setText(call.getState());
+            ((TextView) convertView.findViewById(cx.ring.R.id.call_status)).setText(call.getState());
 
             convertView.setOnDragListener(dragListener);
             convertView.setTag(call);
@@ -325,7 +325,7 @@ public class CallListFragment extends CallableWrapperFragment {
                     break;
                 case DragEvent.ACTION_DRAG_EXITED:
                     // Log.w(TAG, "ACTION_DRAG_EXITED");
-                    v.setBackgroundDrawable(getResources().getDrawable(R.drawable.item_generic_selector));
+                    v.setBackgroundDrawable(getResources().getDrawable(cx.ring.R.drawable.item_generic_selector));
                     break;
                 case DragEvent.ACTION_DROP:
                     // Log.w(TAG, "ACTION_DROP");
@@ -357,7 +357,7 @@ public class CallListFragment extends CallableWrapperFragment {
                     // Log.w(TAG, "ACTION_DRAG_ENDED");
                     View view1 = (View) event.getLocalState();
                     view1.setVisibility(View.VISIBLE);
-                    v.setBackgroundDrawable(getResources().getDrawable(R.drawable.item_generic_selector));
+                    v.setBackgroundDrawable(getResources().getDrawable(cx.ring.R.drawable.item_generic_selector));
                 default:
                     break;
             }
@@ -382,14 +382,14 @@ public class CallListFragment extends CallableWrapperFragment {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
-                    Toast.makeText(getActivity(), getString(R.string.home_transfer_complet), Toast.LENGTH_LONG).show();
+                    Toast.makeText(getActivity(), getString(cx.ring.R.string.home_transfer_complet), Toast.LENGTH_LONG).show();
                     break;
 
                 case 1:
                     String to = data.getStringExtra("to_number");
                     transfer = data.getParcelableExtra("transfer");
                     try {
-                        Toast.makeText(getActivity(), getString(R.string.home_transfering, transfer.getParticipants().get(0).getmContact().getmDisplayName(), to),
+                        Toast.makeText(getActivity(), getString(cx.ring.R.string.home_transfering, transfer.getParticipants().get(0).getmContact().getmDisplayName(), to),
                                 Toast.LENGTH_SHORT).show();
                         mCallbacks.getService().transfer(transfer.getParticipants().get(0).getCallId(), to);
                         mCallbacks.getService().hangUp(transfer.getParticipants().get(0).getCallId());
diff --git a/sflphone-android/src/org/sflphone/fragments/CallableWrapperFragment.java b/ring-android/src/cx/ring/fragments/CallableWrapperFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/CallableWrapperFragment.java
rename to ring-android/src/cx/ring/fragments/CallableWrapperFragment.java
index 31a94c7979f13b3ba365c05601228639359cc42a..53ccc01db04035ee5dee21af68b0e6b19bba1141 100644
--- a/sflphone-android/src/org/sflphone/fragments/CallableWrapperFragment.java
+++ b/ring-android/src/cx/ring/fragments/CallableWrapperFragment.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -38,9 +38,9 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
-import org.sflphone.interfaces.CallInterface;
-import org.sflphone.model.Conference;
-import org.sflphone.service.CallManagerCallBack;
+import cx.ring.interfaces.CallInterface;
+import cx.ring.model.Conference;
+import cx.ring.service.CallManagerCallBack;
 
 import java.util.HashMap;
 
diff --git a/sflphone-android/src/org/sflphone/fragments/ConferenceDFragment.java b/ring-android/src/cx/ring/fragments/ConferenceDFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/ConferenceDFragment.java
rename to ring-android/src/cx/ring/fragments/ConferenceDFragment.java
index a889ccd85bc24d264d5dd68ecd6577a6f2a4ddd4..7bfbafae8c70d0d1e6dc7215895cd1b58b395e55 100644
--- a/sflphone-android/src/org/sflphone/fragments/ConferenceDFragment.java
+++ b/ring-android/src/cx/ring/fragments/ConferenceDFragment.java
@@ -1,10 +1,10 @@
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.util.ArrayList;
 
-import org.sflphone.R;
-import org.sflphone.loaders.ContactsLoader;
-import org.sflphone.model.Conference;
+import cx.ring.R;
+import cx.ring.loaders.ContactsLoader;
+import cx.ring.model.Conference;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/sflphone-android/src/org/sflphone/fragments/ContactListFragment.java b/ring-android/src/cx/ring/fragments/ContactListFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/ContactListFragment.java
rename to ring-android/src/cx/ring/fragments/ContactListFragment.java
index f2ebea1b9ed3d9e25441ab6f075d56c019130eb5..9640452f078580591556ffb69ab20a2189a0171d 100644
--- a/sflphone-android/src/org/sflphone/fragments/ContactListFragment.java
+++ b/ring-android/src/cx/ring/fragments/ContactListFragment.java
@@ -29,19 +29,19 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.util.ArrayList;
 
-import org.sflphone.R;
-import org.sflphone.adapters.ContactsAdapter;
-import org.sflphone.adapters.StarredContactsAdapter;
-import org.sflphone.loaders.ContactsLoader;
-import org.sflphone.loaders.LoaderConstants;
-import org.sflphone.model.CallContact;
-import org.sflphone.service.ISipService;
-import org.sflphone.views.SwipeListViewTouchListener;
-import org.sflphone.views.stickylistheaders.StickyListHeadersListView;
+import cx.ring.R;
+import cx.ring.adapters.ContactsAdapter;
+import cx.ring.adapters.StarredContactsAdapter;
+import cx.ring.loaders.ContactsLoader;
+import cx.ring.loaders.LoaderConstants;
+import cx.ring.model.CallContact;
+import cx.ring.service.ISipService;
+import cx.ring.views.SwipeListViewTouchListener;
+import cx.ring.views.stickylistheaders.StickyListHeadersListView;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -65,7 +65,6 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.GridView;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
diff --git a/sflphone-android/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java b/ring-android/src/cx/ring/fragments/DetailsHistoryEntryFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java
rename to ring-android/src/cx/ring/fragments/DetailsHistoryEntryFragment.java
index 67c974cde99c6aafd69dd23186b3d55125fecb6d..0ca2b98005764315b5b6a714088470d037402c04 100644
--- a/sflphone-android/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java
+++ b/ring-android/src/cx/ring/fragments/DetailsHistoryEntryFragment.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 
 import android.app.Activity;
@@ -42,13 +42,13 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.*;
-import org.sflphone.R;
-import org.sflphone.adapters.ContactPictureTask;
-import org.sflphone.history.HistoryCall;
-import org.sflphone.history.HistoryEntry;
-import org.sflphone.model.account.Account;
-import org.sflphone.model.SipCall;
-import org.sflphone.service.ISipService;
+import cx.ring.R;
+import cx.ring.adapters.ContactPictureTask;
+import cx.ring.history.HistoryCall;
+import cx.ring.history.HistoryEntry;
+import cx.ring.model.account.Account;
+import cx.ring.model.SipCall;
+import cx.ring.service.ISipService;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/fragments/DialingFragment.java b/ring-android/src/cx/ring/fragments/DialingFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/DialingFragment.java
rename to ring-android/src/cx/ring/fragments/DialingFragment.java
index b980399eb9c9040c888dd528ee2048b11c2beb50..7a634f98e43bc1bf1745d67f6536fa0a609f6274 100644
--- a/sflphone-android/src/org/sflphone/fragments/DialingFragment.java
+++ b/ring-android/src/cx/ring/fragments/DialingFragment.java
@@ -29,14 +29,14 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.util.Locale;
 
 import android.support.v4.app.Fragment;
-import org.sflphone.R;
-import org.sflphone.service.ISipService;
-import org.sflphone.views.ClearableEditText;
+import cx.ring.R;
+import cx.ring.service.ISipService;
+import cx.ring.views.ClearableEditText;
 
 import android.app.Activity;
 import android.content.Context;
@@ -53,8 +53,6 @@ import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
diff --git a/sflphone-android/src/org/sflphone/fragments/DropActionsChoice.java b/ring-android/src/cx/ring/fragments/DropActionsChoice.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/fragments/DropActionsChoice.java
rename to ring-android/src/cx/ring/fragments/DropActionsChoice.java
index a97064bd88afa38b30bfa4165694b263804b89b2..5e09f23536b39301fe60591fbb2d37d263609a58 100644
--- a/sflphone-android/src/org/sflphone/fragments/DropActionsChoice.java
+++ b/ring-android/src/cx/ring/fragments/DropActionsChoice.java
@@ -29,10 +29,10 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.support.v4.app.DialogFragment;
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/sflphone-android/src/org/sflphone/fragments/GeneralAccountFragment.java b/ring-android/src/cx/ring/fragments/GeneralAccountFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/GeneralAccountFragment.java
rename to ring-android/src/cx/ring/fragments/GeneralAccountFragment.java
index ad5997ff012544213f2235db658bd146ce63b242..6e9a5f23bd96d05ba07ea520a3a785ccc404bebb 100644
--- a/sflphone-android/src/org/sflphone/fragments/GeneralAccountFragment.java
+++ b/ring-android/src/cx/ring/fragments/GeneralAccountFragment.java
@@ -28,13 +28,13 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
-import org.sflphone.R;
-import org.sflphone.model.account.AccountDetail;
-import org.sflphone.model.account.AccountDetailBasic;
-import org.sflphone.model.account.Account;
-import org.sflphone.views.PasswordPreference;
+import cx.ring.R;
+import cx.ring.model.account.AccountDetail;
+import cx.ring.model.account.AccountDetailBasic;
+import cx.ring.model.account.Account;
+import cx.ring.views.PasswordPreference;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/sflphone-android/src/org/sflphone/fragments/HistoryFragment.java b/ring-android/src/cx/ring/fragments/HistoryFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/HistoryFragment.java
rename to ring-android/src/cx/ring/fragments/HistoryFragment.java
index 806ef5c165c01062161169a3d4966f9c28dad417..7a04f0a35aa87eb831e47676c76757781be74721 100644
--- a/sflphone-android/src/org/sflphone/fragments/HistoryFragment.java
+++ b/ring-android/src/cx/ring/fragments/HistoryFragment.java
@@ -28,7 +28,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
@@ -39,14 +39,14 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.Loader;
 import android.view.*;
-import org.sflphone.R;
-import org.sflphone.adapters.ContactPictureTask;
-import org.sflphone.client.DetailHistoryActivity;
-import org.sflphone.history.HistoryManager;
-import org.sflphone.loaders.HistoryLoader;
-import org.sflphone.loaders.LoaderConstants;
-import org.sflphone.history.HistoryEntry;
-import org.sflphone.service.ISipService;
+import cx.ring.R;
+import cx.ring.adapters.ContactPictureTask;
+import cx.ring.client.DetailHistoryActivity;
+import cx.ring.history.HistoryManager;
+import cx.ring.loaders.HistoryLoader;
+import cx.ring.loaders.LoaderConstants;
+import cx.ring.history.HistoryEntry;
+import cx.ring.service.ISipService;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/fragments/HomeFragment.java b/ring-android/src/cx/ring/fragments/HomeFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/HomeFragment.java
rename to ring-android/src/cx/ring/fragments/HomeFragment.java
index 3bd52a664ba77a8a88f526d773304a2745f2c39c..e3066c97641bc1f109d94f02623dc0c87ee15427 100644
--- a/sflphone-android/src/org/sflphone/fragments/HomeFragment.java
+++ b/ring-android/src/cx/ring/fragments/HomeFragment.java
@@ -28,12 +28,12 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.support.v4.app.Fragment;
-import org.sflphone.R;
-import org.sflphone.adapters.SectionsPagerAdapter;
-import org.sflphone.views.PagerSlidingTabStrip;
+import cx.ring.R;
+import cx.ring.adapters.SectionsPagerAdapter;
+import cx.ring.views.PagerSlidingTabStrip;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/sflphone-android/src/org/sflphone/fragments/IMFragment.java b/ring-android/src/cx/ring/fragments/IMFragment.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/fragments/IMFragment.java
rename to ring-android/src/cx/ring/fragments/IMFragment.java
index 0c09181846a91006cabd1d5df7b80b5489eb2f23..0769d6348d95280cd85cd6fec4a8c48b25193ac2 100644
--- a/sflphone-android/src/org/sflphone/fragments/IMFragment.java
+++ b/ring-android/src/cx/ring/fragments/IMFragment.java
@@ -28,14 +28,14 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.widget.*;
-import org.sflphone.R;
-import org.sflphone.adapters.DiscussArrayAdapter;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipMessage;
-import org.sflphone.service.ISipService;
+import cx.ring.R;
+import cx.ring.adapters.DiscussArrayAdapter;
+import cx.ring.model.Conference;
+import cx.ring.model.SipMessage;
+import cx.ring.service.ISipService;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/sflphone-android/src/org/sflphone/fragments/MenuFragment.java b/ring-android/src/cx/ring/fragments/MenuFragment.java
similarity index 95%
rename from sflphone-android/src/org/sflphone/fragments/MenuFragment.java
rename to ring-android/src/cx/ring/fragments/MenuFragment.java
index e1f32b2eff40faf2f65a4dfdccc61cee908633ca..d7653d8622dadf6ff19c1e6500b0f1977e0238d1 100644
--- a/sflphone-android/src/org/sflphone/fragments/MenuFragment.java
+++ b/ring-android/src/cx/ring/fragments/MenuFragment.java
@@ -28,7 +28,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -44,14 +44,14 @@ import android.view.ViewGroup;
 import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
-import org.sflphone.R;
-import org.sflphone.adapters.AccountSelectionAdapter;
-import org.sflphone.adapters.ContactPictureTask;
-import org.sflphone.loaders.AccountsLoader;
-import org.sflphone.loaders.LoaderConstants;
-import org.sflphone.model.account.Account;
-import org.sflphone.model.CallContact;
-import org.sflphone.service.ISipService;
+import cx.ring.R;
+import cx.ring.adapters.AccountSelectionAdapter;
+import cx.ring.adapters.ContactPictureTask;
+import cx.ring.loaders.AccountsLoader;
+import cx.ring.loaders.LoaderConstants;
+import cx.ring.model.account.Account;
+import cx.ring.model.CallContact;
+import cx.ring.service.ISipService;
 
 import java.util.ArrayList;
 
diff --git a/sflphone-android/src/org/sflphone/fragments/NestedSettingsFragment.java b/ring-android/src/cx/ring/fragments/NestedSettingsFragment.java
similarity index 91%
rename from sflphone-android/src/org/sflphone/fragments/NestedSettingsFragment.java
rename to ring-android/src/cx/ring/fragments/NestedSettingsFragment.java
index d01a6cfe4155fd643b0099c2625f84b59083c885..81a66eabed92ae829969b60eeca4ee6d37d4ef4e 100644
--- a/sflphone-android/src/org/sflphone/fragments/NestedSettingsFragment.java
+++ b/ring-android/src/cx/ring/fragments/NestedSettingsFragment.java
@@ -29,11 +29,10 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import android.content.Intent;
 import android.os.RemoteException;
-import org.sflphone.R;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -43,11 +42,11 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import org.sflphone.model.account.CredentialsManager;
-import org.sflphone.model.account.SRTPManager;
-import org.sflphone.model.account.TLSManager;
-import org.sflphone.model.account.Account;
-import org.sflphone.service.ISipService;
+import cx.ring.model.account.CredentialsManager;
+import cx.ring.model.account.SRTPManager;
+import cx.ring.model.account.TLSManager;
+import cx.ring.model.account.Account;
+import cx.ring.service.ISipService;
 
 import java.util.ArrayList;
 
@@ -138,7 +137,7 @@ public class NestedSettingsFragment extends PreferenceFragment {
         // Load the preferences from an XML resource
         switch (getArguments().getInt("MODE")) {
             case 0: // Credentials
-                addPreferencesFromResource(R.xml.account_credentials);
+                addPreferencesFromResource(cx.ring.R.xml.account_credentials);
                 mCredsManager = new CredentialsManager();
                 mCredsManager.onCreate(getActivity(), getPreferenceScreen(), mCallbacks.getAccount());
                 mCredsManager.reloadCredentials();
@@ -147,17 +146,17 @@ public class NestedSettingsFragment extends PreferenceFragment {
             case 1: // SRTP
                 mSrtpManager = new SRTPManager();
                 if (mCallbacks.getAccount().hasSDESEnabled()) { // SDES
-                    addPreferencesFromResource(R.xml.account_sdes);
+                    addPreferencesFromResource(cx.ring.R.xml.account_sdes);
                     mSrtpManager.onCreate(getPreferenceScreen(), mCallbacks.getAccount());
                     mSrtpManager.setSDESListener();
                 } else { // ZRTP
-                    addPreferencesFromResource(R.xml.account_zrtp);
+                    addPreferencesFromResource(cx.ring.R.xml.account_zrtp);
                     mSrtpManager.onCreate(getPreferenceScreen(), mCallbacks.getAccount());
                     mSrtpManager.setZRTPListener();
                 }
                 break;
             case 2:
-                addPreferencesFromResource(R.xml.account_tls);
+                addPreferencesFromResource(cx.ring.R.xml.account_tls);
                 mTlsManager = new TLSManager();
                 mTlsManager.onCreate(this, getPreferenceScreen(), mCallbacks.getAccount());
                 mTlsManager.setTLSListener();
diff --git a/sflphone-android/src/org/sflphone/fragments/SecurityAccountFragment.java b/ring-android/src/cx/ring/fragments/SecurityAccountFragment.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/fragments/SecurityAccountFragment.java
rename to ring-android/src/cx/ring/fragments/SecurityAccountFragment.java
index ca4993d84e0b35bc5a5e7cf777227ad68199d39c..01042e6ef83fd43e070f19e3cca0265ceb0cf771 100644
--- a/sflphone-android/src/org/sflphone/fragments/SecurityAccountFragment.java
+++ b/ring-android/src/cx/ring/fragments/SecurityAccountFragment.java
@@ -29,20 +29,20 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.util.Locale;
 
-import org.sflphone.R;
+import cx.ring.R;
 import android.app.Activity;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
-import org.sflphone.model.account.AccountDetail;
-import org.sflphone.model.account.AccountDetailSrtp;
-import org.sflphone.model.account.Account;
+import cx.ring.model.account.AccountDetail;
+import cx.ring.model.account.AccountDetailSrtp;
+import cx.ring.model.account.Account;
 
 public class SecurityAccountFragment extends PreferenceFragment {
 
diff --git a/sflphone-android/src/org/sflphone/fragments/TransferDFragment.java b/ring-android/src/cx/ring/fragments/TransferDFragment.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/fragments/TransferDFragment.java
rename to ring-android/src/cx/ring/fragments/TransferDFragment.java
index b595241460c5c1bbf4c55d71282ceb38b245b426..9d51c78cadd56f80108a933656900c6268362fd8 100644
--- a/sflphone-android/src/org/sflphone/fragments/TransferDFragment.java
+++ b/ring-android/src/cx/ring/fragments/TransferDFragment.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.fragments;
+package cx.ring.fragments;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -37,10 +37,10 @@ import java.util.List;
 
 import android.app.Dialog;
 import android.support.v4.app.DialogFragment;
-import org.sflphone.R;
-import org.sflphone.loaders.ContactsLoader;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipCall;
+import cx.ring.R;
+import cx.ring.loaders.ContactsLoader;
+import cx.ring.model.Conference;
+import cx.ring.model.SipCall;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/sflphone-android/src/org/sflphone/history/DatabaseHelper.java b/ring-android/src/cx/ring/history/DatabaseHelper.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/history/DatabaseHelper.java
rename to ring-android/src/cx/ring/history/DatabaseHelper.java
index 2ec83d43d0fb5ad1e91b99d76535b62b7fee19d7..a623e989db1272c74a64616aa8c9530c51327bd2 100644
--- a/sflphone-android/src/org/sflphone/history/DatabaseHelper.java
+++ b/ring-android/src/cx/ring/history/DatabaseHelper.java
@@ -30,7 +30,7 @@
  */
 
 
-package org.sflphone.history;
+package cx.ring.history;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/sflphone-android/src/org/sflphone/history/HistoryCall.java b/ring-android/src/cx/ring/history/HistoryCall.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/history/HistoryCall.java
rename to ring-android/src/cx/ring/history/HistoryCall.java
index 7dd82b69b2ed738a0f3582b27bcebef2fd8b176c..2e7672919118e0d904e150fbdb85b53ef79ec317 100644
--- a/sflphone-android/src/org/sflphone/history/HistoryCall.java
+++ b/ring-android/src/cx/ring/history/HistoryCall.java
@@ -30,12 +30,12 @@
  */
 
 
-package org.sflphone.history;
+package cx.ring.history;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import com.j256.ormlite.field.DatabaseField;
-import org.sflphone.model.SipCall;
+import cx.ring.model.SipCall;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
diff --git a/sflphone-android/src/org/sflphone/history/HistoryEntry.java b/ring-android/src/cx/ring/history/HistoryEntry.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/history/HistoryEntry.java
rename to ring-android/src/cx/ring/history/HistoryEntry.java
index 8ace33af0403e7d9a7d94c2c4bfcbd8cad7c296d..385355c75f62e1972cf3278b1f7a51b7a4df43ab 100644
--- a/sflphone-android/src/org/sflphone/history/HistoryEntry.java
+++ b/ring-android/src/cx/ring/history/HistoryEntry.java
@@ -29,11 +29,11 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.history;
+package cx.ring.history;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import org.sflphone.model.CallContact;
+import cx.ring.model.CallContact;
 
 import java.util.ArrayList;
 import java.util.NavigableMap;
diff --git a/sflphone-android/src/org/sflphone/history/HistoryManager.java b/ring-android/src/cx/ring/history/HistoryManager.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/history/HistoryManager.java
rename to ring-android/src/cx/ring/history/HistoryManager.java
index bb6dd2774e10b7727233448619215eec29545b54..591cbf06bb45f5cb52f916372d18513dfc6f3f6a 100644
--- a/sflphone-android/src/org/sflphone/history/HistoryManager.java
+++ b/ring-android/src/cx/ring/history/HistoryManager.java
@@ -29,14 +29,14 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.history;
+package cx.ring.history;
 
 import android.content.Context;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.table.TableUtils;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipCall;
+import cx.ring.model.Conference;
+import cx.ring.model.SipCall;
 
 import java.sql.SQLException;
 import java.util.List;
diff --git a/sflphone-android/src/org/sflphone/history/HistoryTimeModel.java b/ring-android/src/cx/ring/history/HistoryTimeModel.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/history/HistoryTimeModel.java
rename to ring-android/src/cx/ring/history/HistoryTimeModel.java
index e6a6a8bc2a1e2b378a898b014e7552c640e469ea..14a9035fa05ed855d1fdb9eb53c52d34b9233423 100644
--- a/sflphone-android/src/org/sflphone/history/HistoryTimeModel.java
+++ b/ring-android/src/cx/ring/history/HistoryTimeModel.java
@@ -1,4 +1,4 @@
-package org.sflphone.history;
+package cx.ring.history;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/sflphone-android/src/org/sflphone/interfaces/AccountsInterface.java b/ring-android/src/cx/ring/interfaces/AccountsInterface.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/interfaces/AccountsInterface.java
rename to ring-android/src/cx/ring/interfaces/AccountsInterface.java
index b41f229aa67ed7e0440654298846bd9d2f832b9d..e4416471949bb0224b993661ced0d75941d2c826 100644
--- a/sflphone-android/src/org/sflphone/interfaces/AccountsInterface.java
+++ b/ring-android/src/cx/ring/interfaces/AccountsInterface.java
@@ -28,7 +28,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.interfaces;
+package cx.ring.interfaces;
 
 public interface AccountsInterface {
     
diff --git a/sflphone-android/src/org/sflphone/interfaces/CallInterface.java b/ring-android/src/cx/ring/interfaces/CallInterface.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/interfaces/CallInterface.java
rename to ring-android/src/cx/ring/interfaces/CallInterface.java
index 2e75e3aae5cfd0b0538c91138cd006882146edf0..c1cd902057b82fcddd07fcba2ac08fd9c0bd6e96 100644
--- a/sflphone-android/src/org/sflphone/interfaces/CallInterface.java
+++ b/ring-android/src/cx/ring/interfaces/CallInterface.java
@@ -29,10 +29,10 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.interfaces;
+package cx.ring.interfaces;
 
 
-import org.sflphone.model.Conference;
+import cx.ring.model.Conference;
 
 import java.util.HashMap;
 
diff --git a/sflphone-android/src/org/sflphone/loaders/AccountsLoader.java b/ring-android/src/cx/ring/loaders/AccountsLoader.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/loaders/AccountsLoader.java
rename to ring-android/src/cx/ring/loaders/AccountsLoader.java
index e450ddf62f3eb49ae6ac308e3c2fd85877b65471..8e038ffdfa8936c4fce84ede5c8f3a1ce18cb592 100644
--- a/sflphone-android/src/org/sflphone/loaders/AccountsLoader.java
+++ b/ring-android/src/cx/ring/loaders/AccountsLoader.java
@@ -29,14 +29,14 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.loaders;
+package cx.ring.loaders;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import android.support.v4.content.AsyncTaskLoader;
-import org.sflphone.model.account.Account;
-import org.sflphone.service.ISipService;
+import cx.ring.model.account.Account;
+import cx.ring.service.ISipService;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/sflphone-android/src/org/sflphone/loaders/ContactsLoader.java b/ring-android/src/cx/ring/loaders/ContactsLoader.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/loaders/ContactsLoader.java
rename to ring-android/src/cx/ring/loaders/ContactsLoader.java
index 9cc2e9032a1d075c3ba6f1f4e4afe8dcac76c022..3482d34798f085897dbd0d6f77e748b62f47d1cf 100644
--- a/sflphone-android/src/org/sflphone/loaders/ContactsLoader.java
+++ b/ring-android/src/cx/ring/loaders/ContactsLoader.java
@@ -29,11 +29,11 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.loaders;
+package cx.ring.loaders;
 
 import java.util.ArrayList;
 
-import org.sflphone.model.CallContact;
+import cx.ring.model.CallContact;
 
 import android.content.AsyncTaskLoader;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/loaders/HistoryLoader.java b/ring-android/src/cx/ring/loaders/HistoryLoader.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/loaders/HistoryLoader.java
rename to ring-android/src/cx/ring/loaders/HistoryLoader.java
index d3432a7ed8ffbc6fb914c4364bd2beaffee490fa..5d878aa47b5f9ba1f3afdc8a0a2fa912e22a5485 100644
--- a/sflphone-android/src/org/sflphone/loaders/HistoryLoader.java
+++ b/ring-android/src/cx/ring/loaders/HistoryLoader.java
@@ -29,16 +29,16 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.loaders;
+package cx.ring.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.ContactsContract;
 import android.support.v4.content.AsyncTaskLoader;
-import org.sflphone.history.HistoryCall;
-import org.sflphone.history.HistoryEntry;
-import org.sflphone.history.HistoryManager;
-import org.sflphone.model.CallContact;
+import cx.ring.history.HistoryCall;
+import cx.ring.history.HistoryEntry;
+import cx.ring.history.HistoryManager;
+import cx.ring.model.CallContact;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/sflphone-android/src/org/sflphone/loaders/LoaderConstants.java b/ring-android/src/cx/ring/loaders/LoaderConstants.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/loaders/LoaderConstants.java
rename to ring-android/src/cx/ring/loaders/LoaderConstants.java
index 9cd19a1f84a70d2bb91ec36cfd673d0a154668b1..2d713124b82d3b13bbccbcfa3428ae28e2ce38be 100644
--- a/sflphone-android/src/org/sflphone/loaders/LoaderConstants.java
+++ b/ring-android/src/cx/ring/loaders/LoaderConstants.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.loaders;
+package cx.ring.loaders;
 
 public class LoaderConstants {
     
diff --git a/sflphone-android/src/org/sflphone/model/Attractor.java b/ring-android/src/cx/ring/model/Attractor.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/Attractor.java
rename to ring-android/src/cx/ring/model/Attractor.java
index 15cd3020324e988e8aeccc3ed3f663f829cc2d46..8240c570122972b3c7583f38280c5503e435bfb9 100644
--- a/sflphone-android/src/org/sflphone/model/Attractor.java
+++ b/ring-android/src/cx/ring/model/Attractor.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/sflphone-android/src/org/sflphone/model/Bubble.java b/ring-android/src/cx/ring/model/Bubble.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/Bubble.java
rename to ring-android/src/cx/ring/model/Bubble.java
index 88276bdb524b69932779cba07f084a53652255a9..3cf6e8a05144edb2c2b39749ae8540d8d35e7693 100644
--- a/sflphone-android/src/org/sflphone/model/Bubble.java
+++ b/ring-android/src/cx/ring/model/Bubble.java
@@ -29,13 +29,13 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.content.Context;
 import android.graphics.*;
 import android.graphics.Paint.Style;
-import org.sflphone.R;
-import org.sflphone.adapters.ContactPictureTask;
+import cx.ring.R;
+import cx.ring.adapters.ContactPictureTask;
 
 public abstract class Bubble {
 
diff --git a/sflphone-android/src/org/sflphone/model/BubbleContact.java b/ring-android/src/cx/ring/model/BubbleContact.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/BubbleContact.java
rename to ring-android/src/cx/ring/model/BubbleContact.java
index 62c0a6df11a94da8d83b827d6385486059c09ce2..e21f98a7cb8b814ba8b3d13b8b1fb137c2a1487e 100644
--- a/sflphone-android/src/org/sflphone/model/BubbleContact.java
+++ b/ring-android/src/cx/ring/model/BubbleContact.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.content.Context;
 
diff --git a/sflphone-android/src/org/sflphone/model/BubbleModel.java b/ring-android/src/cx/ring/model/BubbleModel.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/BubbleModel.java
rename to ring-android/src/cx/ring/model/BubbleModel.java
index ab00a2049deae3e638db061a68311a5f8143632e..221ff2e0c5549c2fce71fa764a7351bef2b479cf 100644
--- a/sflphone-android/src/org/sflphone/model/BubbleModel.java
+++ b/ring-android/src/cx/ring/model/BubbleModel.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.graphics.Bitmap;
 import android.graphics.PointF;
diff --git a/sflphone-android/src/org/sflphone/model/BubbleUser.java b/ring-android/src/cx/ring/model/BubbleUser.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/BubbleUser.java
rename to ring-android/src/cx/ring/model/BubbleUser.java
index 26c1e0811fb3f0e6ff6c381b7458497ee84292f9..d79e5c24b89cdd7e435ca71da5805d2e92a1428b 100644
--- a/sflphone-android/src/org/sflphone/model/BubbleUser.java
+++ b/ring-android/src/cx/ring/model/BubbleUser.java
@@ -29,10 +29,10 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.content.Context;
-import org.sflphone.R;
+import cx.ring.R;
 
 public class BubbleUser extends Bubble {
 
diff --git a/sflphone-android/src/org/sflphone/model/BubblesView.java b/ring-android/src/cx/ring/model/BubblesView.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/model/BubblesView.java
rename to ring-android/src/cx/ring/model/BubblesView.java
index 79ca1207f6a54a43d3d9b3144c67ebe7b2aa102f..8b465dde29edd219ae76bcd1603f8f578b8b4a9b 100644
--- a/sflphone-android/src/org/sflphone/model/BubblesView.java
+++ b/ring-android/src/cx/ring/model/BubblesView.java
@@ -30,7 +30,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -49,7 +49,7 @@ import android.view.View.OnTouchListener;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
-import org.sflphone.R;
+import cx.ring.R;
 
 import java.util.List;
 
diff --git a/sflphone-android/src/org/sflphone/model/CallContact.java b/ring-android/src/cx/ring/model/CallContact.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/CallContact.java
rename to ring-android/src/cx/ring/model/CallContact.java
index 9495a8581dd10a3779c136912ec0b346c01360dd..c067a750fdd2043f16391019f848afdc9b4fd575 100644
--- a/sflphone-android/src/org/sflphone/model/CallContact.java
+++ b/ring-android/src/cx/ring/model/CallContact.java
@@ -28,7 +28,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.model;
+package cx.ring.model;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/sflphone-android/src/org/sflphone/model/Codec.java b/ring-android/src/cx/ring/model/Codec.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/Codec.java
rename to ring-android/src/cx/ring/model/Codec.java
index 2bf606226333be12a45a9f35bda091644c4be214..0bef48f00852e1a445f20b969716b7f2689e3570 100644
--- a/sflphone-android/src/org/sflphone/model/Codec.java
+++ b/ring-android/src/cx/ring/model/Codec.java
@@ -29,9 +29,9 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
-import org.sflphone.service.StringVect;
+import cx.ring.service.StringVect;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/ring-android/src/cx/ring/model/Conference.aidl b/ring-android/src/cx/ring/model/Conference.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..774e9460205c6b504a45a4c5ad7e3f115e85bb92
--- /dev/null
+++ b/ring-android/src/cx/ring/model/Conference.aidl
@@ -0,0 +1,4 @@
+package cx.ring.model;
+
+
+parcelable Conference;
\ No newline at end of file
diff --git a/sflphone-android/src/org/sflphone/model/Conference.java b/ring-android/src/cx/ring/model/Conference.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/Conference.java
rename to ring-android/src/cx/ring/model/Conference.java
index 59a2d2b7540c1fb0b73ec7079c38d299ff3d125e..db027f6a9d690f35a738c1a7324f93b2adcfde6a 100644
--- a/sflphone-android/src/org/sflphone/model/Conference.java
+++ b/ring-android/src/cx/ring/model/Conference.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import java.util.ArrayList;
 
diff --git a/sflphone-android/src/org/sflphone/model/SecureSipCall.java b/ring-android/src/cx/ring/model/SecureSipCall.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/SecureSipCall.java
rename to ring-android/src/cx/ring/model/SecureSipCall.java
index bcfbeb08d56a378499402084b21aaa707e49874d..5f5e729afe6407356c212f667036fb0b71174b87 100644
--- a/sflphone-android/src/org/sflphone/model/SecureSipCall.java
+++ b/ring-android/src/cx/ring/model/SecureSipCall.java
@@ -29,12 +29,12 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
-import org.sflphone.model.account.AccountDetailSrtp;
+import cx.ring.model.account.AccountDetailSrtp;
 
 
 public class SecureSipCall extends SipCall {
diff --git a/ring-android/src/cx/ring/model/SipCall.aidl b/ring-android/src/cx/ring/model/SipCall.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..13c290cf89160b87b51b367071513265a2fffbf6
--- /dev/null
+++ b/ring-android/src/cx/ring/model/SipCall.aidl
@@ -0,0 +1,4 @@
+package cx.ring.model;
+
+
+parcelable SipCall;
\ No newline at end of file
diff --git a/sflphone-android/src/org/sflphone/model/SipCall.java b/ring-android/src/cx/ring/model/SipCall.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/SipCall.java
rename to ring-android/src/cx/ring/model/SipCall.java
index 4454f22cc0455b7c88cdef121b3a78fd89799df7..f64a505458ff9cf8c61fce10ea730d12097ac04f 100644
--- a/sflphone-android/src/org/sflphone/model/SipCall.java
+++ b/ring-android/src/cx/ring/model/SipCall.java
@@ -29,13 +29,13 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
-import org.sflphone.model.account.Account;
+import cx.ring.model.account.Account;
 
 public class SipCall implements Parcelable {
 
diff --git a/ring-android/src/cx/ring/model/SipMessage.aidl b/ring-android/src/cx/ring/model/SipMessage.aidl
new file mode 100644
index 0000000000000000000000000000000000000000..072914601be3a9f8fbb00028c9ad50ae1628e1ec
--- /dev/null
+++ b/ring-android/src/cx/ring/model/SipMessage.aidl
@@ -0,0 +1,4 @@
+package cx.ring.model;
+
+
+parcelable SipMessage;
\ No newline at end of file
diff --git a/sflphone-android/src/org/sflphone/model/SipMessage.java b/ring-android/src/cx/ring/model/SipMessage.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/SipMessage.java
rename to ring-android/src/cx/ring/model/SipMessage.java
index 442b0b662c8774a7acc7421089b6f15bdb57b4d1..f8a43cc15647b8600349fed74fa20186fc4786ba 100644
--- a/sflphone-android/src/org/sflphone/model/SipMessage.java
+++ b/ring-android/src/cx/ring/model/SipMessage.java
@@ -28,7 +28,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.model;
+package cx.ring.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/sflphone-android/src/org/sflphone/model/account/Account.java b/ring-android/src/cx/ring/model/account/Account.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/account/Account.java
rename to ring-android/src/cx/ring/model/account/Account.java
index b359c4cbcdc5836212adabe9825da69d9257c2ba..c129dde6857427e1b0c773b68955d52fdf788ce0 100644
--- a/sflphone-android/src/org/sflphone/model/account/Account.java
+++ b/ring-android/src/cx/ring/model/account/Account.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/AccountCredentials.java b/ring-android/src/cx/ring/model/account/AccountCredentials.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/account/AccountCredentials.java
rename to ring-android/src/cx/ring/model/account/AccountCredentials.java
index 707ca4ad3e90622a3cd3b9ece7787ea31b60ee43..bd0eebb8eaba14677601d06b5ef1f8ef74a063f1 100644
--- a/sflphone-android/src/org/sflphone/model/account/AccountCredentials.java
+++ b/ring-android/src/cx/ring/model/account/AccountCredentials.java
@@ -19,7 +19,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/AccountDetail.java b/ring-android/src/cx/ring/model/account/AccountDetail.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/account/AccountDetail.java
rename to ring-android/src/cx/ring/model/account/AccountDetail.java
index e26528767969b025fa76ad276e73b8584ea05af6..54fce72ae86a8f64a5f20ce2765846b0bc7c64d1 100644
--- a/sflphone-android/src/org/sflphone/model/account/AccountDetail.java
+++ b/ring-android/src/cx/ring/model/account/AccountDetail.java
@@ -19,7 +19,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/AccountDetailAdvanced.java b/ring-android/src/cx/ring/model/account/AccountDetailAdvanced.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/account/AccountDetailAdvanced.java
rename to ring-android/src/cx/ring/model/account/AccountDetailAdvanced.java
index 6d23bd10e884662e7d5528757f3ea75d80c27e39..2d09ba5f5b3f0722b1d388d9f6cc1616e5658808 100644
--- a/sflphone-android/src/org/sflphone/model/account/AccountDetailAdvanced.java
+++ b/ring-android/src/cx/ring/model/account/AccountDetailAdvanced.java
@@ -19,7 +19,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/AccountDetailBasic.java b/ring-android/src/cx/ring/model/account/AccountDetailBasic.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/account/AccountDetailBasic.java
rename to ring-android/src/cx/ring/model/account/AccountDetailBasic.java
index 662a81ed896d5c7c3fc6bbc4c66d015c40297bb1..bec769e4d0b5dccd55c1bb57ea524e2906458429 100644
--- a/sflphone-android/src/org/sflphone/model/account/AccountDetailBasic.java
+++ b/ring-android/src/cx/ring/model/account/AccountDetailBasic.java
@@ -19,7 +19,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/AccountDetailSrtp.java b/ring-android/src/cx/ring/model/account/AccountDetailSrtp.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/account/AccountDetailSrtp.java
rename to ring-android/src/cx/ring/model/account/AccountDetailSrtp.java
index 7ca2b9fa91972820804f2bcfe843e0a577c2cc57..29b3ef5c43180b5c962d8ff606c969606010c14b 100644
--- a/sflphone-android/src/org/sflphone/model/account/AccountDetailSrtp.java
+++ b/ring-android/src/cx/ring/model/account/AccountDetailSrtp.java
@@ -19,7 +19,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/AccountDetailTls.java b/ring-android/src/cx/ring/model/account/AccountDetailTls.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/model/account/AccountDetailTls.java
rename to ring-android/src/cx/ring/model/account/AccountDetailTls.java
index db03ed7b9ed1f5d9b3db6d98128a99fc735cc900..37054b68630d05614f1e010c56e27491917d2fbb 100644
--- a/sflphone-android/src/org/sflphone/model/account/AccountDetailTls.java
+++ b/ring-android/src/cx/ring/model/account/AccountDetailTls.java
@@ -19,7 +19,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/sflphone-android/src/org/sflphone/model/account/CredentialsManager.java b/ring-android/src/cx/ring/model/account/CredentialsManager.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/account/CredentialsManager.java
rename to ring-android/src/cx/ring/model/account/CredentialsManager.java
index 62a266bdffba4764391575e0369893ae3a240cd8..f3ae1a28d84ffb0e5b52f4746c2bb041fc58a872 100644
--- a/sflphone-android/src/org/sflphone/model/account/CredentialsManager.java
+++ b/ring-android/src/cx/ring/model/account/CredentialsManager.java
@@ -29,12 +29,12 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.sflphone.views.CredentialsPreference;
+import cx.ring.views.CredentialsPreference;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/sflphone-android/src/org/sflphone/model/account/SRTPManager.java b/ring-android/src/cx/ring/model/account/SRTPManager.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/account/SRTPManager.java
rename to ring-android/src/cx/ring/model/account/SRTPManager.java
index 5189e252b6a5f073a15a72e182251268c34e8475..1414d0d98c47ba6e872fffc3e2a544e51f022952 100644
--- a/sflphone-android/src/org/sflphone/model/account/SRTPManager.java
+++ b/ring-android/src/cx/ring/model/account/SRTPManager.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
diff --git a/sflphone-android/src/org/sflphone/model/account/TLSManager.java b/ring-android/src/cx/ring/model/account/TLSManager.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/model/account/TLSManager.java
rename to ring-android/src/cx/ring/model/account/TLSManager.java
index 98c94f3586218f0bae9c17262fe194b1b92628ac..c2f6dcabe45b6d35a86916ca45f6c957d71340b1 100644
--- a/sflphone-android/src/org/sflphone/model/account/TLSManager.java
+++ b/ring-android/src/cx/ring/model/account/TLSManager.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.model.account;
+package cx.ring.model.account;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -40,8 +40,8 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 import android.util.Log;
-import org.sflphone.R;
-import org.sflphone.fragments.NestedSettingsFragment;
+import cx.ring.R;
+import cx.ring.fragments.NestedSettingsFragment;
 
 import java.io.File;
 
diff --git a/sflphone-android/src/org/sflphone/service/CallManagerCallBack.java b/ring-android/src/cx/ring/service/CallManagerCallBack.java
similarity index 94%
rename from sflphone-android/src/org/sflphone/service/CallManagerCallBack.java
rename to ring-android/src/cx/ring/service/CallManagerCallBack.java
index c8b8502b9d944334e3c5d3d1d286712c2df1bd5b..622f58fa07a60437a908b30d909d2cd440b5054e 100644
--- a/sflphone-android/src/org/sflphone/service/CallManagerCallBack.java
+++ b/ring-android/src/cx/ring/service/CallManagerCallBack.java
@@ -1,16 +1,21 @@
-package org.sflphone.service;
+package cx.ring.service;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import org.sflphone.client.CallActivity;
-import org.sflphone.model.*;
-import org.sflphone.model.account.Account;
-import org.sflphone.utils.SwigNativeConverter;
+import cx.ring.client.CallActivity;
+import cx.ring.model.account.Account;
+import cx.ring.utils.SwigNativeConverter;
 
 import java.util.ArrayList;
 import java.util.Map;
 
+import cx.ring.model.CallContact;
+import cx.ring.model.Conference;
+import cx.ring.model.SecureSipCall;
+import cx.ring.model.SipCall;
+import cx.ring.model.SipMessage;
+
 public class CallManagerCallBack extends Callback {
 
     private static final String TAG = "CallManagerCallBack";
@@ -79,7 +84,7 @@ public class CallManagerCallBack extends Callback {
         } else if (newState.equals("FAILURE")) {
             toUpdate.setCallState(callID, SipCall.state.CALL_STATE_FAILURE);
             mService.getConferences().remove(toUpdate.getId());
-            SFLPhoneservice.sflph_call_hang_up(callID);
+            Ringservice.sflph_call_hang_up(callID);
         } else if (newState.equals("HOLD")) {
             toUpdate.setCallState(callID, SipCall.state.CALL_STATE_HOLD);
         } else if (newState.equals("UNHOLD")) {
@@ -95,8 +100,8 @@ public class CallManagerCallBack extends Callback {
         Log.d(TAG, "on_incoming_call(" + accountID + ", " + callID + ", " + from + ")");
 
         try {
-            StringMap details = SFLPhoneservice.sflph_config_get_account_details(accountID);
-            VectMap credentials = SFLPhoneservice.sflph_config_get_credentials(accountID);
+            StringMap details = Ringservice.sflph_config_get_account_details(accountID);
+            VectMap credentials = Ringservice.sflph_config_get_credentials(accountID);
             Account acc = new Account(accountID, SwigNativeConverter.convertAccountToNative(details), SwigNativeConverter.convertCredentialsToNative(credentials));
 
             Bundle args = new Bundle();
@@ -142,7 +147,7 @@ public class CallManagerCallBack extends Callback {
         Intent intent = new Intent(CONF_CREATED);
         Conference created = new Conference(confID);
 
-        StringVect all_participants = SFLPhoneservice.sflph_call_get_participant_list(confID);
+        StringVect all_participants = Ringservice.sflph_call_get_participant_list(confID);
         Log.w(TAG, "all_participants:" + all_participants.size());
         for (int i = 0; i < all_participants.size(); ++i) {
             if (mService.getConferences().get(all_participants.get(i)) != null) {
@@ -222,7 +227,7 @@ public class CallManagerCallBack extends Callback {
         Conference toModify = mService.getConferences().get(confID);
         toModify.setCallState(confID, state);
 
-        ArrayList<String> newParticipants = SwigNativeConverter.convertSwigToNative(SFLPhoneservice.sflph_call_get_participant_list(intent.getStringExtra("confID")));
+        ArrayList<String> newParticipants = SwigNativeConverter.convertSwigToNative(Ringservice.sflph_call_get_participant_list(intent.getStringExtra("confID")));
 
         if (toModify.getParticipants().size() < newParticipants.size()) {
             // We need to add the new participant to the conf
diff --git a/sflphone-android/src/org/sflphone/service/ConfigurationManagerCallback.java b/ring-android/src/cx/ring/service/ConfigurationManagerCallback.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/service/ConfigurationManagerCallback.java
rename to ring-android/src/cx/ring/service/ConfigurationManagerCallback.java
index 3017ffe2f3b160dedaddfb1351b57166f37e11b8..953a6559835b751592cbdec1a3bbe57577125bc4 100644
--- a/sflphone-android/src/org/sflphone/service/ConfigurationManagerCallback.java
+++ b/ring-android/src/cx/ring/service/ConfigurationManagerCallback.java
@@ -20,7 +20,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.service;
+package cx.ring.service;
 
 import android.content.Intent;
 import android.util.Log;
diff --git a/sflphone-android/src/org/sflphone/service/ISipService.aidl b/ring-android/src/cx/ring/service/ISipService.aidl
similarity index 95%
rename from sflphone-android/src/org/sflphone/service/ISipService.aidl
rename to ring-android/src/cx/ring/service/ISipService.aidl
index 1ec5664e1fe43f13a388aca9d8e612cb93c6daf2..d1ea05afdf3deefb00f81f63bda5c28624848e61 100644
--- a/sflphone-android/src/org/sflphone/service/ISipService.aidl
+++ b/ring-android/src/cx/ring/service/ISipService.aidl
@@ -1,8 +1,8 @@
-package org.sflphone.service;
+package cx.ring.service;
 
-import org.sflphone.model.SipCall;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipMessage;
+import cx.ring.model.SipCall;
+import cx.ring.model.Conference;
+import cx.ring.model.SipMessage;
 
 interface ISipService {
     
diff --git a/sflphone-android/src/org/sflphone/service/OpenSlParams.java b/ring-android/src/cx/ring/service/OpenSlParams.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/service/OpenSlParams.java
rename to ring-android/src/cx/ring/service/OpenSlParams.java
index c9a71eabb6299700bb5eb46f14020db64e563d05..65c73d63395c6865c08163e2463bd97b4b477e10 100644
--- a/sflphone-android/src/org/sflphone/service/OpenSlParams.java
+++ b/ring-android/src/cx/ring/service/OpenSlParams.java
@@ -1,4 +1,4 @@
-package org.sflphone.service;
+package cx.ring.service;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/service/ServiceConstants.java b/ring-android/src/cx/ring/service/ServiceConstants.java
similarity index 94%
rename from sflphone-android/src/org/sflphone/service/ServiceConstants.java
rename to ring-android/src/cx/ring/service/ServiceConstants.java
index 51f4865e5a90530b0a16ef52987e67e491bab959..ab175ab95e80fc81ccfc771209f0d42993ead83b 100644
--- a/sflphone-android/src/org/sflphone/service/ServiceConstants.java
+++ b/ring-android/src/cx/ring/service/ServiceConstants.java
@@ -1,4 +1,4 @@
-package org.sflphone.service;
+package cx.ring.service;
 
 public final class ServiceConstants {
 
diff --git a/sflphone-android/src/org/sflphone/service/SipService.java b/ring-android/src/cx/ring/service/SipService.java
similarity index 90%
rename from sflphone-android/src/org/sflphone/service/SipService.java
rename to ring-android/src/cx/ring/service/SipService.java
index fab2dc48aa17892d4464115404cd0c3f213e3f76..14d907ab8d8ebaef8bb412af1f3ed98e1290dc57 100644
--- a/sflphone-android/src/org/sflphone/service/SipService.java
+++ b/ring-android/src/cx/ring/service/SipService.java
@@ -22,7 +22,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.sflphone.service;
+package cx.ring.service;
 
 import android.os.Handler;
 
@@ -37,11 +37,15 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.*;
 import android.util.Log;
-import org.sflphone.history.HistoryManager;
-import org.sflphone.model.*;
-import org.sflphone.utils.MediaManager;
-import org.sflphone.utils.SipNotifications;
-import org.sflphone.utils.SwigNativeConverter;
+import cx.ring.history.HistoryManager;
+import cx.ring.model.Codec;
+import cx.ring.model.Conference;
+import cx.ring.model.SecureSipCall;
+import cx.ring.model.SipMessage;
+import cx.ring.utils.MediaManager;
+import cx.ring.utils.SipNotifications;
+import cx.ring.utils.SwigNativeConverter;
+import cx.ring.model.SipCall;
 
 
 public class SipService extends Service {
@@ -55,7 +59,7 @@ public class SipService extends Service {
     private Runnable pollEvents = new Runnable() {
         @Override
         public void run() {
-            SFLPhoneservice.sflph_poll_events();
+            Ringservice.sflph_poll_events();
             handler.postDelayed(this, POLLING_TIMEOUT);
         }
     };
@@ -221,7 +225,7 @@ public class SipService extends Service {
 
     private void stopDaemon() {
         handler.removeCallbacks(pollEvents);
-        SFLPhoneservice.sflph_fini();
+        Ringservice.sflph_fini();
         isPjSipStackStarted = false;
     }
 
@@ -250,7 +254,7 @@ public class SipService extends Service {
 
         configurationCallback = new ConfigurationManagerCallback(this);
         callManagerCallBack = new CallManagerCallBack(this);
-        SFLPhoneservice.init(configurationCallback, callManagerCallBack);
+        Ringservice.init(configurationCallback, callManagerCallBack);
         handler.postDelayed(pollEvents, POLLING_TIMEOUT);
         Log.i(TAG, "PjSIPStack started");
     }
@@ -346,7 +350,7 @@ public class SipService extends Service {
                     }
                     mConferences.put(toAdd.getId(), toAdd);
                     mMediaManager.obtainAudioFocus(false);
-                    SFLPhoneservice.sflph_call_place(call.getAccount().getAccountID(), call.getCallId(), call.getmContact().getPhones().get(0).getNumber());
+                    Ringservice.sflph_call_place(call.getAccount().getAccountID(), call.getCallId(), call.getmContact().getPhones().get(0).getNumber());
                 }
             });
         }
@@ -358,7 +362,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.refuse() thread running...");
-                    SFLPhoneservice.sflph_call_refuse(callID);
+                    Ringservice.sflph_call_refuse(callID);
                 }
             });
         }
@@ -370,7 +374,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.accept() thread running...");
-                    SFLPhoneservice.sflph_call_accept(callID);
+                    Ringservice.sflph_call_accept(callID);
                     mMediaManager.RouteToInternalSpeaker();
                 }
             });
@@ -384,7 +388,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.hangUp() thread running...");
-                    SFLPhoneservice.sflph_call_hang_up(callID);
+                    Ringservice.sflph_call_hang_up(callID);
                     removeCall(callID);
                     if(mConferences.size() == 0) {
                         Log.i(TAG, "No more calls!");
@@ -400,7 +404,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.hold() thread running...");
-                    SFLPhoneservice.sflph_call_hold(callID);
+                    Ringservice.sflph_call_hold(callID);
                 }
             });
         }
@@ -411,7 +415,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.unhold() thread running...");
-                    SFLPhoneservice.sflph_call_unhold(callID);
+                    Ringservice.sflph_call_unhold(callID);
                 }
             });
         }
@@ -428,7 +432,7 @@ public class SipService extends Service {
                 @Override
                 protected StringMap doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getCallDetails() thread running...");
-                    return SFLPhoneservice.sflph_call_get_call_details(id);
+                    return Ringservice.sflph_call_get_call_details(id);
                 }
             }
 
@@ -448,7 +452,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.setAudioPlugin() thread running...");
-                    SFLPhoneservice.sflph_config_set_audio_plugin(audioPlugin);
+                    Ringservice.sflph_config_set_audio_plugin(audioPlugin);
                 }
             });
         }
@@ -459,7 +463,7 @@ public class SipService extends Service {
                 @Override
                 protected String doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getCurrentAudioOutputPlugin() thread running...");
-                    return SFLPhoneservice.sflph_config_get_current_audio_output_plugin();
+                    return Ringservice.sflph_config_get_current_audio_output_plugin();
                 }
             }
 
@@ -477,7 +481,7 @@ public class SipService extends Service {
                 @Override
                 protected StringVect doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getAccountList() thread running...");
-                    return SFLPhoneservice.sflph_config_get_account_list();
+                    return Ringservice.sflph_config_get_account_list();
                 }
             }
             AccountList runInstance = new AccountList();
@@ -500,7 +504,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.setAccountsOrder() thread running...");
-                    SFLPhoneservice.sflph_config_set_accounts_order(order);
+                    Ringservice.sflph_config_set_accounts_order(order);
                 }
             });
         }
@@ -517,7 +521,7 @@ public class SipService extends Service {
                 @Override
                 protected StringMap doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getAccountDetails() thread running...");
-                    return SFLPhoneservice.sflph_config_get_account_details(id);
+                    return Ringservice.sflph_config_get_account_details(id);
                 }
             }
 
@@ -543,7 +547,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
 
-                    SFLPhoneservice.sflph_config_set_account_details(accountId, swigmap);
+                    Ringservice.sflph_config_set_account_details(accountId, swigmap);
                     Log.i(TAG, "SipService.setAccountDetails() thread running...");
                 }
 
@@ -557,7 +561,7 @@ public class SipService extends Service {
                 @Override
                 protected StringMap doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getAccountTemplate() thread running...");
-                    return SFLPhoneservice.sflph_config_get_account_template();
+                    return Ringservice.sflph_config_get_account_template();
                 }
             }
 
@@ -585,7 +589,7 @@ public class SipService extends Service {
                 @Override
                 protected String doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.addAccount() thread running...");
-                    return SFLPhoneservice.sflph_config_add_account(map);
+                    return Ringservice.sflph_config_add_account(map);
                 }
             }
 
@@ -604,7 +608,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.setAccountDetails() thread running...");
-                    SFLPhoneservice.sflph_config_remove_account(accountId);
+                    Ringservice.sflph_config_remove_account(accountId);
                 }
             });
         }
@@ -619,7 +623,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.transfer() thread running...");
-                    if (SFLPhoneservice.sflph_call_transfer(callID, to)) {
+                    if (Ringservice.sflph_call_transfer(callID, to)) {
                         Bundle bundle = new Bundle();
                         bundle.putString("CallID", callID);
                         bundle.putString("State", "HUNGUP");
@@ -639,7 +643,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.attendedTransfer() thread running...");
-                    if (SFLPhoneservice.sflph_call_attended_transfer(transferID, targetID)) {
+                    if (Ringservice.sflph_call_attended_transfer(transferID, targetID)) {
                         Log.i(TAG, "OK");
                     } else
                         Log.i(TAG, "NOT OK");
@@ -658,7 +662,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.createConference() thread running...");
-                    SFLPhoneservice.sflph_call_remove_conference(confID);
+                    Ringservice.sflph_call_remove_conference(confID);
                 }
             });
 
@@ -670,7 +674,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.joinParticipant() thread running...");
-                    SFLPhoneservice.sflph_call_join_participant(sel_callID, drag_callID);
+                    Ringservice.sflph_call_join_participant(sel_callID, drag_callID);
                     // Generate a CONF_CREATED callback
                 }
             });
@@ -683,7 +687,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.addParticipant() thread running...");
-                    SFLPhoneservice.sflph_call_add_participant(call.getCallId(), confID);
+                    Ringservice.sflph_call_add_participant(call.getCallId(), confID);
                     mConferences.get(confID).getParticipants().add(call);
                 }
             });
@@ -696,7 +700,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.addMainParticipant() thread running...");
-                    SFLPhoneservice.sflph_call_add_main_participant(confID);
+                    Ringservice.sflph_call_add_main_participant(confID);
                 }
             });
 
@@ -720,7 +724,7 @@ public class SipService extends Service {
                             Log.i(TAG, "Call found and put in current_calls");
                         }
                     }
-                    SFLPhoneservice.sflph_call_detach_participant(callID);
+                    Ringservice.sflph_call_detach_participant(callID);
                 }
             });
 
@@ -732,7 +736,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.joinConference() thread running...");
-                    SFLPhoneservice.sflph_call_join_conference(sel_confID, drag_confID);
+                    Ringservice.sflph_call_join_conference(sel_confID, drag_confID);
                 }
             });
 
@@ -745,7 +749,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.joinConference() thread running...");
-                    SFLPhoneservice.sflph_call_hang_up_conference(confID);
+                    Ringservice.sflph_call_hang_up_conference(confID);
                 }
             });
 
@@ -757,7 +761,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.holdConference() thread running...");
-                    SFLPhoneservice.sflph_call_hold_conference(confID);
+                    Ringservice.sflph_call_hold_conference(confID);
                 }
             });
 
@@ -769,7 +773,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.unholdConference() thread running...");
-                    SFLPhoneservice.sflph_call_unhold_conference(confID);
+                    Ringservice.sflph_call_unhold_conference(confID);
                 }
             });
 
@@ -782,7 +786,7 @@ public class SipService extends Service {
                 @Override
                 protected Boolean doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.isRecording() thread running...");
-                    return SFLPhoneservice.sflph_call_is_conference_participant(callID);
+                    return Ringservice.sflph_call_is_conference_participant(callID);
                 }
             }
 
@@ -826,7 +830,7 @@ public class SipService extends Service {
                 @Override
                 protected StringVect doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getParticipantList() thread running...");
-                    return SFLPhoneservice.sflph_call_get_participant_list(confID);
+                    return Ringservice.sflph_call_get_participant_list(confID);
                 }
             }
             ;
@@ -857,7 +861,7 @@ public class SipService extends Service {
                 @Override
                 protected StringMap doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getConferenceDetails() thread running...");
-                    return SFLPhoneservice.sflph_call_get_conference_details(callID);
+                    return Ringservice.sflph_call_get_conference_details(callID);
                 }
             }
             ConfDetails runInstance = new ConfDetails();
@@ -877,7 +881,7 @@ public class SipService extends Service {
                 @Override
                 protected String doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getRecordPath() thread running...");
-                    return SFLPhoneservice.sflph_config_get_record_path();
+                    return Ringservice.sflph_config_get_record_path();
                 }
             }
 
@@ -898,7 +902,7 @@ public class SipService extends Service {
                 @Override
                 protected Boolean doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.toggleRecordingCall() thread running...");
-                    boolean result = SFLPhoneservice.sflph_call_toggle_recording(id);
+                    boolean result = Ringservice.sflph_call_toggle_recording(id);
 
                     if (getConferences().containsKey(id)) {
                         getConferences().get(id).setRecording(result);
@@ -927,7 +931,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.setRecordingCall() thread running...");
-                    SFLPhoneservice.sflph_call_play_recorded_file(filepath);
+                    Ringservice.sflph_call_play_recorded_file(filepath);
                 }
             });
             return false;
@@ -939,7 +943,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.stopRecordedFilePlayback() thread running...");
-                    SFLPhoneservice.sflph_call_stop_recorded_file(filepath);
+                    Ringservice.sflph_call_stop_recorded_file(filepath);
                 }
             });
         }
@@ -950,7 +954,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.setRecordPath() " + path + " thread running...");
-                    SFLPhoneservice.sflph_config_set_record_path(path);
+                    Ringservice.sflph_config_set_record_path(path);
                 }
             });
         }
@@ -961,7 +965,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.sendTextMessage() thread running...");
-                    SFLPhoneservice.sflph_call_send_text_message(callID, message.comment);
+                    Ringservice.sflph_call_send_text_message(callID, message.comment);
                     if (getConferences().get(callID) != null)
                         getConferences().get(callID).addSipMessage(message);
                 }
@@ -978,13 +982,13 @@ public class SipService extends Service {
                     Log.i(TAG, "SipService.getAudioCodecList() thread running...");
                     ArrayList<Codec> results = new ArrayList<Codec>();
 
-                    IntVect active_payloads = SFLPhoneservice.sflph_config_get_active_audio_codec_list(accountID);
+                    IntVect active_payloads = Ringservice.sflph_config_get_active_audio_codec_list(accountID);
                     for (int i = 0; i < active_payloads.size(); ++i) {
 
-                        results.add(new Codec(active_payloads.get(i), SFLPhoneservice.sflph_config_get_audio_codec_details(active_payloads.get(i)), true));
+                        results.add(new Codec(active_payloads.get(i), Ringservice.sflph_config_get_audio_codec_details(active_payloads.get(i)), true));
 
                     }
-                    IntVect payloads = SFLPhoneservice.sflph_config_get_audio_codec_list();
+                    IntVect payloads = Ringservice.sflph_config_get_audio_codec_list();
 
                     for (int i = 0; i < payloads.size(); ++i) {
                         boolean isActive = false;
@@ -996,7 +1000,7 @@ public class SipService extends Service {
                         if (isActive)
                             continue;
                         else
-                            results.add(new Codec(payloads.get(i), SFLPhoneservice.sflph_config_get_audio_codec_details(payloads.get(i)), false));
+                            results.add(new Codec(payloads.get(i), Ringservice.sflph_config_get_audio_codec_details(payloads.get(i)), false));
 
                     }
 
@@ -1018,7 +1022,7 @@ public class SipService extends Service {
                 @Override
                 protected StringMap doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getRingtoneList() thread running...");
-                    return SFLPhoneservice.sflph_config_get_ringtone_list();
+                    return Ringservice.sflph_config_get_ringtone_list();
                 }
             }
 
@@ -1042,7 +1046,7 @@ public class SipService extends Service {
                 @Override
                 protected Boolean doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.isCaptureMuted() thread running...");
-                    return SFLPhoneservice.sflph_config_check_for_private_key(pemPath);
+                    return Ringservice.sflph_config_check_for_private_key(pemPath);
                 }
             }
 
@@ -1061,7 +1065,7 @@ public class SipService extends Service {
                 @Override
                 protected Boolean doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.isCaptureMuted() thread running...");
-                    return SFLPhoneservice.sflph_config_check_certificate_validity(pemPath, pemPath);
+                    return Ringservice.sflph_config_check_certificate_validity(pemPath, pemPath);
                 }
             }
 
@@ -1080,7 +1084,7 @@ public class SipService extends Service {
                 @Override
                 protected Boolean doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.isCaptureMuted() thread running...");
-                    return SFLPhoneservice.sflph_config_check_hostname_certificate(host, port);
+                    return Ringservice.sflph_config_check_hostname_certificate(host, port);
                 }
             }
 
@@ -1102,7 +1106,7 @@ public class SipService extends Service {
                     for (Object codec : codecs) {
                         list.add((String) codec);
                     }
-                    SFLPhoneservice.sflph_config_set_active_audio_codec_list(list, accountID);
+                    Ringservice.sflph_config_set_active_audio_codec_list(list, accountID);
                 }
             });
         }
@@ -1129,7 +1133,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.playDtmf() thread running...");
-                    SFLPhoneservice.sflph_call_play_dtmf(key);
+                    Ringservice.sflph_call_play_dtmf(key);
                 }
             });
         }
@@ -1150,7 +1154,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.setMuted() thread running...");
-                    SFLPhoneservice.sflph_config_mute_capture(mute);
+                    Ringservice.sflph_config_mute_capture(mute);
                 }
             });
         }
@@ -1162,7 +1166,7 @@ public class SipService extends Service {
                 @Override
                 protected Boolean doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.isCaptureMuted() thread running...");
-                    return SFLPhoneservice.sflph_config_is_capture_muted();
+                    return Ringservice.sflph_config_is_capture_muted();
                 }
             }
 
@@ -1182,7 +1186,7 @@ public class SipService extends Service {
                     Log.i(TAG, "SipService.confirmSAS() thread running...");
                     SecureSipCall call = (SecureSipCall) getCallById(callID);
                     call.setSASConfirmed(true);
-                    SFLPhoneservice.sflph_call_set_sas_verified(callID);
+                    Ringservice.sflph_call_set_sas_verified(callID);
                 }
             });
         }
@@ -1195,7 +1199,7 @@ public class SipService extends Service {
                 @Override
                 protected List doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getCredentials() thread running...");
-                    StringVect map = SFLPhoneservice.sflph_config_get_supported_tls_method();
+                    StringVect map = Ringservice.sflph_config_get_supported_tls_method();
                     return SwigNativeConverter.convertSwigToNative(map);
                 }
             }
@@ -1214,7 +1218,7 @@ public class SipService extends Service {
                 @Override
                 protected List doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.getCredentials() thread running...");
-                    VectMap map = SFLPhoneservice.sflph_config_get_credentials(accountID);
+                    VectMap map = Ringservice.sflph_config_get_credentials(accountID);
                     return SwigNativeConverter.convertCredentialsToNative(map);
                 }
             }
@@ -1233,7 +1237,7 @@ public class SipService extends Service {
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.setCredentials() thread running...");
                     ArrayList<HashMap<String, String>> list = (ArrayList<HashMap<String, String>>) creds;
-                    SFLPhoneservice.sflph_config_set_credentials(accountID, SwigNativeConverter.convertFromNativeToSwig(creds));
+                    Ringservice.sflph_config_set_credentials(accountID, SwigNativeConverter.convertFromNativeToSwig(creds));
                 }
             });
         }
@@ -1244,7 +1248,7 @@ public class SipService extends Service {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.registerAllAccounts() thread running...");
-                    SFLPhoneservice.sflph_config_register_all_accounts();
+                    Ringservice.sflph_config_register_all_accounts();
                 }
             });
         }
diff --git a/sflphone-android/src/org/sflphone/utils/AccelerometerListener.java b/ring-android/src/cx/ring/utils/AccelerometerListener.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/utils/AccelerometerListener.java
rename to ring-android/src/cx/ring/utils/AccelerometerListener.java
index d0607a7d9f9c859cb666548cecce38bac2399b99..f2bbca74a3763ff716ca28a20060810944df0732 100644
--- a/sflphone-android/src/org/sflphone/utils/AccelerometerListener.java
+++ b/ring-android/src/cx/ring/utils/AccelerometerListener.java
@@ -31,7 +31,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
 import android.content.Context;
 import android.hardware.Sensor;
diff --git a/sflphone-android/src/org/sflphone/utils/CallProximityManager.java b/ring-android/src/cx/ring/utils/CallProximityManager.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/utils/CallProximityManager.java
rename to ring-android/src/cx/ring/utils/CallProximityManager.java
index 8236d6dcdff876f3cc5084cdac6b859e49f39976..509aa42b28391881119f2dd199d5867ed4bcdbba 100644
--- a/sflphone-android/src/org/sflphone/utils/CallProximityManager.java
+++ b/ring-android/src/cx/ring/utils/CallProximityManager.java
@@ -30,12 +30,12 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-package org.sflphone.utils;
+package cx.ring.utils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import org.sflphone.utils.AccelerometerListener.OrientationListener;
+import cx.ring.utils.AccelerometerListener.OrientationListener;
 
 import android.content.Context;
 import android.hardware.Sensor;
diff --git a/sflphone-android/src/org/sflphone/utils/Compatibility.java b/ring-android/src/cx/ring/utils/Compatibility.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/utils/Compatibility.java
rename to ring-android/src/cx/ring/utils/Compatibility.java
index 5a30f60e536755c6bb1727929e2841b505226c7c..b40cbfc55b6c6974a0924a8286c9df01828904ee 100644
--- a/sflphone-android/src/org/sflphone/utils/Compatibility.java
+++ b/ring-android/src/cx/ring/utils/Compatibility.java
@@ -31,7 +31,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/sflphone-android/src/org/sflphone/utils/MediaManager.java b/ring-android/src/cx/ring/utils/MediaManager.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/utils/MediaManager.java
rename to ring-android/src/cx/ring/utils/MediaManager.java
index 25ddef56b25f7833ef2ab419501db2b87d16d51f..e1abe4e455162942f28220c477f8c9f8f8ce741c 100644
--- a/sflphone-android/src/org/sflphone/utils/MediaManager.java
+++ b/ring-android/src/cx/ring/utils/MediaManager.java
@@ -29,16 +29,16 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
-import org.sflphone.service.SipService;
+import cx.ring.service.SipService;
 
 import android.content.Context;
 import android.media.AudioManager;
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.os.Handler;
 import android.util.Log;
-import org.sflphone.utils.bluetooth.BluetoothWrapper;
+import cx.ring.utils.bluetooth.BluetoothWrapper;
 
 public class MediaManager implements OnAudioFocusChangeListener, BluetoothWrapper.BluetoothChangeListener {
 
diff --git a/sflphone-android/src/org/sflphone/utils/Ringer.java b/ring-android/src/cx/ring/utils/Ringer.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/utils/Ringer.java
rename to ring-android/src/cx/ring/utils/Ringer.java
index 11423c4e6f5c12fe23e2a1b0a0496d1db4a429bc..1e2767de8894542e4edcecab20809a5c73577875 100644
--- a/sflphone-android/src/org/sflphone/utils/Ringer.java
+++ b/ring-android/src/cx/ring/utils/Ringer.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
 import android.content.Context;
 import android.media.AudioManager;
diff --git a/sflphone-android/src/org/sflphone/utils/SettingsContentObserver.java b/ring-android/src/cx/ring/utils/SettingsContentObserver.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/utils/SettingsContentObserver.java
rename to ring-android/src/cx/ring/utils/SettingsContentObserver.java
index b6aa61ed7b2c9dea54c27e40a8e9231a435b6c74..018cf28b6513d4fbf86d4c6c829ad9fede65e391 100644
--- a/sflphone-android/src/org/sflphone/utils/SettingsContentObserver.java
+++ b/ring-android/src/cx/ring/utils/SettingsContentObserver.java
@@ -29,9 +29,9 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
-import org.sflphone.service.SipService;
+import cx.ring.service.SipService;
 
 import android.content.Context;
 import android.database.ContentObserver;
diff --git a/sflphone-android/src/org/sflphone/utils/SipNotifications.java b/ring-android/src/cx/ring/utils/SipNotifications.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/utils/SipNotifications.java
rename to ring-android/src/cx/ring/utils/SipNotifications.java
index a77f9c519604fac68b8055d4bd567038400be8fe..356552ba75d1683dc9b59c0a6a84e7b8b489c1fb 100644
--- a/sflphone-android/src/org/sflphone/utils/SipNotifications.java
+++ b/ring-android/src/cx/ring/utils/SipNotifications.java
@@ -31,15 +31,15 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
 import java.util.HashMap;
 import java.util.Random;
 
-import org.sflphone.R;
-import org.sflphone.client.HomeActivity;
-import org.sflphone.model.Conference;
-import org.sflphone.model.SipCall;
+import cx.ring.R;
+import cx.ring.client.HomeActivity;
+import cx.ring.model.Conference;
+import cx.ring.model.SipCall;
 
 import android.app.Notification;
 import android.app.NotificationManager;
diff --git a/sflphone-android/src/org/sflphone/utils/SwigNativeConverter.java b/ring-android/src/cx/ring/utils/SwigNativeConverter.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/utils/SwigNativeConverter.java
rename to ring-android/src/cx/ring/utils/SwigNativeConverter.java
index a6ae2b6a2381e98c95ada85d78003631a5937d0c..748391b76738f404ab3c1c535ac6a508b0637e99 100644
--- a/sflphone-android/src/org/sflphone/utils/SwigNativeConverter.java
+++ b/ring-android/src/cx/ring/utils/SwigNativeConverter.java
@@ -29,21 +29,21 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.utils;
+package cx.ring.utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
-import org.sflphone.model.account.AccountDetailAdvanced;
-import org.sflphone.model.account.AccountDetailBasic;
-import org.sflphone.model.account.AccountDetailSrtp;
-import org.sflphone.model.account.AccountDetailTls;
-import org.sflphone.service.ServiceConstants;
-import org.sflphone.service.StringMap;
-import org.sflphone.service.StringVect;
-import org.sflphone.service.VectMap;
+import cx.ring.model.account.AccountDetailAdvanced;
+import cx.ring.model.account.AccountDetailBasic;
+import cx.ring.model.account.AccountDetailSrtp;
+import cx.ring.model.account.AccountDetailTls;
+import cx.ring.service.ServiceConstants;
+import cx.ring.service.StringMap;
+import cx.ring.service.StringVect;
+import cx.ring.service.VectMap;
 
 public class SwigNativeConverter {
 
diff --git a/sflphone-android/src/org/sflphone/utils/bluetooth/BluetoothUtils14.java b/ring-android/src/cx/ring/utils/bluetooth/BluetoothUtils14.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/utils/bluetooth/BluetoothUtils14.java
rename to ring-android/src/cx/ring/utils/bluetooth/BluetoothUtils14.java
index c0bcced7d5200ad1c9c7e5ddfff53f6ec5de77fa..c37834736ddab186669c0b25047395f297bb4ba7 100644
--- a/sflphone-android/src/org/sflphone/utils/bluetooth/BluetoothUtils14.java
+++ b/ring-android/src/cx/ring/utils/bluetooth/BluetoothUtils14.java
@@ -19,7 +19,7 @@
  *  along with CSipSimple.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sflphone.utils.bluetooth;
+package cx.ring.utils.bluetooth;
 
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/sflphone-android/src/org/sflphone/utils/bluetooth/BluetoothWrapper.java b/ring-android/src/cx/ring/utils/bluetooth/BluetoothWrapper.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/utils/bluetooth/BluetoothWrapper.java
rename to ring-android/src/cx/ring/utils/bluetooth/BluetoothWrapper.java
index ad39054fbb6f4991972c86a018332343baaba47f..053db85f22c751d2431ba4620879fa494164a02f 100644
--- a/sflphone-android/src/org/sflphone/utils/bluetooth/BluetoothWrapper.java
+++ b/ring-android/src/cx/ring/utils/bluetooth/BluetoothWrapper.java
@@ -19,7 +19,7 @@
  *  along with CSipSimple.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sflphone.utils.bluetooth;
+package cx.ring.utils.bluetooth;
 
 import android.content.Context;
 
diff --git a/sflphone-android/src/org/sflphone/views/CallPaneLayout.java b/ring-android/src/cx/ring/views/CallPaneLayout.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/views/CallPaneLayout.java
rename to ring-android/src/cx/ring/views/CallPaneLayout.java
index b749908d1e3a295ad2030f3180f3a21421c924db..c9bd68664979369bd47e2251043022e8e96bd2ec 100644
--- a/sflphone-android/src/org/sflphone/views/CallPaneLayout.java
+++ b/ring-android/src/cx/ring/views/CallPaneLayout.java
@@ -29,9 +29,9 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
-import org.sflphone.fragments.CallFragment;
+import cx.ring.fragments.CallFragment;
 
 import android.content.Context;
 import android.support.v4.widget.SlidingPaneLayout;
diff --git a/sflphone-android/src/org/sflphone/views/CircularImageView.java b/ring-android/src/cx/ring/views/CircularImageView.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/CircularImageView.java
rename to ring-android/src/cx/ring/views/CircularImageView.java
index cb16039a20f22f49ec08e4b8a2834175e7c3d757..ad5e73c73be3760574ad0298a8204787d63a5877 100644
--- a/sflphone-android/src/org/sflphone/views/CircularImageView.java
+++ b/ring-android/src/cx/ring/views/CircularImageView.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/views/ClearableEditText.java b/ring-android/src/cx/ring/views/ClearableEditText.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/ClearableEditText.java
rename to ring-android/src/cx/ring/views/ClearableEditText.java
index 4985b28b779085f2271fc1627f2bd1c6c628c91a..9527fd0bbaab44638f3f8e2f249bd149b4d8bc5b 100644
--- a/sflphone-android/src/org/sflphone/views/ClearableEditText.java
+++ b/ring-android/src/cx/ring/views/ClearableEditText.java
@@ -29,9 +29,9 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.content.Context;
 import android.text.Editable;
diff --git a/sflphone-android/src/org/sflphone/views/CredentialsPreference.java b/ring-android/src/cx/ring/views/CredentialsPreference.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/views/CredentialsPreference.java
rename to ring-android/src/cx/ring/views/CredentialsPreference.java
index 10595a9de627c8cda01b40a9cc9f8734f38c2d8e..24f3d3009766a8260346a5ae3a3cba9976e3c3e5 100644
--- a/sflphone-android/src/org/sflphone/views/CredentialsPreference.java
+++ b/ring-android/src/cx/ring/views/CredentialsPreference.java
@@ -29,11 +29,11 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 import java.util.HashMap;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -51,8 +51,8 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
-import org.sflphone.model.account.AccountCredentials;
-import org.sflphone.model.account.CredentialsManager;
+import cx.ring.model.account.AccountCredentials;
+import cx.ring.model.account.CredentialsManager;
 
 public class CredentialsPreference extends DialogPreference {
 
diff --git a/sflphone-android/src/org/sflphone/views/HalfCircleImageView.java b/ring-android/src/cx/ring/views/HalfCircleImageView.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/HalfCircleImageView.java
rename to ring-android/src/cx/ring/views/HalfCircleImageView.java
index edf8a9e801130cd078760461a0dcb19139fc0f2b..e9b0d6accc7b113b6f1f72d5487cfd2a8dbd42fa 100644
--- a/sflphone-android/src/org/sflphone/views/HalfCircleImageView.java
+++ b/ring-android/src/cx/ring/views/HalfCircleImageView.java
@@ -29,9 +29,9 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/sflphone-android/src/org/sflphone/views/NumberPickerPreference.java b/ring-android/src/cx/ring/views/NumberPickerPreference.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/NumberPickerPreference.java
rename to ring-android/src/cx/ring/views/NumberPickerPreference.java
index 77918956836192ee7b713df23f8b518346d2faef..bbf73429ce85ea778c41a55c0b1cc5d2326f9a89 100644
--- a/sflphone-android/src/org/sflphone/views/NumberPickerPreference.java
+++ b/ring-android/src/cx/ring/views/NumberPickerPreference.java
@@ -29,11 +29,11 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 import java.lang.reflect.Field;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/sflphone-android/src/org/sflphone/views/PagerSlidingTabStrip.java b/ring-android/src/cx/ring/views/PagerSlidingTabStrip.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/PagerSlidingTabStrip.java
rename to ring-android/src/cx/ring/views/PagerSlidingTabStrip.java
index ffba8f6bd16d39558d3dbb29627231ae7dd911c8..ff363c5e0ea2d5d6eb6c7338fba57e99f998b25b 100644
--- a/sflphone-android/src/org/sflphone/views/PagerSlidingTabStrip.java
+++ b/ring-android/src/cx/ring/views/PagerSlidingTabStrip.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 import java.util.Locale;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/sflphone-android/src/org/sflphone/views/PasswordEditText.java b/ring-android/src/cx/ring/views/PasswordEditText.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/views/PasswordEditText.java
rename to ring-android/src/cx/ring/views/PasswordEditText.java
index e15ce65ce8ed9b73d1d143abdc1d84c9649f0c90..a6c62f5ed2b0a15a0f85e6658d77966d0dac5fa5 100644
--- a/sflphone-android/src/org/sflphone/views/PasswordEditText.java
+++ b/ring-android/src/cx/ring/views/PasswordEditText.java
@@ -1,4 +1,4 @@
-package org.sflphone.views;
+package cx.ring.views;
 
 import android.content.Context;
 import android.text.Editable;
@@ -13,7 +13,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
-import org.sflphone.R;
+import cx.ring.R;
 
 /**
  * Created by lisional on 06/04/14.
diff --git a/sflphone-android/src/org/sflphone/views/PasswordPreference.java b/ring-android/src/cx/ring/views/PasswordPreference.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/views/PasswordPreference.java
rename to ring-android/src/cx/ring/views/PasswordPreference.java
index 62e265419b51c8713618430e03ee8b85c1643d32..17272339d71a75714bd5b56ea9777dd3e3f6fd77 100644
--- a/sflphone-android/src/org/sflphone/views/PasswordPreference.java
+++ b/ring-android/src/cx/ring/views/PasswordPreference.java
@@ -29,10 +29,10 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
-import org.sflphone.R;
-import org.sflphone.utils.Compatibility;
+import cx.ring.R;
+import cx.ring.utils.Compatibility;
 
 import android.content.Context;
 import android.view.View.OnClickListener;
diff --git a/sflphone-android/src/org/sflphone/views/QuadNumberPickerPreference.java b/ring-android/src/cx/ring/views/QuadNumberPickerPreference.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/QuadNumberPickerPreference.java
rename to ring-android/src/cx/ring/views/QuadNumberPickerPreference.java
index a97eeca303eed18a65e2999ff98419aba193b4cf..49bf9d3c1c0004d8e3061c21e7cfa399df5be347 100644
--- a/sflphone-android/src/org/sflphone/views/QuadNumberPickerPreference.java
+++ b/ring-android/src/cx/ring/views/QuadNumberPickerPreference.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 /*
  * Copyright (C) 2011 The CyanogenMod Project
@@ -57,7 +57,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.NumberPicker;
 import android.widget.TextView;
-import org.sflphone.R;
+import cx.ring.R;
 
 import java.lang.reflect.Field;
 
diff --git a/sflphone-android/src/org/sflphone/views/SlidingUpPanelLayout.java b/ring-android/src/cx/ring/views/SlidingUpPanelLayout.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/SlidingUpPanelLayout.java
rename to ring-android/src/cx/ring/views/SlidingUpPanelLayout.java
index c4cb3343f5c6a26e9e66d88cba13d12139f09dfc..d25b92e8efb917556d0e16a4448e15d286f4787e 100644
--- a/sflphone-android/src/org/sflphone/views/SlidingUpPanelLayout.java
+++ b/ring-android/src/cx/ring/views/SlidingUpPanelLayout.java
@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/sflphone-android/src/org/sflphone/views/SwipeListViewTouchListener.java b/ring-android/src/cx/ring/views/SwipeListViewTouchListener.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/SwipeListViewTouchListener.java
rename to ring-android/src/cx/ring/views/SwipeListViewTouchListener.java
index e01ab84ed8847f00875d75a4ddaf34af2d4261e2..8e054662b75231e2ff5adf9b4dd7fb96417cfc26 100644
--- a/sflphone-android/src/org/sflphone/views/SwipeListViewTouchListener.java
+++ b/ring-android/src/cx/ring/views/SwipeListViewTouchListener.java
@@ -29,13 +29,13 @@
  *  as that of the covered work.
  */
 
-package org.sflphone.views;
+package cx.ring.views;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortController.java b/ring-android/src/cx/ring/views/dragsortlv/DragSortController.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/DragSortController.java
rename to ring-android/src/cx/ring/views/dragsortlv/DragSortController.java
index e177f2510d55f322fc928146f002aea9afbaf669..616c6ac30a2e729f506e2c431c0a83404580f6f4 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortController.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/DragSortController.java
@@ -38,7 +38,7 @@
 
 
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.graphics.Point;
 import android.view.GestureDetector;
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortCursorAdapter.java b/ring-android/src/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/DragSortCursorAdapter.java
rename to ring-android/src/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
index f001e7b7f45452ca8002bd896435bac0694ad60b..1700d443c8b4cadceff6cde87f10c99c91bd77a5 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortCursorAdapter.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
@@ -35,7 +35,7 @@
  *
  */
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import java.util.ArrayList;
 
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortItemView.java b/ring-android/src/cx/ring/views/dragsortlv/DragSortItemView.java
similarity index 97%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/DragSortItemView.java
rename to ring-android/src/cx/ring/views/dragsortlv/DragSortItemView.java
index 3d6108908e3878c49ed723f9c20342b8e8ac2c36..0bb976c8d33cf90386fa9586fd8e14a8b4f60b06 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortItemView.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/DragSortItemView.java
@@ -35,15 +35,13 @@
  *
  */
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.content.Context;
 import android.view.Gravity;
 import android.view.View;
-import android.view.View.MeasureSpec;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
-import android.util.Log;
 
 /**
  * Lightweight ViewGroup that wraps list items obtained from user's
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortItemViewCheckable.java b/ring-android/src/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/DragSortItemViewCheckable.java
rename to ring-android/src/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
index 7c159d360a6823a5f3c823d95fc045ecac0e4b4f..c4a176f39de4b68ea0cadaae749bb8ce79551b69 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortItemViewCheckable.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
@@ -35,7 +35,7 @@
  *
  */
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.content.Context;
 import android.view.View;
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortListView.java b/ring-android/src/cx/ring/views/dragsortlv/DragSortListView.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/DragSortListView.java
rename to ring-android/src/cx/ring/views/dragsortlv/DragSortListView.java
index f973097c8dbc31491ac2174a273c3c74daedfc6d..3655fb21fda0d5ab0ca305379704315e3ddb2168 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/DragSortListView.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/DragSortListView.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -49,7 +49,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.sflphone.R;
+import cx.ring.R;
 
 /**
  * ListView subclass that mediates drag and drop resorting of items.
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/ResourceDragSortCursorAdapter.java b/ring-android/src/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/ResourceDragSortCursorAdapter.java
rename to ring-android/src/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java
index 559dda395497d7f570a242dad8a689d90724f8dd..6bec6a294a8e5eb2b8b3cf30a53e4211272c9629 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/ResourceDragSortCursorAdapter.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/SimpleDragSortCursorAdapter.java b/ring-android/src/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/SimpleDragSortCursorAdapter.java
rename to ring-android/src/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java
index 0176a07a68422eb3517b116f1adf5a01c7ac2119..df38a324db6626c727af2b828b2186647550ab87 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/SimpleDragSortCursorAdapter.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/sflphone-android/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java b/ring-android/src/cx/ring/views/dragsortlv/SimpleFloatViewManager.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java
rename to ring-android/src/cx/ring/views/dragsortlv/SimpleFloatViewManager.java
index e605695a2641b23d095f9b4b02a2564c7f43e103..5059f5985ca57d9652fb8cf1144b687f7eee49f8 100644
--- a/sflphone-android/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java
+++ b/ring-android/src/cx/ring/views/dragsortlv/SimpleFloatViewManager.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.dragsortlv;
+package cx.ring.views.dragsortlv;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/AdapterWrapper.java b/ring-android/src/cx/ring/views/stickylistheaders/AdapterWrapper.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/AdapterWrapper.java
rename to ring-android/src/cx/ring/views/stickylistheaders/AdapterWrapper.java
index 66c7f1f11b5fc54a8cb77e09593b21c0755c6bbd..22b02a8a9ef60ba1da3c9be68ea3ba045e76f7b4 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/AdapterWrapper.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/AdapterWrapper.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/ApiLevelTooLowException.java b/ring-android/src/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java
similarity index 84%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/ApiLevelTooLowException.java
rename to ring-android/src/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java
index 03d4daa681d98d83d8097ab0ff9d3f813de90e41..075dfb4d6ab9c17a2794b4521f5d48503f5f542b 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/ApiLevelTooLowException.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 public class ApiLevelTooLowException extends RuntimeException {
 
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/CheckableWrapperView.java b/ring-android/src/cx/ring/views/stickylistheaders/CheckableWrapperView.java
similarity index 92%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/CheckableWrapperView.java
rename to ring-android/src/cx/ring/views/stickylistheaders/CheckableWrapperView.java
index 872219948bf00e60e799da0799910f3c2b62eb63..e22204f44b04910d1fb9d9ac3783b979647fa340 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/CheckableWrapperView.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/CheckableWrapperView.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 import android.content.Context;
 import android.widget.Checkable;
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/SectionIndexerAdapterWrapper.java b/ring-android/src/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java
similarity index 94%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/SectionIndexerAdapterWrapper.java
rename to ring-android/src/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java
index b1632649c203f3e2da745331f8416343be39a5e4..dd823ff82cdf3fc6e52bb44407651916beec4868 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/SectionIndexerAdapterWrapper.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 import android.content.Context;
 import android.widget.SectionIndexer;
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/StickyListHeadersAdapter.java b/ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java
similarity index 96%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/StickyListHeadersAdapter.java
rename to ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java
index 568688f8518140c48ee54c1a248afda586b695fa..236338d3dba18e7b6c5d348b79850af43fdfb9a6 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/StickyListHeadersAdapter.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/StickyListHeadersListView.java b/ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersListView.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/StickyListHeadersListView.java
rename to ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersListView.java
index 0cce2c2c406d840eb0c72834b98be68c88ec51a7..72780e9d673e14b42812b98c591763d08b40770c 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/StickyListHeadersListView.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersListView.java
@@ -1,8 +1,7 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
-import org.sflphone.R;
-import org.sflphone.adapters.ContactsAdapter;
-import org.sflphone.views.stickylistheaders.WrapperViewList.LifeCycleListener;
+import cx.ring.R;
+import cx.ring.adapters.ContactsAdapter;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -16,7 +15,6 @@ import android.util.AttributeSet;
 import android.util.SparseBooleanArray;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.View.MeasureSpec;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView.OnItemClickListener;
@@ -476,7 +474,7 @@ public class StickyListHeadersListView extends FrameLayout {
 
 	}
 
-	private class WrapperViewListLifeCycleListener implements LifeCycleListener {
+	private class WrapperViewListLifeCycleListener implements WrapperViewList.LifeCycleListener {
 
 		@Override
 		public void onDispatchDrawOccurred(Canvas canvas) {
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/WrapperView.java b/ring-android/src/cx/ring/views/stickylistheaders/WrapperView.java
similarity index 98%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/WrapperView.java
rename to ring-android/src/cx/ring/views/stickylistheaders/WrapperView.java
index 19bcc08935d9e3b6eedb9cf05a2a3a7cd80e6c6a..9ee36ad50b63f7b94ba2d1abcbcef8fbd0218443 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/WrapperView.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/WrapperView.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/sflphone-android/src/org/sflphone/views/stickylistheaders/WrapperViewList.java b/ring-android/src/cx/ring/views/stickylistheaders/WrapperViewList.java
similarity index 99%
rename from sflphone-android/src/org/sflphone/views/stickylistheaders/WrapperViewList.java
rename to ring-android/src/cx/ring/views/stickylistheaders/WrapperViewList.java
index 0ea0bb4d888602fbf51a28790764067c87f88165..c0c95d7e664001eaf0285bbeb68f196dcfdba285 100644
--- a/sflphone-android/src/org/sflphone/views/stickylistheaders/WrapperViewList.java
+++ b/ring-android/src/cx/ring/views/stickylistheaders/WrapperViewList.java
@@ -1,4 +1,4 @@
-package org.sflphone.views.stickylistheaders;
+package cx.ring.views.stickylistheaders;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/sflphone-android/.idea/misc.xml b/sflphone-android/.idea/misc.xml
deleted file mode 100644
index 75cc5bf733359088bbe18a03befbb1f4b23c0abe..0000000000000000000000000000000000000000
--- a/sflphone-android/.idea/misc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>Android API 19 Platform</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
-
diff --git a/sflphone-android/Tests/gen/org/sflphone/tests/BuildConfig.java b/sflphone-android/Tests/gen/org/sflphone/tests/BuildConfig.java
deleted file mode 100644
index 880f80fe71699f9171bc212a8e81a32f4f9cc018..0000000000000000000000000000000000000000
--- a/sflphone-android/Tests/gen/org/sflphone/tests/BuildConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.sflphone.tests;
-
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
-public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
\ No newline at end of file
diff --git a/sflphone-android/Tests/gen/org/sflphone/tests/Manifest.java b/sflphone-android/Tests/gen/org/sflphone/tests/Manifest.java
deleted file mode 100644
index 297935d734427cff218aa8d29bfe765bc18dc59f..0000000000000000000000000000000000000000
--- a/sflphone-android/Tests/gen/org/sflphone/tests/Manifest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.sflphone.tests;
-
-/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
-public final class Manifest {
-}
\ No newline at end of file
diff --git a/sflphone-android/Tests/gen/org/sflphone/tests/R.java b/sflphone-android/Tests/gen/org/sflphone/tests/R.java
deleted file mode 100644
index 8956400ffdda290b0245f808cb2d20a962faac41..0000000000000000000000000000000000000000
--- a/sflphone-android/Tests/gen/org/sflphone/tests/R.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.sflphone.tests;
-
-/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
-public final class R {
-}
\ No newline at end of file
diff --git a/sflphone-android/libs/android-support-v13.jar b/sflphone-android/libs/android-support-v13.jar
deleted file mode 100644
index 031bcd8596442e60d1a374de508792314401d3af..0000000000000000000000000000000000000000
Binary files a/sflphone-android/libs/android-support-v13.jar and /dev/null differ
diff --git a/sflphone-android/src/org/sflphone/model/Conference.aidl b/sflphone-android/src/org/sflphone/model/Conference.aidl
deleted file mode 100644
index 3c40962554179b05e89d7bccea350d30df1be1e8..0000000000000000000000000000000000000000
--- a/sflphone-android/src/org/sflphone/model/Conference.aidl
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.sflphone.model;
-
-
-parcelable Conference;
\ No newline at end of file
diff --git a/sflphone-android/src/org/sflphone/model/SipCall.aidl b/sflphone-android/src/org/sflphone/model/SipCall.aidl
deleted file mode 100644
index b631a9a965017716f70400d593151568447e650b..0000000000000000000000000000000000000000
--- a/sflphone-android/src/org/sflphone/model/SipCall.aidl
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.sflphone.model;
-
-
-parcelable SipCall;
\ No newline at end of file
diff --git a/sflphone-android/src/org/sflphone/model/SipMessage.aidl b/sflphone-android/src/org/sflphone/model/SipMessage.aidl
deleted file mode 100644
index 467cf80546e3f0b53d6004eb2a492a42194c0df9..0000000000000000000000000000000000000000
--- a/sflphone-android/src/org/sflphone/model/SipMessage.aidl
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.sflphone.model;
-
-
-parcelable SipMessage;
\ No newline at end of file