diff --git a/tools/__init__.py b/pelican/tools/__init__.py
similarity index 100%
rename from tools/__init__.py
rename to pelican/tools/__init__.py
diff --git a/tools/pelican_import.py b/pelican/tools/pelican_import.py
similarity index 100%
rename from tools/pelican_import.py
rename to pelican/tools/pelican_import.py
diff --git a/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
similarity index 100%
rename from tools/pelican_quickstart.py
rename to pelican/tools/pelican_quickstart.py
diff --git a/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
similarity index 100%
rename from tools/pelican_themes.py
rename to pelican/tools/pelican_themes.py
diff --git a/setup.py b/setup.py
index d26ad5f4..1f75131b 100755
--- a/setup.py
+++ b/setup.py
@@ -13,9 +13,9 @@ except ImportError:
 entry_points = {
     'console_scripts': [
         'pelican = pelican:main',
-        'pelican-import = tools.pelican_import:main',
-        'pelican-quickstart = tools.pelican_quickstart:main',
-        'pelican-themes = tools.pelican_themes:main'
+        'pelican-import = pelican.tools.pelican_import:main',
+        'pelican-quickstart = pelican.tools.pelican_quickstart:main',
+        'pelican-themes = pelican.tools.pelican_themes:main'
    ]     
 }
 
@@ -27,7 +27,7 @@ setup(
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog from reStructuredText or Markdown input files.",
     long_description=open('README.rst').read(),
-    packages = ['pelican'],
+    packages = ['pelican', 'pelican.tools'],
     include_package_data = True,
     install_requires = requires,
     entry_points = entry_points,