diff --git a/diceware.py b/diceware.py
index 9a313d27447cf153fd9d63e0b2caf3dd1bde247b..927e7451b9a4cc2062a429c0ec35e6c11d18cf56 100644
--- a/diceware.py
+++ b/diceware.py
@@ -62,7 +62,8 @@ def get_wordlist_path(lang):
     if not RE_LANG_CODE.match(lang):
         raise ValueError("Not a valid language code: %s" % lang)
     basename = 'wordlist_%s.txt' % lang
-    return os.path.abspath(os.path.join(SRC_DIR, basename.lower()))
+    return os.path.abspath(os.path.join(
+        SRC_DIR, 'wordlists', basename.lower()))
 
 
 def insert_special_char(word, specials=SPECIAL_CHARS, rnd=None):
diff --git a/setup.cfg b/setup.cfg
index d5c22a0d399e15063bfcede302ea3ecc05fb4553..dd70e163764ae6f9f900711711610b208a8213dc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,4 +6,4 @@ docs = develop easy_install diceware[docs]
 [pytest]
 addopts = --doctest-modules
           --doctest-glob='*.rst'
-          tests docs README.rst diceware
+          tests docs README.rst diceware.py
diff --git a/setup.py b/setup.py
index 606f8a1b84539a571f515673873b37ba0dec58a8..d0f87269489d7ffab79e0712ba7f95341fe88af5 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
     license="GPL 3.0",
     keywords="diceware password passphrase",
     url="https://github.com/ulif/diceware/",
-    packages=['diceware'],
+    packages=[],
     package_data={
         'diceware': ['*.txt', '*.asc'],
         },
@@ -76,7 +76,7 @@ setup(
     cmdclass={'test': PyTest},
     entry_points={
         'console_scripts': [
-            'diceware = diceware.diceware:main',
+            'diceware = diceware:main',
         ]
         }
 )
diff --git a/tests/test_diceware.py b/tests/test_diceware.py
index 15d9232281414b88c62a78ef39cee5e33111653e..b45d3e5340cd39d06efc8d488aa5d4ea3ede1275 100644
--- a/tests/test_diceware.py
+++ b/tests/test_diceware.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 import sys
-from diceware.diceware import (
+from diceware import (
     SRC_DIR, RE_LANG_CODE, SPECIAL_CHARS, get_wordlist, get_wordlist_path,
     insert_special_char, get_passphrase, handle_options, main,
     )
@@ -33,7 +33,7 @@ class Test_GetWordList(object):
 
     def test_get_wordlist_en(self):
         # we can get a list of words out of english wordlist.
-        en_src = os.path.join(SRC_DIR, 'wordlist_en.txt')
+        en_src = os.path.join(SRC_DIR, 'wordlists', 'wordlist_en.txt')
         en_result = get_wordlist(en_src)
         assert en_result[0] == 'a'
         assert en_result[-1] == '@'