diff --git a/src/libprs500/trac/Changelog.py b/src/libprs500/trac/plugins/Changelog.py
similarity index 100%
rename from src/libprs500/trac/Changelog.py
rename to src/libprs500/trac/plugins/Changelog.py
diff --git a/src/libprs500/trac/download/__init__.py b/src/libprs500/trac/plugins/__init__.py
similarity index 94%
rename from src/libprs500/trac/download/__init__.py
rename to src/libprs500/trac/plugins/__init__.py
index b7d93c9623..51203cc1c6 100644
--- a/src/libprs500/trac/download/__init__.py
+++ b/src/libprs500/trac/plugins/__init__.py
@@ -13,4 +13,5 @@
 ##    with this program; if not, write to the Free Software Foundation, Inc.,
 ##    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from download import *
\ No newline at end of file
+from download import *
+from Changelog import *
\ No newline at end of file
diff --git a/src/libprs500/trac/download/download.py b/src/libprs500/trac/plugins/download.py
similarity index 100%
rename from src/libprs500/trac/download/download.py
rename to src/libprs500/trac/plugins/download.py
diff --git a/src/libprs500/trac/download/htdocs/images/debian_logo.png b/src/libprs500/trac/plugins/htdocs/images/debian_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/debian_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/debian_logo.png
diff --git a/src/libprs500/trac/download/htdocs/images/fedora_logo.png b/src/libprs500/trac/plugins/htdocs/images/fedora_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/fedora_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/fedora_logo.png
diff --git a/src/libprs500/trac/download/htdocs/images/gentoo_logo.png b/src/libprs500/trac/plugins/htdocs/images/gentoo_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/gentoo_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/gentoo_logo.png
diff --git a/src/libprs500/trac/download/htdocs/images/linux_logo.png b/src/libprs500/trac/plugins/htdocs/images/linux_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/linux_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/linux_logo.png
diff --git a/src/libprs500/trac/download/htdocs/images/osx_logo.png b/src/libprs500/trac/plugins/htdocs/images/osx_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/osx_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/osx_logo.png
diff --git a/src/libprs500/trac/download/htdocs/images/ubuntu_logo.png b/src/libprs500/trac/plugins/htdocs/images/ubuntu_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/ubuntu_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/ubuntu_logo.png
diff --git a/src/libprs500/trac/download/htdocs/images/windows_logo.png b/src/libprs500/trac/plugins/htdocs/images/windows_logo.png
similarity index 100%
rename from src/libprs500/trac/download/htdocs/images/windows_logo.png
rename to src/libprs500/trac/plugins/htdocs/images/windows_logo.png
diff --git a/src/libprs500/trac/download/htdocs/stylesheet/download.css b/src/libprs500/trac/plugins/htdocs/stylesheet/download.css
similarity index 100%
rename from src/libprs500/trac/download/htdocs/stylesheet/download.css
rename to src/libprs500/trac/plugins/htdocs/stylesheet/download.css
diff --git a/src/libprs500/trac/download/templates/binary.html b/src/libprs500/trac/plugins/templates/binary.html
similarity index 100%
rename from src/libprs500/trac/download/templates/binary.html
rename to src/libprs500/trac/plugins/templates/binary.html
diff --git a/src/libprs500/trac/download/templates/distro.html b/src/libprs500/trac/plugins/templates/distro.html
similarity index 100%
rename from src/libprs500/trac/download/templates/distro.html
rename to src/libprs500/trac/plugins/templates/distro.html
diff --git a/src/libprs500/trac/download/templates/download.html b/src/libprs500/trac/plugins/templates/download.html
similarity index 100%
rename from src/libprs500/trac/download/templates/download.html
rename to src/libprs500/trac/plugins/templates/download.html
diff --git a/src/libprs500/trac/setup.py b/src/libprs500/trac/setup.py
index bc00fd6654..cb177825cd 100644
--- a/src/libprs500/trac/setup.py
+++ b/src/libprs500/trac/setup.py
@@ -23,9 +23,10 @@ setup(
     packages=find_packages(exclude=['*.tests*']),
     entry_points = """
         [trac.plugins]
-        download = libprs500.trac.download
+        download = plugins.download
+        changelog = plugins.Changelog
     """,
-    package_data={'download': ['templates/*.html',
+    package_data={'plugins': ['templates/*.html',
                                'htdocs/css/*.css', 
                                'htdocs/images/*']},
 )