diff --git a/MANIFEST.in b/MANIFEST.in
index 01f64745763817462b9d7d5f2498c84f7451d5bc..737f5b74088cd3182347d1ac00bf6346e68921a3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-recursive-include tinydtls *.h LICENSE ABOUT.md configure.ac CONTRIBUTING.md README Makefile.in doc/Doxyfile.in
-include dtls.pyx LICENSE
+recursive-include DTLSSocket/tinydtls *.h LICENSE ABOUT.md configure.ac CONTRIBUTING.md README Makefile.in doc/Doxyfile.in
+include DTLSSocket/dtls.pyx LICENSE
diff --git a/setup.py b/setup.py
index 6b7983af2b60ce4df75803c38e89c01615598578..e4db61cbfdd838e9673f77aab682db89a45a1867 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ setup(
     author      = "Jannis Konrad",
     author_email= "Jannis.Konrad@h-brs.de",
     url         = "https://git.fslab.de/jkonra2m/tinydtls-cython",
-    py_modules  = [ "DTLSSocket", ],
+    py_modules  = [ "DTLSSocket.DTLSSocket"],
     cmdclass    = {"build_ext": prepare_tinydtls},
     ext_modules = cy_build,
     )