diff --git a/src/bitmessagekivy/__init__.py b/src/bitmessagekivy/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main.kv b/src/bitmessagekivy/main.kv
similarity index 98%
rename from src/main.kv
rename to src/bitmessagekivy/main.kv
index 9cfc0352..3c73080a 100644
--- a/src/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -75,7 +75,7 @@
             on_press:
                 root.manager.current = 'email'
         Button:
-            text: "sent"
+            text: "sents"
             background_color: (0,0,0,0)
             size_hint_y: 0.3
             size_hint_x: 0.1
diff --git a/src/mpybit.py b/src/bitmessagekivy/mpybit.py
similarity index 97%
rename from src/mpybit.py
rename to src/bitmessagekivy/mpybit.py
index 1b89ec9a..8a6e6265 100644
--- a/src/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -1,5 +1,10 @@
 import time
 
+from kivy.app import App
+from kivy.core.window import Window
+from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.gridlayout import GridLayout
+
 from debug import logger
 
 from addresses import addBMIfNotPresent, decodeAddress
@@ -10,18 +15,13 @@ from helper_ackPayload import genAckPayload
 
 from helper_sql import sqlExecute
 
-from kivy.app import App
-from kivy.core.window import Window
-# from kivy.uix.boxlayout import BoxLayout
-from kivy.uix.gridlayout import GridLayout
-
 import queues
 
 import shutdown
 statusIconColor = 'red'
 
 
-class LoginScreen(GridLayout):
+class LoginScreen(BoxLayout):
     """This will use for sending message to recipents from mobile client."""
 
     def send(self):