diff --git a/.travis.yml b/.travis.yml
index a4a21d2c..3a27f459 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_script:
     - flake8 . --count --ignore=E3 --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 #    - twistedchecker --pep8=y -d W9001,W9002 cowrie twisted.plugins
 #   Twistedchecker has some version issues, disable for now
-script: PYTHONPATH=${TRAVIS_BUILD_DIR} trial cowrie
+script: PYTHONPATH=${TRAVIS_BUILD_DIR}/src trial cowrie
 notifications:
   email: false
   slack:
diff --git a/bin/cowrie b/bin/cowrie
index c008856d..3a13f3ff 100755
--- a/bin/cowrie
+++ b/bin/cowrie
@@ -161,7 +161,7 @@ fi
 
 find_cowrie_directory $0
 cd ${COWRIEDIR}
-export PYTHONPATH=${PYTHONPATH}:${COWRIEDIR}
+export PYTHONPATH=${PYTHONPATH}:${COWRIEDIR}/src
 PIDFILE=var/run/cowrie.pid
 set -e
 
diff --git a/cowrie/__init__.py b/src/cowrie/__init__.py
similarity index 100%
rename from cowrie/__init__.py
rename to src/cowrie/__init__.py
diff --git a/cowrie/commands/__init__.py b/src/cowrie/commands/__init__.py
similarity index 100%
rename from cowrie/commands/__init__.py
rename to src/cowrie/commands/__init__.py
diff --git a/cowrie/commands/adduser.py b/src/cowrie/commands/adduser.py
similarity index 100%
rename from cowrie/commands/adduser.py
rename to src/cowrie/commands/adduser.py
diff --git a/cowrie/commands/apt.py b/src/cowrie/commands/apt.py
similarity index 100%
rename from cowrie/commands/apt.py
rename to src/cowrie/commands/apt.py
diff --git a/cowrie/commands/base.py b/src/cowrie/commands/base.py
similarity index 100%
rename from cowrie/commands/base.py
rename to src/cowrie/commands/base.py
diff --git a/cowrie/commands/base64.py b/src/cowrie/commands/base64.py
similarity index 100%
rename from cowrie/commands/base64.py
rename to src/cowrie/commands/base64.py
diff --git a/cowrie/commands/busybox.py b/src/cowrie/commands/busybox.py
similarity index 100%
rename from cowrie/commands/busybox.py
rename to src/cowrie/commands/busybox.py
diff --git a/cowrie/commands/cat.py b/src/cowrie/commands/cat.py
similarity index 100%
rename from cowrie/commands/cat.py
rename to src/cowrie/commands/cat.py
diff --git a/cowrie/commands/curl.py b/src/cowrie/commands/curl.py
similarity index 100%
rename from cowrie/commands/curl.py
rename to src/cowrie/commands/curl.py
diff --git a/cowrie/commands/dd.py b/src/cowrie/commands/dd.py
similarity index 100%
rename from cowrie/commands/dd.py
rename to src/cowrie/commands/dd.py
diff --git a/cowrie/commands/du.py b/src/cowrie/commands/du.py
similarity index 100%
rename from cowrie/commands/du.py
rename to src/cowrie/commands/du.py
diff --git a/cowrie/commands/env.py b/src/cowrie/commands/env.py
similarity index 100%
rename from cowrie/commands/env.py
rename to src/cowrie/commands/env.py
diff --git a/cowrie/commands/ethtool.py b/src/cowrie/commands/ethtool.py
similarity index 100%
rename from cowrie/commands/ethtool.py
rename to src/cowrie/commands/ethtool.py
diff --git a/cowrie/commands/free.py b/src/cowrie/commands/free.py
similarity index 100%
rename from cowrie/commands/free.py
rename to src/cowrie/commands/free.py
diff --git a/cowrie/commands/fs.py b/src/cowrie/commands/fs.py
similarity index 100%
rename from cowrie/commands/fs.py
rename to src/cowrie/commands/fs.py
diff --git a/cowrie/commands/ftpget.py b/src/cowrie/commands/ftpget.py
similarity index 100%
rename from cowrie/commands/ftpget.py
rename to src/cowrie/commands/ftpget.py
diff --git a/cowrie/commands/gcc.py b/src/cowrie/commands/gcc.py
similarity index 100%
rename from cowrie/commands/gcc.py
rename to src/cowrie/commands/gcc.py
diff --git a/cowrie/commands/ifconfig.py b/src/cowrie/commands/ifconfig.py
similarity index 100%
rename from cowrie/commands/ifconfig.py
rename to src/cowrie/commands/ifconfig.py
diff --git a/cowrie/commands/iptables.py b/src/cowrie/commands/iptables.py
similarity index 100%
rename from cowrie/commands/iptables.py
rename to src/cowrie/commands/iptables.py
diff --git a/cowrie/commands/last.py b/src/cowrie/commands/last.py
similarity index 100%
rename from cowrie/commands/last.py
rename to src/cowrie/commands/last.py
diff --git a/cowrie/commands/ls.py b/src/cowrie/commands/ls.py
similarity index 100%
rename from cowrie/commands/ls.py
rename to src/cowrie/commands/ls.py
diff --git a/cowrie/commands/nc.py b/src/cowrie/commands/nc.py
similarity index 100%
rename from cowrie/commands/nc.py
rename to src/cowrie/commands/nc.py
diff --git a/cowrie/commands/netstat.py b/src/cowrie/commands/netstat.py
similarity index 100%
rename from cowrie/commands/netstat.py
rename to src/cowrie/commands/netstat.py
diff --git a/cowrie/commands/nohup.py b/src/cowrie/commands/nohup.py
similarity index 100%
rename from cowrie/commands/nohup.py
rename to src/cowrie/commands/nohup.py
diff --git a/cowrie/commands/perl.py b/src/cowrie/commands/perl.py
similarity index 100%
rename from cowrie/commands/perl.py
rename to src/cowrie/commands/perl.py
diff --git a/cowrie/commands/ping.py b/src/cowrie/commands/ping.py
similarity index 100%
rename from cowrie/commands/ping.py
rename to src/cowrie/commands/ping.py
diff --git a/cowrie/commands/python.py b/src/cowrie/commands/python.py
similarity index 100%
rename from cowrie/commands/python.py
rename to src/cowrie/commands/python.py
diff --git a/cowrie/commands/scp.py b/src/cowrie/commands/scp.py
similarity index 100%
rename from cowrie/commands/scp.py
rename to src/cowrie/commands/scp.py
diff --git a/cowrie/commands/service.py b/src/cowrie/commands/service.py
similarity index 100%
rename from cowrie/commands/service.py
rename to src/cowrie/commands/service.py
diff --git a/cowrie/commands/sleep.py b/src/cowrie/commands/sleep.py
similarity index 100%
rename from cowrie/commands/sleep.py
rename to src/cowrie/commands/sleep.py
diff --git a/cowrie/commands/ssh.py b/src/cowrie/commands/ssh.py
similarity index 100%
rename from cowrie/commands/ssh.py
rename to src/cowrie/commands/ssh.py
diff --git a/cowrie/commands/sudo.py b/src/cowrie/commands/sudo.py
similarity index 100%
rename from cowrie/commands/sudo.py
rename to src/cowrie/commands/sudo.py
diff --git a/cowrie/commands/tar.py b/src/cowrie/commands/tar.py
similarity index 100%
rename from cowrie/commands/tar.py
rename to src/cowrie/commands/tar.py
diff --git a/cowrie/commands/tftp.py b/src/cowrie/commands/tftp.py
similarity index 100%
rename from cowrie/commands/tftp.py
rename to src/cowrie/commands/tftp.py
diff --git a/cowrie/commands/ulimit.py b/src/cowrie/commands/ulimit.py
similarity index 100%
rename from cowrie/commands/ulimit.py
rename to src/cowrie/commands/ulimit.py
diff --git a/cowrie/commands/uname.py b/src/cowrie/commands/uname.py
similarity index 100%
rename from cowrie/commands/uname.py
rename to src/cowrie/commands/uname.py
diff --git a/cowrie/commands/uptime.py b/src/cowrie/commands/uptime.py
similarity index 100%
rename from cowrie/commands/uptime.py
rename to src/cowrie/commands/uptime.py
diff --git a/cowrie/commands/wget.py b/src/cowrie/commands/wget.py
similarity index 100%
rename from cowrie/commands/wget.py
rename to src/cowrie/commands/wget.py
diff --git a/cowrie/commands/which.py b/src/cowrie/commands/which.py
similarity index 100%
rename from cowrie/commands/which.py
rename to src/cowrie/commands/which.py
diff --git a/cowrie/core/__init__.py b/src/cowrie/core/__init__.py
similarity index 100%
rename from cowrie/core/__init__.py
rename to src/cowrie/core/__init__.py
diff --git a/cowrie/core/artifact.py b/src/cowrie/core/artifact.py
similarity index 100%
rename from cowrie/core/artifact.py
rename to src/cowrie/core/artifact.py
diff --git a/cowrie/core/auth.py b/src/cowrie/core/auth.py
similarity index 100%
rename from cowrie/core/auth.py
rename to src/cowrie/core/auth.py
diff --git a/cowrie/core/cef.py b/src/cowrie/core/cef.py
similarity index 100%
rename from cowrie/core/cef.py
rename to src/cowrie/core/cef.py
diff --git a/cowrie/core/checkers.py b/src/cowrie/core/checkers.py
similarity index 100%
rename from cowrie/core/checkers.py
rename to src/cowrie/core/checkers.py
diff --git a/cowrie/core/config.py b/src/cowrie/core/config.py
similarity index 100%
rename from cowrie/core/config.py
rename to src/cowrie/core/config.py
diff --git a/cowrie/core/credentials.py b/src/cowrie/core/credentials.py
similarity index 100%
rename from cowrie/core/credentials.py
rename to src/cowrie/core/credentials.py
diff --git a/cowrie/core/dblog.py b/src/cowrie/core/dblog.py
similarity index 100%
rename from cowrie/core/dblog.py
rename to src/cowrie/core/dblog.py
diff --git a/cowrie/core/output.py b/src/cowrie/core/output.py
similarity index 100%
rename from cowrie/core/output.py
rename to src/cowrie/core/output.py
diff --git a/cowrie/core/realm.py b/src/cowrie/core/realm.py
similarity index 100%
rename from cowrie/core/realm.py
rename to src/cowrie/core/realm.py
diff --git a/cowrie/core/ttylog.py b/src/cowrie/core/ttylog.py
similarity index 100%
rename from cowrie/core/ttylog.py
rename to src/cowrie/core/ttylog.py
diff --git a/cowrie/core/utils.py b/src/cowrie/core/utils.py
similarity index 100%
rename from cowrie/core/utils.py
rename to src/cowrie/core/utils.py
diff --git a/cowrie/dblog/__init__.py b/src/cowrie/dblog/__init__.py
similarity index 100%
rename from cowrie/dblog/__init__.py
rename to src/cowrie/dblog/__init__.py
diff --git a/cowrie/dblog/xmpp.py b/src/cowrie/dblog/xmpp.py
similarity index 100%
rename from cowrie/dblog/xmpp.py
rename to src/cowrie/dblog/xmpp.py
diff --git a/cowrie/insults/__init__.py b/src/cowrie/insults/__init__.py
similarity index 100%
rename from cowrie/insults/__init__.py
rename to src/cowrie/insults/__init__.py
diff --git a/cowrie/insults/insults.py b/src/cowrie/insults/insults.py
similarity index 100%
rename from cowrie/insults/insults.py
rename to src/cowrie/insults/insults.py
diff --git a/cowrie/output/README.md b/src/cowrie/output/README.md
similarity index 100%
rename from cowrie/output/README.md
rename to src/cowrie/output/README.md
diff --git a/cowrie/output/__init__.py b/src/cowrie/output/__init__.py
similarity index 100%
rename from cowrie/output/__init__.py
rename to src/cowrie/output/__init__.py
diff --git a/cowrie/output/csirtg.py b/src/cowrie/output/csirtg.py
similarity index 100%
rename from cowrie/output/csirtg.py
rename to src/cowrie/output/csirtg.py
diff --git a/cowrie/output/cuckoo.py b/src/cowrie/output/cuckoo.py
similarity index 100%
rename from cowrie/output/cuckoo.py
rename to src/cowrie/output/cuckoo.py
diff --git a/cowrie/output/dshield.py b/src/cowrie/output/dshield.py
similarity index 100%
rename from cowrie/output/dshield.py
rename to src/cowrie/output/dshield.py
diff --git a/cowrie/output/elasticsearch.py b/src/cowrie/output/elasticsearch.py
similarity index 100%
rename from cowrie/output/elasticsearch.py
rename to src/cowrie/output/elasticsearch.py
diff --git a/cowrie/output/hpfeeds.py b/src/cowrie/output/hpfeeds.py
similarity index 100%
rename from cowrie/output/hpfeeds.py
rename to src/cowrie/output/hpfeeds.py
diff --git a/cowrie/output/hpfeeds3.py b/src/cowrie/output/hpfeeds3.py
similarity index 100%
rename from cowrie/output/hpfeeds3.py
rename to src/cowrie/output/hpfeeds3.py
diff --git a/cowrie/output/influx.py b/src/cowrie/output/influx.py
similarity index 100%
rename from cowrie/output/influx.py
rename to src/cowrie/output/influx.py
diff --git a/cowrie/output/jsonlog.py b/src/cowrie/output/jsonlog.py
similarity index 100%
rename from cowrie/output/jsonlog.py
rename to src/cowrie/output/jsonlog.py
diff --git a/cowrie/output/kafka.py b/src/cowrie/output/kafka.py
similarity index 100%
rename from cowrie/output/kafka.py
rename to src/cowrie/output/kafka.py
diff --git a/cowrie/output/localsyslog.py b/src/cowrie/output/localsyslog.py
similarity index 100%
rename from cowrie/output/localsyslog.py
rename to src/cowrie/output/localsyslog.py
diff --git a/cowrie/output/malshare.py b/src/cowrie/output/malshare.py
similarity index 100%
rename from cowrie/output/malshare.py
rename to src/cowrie/output/malshare.py
diff --git a/cowrie/output/mongodb.py b/src/cowrie/output/mongodb.py
similarity index 100%
rename from cowrie/output/mongodb.py
rename to src/cowrie/output/mongodb.py
diff --git a/cowrie/output/mysql.py b/src/cowrie/output/mysql.py
similarity index 100%
rename from cowrie/output/mysql.py
rename to src/cowrie/output/mysql.py
diff --git a/cowrie/output/redis.py b/src/cowrie/output/redis.py
similarity index 100%
rename from cowrie/output/redis.py
rename to src/cowrie/output/redis.py
diff --git a/cowrie/output/rethinkdblog.py b/src/cowrie/output/rethinkdblog.py
similarity index 100%
rename from cowrie/output/rethinkdblog.py
rename to src/cowrie/output/rethinkdblog.py
diff --git a/cowrie/output/s3.py b/src/cowrie/output/s3.py
similarity index 100%
rename from cowrie/output/s3.py
rename to src/cowrie/output/s3.py
diff --git a/cowrie/output/slack.py b/src/cowrie/output/slack.py
similarity index 100%
rename from cowrie/output/slack.py
rename to src/cowrie/output/slack.py
diff --git a/cowrie/output/socketlog.py b/src/cowrie/output/socketlog.py
similarity index 100%
rename from cowrie/output/socketlog.py
rename to src/cowrie/output/socketlog.py
diff --git a/cowrie/output/splunk.py b/src/cowrie/output/splunk.py
similarity index 100%
rename from cowrie/output/splunk.py
rename to src/cowrie/output/splunk.py
diff --git a/cowrie/output/splunklegacy.py b/src/cowrie/output/splunklegacy.py
similarity index 100%
rename from cowrie/output/splunklegacy.py
rename to src/cowrie/output/splunklegacy.py
diff --git a/cowrie/output/sqlite.py b/src/cowrie/output/sqlite.py
similarity index 100%
rename from cowrie/output/sqlite.py
rename to src/cowrie/output/sqlite.py
diff --git a/cowrie/output/textlog.py b/src/cowrie/output/textlog.py
similarity index 100%
rename from cowrie/output/textlog.py
rename to src/cowrie/output/textlog.py
diff --git a/cowrie/output/virustotal.py b/src/cowrie/output/virustotal.py
similarity index 100%
rename from cowrie/output/virustotal.py
rename to src/cowrie/output/virustotal.py
diff --git a/cowrie/output/xmpp.py b/src/cowrie/output/xmpp.py
similarity index 100%
rename from cowrie/output/xmpp.py
rename to src/cowrie/output/xmpp.py
diff --git a/cowrie/proxy/__init__.py b/src/cowrie/proxy/__init__.py
similarity index 100%
rename from cowrie/proxy/__init__.py
rename to src/cowrie/proxy/__init__.py
diff --git a/cowrie/proxy/avatar.py b/src/cowrie/proxy/avatar.py
similarity index 100%
rename from cowrie/proxy/avatar.py
rename to src/cowrie/proxy/avatar.py
diff --git a/cowrie/proxy/endpoints.py b/src/cowrie/proxy/endpoints.py
similarity index 100%
rename from cowrie/proxy/endpoints.py
rename to src/cowrie/proxy/endpoints.py
diff --git a/cowrie/proxy/server.py b/src/cowrie/proxy/server.py
similarity index 100%
rename from cowrie/proxy/server.py
rename to src/cowrie/proxy/server.py
diff --git a/cowrie/proxy/session.py b/src/cowrie/proxy/session.py
similarity index 100%
rename from cowrie/proxy/session.py
rename to src/cowrie/proxy/session.py
diff --git a/cowrie/python/__init__.py b/src/cowrie/python/__init__.py
similarity index 100%
rename from cowrie/python/__init__.py
rename to src/cowrie/python/__init__.py
diff --git a/cowrie/python/logfile.py b/src/cowrie/python/logfile.py
similarity index 100%
rename from cowrie/python/logfile.py
rename to src/cowrie/python/logfile.py
diff --git a/cowrie/shell/__init__.py b/src/cowrie/shell/__init__.py
similarity index 100%
rename from cowrie/shell/__init__.py
rename to src/cowrie/shell/__init__.py
diff --git a/cowrie/shell/avatar.py b/src/cowrie/shell/avatar.py
similarity index 100%
rename from cowrie/shell/avatar.py
rename to src/cowrie/shell/avatar.py
diff --git a/cowrie/shell/command.py b/src/cowrie/shell/command.py
similarity index 100%
rename from cowrie/shell/command.py
rename to src/cowrie/shell/command.py
diff --git a/cowrie/shell/customparser.py b/src/cowrie/shell/customparser.py
similarity index 100%
rename from cowrie/shell/customparser.py
rename to src/cowrie/shell/customparser.py
diff --git a/cowrie/shell/filetransfer.py b/src/cowrie/shell/filetransfer.py
similarity index 100%
rename from cowrie/shell/filetransfer.py
rename to src/cowrie/shell/filetransfer.py
diff --git a/cowrie/shell/fs.py b/src/cowrie/shell/fs.py
similarity index 100%
rename from cowrie/shell/fs.py
rename to src/cowrie/shell/fs.py
diff --git a/cowrie/shell/honeypot.py b/src/cowrie/shell/honeypot.py
similarity index 100%
rename from cowrie/shell/honeypot.py
rename to src/cowrie/shell/honeypot.py
diff --git a/cowrie/shell/protocol.py b/src/cowrie/shell/protocol.py
similarity index 100%
rename from cowrie/shell/protocol.py
rename to src/cowrie/shell/protocol.py
diff --git a/cowrie/shell/pwd.py b/src/cowrie/shell/pwd.py
similarity index 100%
rename from cowrie/shell/pwd.py
rename to src/cowrie/shell/pwd.py
diff --git a/cowrie/shell/server.py b/src/cowrie/shell/server.py
similarity index 100%
rename from cowrie/shell/server.py
rename to src/cowrie/shell/server.py
diff --git a/cowrie/shell/session.py b/src/cowrie/shell/session.py
similarity index 100%
rename from cowrie/shell/session.py
rename to src/cowrie/shell/session.py
diff --git a/cowrie/shell/shlex.py b/src/cowrie/shell/shlex.py
similarity index 100%
rename from cowrie/shell/shlex.py
rename to src/cowrie/shell/shlex.py
diff --git a/cowrie/ssh/__init__.py b/src/cowrie/ssh/__init__.py
similarity index 100%
rename from cowrie/ssh/__init__.py
rename to src/cowrie/ssh/__init__.py
diff --git a/cowrie/ssh/channel.py b/src/cowrie/ssh/channel.py
similarity index 100%
rename from cowrie/ssh/channel.py
rename to src/cowrie/ssh/channel.py
diff --git a/cowrie/ssh/connection.py b/src/cowrie/ssh/connection.py
similarity index 100%
rename from cowrie/ssh/connection.py
rename to src/cowrie/ssh/connection.py
diff --git a/cowrie/ssh/factory.py b/src/cowrie/ssh/factory.py
similarity index 100%
rename from cowrie/ssh/factory.py
rename to src/cowrie/ssh/factory.py
diff --git a/cowrie/ssh/forwarding.py b/src/cowrie/ssh/forwarding.py
similarity index 100%
rename from cowrie/ssh/forwarding.py
rename to src/cowrie/ssh/forwarding.py
diff --git a/cowrie/ssh/keys.py b/src/cowrie/ssh/keys.py
similarity index 100%
rename from cowrie/ssh/keys.py
rename to src/cowrie/ssh/keys.py
diff --git a/cowrie/ssh/session.py b/src/cowrie/ssh/session.py
similarity index 100%
rename from cowrie/ssh/session.py
rename to src/cowrie/ssh/session.py
diff --git a/cowrie/ssh/transport.py b/src/cowrie/ssh/transport.py
similarity index 100%
rename from cowrie/ssh/transport.py
rename to src/cowrie/ssh/transport.py
diff --git a/cowrie/ssh/userauth.py b/src/cowrie/ssh/userauth.py
similarity index 100%
rename from cowrie/ssh/userauth.py
rename to src/cowrie/ssh/userauth.py
diff --git a/cowrie/telnet/__init__.py b/src/cowrie/telnet/__init__.py
similarity index 100%
rename from cowrie/telnet/__init__.py
rename to src/cowrie/telnet/__init__.py
diff --git a/cowrie/telnet/session.py b/src/cowrie/telnet/session.py
similarity index 100%
rename from cowrie/telnet/session.py
rename to src/cowrie/telnet/session.py
diff --git a/cowrie/telnet/transport.py b/src/cowrie/telnet/transport.py
similarity index 100%
rename from cowrie/telnet/transport.py
rename to src/cowrie/telnet/transport.py
diff --git a/cowrie/test/__init__.py b/src/cowrie/test/__init__.py
similarity index 100%
rename from cowrie/test/__init__.py
rename to src/cowrie/test/__init__.py
diff --git a/cowrie/test/fake_server.py b/src/cowrie/test/fake_server.py
similarity index 100%
rename from cowrie/test/fake_server.py
rename to src/cowrie/test/fake_server.py
diff --git a/cowrie/test/fake_transport.py b/src/cowrie/test/fake_transport.py
similarity index 100%
rename from cowrie/test/fake_transport.py
rename to src/cowrie/test/fake_transport.py
diff --git a/cowrie/test/test_base_commands.py b/src/cowrie/test/test_base_commands.py
similarity index 100%
rename from cowrie/test/test_base_commands.py
rename to src/cowrie/test/test_base_commands.py
diff --git a/cowrie/test/test_echo.py b/src/cowrie/test/test_echo.py
similarity index 100%
rename from cowrie/test/test_echo.py
rename to src/cowrie/test/test_echo.py
diff --git a/cowrie/test/test_utils.py b/src/cowrie/test/test_utils.py
similarity index 100%
rename from cowrie/test/test_utils.py
rename to src/cowrie/test/test_utils.py
diff --git a/twisted/plugins/cowrie_plugin.py b/src/twisted/plugins/cowrie_plugin.py
similarity index 100%
rename from twisted/plugins/cowrie_plugin.py
rename to src/twisted/plugins/cowrie_plugin.py