diff --git a/.idea/misc.xml b/.idea/misc.xml
index cca2cdae..7158618b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 279ed12d..3fe5edeb 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/OpenOTP.iml" filepath="$PROJECT_DIR$/OpenOTP.iml" />
+      <module fileurl="file://$PROJECT_DIR$/andOTP.iml" filepath="$PROJECT_DIR$/andOTP.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/otp-authenticator.iml" filepath="$PROJECT_DIR$/otp-authenticator.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 1ad57196..b195edfb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+Copyright (C) 2017 Jakob Nixdorf <flocke@shadowice.org>
 Copyright (C) 2015 Bruno Bierbaumer
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in the
diff --git a/README.md b/README.md
index b8b2030d..db35cc40 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,29 @@
-#  OTP Authenticator [![Build Status](https://img.shields.io/travis/0xbb/otp-authenticator/master.svg?style=flat-square)](https://travis-ci.org/0xbb/otp-authenticator)
-![OTP Authenticator Icon](./media/icon.png)
+#  andOTP -  Android OTP Authenticator
+![andOTP](./media/icon.png)
 
-OTP Authenticator is a two-factor authentication App for Android 4.0+. 
+andOTP is a two-factor authentication App for Android 4.3+.
 
 It implements Time-based One-time Passwords (TOTP) like specified in RFC 6238.  
 Simply scan the QR code and login with the generated 6-digit code. 
 
+This is a fork of the great OTP Authenticator app written by Bruno Bierbaumer,
+which has sadly been inactive since 2015. All credit for the original version
+goes to Bruno.
 
 ## Features:
 - Free and Open-Source
 - Requires minimal permissions
   - Only camera access for QR code scanning
-- Encrypted storage on Android 4.3+
+- Encrypted storage
 - Sleek minimalistic Material Design
 - Great Usability 
 - Compatible with Google Authenticator
 
+<!--
+
 ## Download:
 ### Google Play:
 
-
 <a href="https://play.google.com/store/apps/details?id=net.bierbaumer.otp_authenticator&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-AC-global-none-all-co-pr-py-PartBadges-Oct1515-1"><img width=250 alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge.png" /></a>
 
 
@@ -29,6 +33,8 @@ Simply scan the QR code and login with the generated 6-digit code.
 ### APK:
 [![Download Latest Version (v0.1.2)](https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=https://github.com/0xbb/otp-authenticator/releases/download/v0.1.2/otp-authenticator-v0.1.2.apk)](https://github.com/0xbb/otp-authenticator/releases/download/v0.1.2/otp-authenticator-v0.1.2.apk)
 
+-->
+
 ## Screenshots:
 ### Overview:
 ![Home Screen](./media/overview_720p.gif) 
@@ -47,6 +53,7 @@ Simply scan the QR code and login with the generated 6-digit code.
 
 ## License:
 ```
+Copyright (C) 2017 Jakob Nixdorf <flocke@shadowice.org>
 Copyright (C) 2015 Bruno Bierbaumer
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in the
diff --git a/app/build.gradle b/app/build.gradle
index 9a8f1696..4399d125 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion '25.0.3'
 
     defaultConfig {
-        applicationId "net.bierbaumer.otp_authenticator"
+        applicationId "org.shadowice.flocke.andotp"
         minSdkVersion 18
         targetSdkVersion 25
         versionCode 3
diff --git a/app/src/androidTest/java/net/bierbaumer/otp_authenticator/ApplicationTest.java b/app/src/androidTest/java/org/shadowice/flocke/andotp/ApplicationTest.java
similarity index 99%
rename from app/src/androidTest/java/net/bierbaumer/otp_authenticator/ApplicationTest.java
rename to app/src/androidTest/java/org/shadowice/flocke/andotp/ApplicationTest.java
index f7609263..91919348 100644
--- a/app/src/androidTest/java/net/bierbaumer/otp_authenticator/ApplicationTest.java
+++ b/app/src/androidTest/java/org/shadowice/flocke/andotp/ApplicationTest.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.app.Application;
 import android.content.Context;
diff --git a/app/src/androidTest/java/net/bierbaumer/otp_authenticator/MainActivityTest.java b/app/src/androidTest/java/org/shadowice/flocke/andotp/MainActivityTest.java
similarity index 99%
rename from app/src/androidTest/java/net/bierbaumer/otp_authenticator/MainActivityTest.java
rename to app/src/androidTest/java/org/shadowice/flocke/andotp/MainActivityTest.java
index 4a814d82..b80ba9d9 100644
--- a/app/src/androidTest/java/net/bierbaumer/otp_authenticator/MainActivityTest.java
+++ b/app/src/androidTest/java/org/shadowice/flocke/andotp/MainActivityTest.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 
 import android.app.Activity;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98e93d32..cbb75d73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-    package="net.bierbaumer.otp_authenticator">
+    package="org.shadowice.flocke.andotp">
 
     <application
         android:allowBackup="false"
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/CaptureActivityAnyOrientation.java b/app/src/main/java/org/shadowice/flocke/andotp/CaptureActivityAnyOrientation.java
similarity index 75%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/CaptureActivityAnyOrientation.java
rename to app/src/main/java/org/shadowice/flocke/andotp/CaptureActivityAnyOrientation.java
index b1b9b1cc..7cbf8b2c 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/CaptureActivityAnyOrientation.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/CaptureActivityAnyOrientation.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import com.journeyapps.barcodescanner.CaptureActivity;
 
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/EncryptionHelper.java b/app/src/main/java/org/shadowice/flocke/andotp/EncryptionHelper.java
similarity index 95%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/EncryptionHelper.java
rename to app/src/main/java/org/shadowice/flocke/andotp/EncryptionHelper.java
index 8d4443c9..b4d9c274 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/EncryptionHelper.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/EncryptionHelper.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.content.Context;
 
@@ -20,8 +20,8 @@ import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import static net.bierbaumer.otp_authenticator.Utils.readFully;
-import static net.bierbaumer.otp_authenticator.Utils.writeFully;
+import static org.shadowice.flocke.andotp.Utils.readFully;
+import static org.shadowice.flocke.andotp.Utils.writeFully;
 
 public class EncryptionHelper {
     private final static String ALGORITHM = "AES/GCM/NoPadding";
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/EntriesAdapter.java b/app/src/main/java/org/shadowice/flocke/andotp/EntriesAdapter.java
similarity index 98%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/EntriesAdapter.java
rename to app/src/main/java/org/shadowice/flocke/andotp/EntriesAdapter.java
index 1a1c2c40..dd809c22 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/EntriesAdapter.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/EntriesAdapter.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.content.ClipData;
 import android.graphics.Color;
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/Entry.java b/app/src/main/java/org/shadowice/flocke/andotp/Entry.java
similarity index 98%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/Entry.java
rename to app/src/main/java/org/shadowice/flocke/andotp/Entry.java
index a9da4dee..c8260953 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/Entry.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Entry.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.net.Uri;
 
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java
similarity index 99%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
rename to app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java
index 0ea4f9fc..299198f7 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.Manifest;
 import android.animation.ObjectAnimator;
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/MyApplication.java b/app/src/main/java/org/shadowice/flocke/andotp/MyApplication.java
similarity index 81%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/MyApplication.java
rename to app/src/main/java/org/shadowice/flocke/andotp/MyApplication.java
index bbca0572..6ac890ff 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/MyApplication.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/MyApplication.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/PRNGFixes.java b/app/src/main/java/org/shadowice/flocke/andotp/PRNGFixes.java
similarity index 99%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/PRNGFixes.java
rename to app/src/main/java/org/shadowice/flocke/andotp/PRNGFixes.java
index 0c5b588e..13248b6a 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/PRNGFixes.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/PRNGFixes.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 /*
  * This software is provided 'as-is', without any express or implied
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/SecretKeyWrapper.java b/app/src/main/java/org/shadowice/flocke/andotp/SecretKeyWrapper.java
similarity index 99%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/SecretKeyWrapper.java
rename to app/src/main/java/org/shadowice/flocke/andotp/SecretKeyWrapper.java
index 3195b5f6..1ff08c48 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/SecretKeyWrapper.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/SecretKeyWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/SettingsHelper.java b/app/src/main/java/org/shadowice/flocke/andotp/SettingsHelper.java
similarity index 92%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/SettingsHelper.java
rename to app/src/main/java/org/shadowice/flocke/andotp/SettingsHelper.java
index 61ce8aab..8ab42fed 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/SettingsHelper.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/SettingsHelper.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import android.content.Context;
 import android.os.Build;
@@ -11,8 +11,8 @@ import java.util.ArrayList;
 
 import javax.crypto.SecretKey;
 
-import static net.bierbaumer.otp_authenticator.Utils.readFully;
-import static net.bierbaumer.otp_authenticator.Utils.writeFully;
+import static org.shadowice.flocke.andotp.Utils.readFully;
+import static org.shadowice.flocke.andotp.Utils.writeFully;
 
 public class SettingsHelper {
     public static final String KEY_FILE = "otp.key";
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/TOTPHelper.java b/app/src/main/java/org/shadowice/flocke/andotp/TOTPHelper.java
similarity index 96%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/TOTPHelper.java
rename to app/src/main/java/org/shadowice/flocke/andotp/TOTPHelper.java
index bbf6cc52..41a0bb02 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/TOTPHelper.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/TOTPHelper.java
@@ -1,4 +1,4 @@
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/Utils.java b/app/src/main/java/org/shadowice/flocke/andotp/Utils.java
similarity index 97%
rename from app/src/main/java/net/bierbaumer/otp_authenticator/Utils.java
rename to app/src/main/java/org/shadowice/flocke/andotp/Utils.java
index 45c83ce3..e68fc9b7 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/Utils.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.bierbaumer.otp_authenticator;
+package org.shadowice.flocke.andotp;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad65da55..681d74e4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="net.bierbaumer.otp_authenticator.MainActivity">
+    tools:context="org.shadowice.flocke.andotp.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index f30f0274..d5afe185 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -10,7 +10,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="net.bierbaumer.otp_authenticator.MainActivity"
+    tools:context="org.shadowice.flocke.andotp.MainActivity"
     tools:showIn="@layout/activity_main">
 
     <ListView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4eef8a54..d43d3b70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">OTP Authenticator</string>
-    <string name="app_launcher">Authenticator</string>
+    <string name="app_name">andOTP</string>
+    <string name="app_launcher">OTP Authenticator</string>
     <string name="no_accounts">No account has been added yet</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_edit">Edit</string>