diff --git a/src/bitmessagekivy/baseclass/qrcode.py b/src/bitmessagekivy/baseclass/qrcode.py
index 6cb9383b..6c81bd58 100644
--- a/src/bitmessagekivy/baseclass/qrcode.py
+++ b/src/bitmessagekivy/baseclass/qrcode.py
@@ -2,6 +2,7 @@ import state
 from bitmessagekivy.baseclass.common import toast
 from kivy.uix.screenmanager import Screen
 from kivy.properties import StringProperty
+from kivy_garden.qrcode import QRCodeWidget
 
 
 class ShowQRCode(Screen):
@@ -12,10 +13,6 @@ class ShowQRCode(Screen):
         """Method used for showing QR Code"""
         self.ids.qr.clear_widgets()
         state.kivyapp.set_toolbar_for_QrCode()
-        try:
-            from kivy.garden.qrcode import QRCodeWidget
-        except Exception:
-            from kivy_garden.qrcode import QRCodeWidget
         self.address = address
         self.ids.qr.add_widget(QRCodeWidget(data=address))
         self.ids.qr.children[0].show_border = False
diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index 053ade40..6922ad56 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -58,7 +58,7 @@ import ast
 
 from bitmessagekivy.baseclass.common import toast
 
-from kivy_garden.zbarcam import ZBarCam
+from qr_scanner.zbarcam import ZBarCam
 from pyzbar.pyzbar import ZBarSymbol
 
 if platform != "android":
diff --git a/src/kivy_garden/__init__.py b/src/qr_scanner/__init__.py
similarity index 100%
rename from src/kivy_garden/__init__.py
rename to src/qr_scanner/__init__.py
diff --git a/src/kivy_garden/xcamera/__init__.py b/src/qr_scanner/xcamera/__init__.py
similarity index 100%
rename from src/kivy_garden/xcamera/__init__.py
rename to src/qr_scanner/xcamera/__init__.py
diff --git a/src/kivy_garden/xcamera/android_api.py b/src/qr_scanner/xcamera/android_api.py
similarity index 100%
rename from src/kivy_garden/xcamera/android_api.py
rename to src/qr_scanner/xcamera/android_api.py
diff --git a/src/kivy_garden/xcamera/data/icons.ttf b/src/qr_scanner/xcamera/data/icons.ttf
similarity index 100%
rename from src/kivy_garden/xcamera/data/icons.ttf
rename to src/qr_scanner/xcamera/data/icons.ttf
diff --git a/src/kivy_garden/xcamera/data/shutter.wav b/src/qr_scanner/xcamera/data/shutter.wav
similarity index 100%
rename from src/kivy_garden/xcamera/data/shutter.wav
rename to src/qr_scanner/xcamera/data/shutter.wav
diff --git a/src/kivy_garden/xcamera/main.py b/src/qr_scanner/xcamera/main.py
similarity index 94%
rename from src/kivy_garden/xcamera/main.py
rename to src/qr_scanner/xcamera/main.py
index c5226627..faa9390f 100644
--- a/src/kivy_garden/xcamera/main.py
+++ b/src/qr_scanner/xcamera/main.py
@@ -3,7 +3,7 @@ from kivy.app import App
 from kivy.lang import Builder
 
 kv = """
-#:import XCamera kivy_garden.xcamera.XCamera
+#:import XCamera qr_scanner.xcamera.XCamera
 
 FloatLayout:
     orientation: 'vertical'
diff --git a/src/kivy_garden/xcamera/platform_api.py b/src/qr_scanner/xcamera/platform_api.py
similarity index 100%
rename from src/kivy_garden/xcamera/platform_api.py
rename to src/qr_scanner/xcamera/platform_api.py
diff --git a/src/kivy_garden/xcamera/version.py b/src/qr_scanner/xcamera/version.py
similarity index 100%
rename from src/kivy_garden/xcamera/version.py
rename to src/qr_scanner/xcamera/version.py
diff --git a/src/kivy_garden/xcamera/xcamera.kv b/src/qr_scanner/xcamera/xcamera.kv
similarity index 95%
rename from src/kivy_garden/xcamera/xcamera.kv
rename to src/qr_scanner/xcamera/xcamera.kv
index 1efc6895..da5ec518 100644
--- a/src/kivy_garden/xcamera/xcamera.kv
+++ b/src/qr_scanner/xcamera/xcamera.kv
@@ -1,4 +1,4 @@
-#:import xcamera kivy_garden.xcamera.xcamera
+#:import xcamera qr_scanner.xcamera.xcamera
 
 <XCameraIconButton>
     icon_color: (0, 0, 0, 1)
diff --git a/src/kivy_garden/xcamera/xcamera.py b/src/qr_scanner/xcamera/xcamera.py
similarity index 100%
rename from src/kivy_garden/xcamera/xcamera.py
rename to src/qr_scanner/xcamera/xcamera.py
diff --git a/src/kivy_garden/zbarcam/__init__.py b/src/qr_scanner/zbarcam/__init__.py
similarity index 100%
rename from src/kivy_garden/zbarcam/__init__.py
rename to src/qr_scanner/zbarcam/__init__.py
diff --git a/src/kivy_garden/zbarcam/utils.py b/src/qr_scanner/zbarcam/utils.py
similarity index 100%
rename from src/kivy_garden/zbarcam/utils.py
rename to src/qr_scanner/zbarcam/utils.py
diff --git a/src/kivy_garden/zbarcam/version.py b/src/qr_scanner/zbarcam/version.py
similarity index 100%
rename from src/kivy_garden/zbarcam/version.py
rename to src/qr_scanner/zbarcam/version.py
diff --git a/src/kivy_garden/zbarcam/zbarcam.kv b/src/qr_scanner/zbarcam/zbarcam.kv
similarity index 89%
rename from src/kivy_garden/zbarcam/zbarcam.kv
rename to src/qr_scanner/zbarcam/zbarcam.kv
index 5b123be4..b3b2dd0d 100644
--- a/src/kivy_garden/zbarcam/zbarcam.kv
+++ b/src/qr_scanner/zbarcam/zbarcam.kv
@@ -1,5 +1,5 @@
-#:import XCamera kivy_garden.xcamera.XCamera
-#:import is_android kivy_garden.zbarcam.utils.is_android
+#:import XCamera qr_scanner.xcamera.XCamera
+#:import is_android qr_scanner.zbarcam.utils.is_android
 <ZBarCam>:
     Widget:
         # invert width/height on rotated Android
diff --git a/src/kivy_garden/zbarcam/zbarcam.py b/src/qr_scanner/zbarcam/zbarcam.py
similarity index 100%
rename from src/kivy_garden/zbarcam/zbarcam.py
rename to src/qr_scanner/zbarcam/zbarcam.py