diff --git a/.gitignore b/.gitignore
index c6cbe56..3a2358d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,36 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+# built application files
+*.apk
+*.ap_
+
+# Mac files
 .DS_Store
-/build
-/captures
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Ignore gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+proguard-project.txt
+
+# Eclipse files
+.project
+.classpath
+.settings/
+
+# Android Studio/IDEA
+*.iml
+.idea
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 7ac24c7..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5d19981..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </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="4">
-          <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="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <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" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <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">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 17e3cf1..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Bewegungsmelder.iml" filepath="$PROJECT_DIR$/Bewegungsmelder.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.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/build.gradle b/app/build.gradle
index f67e4dc..863d1ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.jjoe64.motiondetection"
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +21,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(path: ':motion-detection')
+    testImplementation 'junit:junit:4.12'
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e31d240..ad5e9e1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,12 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jjoe64.motiondetection">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="23"/>
-
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.front" android:required="false" />
-
-    <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
diff --git a/app/src/main/java/com/jjoe64/motiondetection/MainActivity.java b/app/src/main/java/com/jjoe64/motiondetection/MainActivity.java
index 8d1b893..4cbabb8 100644
--- a/app/src/main/java/com/jjoe64/motiondetection/MainActivity.java
+++ b/app/src/main/java/com/jjoe64/motiondetection/MainActivity.java
@@ -1,19 +1,16 @@
 package com.jjoe64.motiondetection;
 
 import android.content.Context;
-import android.content.pm.PackageManager;
-import android.hardware.Camera;
-import android.os.Vibrator;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.SurfaceHolder;
+import android.os.Vibrator;
 import android.view.SurfaceView;
 import android.widget.TextView;
 
 import com.jjoe64.motiondetection.motiondetection.MotionDetector;
 import com.jjoe64.motiondetection.motiondetection.MotionDetectorCallback;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class MainActivity extends AppCompatActivity {
     private TextView txtStatus;
     private MotionDetector motionDetector;
diff --git a/build.gradle b/build.gradle
index c20bca1..59915fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext{
+        android_gradle_plugin_version = '4.1.2'
+        kotlin_version = "1.5.10"
+        appcompat_version = '1.3.0'
+    }
+
     repositories {
+        google()
+        mavenCentral()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
-
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "com.android.tools.build:gradle:$android_gradle_plugin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -14,6 +23,8 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
+        mavenCentral()
         jcenter()
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f8f197..114598c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/motion-detection/.gitignore b/motion-detection/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/motion-detection/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/motion-detection/build.gradle b/motion-detection/build.gradle
new file mode 100644
index 0000000..a1f80d2
--- /dev/null
+++ b/motion-detection/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+}
diff --git a/motion-detection/proguard-rules.pro b/motion-detection/proguard-rules.pro
new file mode 100644
index 0000000..c15ccc8
--- /dev/null
+++ b/motion-detection/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/jonas/android-sdk/android-sdk-macosx/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/motion-detection/src/androidTest/java/de/appsthatmatter/knxpresso/bewegungsmelder/ApplicationTest.java b/motion-detection/src/androidTest/java/de/appsthatmatter/knxpresso/bewegungsmelder/ApplicationTest.java
new file mode 100644
index 0000000..06adcb8
--- /dev/null
+++ b/motion-detection/src/androidTest/java/de/appsthatmatter/knxpresso/bewegungsmelder/ApplicationTest.java
@@ -0,0 +1,13 @@
+package de.appsthatmatter.knxpresso.bewegungsmelder;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/motion-detection/src/main/AndroidManifest.xml b/motion-detection/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..cf7448b
--- /dev/null
+++ b/motion-detection/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.jjoe64.library.motiondetection">
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature
+        android:name="android.hardware.camera.front"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+</manifest>
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/AggregateLumaMotionDetection.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/AggregateLumaMotionDetection.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/AggregateLumaMotionDetection.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/AggregateLumaMotionDetection.java
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/Comparer.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/Comparer.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/Comparer.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/Comparer.java
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/IMotionDetection.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/IMotionDetection.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/IMotionDetection.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/IMotionDetection.java
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/ImageProcessing.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/ImageProcessing.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/ImageProcessing.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/ImageProcessing.java
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetector.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetector.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetector.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetector.java
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetectorCallback.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetectorCallback.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetectorCallback.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/MotionDetectorCallback.java
diff --git a/app/src/main/java/com/jjoe64/motiondetection/motiondetection/State.java b/motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/State.java
similarity index 100%
rename from app/src/main/java/com/jjoe64/motiondetection/motiondetection/State.java
rename to motion-detection/src/main/java/com/jjoe64/motiondetection/motiondetection/State.java
diff --git a/settings.gradle b/settings.gradle
index e7b4def..b1474d6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
+rootProject.name = "android-motion-detection"
 include ':app'
+include ':motion-detection'
\ No newline at end of file