diff --git a/ldap_sync_2.0_as.iml b/.idea/LDAP-Sync.iml
similarity index 70%
rename from ldap_sync_2.0_as.iml
rename to .idea/LDAP-Sync.iml
index 9a6ece3..4c32a2a 100644
--- a/ldap_sync_2.0_as.iml
+++ b/.idea/LDAP-Sync.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ldap_sync_2.0_as" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="LDAP-Sync" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e026154..e83cc76 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="5">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1d58210..8fe1e65 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/LDAP-Sync.iml" filepath="$PROJECT_DIR$/.idea/LDAP-Sync.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ldap_sync_2.0_as.iml" filepath="$PROJECT_DIR$/ldap_sync_2.0_as.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index a95f2fe..fc51f1b 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -49,13 +49,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -63,6 +56,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -84,37 +84,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/unitTestConfig" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
@@ -141,7 +131,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.apache.maven:maven-profile:2.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: nekohtml:nekohtml:1.9.6.2@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: xpp3:xpp3_min:1.1.4c@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/mw/Projekte/Java/ldap_sync_2.0_as/app/libs/unboundid-ldapsdk-me.jar:unspecified@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: nekohtml:xercesMinimal:1.9.6.2@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.apache.maven:maven-model:2.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.robolectric:utils:3.8@jar" level="project" />
@@ -151,6 +140,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:20.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.robolectric:resources:3.8@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.unboundid:unboundid-ldapsdk:3.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.robolectric:junit:3.8@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.almworks.sqlite4java:sqlite4java:0.282@jar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index ab2d9cd..f7c6ce0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "28.0.2"
 
     defaultConfig {
-        applicationId "de.danielweisser.android.ldapsync"
+        applicationId "de.wikilab.android.ldapsync"
         minSdkVersion 11
         targetSdkVersion 22
         compileOptions {
@@ -28,7 +28,8 @@ android {
 }
 
 dependencies {
-    implementation files('libs/unboundid-ldapsdk-me.jar')
+    // https://mvnrepository.com/artifact/com.unboundid/unboundid-ldapsdk
+    implementation group: 'com.unboundid', name: 'unboundid-ldapsdk', version: '3.2.1'
     implementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:3.8"
 }
diff --git a/app/libs/unboundid-ldapsdk-me.jar b/app/libs/unboundid-ldapsdk-me.jar
deleted file mode 100644
index 8f2824c..0000000
Binary files a/app/libs/unboundid-ldapsdk-me.jar and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3214366..b7dc727 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.danielweisser.android.ldapsync"
-    android:versionCode="14"
-    android:versionName="2.1" android:installLocation="internalOnly">
+    package="de.wikilab.android.ldapsync"
+    android:versionCode="15"
+    android:versionName="2.1.1" android:installLocation="internalOnly">
 
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -23,7 +23,7 @@
         android:label="@string/app_name"
         android:theme="@style/LightThemeSelector" >
         <service
-            android:name=".authenticator.LDAPAuthenticationService"
+            android:name="de.wikilab.android.ldapsync.authenticator.LDAPAuthenticationService"
             android:exported="true"
             android:permission="android.permission.MANAGE_ACCOUNTS" >
             <intent-filter>
@@ -35,7 +35,7 @@
                 android:resource="@xml/authenticator" />
         </service>
         <service
-            android:name=".syncadapter.SyncService"
+            android:name="de.wikilab.android.ldapsync.syncadapter.SyncService"
             android:exported="true"
             android:permission="android.permission.MANAGE_ACCOUNTS" >
             <intent-filter>
@@ -48,7 +48,7 @@
         </service>
 
         <activity
-            android:name=".authenticator.LDAPAuthenticatorActivity"
+            android:name="de.wikilab.android.ldapsync.authenticator.LDAPAuthenticatorActivity"
             android:excludeFromRecents="true"
             android:label="@string/ui_activity_title"
             android:windowSoftInputMode="stateVisible|adjustResize">
@@ -60,10 +60,10 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".authenticator.AccountSettingsActivity" >
+        <activity android:name="de.wikilab.android.ldapsync.authenticator.AccountSettingsActivity" >
         </activity>
 
-        <activity android:name=".authenticator.AccountsListActivity" >
+        <activity android:name="de.wikilab.android.ldapsync.authenticator.AccountsListActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -85,7 +85,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".activity.SyncErrorActivity"
+        <activity android:name="de.wikilab.android.ldapsync.activity.SyncErrorActivity"
             android:label="UF Phonebook Sync Error"
             android:launchMode="singleTask"
             android:taskAffinity=""
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/Constants.java b/app/src/main/java/de/wikilab/android/ldapsync/Constants.java
similarity index 90%
rename from app/src/main/java/de/danielweisser/android/ldapsync/Constants.java
rename to app/src/main/java/de/wikilab/android/ldapsync/Constants.java
index 14a1ba8..f2b95e0 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/Constants.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync;
+package de.wikilab.android.ldapsync;
 
 /**
  * Constants for the LDAP sync adapter.
@@ -26,7 +26,7 @@ public class Constants {
 	/**
 	 * Account type string.
 	 */
-	public static final String ACCOUNT_TYPE = "de.danielweisser.android.ldapsync";
+	public static final String ACCOUNT_TYPE = "de.wikilab.android.ldapsync";
 
 	/**
 	 * SD card LDAPSync folder.
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/Util.java b/app/src/main/java/de/wikilab/android/ldapsync/Util.java
similarity index 93%
rename from app/src/main/java/de/danielweisser/android/ldapsync/Util.java
rename to app/src/main/java/de/wikilab/android/ldapsync/Util.java
index b8e1153..6a568c9 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/Util.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/Util.java
@@ -1,4 +1,4 @@
-package de.danielweisser.android.ldapsync;
+package de.wikilab.android.ldapsync;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/activity/ProfileActivity.java b/app/src/main/java/de/wikilab/android/ldapsync/activity/ProfileActivity.java
similarity index 85%
rename from app/src/main/java/de/danielweisser/android/ldapsync/activity/ProfileActivity.java
rename to app/src/main/java/de/wikilab/android/ldapsync/activity/ProfileActivity.java
index d2d78c5..87b6daf 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/activity/ProfileActivity.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/activity/ProfileActivity.java
@@ -1,30 +1,7 @@
-package de.danielweisser.android.ldapsync.activity;
+package de.wikilab.android.ldapsync.activity;
 
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.client.Address;
-import de.danielweisser.android.ldapsync.client.Contact;
-//import de.danielweisser.android.ldapsync.client.Organization;
-import de.danielweisser.android.ldapsync.platform.ContactManager;
-import de.danielweisser.android.ldapsync.syncadapter.Logger;
+//import de.wikilab.android.ldapsync.client.Organization;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Intents.Insert;
-import android.text.util.Linkify;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
 /*
 public class ProfileActivity extends Activity implements OnClickListener {
 
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/activity/SyncErrorActivity.java b/app/src/main/java/de/wikilab/android/ldapsync/activity/SyncErrorActivity.java
similarity index 90%
rename from app/src/main/java/de/danielweisser/android/ldapsync/activity/SyncErrorActivity.java
rename to app/src/main/java/de/wikilab/android/ldapsync/activity/SyncErrorActivity.java
index 14124b6..a6fa7b2 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/activity/SyncErrorActivity.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/activity/SyncErrorActivity.java
@@ -1,7 +1,7 @@
-package de.danielweisser.android.ldapsync.activity;
+package de.wikilab.android.ldapsync.activity;
 
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.Util;
+import de.wikilab.android.ldapsync.R;
+import de.wikilab.android.ldapsync.Util;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/AccountSettingsActivity.java b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/AccountSettingsActivity.java
similarity index 79%
rename from app/src/main/java/de/danielweisser/android/ldapsync/authenticator/AccountSettingsActivity.java
rename to app/src/main/java/de/wikilab/android/ldapsync/authenticator/AccountSettingsActivity.java
index b3ff282..a8c9481 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/AccountSettingsActivity.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/AccountSettingsActivity.java
@@ -1,4 +1,4 @@
-package de.danielweisser.android.ldapsync.authenticator;
+package de.wikilab.android.ldapsync.authenticator;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -16,12 +16,10 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.client.LDAPServerInstance;
-import de.danielweisser.android.ldapsync.platform.ContactManager;
-
-import java.util.Map;
+import de.wikilab.android.ldapsync.Constants;
+import de.wikilab.android.ldapsync.R;
+import de.wikilab.android.ldapsync.client.LDAPServerInstance;
+import de.wikilab.android.ldapsync.platform.ContactManager;
 
 public class AccountSettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -120,19 +118,22 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	 */
 	public void createAccount(View view) {
 		Log.i(TAG, "finishLogin()");
-		final Account account = new Account(accountName, Constants.ACCOUNT_TYPE);
-
-		Bundle userData = new Bundle();
-		userData.putString(Constants.PARAM_USERNAME, ldapServerInstance.bindDN);
-		userData.putString(Constants.PARAM_PORT, ldapServerInstance.port + "");
-		userData.putString(Constants.PARAM_HOST, ldapServerInstance.host);
-		userData.putString(Constants.PARAM_ENCRYPTION, ldapServerInstance.encryption + "");
-		AccountManager mAccountManager = AccountManager.get(this);
-		mAccountManager.addAccountExplicitly(account, ldapServerInstance.bindPW, userData);
-
-		// Set contacts sync for this account.
-		ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
-		ContactManager.makeGroupVisible(account.name, getContentResolver());
+		if (ldapServerInstance != null) {
+			// Only create new account while in the new account flow, but not when editing existing account
+			final Account account = new Account(accountName, Constants.ACCOUNT_TYPE);
+
+			Bundle userData = new Bundle();
+			userData.putString(Constants.PARAM_USERNAME, ldapServerInstance.bindDN);
+			userData.putString(Constants.PARAM_PORT, ldapServerInstance.port + "");
+			userData.putString(Constants.PARAM_HOST, ldapServerInstance.host);
+			userData.putString(Constants.PARAM_ENCRYPTION, ldapServerInstance.encryption + "");
+			AccountManager mAccountManager = AccountManager.get(this);
+			mAccountManager.addAccountExplicitly(account, ldapServerInstance.bindPW, userData);
+
+			// Set contacts sync for this account.
+			ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
+			ContactManager.makeGroupVisible(account.name, getContentResolver());
+		}
 		setResult(RESULT_OK, new Intent());
 		finish();
 	}
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/AccountsListActivity.java b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/AccountsListActivity.java
similarity index 93%
rename from app/src/main/java/de/danielweisser/android/ldapsync/authenticator/AccountsListActivity.java
rename to app/src/main/java/de/wikilab/android/ldapsync/authenticator/AccountsListActivity.java
index 94033ea..e9e5cd2 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/AccountsListActivity.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/AccountsListActivity.java
@@ -1,4 +1,4 @@
-package de.danielweisser.android.ldapsync.authenticator;
+package de.wikilab.android.ldapsync.authenticator;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -17,8 +17,8 @@
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.R;
+import de.wikilab.android.ldapsync.Constants;
+import de.wikilab.android.ldapsync.R;
 
 public class AccountsListActivity extends ListActivity {
 
@@ -27,6 +27,11 @@ public class AccountsListActivity extends ListActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+	}
+
+	@Override
+	protected void onStart() {
+		super.onStart();
 		AccountManager accountManager = AccountManager.get(this);
 		Account[] accountsList = accountManager.getAccountsByType(Constants.ACCOUNT_TYPE);
 		String[] values = new String[accountsList.length];
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticationService.java b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticationService.java
similarity index 95%
rename from app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticationService.java
rename to app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticationService.java
index b335cfa..0c90018 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticationService.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticationService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.authenticator;
+package de.wikilab.android.ldapsync.authenticator;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticator.java b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticator.java
similarity index 93%
rename from app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticator.java
rename to app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticator.java
index aaa22fa..ecbbf23 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticator.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.authenticator;
+package de.wikilab.android.ldapsync.authenticator;
 
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
@@ -24,12 +24,12 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.client.LDAPServerInstance;
-import de.danielweisser.android.ldapsync.client.LDAPUtilities;
+import de.wikilab.android.ldapsync.Constants;
+import de.wikilab.android.ldapsync.client.LDAPServerInstance;
+import de.wikilab.android.ldapsync.client.LDAPUtilities;
 
 /**
- * This class is an implementation of AbstractAccountAuthenticator for authenticating accounts in the de.danielweisser.android.ldapsync domain.
+ * This class is an implementation of AbstractAccountAuthenticator for authenticating accounts in the de.wikilab.android.ldapsync domain.
  * 
  * @author <a href="mailto:daniel.weisser@gmx.de">Daniel Weisser</a>
  */
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java
similarity index 97%
rename from app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java
rename to app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java
index bfe6bb1..8cd20dd 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/authenticator/LDAPAuthenticatorActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.authenticator;
+package de.wikilab.android.ldapsync.authenticator;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -38,9 +38,9 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.client.LDAPServerInstance;
-import de.danielweisser.android.ldapsync.client.LDAPUtilities;
+import de.wikilab.android.ldapsync.R;
+import de.wikilab.android.ldapsync.client.LDAPServerInstance;
+import de.wikilab.android.ldapsync.client.LDAPUtilities;
 
 /**
  * Activity which displays login screen to the user.
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/client/Address.java b/app/src/main/java/de/wikilab/android/ldapsync/client/Address.java
similarity index 98%
rename from app/src/main/java/de/danielweisser/android/ldapsync/client/Address.java
rename to app/src/main/java/de/wikilab/android/ldapsync/client/Address.java
index 331541d..1b9523d 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/client/Address.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/client/Address.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.client;
+package de.wikilab.android.ldapsync.client;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/client/Contact.java b/app/src/main/java/de/wikilab/android/ldapsync/client/Contact.java
similarity index 98%
rename from app/src/main/java/de/danielweisser/android/ldapsync/client/Contact.java
rename to app/src/main/java/de/wikilab/android/ldapsync/client/Contact.java
index e0e1af9..a5c5162 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/client/Contact.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/client/Contact.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.client;
+package de.wikilab.android.ldapsync.client;
 
 import java.io.ByteArrayOutputStream;
 
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.provider.ContactsContract;
 import android.util.Log;
 
 import com.unboundid.ldap.sdk.ReadOnlyEntry;
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/client/ContactTest.java b/app/src/main/java/de/wikilab/android/ldapsync/client/ContactTest.java
similarity index 87%
rename from app/src/main/java/de/danielweisser/android/ldapsync/client/ContactTest.java
rename to app/src/main/java/de/wikilab/android/ldapsync/client/ContactTest.java
index 985305e..c22f6bc 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/client/ContactTest.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/client/ContactTest.java
@@ -1,4 +1,4 @@
-package de.danielweisser.android.ldapsync.client;
+package de.wikilab.android.ldapsync.client;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/client/LDAPServerInstance.java b/app/src/main/java/de/wikilab/android/ldapsync/client/LDAPServerInstance.java
similarity index 99%
rename from app/src/main/java/de/danielweisser/android/ldapsync/client/LDAPServerInstance.java
rename to app/src/main/java/de/wikilab/android/ldapsync/client/LDAPServerInstance.java
index b1d8e8f..308e50d 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/client/LDAPServerInstance.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/client/LDAPServerInstance.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.client;
+package de.wikilab.android.ldapsync.client;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/client/LDAPUtilities.java b/app/src/main/java/de/wikilab/android/ldapsync/client/LDAPUtilities.java
similarity index 95%
rename from app/src/main/java/de/danielweisser/android/ldapsync/client/LDAPUtilities.java
rename to app/src/main/java/de/wikilab/android/ldapsync/client/LDAPUtilities.java
index 1f99ffa..55a7004 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/client/LDAPUtilities.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/client/LDAPUtilities.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.client;
+package de.wikilab.android.ldapsync.client;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -39,10 +38,9 @@
 import com.unboundid.ldap.sdk.SearchResultEntry;
 import com.unboundid.ldap.sdk.SearchScope;
 
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.activity.SyncErrorActivity;
-import de.danielweisser.android.ldapsync.authenticator.LDAPAuthenticatorActivity;
-import de.danielweisser.android.ldapsync.syncadapter.SyncService;
+import de.wikilab.android.ldapsync.R;
+import de.wikilab.android.ldapsync.activity.SyncErrorActivity;
+import de.wikilab.android.ldapsync.authenticator.LDAPAuthenticatorActivity;
 
 /**
  * Provides utility methods for communicating with the LDAP server.
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/platform/ContactManager.java b/app/src/main/java/de/wikilab/android/ldapsync/platform/ContactManager.java
similarity index 98%
rename from app/src/main/java/de/danielweisser/android/ldapsync/platform/ContactManager.java
rename to app/src/main/java/de/wikilab/android/ldapsync/platform/ContactManager.java
index cc9248c..df999c8 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/platform/ContactManager.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/platform/ContactManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.platform;
+package de.wikilab.android.ldapsync.platform;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,10 +46,10 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.util.Log;
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.client.Address;
-import de.danielweisser.android.ldapsync.client.Contact;
-import de.danielweisser.android.ldapsync.syncadapter.Logger;
+import de.wikilab.android.ldapsync.Constants;
+import de.wikilab.android.ldapsync.client.Address;
+import de.wikilab.android.ldapsync.client.Contact;
+import de.wikilab.android.ldapsync.syncadapter.Logger;
 
 /**
  * Class for managing contacts sync related operations
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/platform/ContactMerger.java b/app/src/main/java/de/wikilab/android/ldapsync/platform/ContactMerger.java
similarity index 96%
rename from app/src/main/java/de/danielweisser/android/ldapsync/platform/ContactMerger.java
rename to app/src/main/java/de/wikilab/android/ldapsync/platform/ContactMerger.java
index 5ab516e..a47c15c 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/platform/ContactMerger.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/platform/ContactMerger.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.platform;
+package de.wikilab.android.ldapsync.platform;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -32,9 +31,9 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.text.TextUtils;
-import de.danielweisser.android.ldapsync.client.Address;
-import de.danielweisser.android.ldapsync.client.Contact;
-import de.danielweisser.android.ldapsync.syncadapter.Logger;
+import de.wikilab.android.ldapsync.client.Address;
+import de.wikilab.android.ldapsync.client.Contact;
+import de.wikilab.android.ldapsync.syncadapter.Logger;
 
 /**
  * A helper class that merges the fields of existing contacts with the fields of new contacts.
@@ -184,7 +183,7 @@ public void updateAddress(int adressType) {
 		}
 	}
 
-	private void updateAddress(de.danielweisser.android.ldapsync.client.Address newAddress, Address existingAddress, int adressType) {
+	private void updateAddress(de.wikilab.android.ldapsync.client.Address newAddress, Address existingAddress, int adressType) {
 		final String selection = Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=? AND " + StructuredPostal.TYPE + "=?";
 		if ((newAddress == null || newAddress.isEmpty()) && existingAddress != null) {
 			l.d("Delete address " + adressType + "(" + existingC.getFirstName() + " " + existingC.getLastName() + ")");
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/Logger.java b/app/src/main/java/de/wikilab/android/ldapsync/syncadapter/Logger.java
similarity index 95%
rename from app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/Logger.java
rename to app/src/main/java/de/wikilab/android/ldapsync/syncadapter/Logger.java
index a61d40c..9bd7b7a 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/Logger.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/syncadapter/Logger.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.syncadapter;
+package de.wikilab.android.ldapsync.syncadapter;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -26,7 +26,7 @@
 
 import android.os.Environment;
 import android.util.Log;
-import de.danielweisser.android.ldapsync.Constants;
+import de.wikilab.android.ldapsync.Constants;
 
 /**
  * A simple file logger, that logs the details of the synchronization process to SD card.
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/SyncAdapter.java b/app/src/main/java/de/wikilab/android/ldapsync/syncadapter/SyncAdapter.java
similarity index 90%
rename from app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/SyncAdapter.java
rename to app/src/main/java/de/wikilab/android/ldapsync/syncadapter/SyncAdapter.java
index 7cf1149..9f39cc6 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/SyncAdapter.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/syncadapter/SyncAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.syncadapter;
+package de.wikilab.android.ldapsync.syncadapter;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -31,11 +31,11 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.client.Contact;
-import de.danielweisser.android.ldapsync.client.LDAPServerInstance;
-import de.danielweisser.android.ldapsync.client.LDAPUtilities;
-import de.danielweisser.android.ldapsync.platform.ContactManager;
+import de.wikilab.android.ldapsync.Constants;
+import de.wikilab.android.ldapsync.client.Contact;
+import de.wikilab.android.ldapsync.client.LDAPServerInstance;
+import de.wikilab.android.ldapsync.client.LDAPUtilities;
+import de.wikilab.android.ldapsync.platform.ContactManager;
 
 /**
  * SyncAdapter implementation for synchronizing LDAP contacts to the platform ContactOperations provider.
diff --git a/app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/SyncService.java b/app/src/main/java/de/wikilab/android/ldapsync/syncadapter/SyncService.java
similarity index 96%
rename from app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/SyncService.java
rename to app/src/main/java/de/wikilab/android/ldapsync/syncadapter/SyncService.java
index 58b7cb4..62359fd 100644
--- a/app/src/main/java/de/danielweisser/android/ldapsync/syncadapter/SyncService.java
+++ b/app/src/main/java/de/wikilab/android/ldapsync/syncadapter/SyncService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync.syncadapter;
+package de.wikilab.android.ldapsync.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/res/layout/sync_error_layout.xml b/app/src/main/res/layout/sync_error_layout.xml
index ed3e8f6..760f16c 100644
--- a/app/src/main/res/layout/sync_error_layout.xml
+++ b/app/src/main/res/layout/sync_error_layout.xml
@@ -9,7 +9,6 @@
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" 
     android:padding="10dp"
-    android:textColor="#FFFFFF"
     />
 <Button
  android:id="@+id/buttonSendErrorReport"
diff --git a/app/src/main/res/xml/account_preferences.xml b/app/src/main/res/xml/account_preferences.xml
index c3a8239..eadfb72 100644
--- a/app/src/main/res/xml/account_preferences.xml
+++ b/app/src/main/res/xml/account_preferences.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="account_settings"
-    android:summary="Misc account preferences"
-    android:title="Account Preferences" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="General Settings" />
+    <PreferenceCategory android:title="Advanced">
+    </PreferenceCategory>
 
     <PreferenceScreen
-        android:key="account_settings"
-        android:summary="Change settings for your accounts"
-        android:title="Account Settings" >
-        <intent android:action="de.danielweisser.android.ldapsync.ACCOUNT_SETUP"
-            android:targetPackage="de.danielweisser.android.ldapsync"
-            android:targetClass="de.danielweisser.android.ldapsync.authenticator.AccountsListActivity" />
+        android:key="ldap_account_prefs"
+        android:summary="Change LDAP configuration details"
+        android:title="LDAP details" >
+        <intent android:action="de.wikilab.android.ldapsync.ACCOUNT_SETUP"
+            android:targetPackage="de.wikilab.android.ldapsync"
+            android:targetClass="de.wikilab.android.ldapsync.authenticator.AccountSettingsActivity" />
     </PreferenceScreen>
 
+    <PreferenceCategory android:title="Sync Options">
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml
index 1cdca65..8f288bf 100644
--- a/app/src/main/res/xml/authenticator.xml
+++ b/app/src/main/res/xml/authenticator.xml
@@ -16,7 +16,7 @@
  -->
  
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="de.danielweisser.android.ldapsync"
+    android:accountType="de.wikilab.android.ldapsync"
     android:icon="@drawable/icon"
     android:smallIcon="@drawable/icon"
     android:label="@string/label"
diff --git a/app/src/main/res/xml/syncadapter.xml b/app/src/main/res/xml/syncadapter.xml
index 1fd88f5..70b04df 100644
--- a/app/src/main/res/xml/syncadapter.xml
+++ b/app/src/main/res/xml/syncadapter.xml
@@ -17,6 +17,6 @@
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
     android:contentAuthority="com.android.contacts"
-    android:accountType="de.danielweisser.android.ldapsync"
+    android:accountType="de.wikilab.android.ldapsync"
     android:supportsUploading="false"
 />
diff --git a/app/src/test/java/de/danielweisser/android/ldapsync/LDAPAuthenticatorActivityTest.java b/app/src/test/java/de/wikilab/android/ldapsync/LDAPAuthenticatorActivityTest.java
similarity index 70%
rename from app/src/test/java/de/danielweisser/android/ldapsync/LDAPAuthenticatorActivityTest.java
rename to app/src/test/java/de/wikilab/android/ldapsync/LDAPAuthenticatorActivityTest.java
index ef63141..322a5ff 100644
--- a/app/src/test/java/de/danielweisser/android/ldapsync/LDAPAuthenticatorActivityTest.java
+++ b/app/src/test/java/de/wikilab/android/ldapsync/LDAPAuthenticatorActivityTest.java
@@ -1,4 +1,4 @@
-package de.danielweisser.android.ldapsync;
+package de.wikilab.android.ldapsync;
 
 import static org.junit.Assert.assertEquals;
 
@@ -6,8 +6,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.authenticator.LDAPAuthenticatorActivity;
+import de.wikilab.android.ldapsync.authenticator.LDAPAuthenticatorActivity;
 
 @RunWith(RobolectricTestRunner.class)
 public class LDAPAuthenticatorActivityTest {