diff --git a/examples/run_airline_ontime_data_download.sh b/examples/airline_ontime_data_download.sh
similarity index 100%
rename from examples/run_airline_ontime_data_download.sh
rename to examples/airline_ontime_data_download.sh
diff --git a/examples/run_airline_ontime_data_mysql_to_ch_migration.sh b/examples/airline_ontime_data_mysql_to_ch_migration.sh
similarity index 100%
rename from examples/run_airline_ontime_data_mysql_to_ch_migration.sh
rename to examples/airline_ontime_data_mysql_to_ch_migration.sh
diff --git a/examples/run_airline_ontime_data_mysql_to_ch_reader.sh b/examples/airline_ontime_data_mysql_to_ch_reader.sh
similarity index 63%
rename from examples/run_airline_ontime_data_mysql_to_ch_reader.sh
rename to examples/airline_ontime_data_mysql_to_ch_reader.sh
index a54ae93..31629f8 100755
--- a/examples/run_airline_ontime_data_mysql_to_ch_reader.sh
+++ b/examples/airline_ontime_data_mysql_to_ch_reader.sh
@@ -2,14 +2,24 @@
 # read airline.ontime test dataset from MySQL and write it to CH
 
 # ugly stub to suppress unsufficient sockets
-sudo bash -c "echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse"
+#sudo bash -c "echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse"
 
 # run data reader with specified Python version
 
-PYTHON=python3.6
-PYTHON=/home/user/pypy3.5-5.9-beta-linux_x86_64-portable/bin/pypy
+PYTHON=""
+PYTHON="/home/user/pypy3.5-5.9-beta-linux_x86_64-portable/bin/pypy"
+PYTHON="python3.6"
+PYTHON="python3"
 
-$PYTHON ../clickhouse-mysql ${*:1} \
+CH_MYSQL="/usr/bin/clickhouse-mysql"
+CH_MYSQL="-m clickhouse_mysql.main"
+
+if [ ! -d "clickhouse_mysql" ]; then
+    # no clickhouse_mysql dir available - step out of examples dir
+    cd ..
+fi
+
+$PYTHON $CH_MYSQL ${*:1} \
     --src-resume \
     --src-wait \
     --nice-pause=1 \
diff --git a/examples/run_airline_ontime_mysql_data_import.sh b/examples/airline_ontime_mysql_data_import.sh
similarity index 100%
rename from examples/run_airline_ontime_mysql_data_import.sh
rename to examples/airline_ontime_mysql_data_import.sh
diff --git a/examples/run_datatypes.sh b/examples/datatypes.sh
similarity index 76%
rename from examples/run_datatypes.sh
rename to examples/datatypes.sh
index e9e8a9a..8633145 100755
--- a/examples/run_datatypes.sh
+++ b/examples/datatypes.sh
@@ -2,7 +2,15 @@
 
 sudo bash -c "echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse"
 
-python3 ../clickhouse-mysql ${*:1} \
+PYTHON=""
+PYTHON="python3.6"
+PYTHON="python3"
+PYTHON="/home/user/pypy3.5-5.9-beta-linux_x86_64-portable/bin/pypy"
+
+CH_MYSQL="/usr/bin/clickhouse-mysql"
+CH_MYSQL="-m clickhouse_mysql.main"
+
+$PYTHON $CH_MYSQL ${*:1} \
     --src-resume \
     --src-wait \
     --src-host=127.0.0.1 \
diff --git a/setup.py b/setup.py
index 6c90a3f..efd832b 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,11 @@
     keywords='clickhouse mysql data migration',
 
     # list of packages to be included into project
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
+    packages=find_packages(exclude=[
+        'contrib',
+        'docs',
+        'tests',
+    ]),
 
     # run-time dependencies
     # these will be installed by pip
@@ -60,6 +64,7 @@
     # cross-platform support for pip to create the appropriate form of executable
     entry_points={
         'console_scripts': [
+            # executable name=what to call
             'clickhouse-mysql=clickhouse_mysql:main',
         ],
     },