diff --git a/data/com.github.hannesschulze.conecto.gschema.xml b/data/com.github.hannesschulze.conecto.gschema.xml
index 687f95bcf4da616876dd2bcd69e80df5763ce18e..a791dd9f338fd0873e95188c044b359cc9b5c02c 100644
--- a/data/com.github.hannesschulze.conecto.gschema.xml
+++ b/data/com.github.hannesschulze.conecto.gschema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema id="com.github.gyan000.eos-connect" path="/com/github/gyan000/eos-connect/">
+  <schema id="com.github.hannesschulze.conecto" path="/com/github/hannesschulze/conecto/">
     <key type="b" name="use-dark-theme">
       <default>false</default>
       <summary>Use dark theme.</summary>
@@ -14,7 +14,7 @@
       <summary>Activate / Deactivate the storage of SMS for all devices.</summary>
     </key>
   </schema>
-  <schema id="com.github.gyan000.eos-connect.settings.device">
+  <schema id="com.github.hannesschulze.conecto.settings.device">
     <key type="s" name="custom-name">
       <default>""</default>
       <summary>Custom name for the device.</summary>
diff --git a/po/com.github.gyan000.eos-connect.pot b/po/com.github.gyan000.eos-connect.pot
index 4dd06d0d4f1c0575d64d953668aecc8f8d54a99d..a0fc2f126d1a7b4ac47ca22945646bb5b771d5c8 100644
--- a/po/com.github.gyan000.eos-connect.pot
+++ b/po/com.github.gyan000.eos-connect.pot
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the com.github.gyan000.eos-connect package.
+# This file is distributed under the same license as the com.github.hannesschulze.conecto package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: com.github.gyan000.eos-connect\n"
+"Project-Id-Version: com.github.hannesschulze.conecto\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-03 18:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
diff --git a/po/fr.po b/po/fr.po
index c69c2fa592364fe51058cb3e7216a9713f0233f1..bdf0de8290d5fc3272e6feea71fc42bd149b5e60 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,11 +1,11 @@
-# French translations for com.github.gyan000.eos-connect package.
-# Copyright (C) 2018 THE com.github.gyan000.eos-connect'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the com.github.gyan000.eos-connect package.
+# French translations for com.github.hannesschulze.conecto package.
+# Copyright (C) 2018 THE  com.github.hannesschulze.conecto'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  com.github.hannesschulze.conecto package.
 # Automatically generated, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: com.github.gyan000.eos-connect\n"
+"Project-Id-Version: com.github.hannesschulze.conecto\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-03 18:05+0200\n"
 "PO-Revision-Date: 2018-06-03 16:22+0200\n"
diff --git a/po/uk.po b/po/uk.po
index b488216cf2017e3641a689396f0385546e64457d..2e74c44972a9b84fd84c94cbb2a7601d892d7d24 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,11 +1,11 @@
-# Ukrainian translations for com.github.gyan000.eos-connect package.
-# Copyright (C) 2018 THE com.github.gyan000.eos-connect'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the com.github.gyan000.eos-connect package.
+# Ukrainian translations for com.github.hannesschulze.conecto package.
+# Copyright (C) 2018 THE  com.github.hannesschulze.conecto'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  com.github.hannesschulze.conecto package.
 # Automatically generated, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: com.github.gyan000.eos-connect\n"
+"Project-Id-Version: com.github.hannesschulze.conecto\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-03 18:05+0200\n"
 "PO-Revision-Date: 2018-06-03 16:22+0200\n"
diff --git a/src/EOSConnect/EOSConnect.vala b/src/Conecto/Conecto.vala
similarity index 94%
rename from src/EOSConnect/EOSConnect.vala
rename to src/Conecto/Conecto.vala
index 6b1c04bb0cd9167bb2aa55efe5e14854e5e83199..a31e2f58fa2d2bf038685de6796ac1b3c6a7e23d 100644
--- a/src/EOSConnect/EOSConnect.vala
+++ b/src/Conecto/Conecto.vala
@@ -14,6 +14,7 @@
  *
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
+ * Hannes Schulze <haschu0103 (at) gmail.com>
  */
 using EOSConnect.Plugin;
 using EOSConnect.Plugin.Windows;
@@ -26,9 +27,9 @@ namespace EOSConnect {
 
     public class App : Granite.Application {
 
-        public const string APP_NAME="eos-connect";
-        public const string GSETTINGS_SCHEMA_ID="com.github.gyan000.eos-connect";
-        public const string GSETTINGS_SCHEMA_PATH="/com/github/gyan000/eos-connect";
+        public const string APP_NAME="conecto";
+        public const string GSETTINGS_SCHEMA_ID="com.github.hannesschulze.conecto";
+        public const string GSETTINGS_SCHEMA_PATH="/com/github/hannesschulze/conecto";
         public HashMap<string, Device> devices_map;
         public ContactsInterface contacts_interface;
         private GLib.Settings main_settings;
@@ -44,8 +45,8 @@ namespace EOSConnect {
         construct {
             application_id = App.GSETTINGS_SCHEMA_ID;
             flags = ApplicationFlags.FLAGS_NONE;
-            program_name = "EOS Connect";
-            build_version = "0.5";
+            program_name = "Conecto";
+            build_version = "0.1";
         }
 
         public override void activate ()
@@ -111,7 +112,7 @@ namespace EOSConnect {
                 error ("Cannot run without thread support.\n");
             }
 
-             message ("Report any issues/bugs you might find to https://github.com/gyan000/EOSConnect/issues");
+             message ("Report any issues/bugs you might find to https://github.com/hannesschulze/conecto/issues");
 
             var application = new App ();
             return application.run (args);
diff --git a/src/EOSConnect/Config.vala b/src/Conecto/Config.vala
similarity index 100%
rename from src/EOSConnect/Config.vala
rename to src/Conecto/Config.vala
diff --git a/src/EOSConnect/Contact.vala b/src/Conecto/Contact.vala
similarity index 100%
rename from src/EOSConnect/Contact.vala
rename to src/Conecto/Contact.vala
diff --git a/src/EOSConnect/ContactsInterface.vala b/src/Conecto/ContactsInterface.vala
similarity index 100%
rename from src/EOSConnect/ContactsInterface.vala
rename to src/Conecto/ContactsInterface.vala
diff --git a/src/EOSConnect/Contractor.vala b/src/Conecto/Contractor.vala
similarity index 98%
rename from src/EOSConnect/Contractor.vala
rename to src/Conecto/Contractor.vala
index f572851283806f5aad7763f04f7ec4688c35e26f..b8bd223acb72984c66d17d57b8ab790664bc3bcb 100644
--- a/src/EOSConnect/Contractor.vala
+++ b/src/Conecto/Contractor.vala
@@ -64,7 +64,7 @@ namespace EOSConnect {
                 string str_name="Name=Send to " + device.custom_name + "\n";
                 string str_desc="Description=Send this file to  " + device.custom_name + "\n";
                 // TOCHEK find out why without --print-reply it's not working.
-                string str_command  ="Exec=dbus-send --print-reply --dest=com.github.gyan000.eos-connect ";
+                string str_command  ="Exec=dbus-send --print-reply --dest=com.github.hannesschulze.conecto ";
                        str_command += "/com/github/gyan000/eosconnect/share ";
                        str_command += "com.github.gyan000.eosconnect.Share.Files ";
                        str_command += "string:'" + device.id + "' string:'%F'\n";
diff --git a/src/EOSConnect/DebugToolbar.vala b/src/Conecto/DebugToolbar.vala
similarity index 100%
rename from src/EOSConnect/DebugToolbar.vala
rename to src/Conecto/DebugToolbar.vala
diff --git a/src/EOSConnect/EContacts.vala b/src/Conecto/EContacts.vala
similarity index 100%
rename from src/EOSConnect/EContacts.vala
rename to src/Conecto/EContacts.vala
diff --git a/src/EOSConnect/MainWindow.vala b/src/Conecto/MainWindow.vala
similarity index 100%
rename from src/EOSConnect/MainWindow.vala
rename to src/Conecto/MainWindow.vala
diff --git a/src/EOSConnect/Notification.vala b/src/Conecto/Notification.vala
similarity index 100%
rename from src/EOSConnect/Notification.vala
rename to src/Conecto/Notification.vala
diff --git a/src/EOSConnect/Plugin/Battery.vala b/src/Conecto/Plugin/Battery.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Battery.vala
rename to src/Conecto/Plugin/Battery.vala
diff --git a/src/EOSConnect/Plugin/Dialogs/NotificationSettings.vala b/src/Conecto/Plugin/Dialogs/NotificationSettings.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Dialogs/NotificationSettings.vala
rename to src/Conecto/Plugin/Dialogs/NotificationSettings.vala
diff --git a/src/EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala b/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala
rename to src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala
diff --git a/src/EOSConnect/Plugin/Notification.vala b/src/Conecto/Plugin/Notification.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Notification.vala
rename to src/Conecto/Plugin/Notification.vala
diff --git a/src/EOSConnect/Plugin/Ping.vala b/src/Conecto/Plugin/Ping.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Ping.vala
rename to src/Conecto/Plugin/Ping.vala
diff --git a/src/EOSConnect/Plugin/PluginInterface.vala b/src/Conecto/Plugin/PluginInterface.vala
similarity index 100%
rename from src/EOSConnect/Plugin/PluginInterface.vala
rename to src/Conecto/Plugin/PluginInterface.vala
diff --git a/src/EOSConnect/Plugin/Popover/BatterySettings.vala b/src/Conecto/Plugin/Popover/BatterySettings.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Popover/BatterySettings.vala
rename to src/Conecto/Plugin/Popover/BatterySettings.vala
diff --git a/src/EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala b/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala
rename to src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala
diff --git a/src/EOSConnect/Plugin/Popover/ShareSettings.vala b/src/Conecto/Plugin/Popover/ShareSettings.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Popover/ShareSettings.vala
rename to src/Conecto/Plugin/Popover/ShareSettings.vala
diff --git a/src/EOSConnect/Plugin/Popover/TelephonySettings.vala b/src/Conecto/Plugin/Popover/TelephonySettings.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Popover/TelephonySettings.vala
rename to src/Conecto/Plugin/Popover/TelephonySettings.vala
diff --git a/src/EOSConnect/Plugin/SMS.vala b/src/Conecto/Plugin/SMS.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMS.vala
rename to src/Conecto/Plugin/SMS.vala
diff --git a/src/EOSConnect/Plugin/SMSContact.vala b/src/Conecto/Plugin/SMSContact.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMSContact.vala
rename to src/Conecto/Plugin/SMSContact.vala
diff --git a/src/EOSConnect/Plugin/SMSStore.vala b/src/Conecto/Plugin/SMSStore.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMSStore.vala
rename to src/Conecto/Plugin/SMSStore.vala
diff --git a/src/EOSConnect/Plugin/SMSStoreFactory.vala b/src/Conecto/Plugin/SMSStoreFactory.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMSStoreFactory.vala
rename to src/Conecto/Plugin/SMSStoreFactory.vala
diff --git a/src/EOSConnect/Plugin/SMSStoreInterface.vala b/src/Conecto/Plugin/SMSStoreInterface.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMSStoreInterface.vala
rename to src/Conecto/Plugin/SMSStoreInterface.vala
diff --git a/src/EOSConnect/Plugin/SMSStoreSQLite.vala b/src/Conecto/Plugin/SMSStoreSQLite.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMSStoreSQLite.vala
rename to src/Conecto/Plugin/SMSStoreSQLite.vala
diff --git a/src/EOSConnect/Plugin/SMSStoreTemp.vala b/src/Conecto/Plugin/SMSStoreTemp.vala
similarity index 100%
rename from src/EOSConnect/Plugin/SMSStoreTemp.vala
rename to src/Conecto/Plugin/SMSStoreTemp.vala
diff --git a/src/EOSConnect/Plugin/Share.vala b/src/Conecto/Plugin/Share.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Share.vala
rename to src/Conecto/Plugin/Share.vala
diff --git a/src/EOSConnect/Plugin/Telephony.vala b/src/Conecto/Plugin/Telephony.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Telephony.vala
rename to src/Conecto/Plugin/Telephony.vala
diff --git a/src/EOSConnect/Plugin/Views/SMSMessagesView.vala b/src/Conecto/Plugin/Views/SMSMessagesView.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Views/SMSMessagesView.vala
rename to src/Conecto/Plugin/Views/SMSMessagesView.vala
diff --git a/src/EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala
rename to src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala
diff --git a/src/EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala
rename to src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala
diff --git a/src/EOSConnect/Plugin/Widgets/SMSContactListBox.vala b/src/Conecto/Plugin/Widgets/SMSContactListBox.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Widgets/SMSContactListBox.vala
rename to src/Conecto/Plugin/Widgets/SMSContactListBox.vala
diff --git a/src/EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala b/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala
rename to src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala
diff --git a/src/EOSConnect/Plugin/Widgets/SMSTextEntry.vala b/src/Conecto/Plugin/Widgets/SMSTextEntry.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Widgets/SMSTextEntry.vala
rename to src/Conecto/Plugin/Widgets/SMSTextEntry.vala
diff --git a/src/EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala
rename to src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala
diff --git a/src/EOSConnect/Plugin/Windows/SMSHistory.vala b/src/Conecto/Plugin/Windows/SMSHistory.vala
similarity index 100%
rename from src/EOSConnect/Plugin/Windows/SMSHistory.vala
rename to src/Conecto/Plugin/Windows/SMSHistory.vala
diff --git a/src/EOSConnect/Tools.vala b/src/Conecto/Tools.vala
similarity index 100%
rename from src/EOSConnect/Tools.vala
rename to src/Conecto/Tools.vala
diff --git a/src/EOSConnect/Views/DeviceSettingsView.vala b/src/Conecto/Views/DeviceSettingsView.vala
similarity index 100%
rename from src/EOSConnect/Views/DeviceSettingsView.vala
rename to src/Conecto/Views/DeviceSettingsView.vala
diff --git a/src/EOSConnect/Views/DevicesView.vala b/src/Conecto/Views/DevicesView.vala
similarity index 100%
rename from src/EOSConnect/Views/DevicesView.vala
rename to src/Conecto/Views/DevicesView.vala
diff --git a/src/EOSConnect/Views/MainSettingsView.vala b/src/Conecto/Views/MainSettingsView.vala
similarity index 100%
rename from src/EOSConnect/Views/MainSettingsView.vala
rename to src/Conecto/Views/MainSettingsView.vala
diff --git a/src/EOSConnect/Widgets/DeviceListActionBarFooter.vala b/src/Conecto/Widgets/DeviceListActionBarFooter.vala
similarity index 100%
rename from src/EOSConnect/Widgets/DeviceListActionBarFooter.vala
rename to src/Conecto/Widgets/DeviceListActionBarFooter.vala
diff --git a/src/EOSConnect/Widgets/DeviceListBox.vala b/src/Conecto/Widgets/DeviceListBox.vala
similarity index 100%
rename from src/EOSConnect/Widgets/DeviceListBox.vala
rename to src/Conecto/Widgets/DeviceListBox.vala
diff --git a/src/EOSConnect/Widgets/DeviceListBoxRow.vala b/src/Conecto/Widgets/DeviceListBoxRow.vala
similarity index 100%
rename from src/EOSConnect/Widgets/DeviceListBoxRow.vala
rename to src/Conecto/Widgets/DeviceListBoxRow.vala
diff --git a/src/EOSConnect/Widgets/DeviceMenuitem.vala b/src/Conecto/Widgets/DeviceMenuitem.vala
similarity index 100%
rename from src/EOSConnect/Widgets/DeviceMenuitem.vala
rename to src/Conecto/Widgets/DeviceMenuitem.vala
diff --git a/src/EOSConnect/Widgets/PluginListBox.vala b/src/Conecto/Widgets/PluginListBox.vala
similarity index 100%
rename from src/EOSConnect/Widgets/PluginListBox.vala
rename to src/Conecto/Widgets/PluginListBox.vala
diff --git a/src/EOSConnect/Widgets/PluginListBoxRow.vala b/src/Conecto/Widgets/PluginListBoxRow.vala
similarity index 100%
rename from src/EOSConnect/Widgets/PluginListBoxRow.vala
rename to src/Conecto/Widgets/PluginListBoxRow.vala
diff --git a/src/MConnect/MConnectThread.vala b/src/MConnect/MConnectThread.vala
index 6c549218ddb353624f74cdfffbe2b7a11373d533..845f1003f44dc71602aa98c58562384ef7c525c9 100644
--- a/src/MConnect/MConnectThread.vala
+++ b/src/MConnect/MConnectThread.vala
@@ -91,7 +91,7 @@ namespace MConnect {
 
                 discovery.listen ();
 
-                Bus.own_name (BusType.SESSION, "com.github.gyan000.eos-connect", BusNameOwnerFlags.NONE,
+                Bus.own_name (BusType.SESSION, "com.github.hannesschulze.conecto", BusNameOwnerFlags.NONE,
                   on_bus_aquired,
                   () => {},
                   () => stderr.printf ("Could not aquire name\n"));
@@ -108,7 +108,7 @@ namespace MConnect {
         public void on_bus_aquired (DBusConnection conn) {
             try {
                 // Share service.
-                conn.register_object ("/com/github/gyan000/eosconnect/share", new ShareHandlerProxy ());
+                conn.register_object ("/com/github/hannesschulze/conecto/share", new ShareHandlerProxy ());
             } catch (IOError e) {
                 warning ("Could not register service.\n");
             }
diff --git a/src/MConnect/ShareHandlerProxy.vala b/src/MConnect/ShareHandlerProxy.vala
index f64f171bddeee74493f63cf44cab272915148fa9..041839d38c4e892701a714372d59f744f9cdc898 100644
--- a/src/MConnect/ShareHandlerProxy.vala
+++ b/src/MConnect/ShareHandlerProxy.vala
@@ -20,7 +20,7 @@ using EOSConnect.Plugin;
 using Gee;
 using MConnect;
 
-[DBus (name = "com.github.gyan000.eosconnect.Share")]
+[DBus (name = "com.github.hannesschulze.conecto.Share")]
 class ShareHandlerProxy : Object {
 
     // private HashMap<string, Device> devices_map;
@@ -51,7 +51,7 @@ class ShareHandlerProxy : Object {
     }
 }
 
-[DBus (name = "com.github.gyan000.eosconnect.ShareError")]
+[DBus (name = "com.github.hannesschulze.conecto.ShareError")]
 public errordomain ShareError {
     SOME_ERROR
 }
diff --git a/src/meson.build b/src/meson.build
index 94055be36163d87f6c4954e854209610a72f2c3a..859e8529996b375837851988573278cd99e2e09a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,49 +1,49 @@
 conecto_sources = files(
-    'EOSConnect/Config.vala',
-    'EOSConnect/Contact.vala',
-    'EOSConnect/ContactsInterface.vala',
-    'EOSConnect/Contractor.vala',
-    'EOSConnect/EContacts.vala',
-    'EOSConnect/EOSConnect.vala',
-    'EOSConnect/DebugToolbar.vala',
-    'EOSConnect/MainWindow.vala',
-    'EOSConnect/Plugin/Battery.vala',
-    'EOSConnect/Plugin/Dialogs/NotificationSettings.vala',
-    'EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala',
-    'EOSConnect/Plugin/Notification.vala',
-    'EOSConnect/Plugin/Ping.vala',
-    'EOSConnect/Plugin/PluginInterface.vala',
-    'EOSConnect/Plugin/Popover/BatterySettings.vala',
-    'EOSConnect/Plugin/Popover/ShareSettings.vala',
-    'EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala',
-    'EOSConnect/Plugin/Popover/TelephonySettings.vala',
-    'EOSConnect/Plugin/Share.vala',
-    'EOSConnect/Plugin/SMS.vala',
-    'EOSConnect/Plugin/SMSContact.vala',
-    'EOSConnect/Plugin/SMSStore.vala',
-    'EOSConnect/Plugin/SMSStoreFactory.vala',
-    'EOSConnect/Plugin/SMSStoreInterface.vala',
-    'EOSConnect/Plugin/SMSStoreSQLite.vala',
-    'EOSConnect/Plugin/SMSStoreTemp.vala',
-    'EOSConnect/Plugin/Telephony.vala',
-    'EOSConnect/Plugin/Views/SMSMessagesView.vala',
-    'EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala',
-    'EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala',
-    'EOSConnect/Plugin/Widgets/SMSContactListBox.vala',
-    'EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala',
-    'EOSConnect/Plugin/Widgets/SMSTextEntry.vala',
-    'EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala',
-    'EOSConnect/Plugin/Windows/SMSHistory.vala',
-    'EOSConnect/Tools.vala',
-    'EOSConnect/Views/DevicesView.vala',
-    'EOSConnect/Views/DeviceSettingsView.vala',
-    'EOSConnect/Views/MainSettingsView.vala',
-    'EOSConnect/Widgets/DeviceListActionBarFooter.vala',
-    'EOSConnect/Widgets/DeviceListBox.vala',
-    'EOSConnect/Widgets/DeviceListBoxRow.vala',
-    'EOSConnect/Widgets/DeviceMenuitem.vala',
-    'EOSConnect/Widgets/PluginListBox.vala',
-    'EOSConnect/Widgets/PluginListBoxRow.vala',
+    'Conecto/Config.vala',
+    'Conecto/Contact.vala',
+    'Conecto/ContactsInterface.vala',
+    'Conecto/Contractor.vala',
+    'Conecto/EContacts.vala',
+    'Conecto/Conecto.vala',
+    'Conecto/DebugToolbar.vala',
+    'Conecto/MainWindow.vala',
+    'Conecto/Plugin/Battery.vala',
+    'Conecto/Plugin/Dialogs/NotificationSettings.vala',
+    'Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala',
+    'Conecto/Plugin/Notification.vala',
+    'Conecto/Plugin/Ping.vala',
+    'Conecto/Plugin/PluginInterface.vala',
+    'Conecto/Plugin/Popover/BatterySettings.vala',
+    'Conecto/Plugin/Popover/ShareSettings.vala',
+    'Conecto/Plugin/Popover/SMSNewMessageNewContact.vala',
+    'Conecto/Plugin/Popover/TelephonySettings.vala',
+    'Conecto/Plugin/Share.vala',
+    'Conecto/Plugin/SMS.vala',
+    'Conecto/Plugin/SMSContact.vala',
+    'Conecto/Plugin/SMSStore.vala',
+    'Conecto/Plugin/SMSStoreFactory.vala',
+    'Conecto/Plugin/SMSStoreInterface.vala',
+    'Conecto/Plugin/SMSStoreSQLite.vala',
+    'Conecto/Plugin/SMSStoreTemp.vala',
+    'Conecto/Plugin/Telephony.vala',
+    'Conecto/Plugin/Views/SMSMessagesView.vala',
+    'Conecto/Plugin/Widgets/PingPluginListBoxRow.vala',
+    'Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala',
+    'Conecto/Plugin/Widgets/SMSContactListBox.vala',
+    'Conecto/Plugin/Widgets/SMSContactListBoxRow.vala',
+    'Conecto/Plugin/Widgets/SMSTextEntry.vala',
+    'Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala',
+    'Conecto/Plugin/Windows/SMSHistory.vala',
+    'Conecto/Tools.vala',
+    'Conecto/Views/DevicesView.vala',
+    'Conecto/Views/DeviceSettingsView.vala',
+    'Conecto/Views/MainSettingsView.vala',
+    'Conecto/Widgets/DeviceListActionBarFooter.vala',
+    'Conecto/Widgets/DeviceListBox.vala',
+    'Conecto/Widgets/DeviceListBoxRow.vala',
+    'Conecto/Widgets/DeviceMenuitem.vala',
+    'Conecto/Widgets/PluginListBox.vala',
+    'Conecto/Widgets/PluginListBoxRow.vala',
     # 'MConnect/Config.vala',
     'MConnect/BatteryHandler.vala',
     'MConnect/Core.vala',