diff --git a/MANIFEST.in b/MANIFEST.in
index 2ea29c0..d2dd0c9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include COPYING MANIFEST MANIFEST.in README.md trimage
+include COPYING MANIFEST MANIFEST.in README.md bin/trimage
 recursive-include desktop *.svg *.desktop
-recursive-include src/ *.py *.png
+recursive-include trimage/ *.py *.png
diff --git a/trimage b/bin/trimage
similarity index 100%
rename from trimage
rename to bin/trimage
diff --git a/setup.py b/setup.py
index c916921..abb3796 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 win=(sys.platform == "win32")
 if win:
   import py2exe
-  sys.path.append("src/trimage")
+  sys.path.append("trimage")
 
 from distutils.core import setup
 
@@ -15,19 +15,18 @@ setup(name = "trimage",
     author_email = "help@trimage.org",
     url = "http://trimage.org",
     license = "MIT license",
-    package_dir = {'trimage' : 'src/trimage'},
     packages = ["trimage",
               "trimage.ThreadPool"],
     package_data = {"trimage" : ["pixmaps/*.*"] },
     data_files=[('share/icons/hicolor/scalable/apps', ['desktop/trimage.svg']),
             ('share/applications', ['desktop/trimage.desktop']),
             ('share/man/man1', ['doc/trimage.1'])],
-    scripts = ["trimage"],
+    scripts = ["bin/trimage"],
     long_description = """Trimage is a cross-platform GUI and command-line interface to optimize image files via optipng, advpng and jpegoptim, depending on the filetype (currently, PNG and JPG files are supported). It was inspired by imageoptim. All image files are losslessy compressed on the highest available compression levels. Trimage gives you various input functions to fit your own workflow: A regular file dialog, dragging and dropping and various command line options.""",
     requires = ["PyQt5"],
 
     #for py2exe
-    windows=[r'src\trimage\trimage.py'],
+    windows=[r'trimage\trimage.py'],
     zipfile=None,
     options={"py2exe":{
         "optimize":2,
diff --git a/src/trimage/ThreadPool/ThreadPool.py b/trimage/ThreadPool/ThreadPool.py
similarity index 100%
rename from src/trimage/ThreadPool/ThreadPool.py
rename to trimage/ThreadPool/ThreadPool.py
diff --git a/src/trimage/ThreadPool/__init__.py b/trimage/ThreadPool/__init__.py
similarity index 100%
rename from src/trimage/ThreadPool/__init__.py
rename to trimage/ThreadPool/__init__.py
diff --git a/src/trimage/__init__.py b/trimage/__init__.py
similarity index 100%
rename from src/trimage/__init__.py
rename to trimage/__init__.py
diff --git a/src/trimage/pixmaps/compressing.gif b/trimage/pixmaps/compressing.gif
similarity index 100%
rename from src/trimage/pixmaps/compressing.gif
rename to trimage/pixmaps/compressing.gif
diff --git a/src/trimage/pixmaps/list-add.png b/trimage/pixmaps/list-add.png
similarity index 100%
rename from src/trimage/pixmaps/list-add.png
rename to trimage/pixmaps/list-add.png
diff --git a/src/trimage/pixmaps/trimage-icon.png b/trimage/pixmaps/trimage-icon.png
similarity index 100%
rename from src/trimage/pixmaps/trimage-icon.png
rename to trimage/pixmaps/trimage-icon.png
diff --git a/src/trimage/pixmaps/view-refresh.png b/trimage/pixmaps/view-refresh.png
similarity index 100%
rename from src/trimage/pixmaps/view-refresh.png
rename to trimage/pixmaps/view-refresh.png
diff --git a/src/trimage/tools.py b/trimage/tools.py
similarity index 100%
rename from src/trimage/tools.py
rename to trimage/tools.py
diff --git a/src/trimage/trimage.py b/trimage/trimage.py
similarity index 100%
rename from src/trimage/trimage.py
rename to trimage/trimage.py
diff --git a/src/trimage/ui.py b/trimage/ui.py
similarity index 100%
rename from src/trimage/ui.py
rename to trimage/ui.py