diff --git a/zomp/lib/otpr-zx/0.1.0/Emakefile b/zomp/lib/otpr/zx/0.1.0/Emakefile
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/Emakefile
rename to zomp/lib/otpr/zx/0.1.0/Emakefile
diff --git a/zomp/lib/otpr-zx/0.1.0/LICENSE b/zomp/lib/otpr/zx/0.1.0/LICENSE
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/LICENSE
rename to zomp/lib/otpr/zx/0.1.0/LICENSE
diff --git a/zomp/lib/otpr-zx/0.1.0/ebin/zx.app b/zomp/lib/otpr/zx/0.1.0/ebin/zx.app
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/ebin/zx.app
rename to zomp/lib/otpr/zx/0.1.0/ebin/zx.app
diff --git a/zomp/lib/otpr-zx/0.1.0/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.1.0/include/zx_logger.hrl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/include/zx_logger.hrl
rename to zomp/lib/otpr/zx/0.1.0/include/zx_logger.hrl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx.erl b/zomp/lib/otpr/zx/0.1.0/src/zx.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx_conn.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_conn.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx_conn.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx_conn.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_conn_sup.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx_conn_sup.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx_conn_sup.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_daemon.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx_daemon.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx_daemon.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx_lib.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_lib.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx_lib.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx_lib.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx_net.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_net.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx_net.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx_net.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/src/zx_sup.erl b/zomp/lib/otpr/zx/0.1.0/src/zx_sup.erl
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/src/zx_sup.erl
rename to zomp/lib/otpr/zx/0.1.0/src/zx_sup.erl
diff --git a/zomp/lib/otpr-zx/0.1.0/zmake b/zomp/lib/otpr/zx/0.1.0/zmake
similarity index 100%
rename from zomp/lib/otpr-zx/0.1.0/zmake
rename to zomp/lib/otpr/zx/0.1.0/zmake
diff --git a/zomp/zx.sh b/zomp/zx
similarity index 57%
rename from zomp/zx.sh
rename to zomp/zx
index c439460..c93a206 100755
--- a/zomp/zx.sh
+++ b/zomp/zx
@@ -1,11 +1,11 @@
-#! /bin/sh
+#!/bin/sh
 
 set -x
 
 ZOMP_DIR="$HOME/zomp"
 ORIGIN="$(pwd)"
-VERSION="$(ls $ZOMP_DIR/lib/otpr-zx/ | sort --field-separator=. --reverse | head --lines=1)"
-ZX_DIR="$ZOMP_DIR/lib/otpr-zx/$VERSION"
+VERSION="$(ls $ZOMP_DIR/lib/otpr/zx/ | sort --field-separator=. --reverse | head --lines=1)"
+ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$VERSION"
 
 cd "$ZX_DIR"
 ./zmake
diff --git a/zx_dev.sh b/zx_dev
similarity index 96%
rename from zx_dev.sh
rename to zx_dev
index f02735a..6a1d577 100755
--- a/zx_dev.sh
+++ b/zx_dev
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 set -x