diff --git a/build.gradle b/build.gradle
index 19893391..1eef1402 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'application'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-mainClassName = 'cli.Main'
+mainClassName = 'org.asamk.textsecure.Main'
 
 version = '0.1.0'
 
diff --git a/src/main/java/cli/TextSecure.java b/src/main/java/org/asamk/TextSecure.java
similarity index 86%
rename from src/main/java/cli/TextSecure.java
rename to src/main/java/org/asamk/TextSecure.java
index 3220ba00..d046c0a1 100644
--- a/src/main/java/cli/TextSecure.java
+++ b/src/main/java/org/asamk/TextSecure.java
@@ -1,5 +1,7 @@
-package cli;
+package org.asamk;
 
+import org.asamk.textsecure.AttachmentInvalidException;
+import org.asamk.textsecure.GroupNotFoundException;
 import org.freedesktop.dbus.DBusInterface;
 import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
 
diff --git a/src/main/java/cli/AttachmentInvalidException.java b/src/main/java/org/asamk/textsecure/AttachmentInvalidException.java
similarity index 91%
rename from src/main/java/cli/AttachmentInvalidException.java
rename to src/main/java/org/asamk/textsecure/AttachmentInvalidException.java
index 289855e9..bf227269 100644
--- a/src/main/java/cli/AttachmentInvalidException.java
+++ b/src/main/java/org/asamk/textsecure/AttachmentInvalidException.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 public class AttachmentInvalidException extends Exception {
     private final String attachment;
diff --git a/src/main/java/cli/Base64.java b/src/main/java/org/asamk/textsecure/Base64.java
similarity index 99%
rename from src/main/java/cli/Base64.java
rename to src/main/java/org/asamk/textsecure/Base64.java
index b2a28591..f8f6b4cd 100644
--- a/src/main/java/cli/Base64.java
+++ b/src/main/java/org/asamk/textsecure/Base64.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
diff --git a/src/main/java/cli/GroupInfo.java b/src/main/java/org/asamk/textsecure/GroupInfo.java
similarity index 96%
rename from src/main/java/cli/GroupInfo.java
rename to src/main/java/org/asamk/textsecure/GroupInfo.java
index fe31baf9..dd6cacf7 100644
--- a/src/main/java/cli/GroupInfo.java
+++ b/src/main/java/org/asamk/textsecure/GroupInfo.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/cli/GroupNotFoundException.java b/src/main/java/org/asamk/textsecure/GroupNotFoundException.java
similarity index 89%
rename from src/main/java/cli/GroupNotFoundException.java
rename to src/main/java/org/asamk/textsecure/GroupNotFoundException.java
index 85e1cf0b..57f4cef8 100644
--- a/src/main/java/cli/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/textsecure/GroupNotFoundException.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 public class GroupNotFoundException extends Exception {
     private final byte[] groupId;
diff --git a/src/main/java/cli/JsonAxolotlStore.java b/src/main/java/org/asamk/textsecure/JsonAxolotlStore.java
similarity index 99%
rename from src/main/java/cli/JsonAxolotlStore.java
rename to src/main/java/org/asamk/textsecure/JsonAxolotlStore.java
index e7eb054c..f054e337 100644
--- a/src/main/java/cli/JsonAxolotlStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonAxolotlStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/src/main/java/cli/JsonGroupStore.java b/src/main/java/org/asamk/textsecure/JsonGroupStore.java
similarity index 98%
rename from src/main/java/cli/JsonGroupStore.java
rename to src/main/java/org/asamk/textsecure/JsonGroupStore.java
index 0fbfdc85..17a59f87 100644
--- a/src/main/java/cli/JsonGroupStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonGroupStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/src/main/java/cli/JsonIdentityKeyStore.java b/src/main/java/org/asamk/textsecure/JsonIdentityKeyStore.java
similarity index 99%
rename from src/main/java/cli/JsonIdentityKeyStore.java
rename to src/main/java/org/asamk/textsecure/JsonIdentityKeyStore.java
index e4d18b8f..050158fc 100644
--- a/src/main/java/cli/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonIdentityKeyStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/src/main/java/cli/JsonPreKeyStore.java b/src/main/java/org/asamk/textsecure/JsonPreKeyStore.java
similarity index 99%
rename from src/main/java/cli/JsonPreKeyStore.java
rename to src/main/java/org/asamk/textsecure/JsonPreKeyStore.java
index 393f1805..9688cf3e 100644
--- a/src/main/java/cli/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonPreKeyStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/src/main/java/cli/JsonSessionStore.java b/src/main/java/org/asamk/textsecure/JsonSessionStore.java
similarity index 99%
rename from src/main/java/cli/JsonSessionStore.java
rename to src/main/java/org/asamk/textsecure/JsonSessionStore.java
index 3cb78945..db352d3b 100644
--- a/src/main/java/cli/JsonSessionStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonSessionStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/src/main/java/cli/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/textsecure/JsonSignedPreKeyStore.java
similarity index 99%
rename from src/main/java/cli/JsonSignedPreKeyStore.java
rename to src/main/java/org/asamk/textsecure/JsonSignedPreKeyStore.java
index 4dc0cad3..d8dbeb9a 100644
--- a/src/main/java/cli/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/textsecure/JsonSignedPreKeyStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/src/main/java/cli/Main.java b/src/main/java/org/asamk/textsecure/Main.java
similarity index 98%
rename from src/main/java/cli/Main.java
rename to src/main/java/org/asamk/textsecure/Main.java
index 2884ef91..265059f7 100644
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/org/asamk/textsecure/Main.java
@@ -14,12 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package cli;
+package org.asamk.textsecure;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;
+import org.asamk.TextSecure;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
@@ -38,6 +39,9 @@ import java.util.List;
 
 public class Main {
 
+    public static final String TEXTSECURE_BUSNAME = "org.asamk.TextSecure";
+    public static final String TEXTSECURE_OBJECTPATH = "/org/asamk/TextSecure";
+
     public static void main(String[] args) {
         // Workaround for BKS truststore
         Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
@@ -63,7 +67,7 @@ public class Main {
                     }
                     dBusConn = DBusConnection.getConnection(busType);
                     ts = (TextSecure) dBusConn.getRemoteObject(
-                            "org.asamk.TextSecure", "/org/asamk/TextSecure",
+                            TEXTSECURE_BUSNAME, TEXTSECURE_OBJECTPATH,
                             TextSecure.class);
                 } catch (DBusException e) {
                     e.printStackTrace();
@@ -284,8 +288,8 @@ public class Main {
                                 busType = DBusConnection.SESSION;
                             }
                             conn = DBusConnection.getConnection(busType);
-                            conn.requestBusName("org.asamk.TextSecure");
-                            conn.exportObject("/org/asamk/TextSecure", m);
+                            conn.requestBusName(TEXTSECURE_BUSNAME);
+                            conn.exportObject(TEXTSECURE_OBJECTPATH, m);
                         } catch (DBusException e) {
                             e.printStackTrace();
                             System.exit(3);
diff --git a/src/main/java/cli/Manager.java b/src/main/java/org/asamk/textsecure/Manager.java
similarity index 99%
rename from src/main/java/cli/Manager.java
rename to src/main/java/org/asamk/textsecure/Manager.java
index caa3fb5d..f0714ce1 100644
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/org/asamk/textsecure/Manager.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package cli;
+package org.asamk.textsecure;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.asamk.TextSecure;
 import org.whispersystems.libaxolotl.*;
 import org.whispersystems.libaxolotl.ecc.Curve;
 import org.whispersystems.libaxolotl.ecc.ECKeyPair;
diff --git a/src/main/java/cli/Util.java b/src/main/java/org/asamk/textsecure/Util.java
similarity index 95%
rename from src/main/java/cli/Util.java
rename to src/main/java/org/asamk/textsecure/Util.java
index 215e14b8..7cbc851e 100644
--- a/src/main/java/cli/Util.java
+++ b/src/main/java/org/asamk/textsecure/Util.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
diff --git a/src/main/java/cli/WhisperTrustStore.java b/src/main/java/org/asamk/textsecure/WhisperTrustStore.java
similarity index 73%
rename from src/main/java/cli/WhisperTrustStore.java
rename to src/main/java/org/asamk/textsecure/WhisperTrustStore.java
index 08519653..48d96e8f 100644
--- a/src/main/java/cli/WhisperTrustStore.java
+++ b/src/main/java/org/asamk/textsecure/WhisperTrustStore.java
@@ -1,4 +1,4 @@
-package cli;
+package org.asamk.textsecure;
 
 import org.whispersystems.textsecure.api.push.TrustStore;
 
@@ -8,7 +8,7 @@ class WhisperTrustStore implements TrustStore {
 
     @Override
     public InputStream getKeyStoreInputStream() {
-        return cli.WhisperTrustStore.class.getResourceAsStream("whisper.store");
+        return WhisperTrustStore.class.getResourceAsStream("whisper.store");
     }
 
     @Override
diff --git a/src/main/resources/cli/whisper.store b/src/main/resources/org/asamk/textsecure/whisper.store
similarity index 100%
rename from src/main/resources/cli/whisper.store
rename to src/main/resources/org/asamk/textsecure/whisper.store