diff --git a/README.md b/README.md
index c02c7da..aa86f16 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ When submitting code, please make every effort to follow existing conventions an
 
 ## License
 
-Copyright 2018 Picnic Supermarkt
+Copyright 2018 Picnic Technologies
 
 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 Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a0a9ea8..304686b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme">
-        <activity android:name="systems.picnic.fingerpaintview.sample.SampleActivity">
+        <activity android:name="tech.picnic.fingerpaintview.sample.SampleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/systems/picnic/fingerpaintview/sample/SampleActivity.kt b/app/src/main/java/tech/picnic/fingerpaintview/sample/SampleActivity.kt
similarity index 76%
rename from app/src/main/java/systems/picnic/fingerpaintview/sample/SampleActivity.kt
rename to app/src/main/java/tech/picnic/fingerpaintview/sample/SampleActivity.kt
index d2fa5f8..744b8b2 100644
--- a/app/src/main/java/systems/picnic/fingerpaintview/sample/SampleActivity.kt
+++ b/app/src/main/java/tech/picnic/fingerpaintview/sample/SampleActivity.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright 2018 Picnic Supermarkt
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package systems.picnic.fingerpaintview.sample
+package tech.picnic.fingerpaintview.sample
 
 import android.graphics.Color
 import android.os.Bundle
@@ -80,7 +65,7 @@ class SampleActivity : AppCompatActivity(), SeekBar.OnSeekBarChangeListener, Vie
     }
 
     override fun onBackPressed() {
-        if(previewContainer.visibility == View.VISIBLE) {
+        if (previewContainer.visibility == View.VISIBLE) {
             hidePreview()
         } else {
             super.onBackPressed()
diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml
index 482e298..7a5da97 100644
--- a/app/src/main/res/layout/activity_sample.xml
+++ b/app/src/main/res/layout/activity_sample.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="#68768A">
 
-    <systems.picnic.fingerpaintview.FingerPaintImageView
+    <tech.picnic.fingerpaintview.FingerPaintImageView
         android:id="@+id/finger"
         android:layout_width="300dp"
         android:layout_height="300dp"
diff --git a/fingerpaintview/src/main/java/systems/picnic/fingerpaintview/FingerPaintImageView.kt b/fingerpaintview/src/main/java/tech/picnic/fingerpaintview/FingerPaintImageView.kt
similarity index 84%
rename from fingerpaintview/src/main/java/systems/picnic/fingerpaintview/FingerPaintImageView.kt
rename to fingerpaintview/src/main/java/tech/picnic/fingerpaintview/FingerPaintImageView.kt
index 8b40e9b..7e56b99 100644
--- a/fingerpaintview/src/main/java/systems/picnic/fingerpaintview/FingerPaintImageView.kt
+++ b/fingerpaintview/src/main/java/tech/picnic/fingerpaintview/FingerPaintImageView.kt
@@ -1,30 +1,4 @@
-/**
- * The MIT License
- *
- * Copyright (c) 2018 Picnic Supermarkt
- *
- * 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 Software without restriction, including
- * without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom
- * the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice
- * shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package systems.picnic.fingerpaintview
+package tech.picnic.fingerpaintview
 
 import android.annotation.SuppressLint
 import android.content.Context