diff --git a/src/calibre/ebooks/pdf/manipulate.py b/src/calibre/ebooks/pdf/manipulate/cli.py
similarity index 95%
rename from src/calibre/ebooks/pdf/manipulate.py
rename to src/calibre/ebooks/pdf/manipulate/cli.py
index 8c49650730..e82946f2ea 100644
--- a/src/calibre/ebooks/pdf/manipulate.py
+++ b/src/calibre/ebooks/pdf/manipulate/cli.py
@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import string, sys
 
 from calibre.utils.config import Config, StringConfig
-from calibre.ebooks.pdf import info, merge, reverse, split, trim
+from calibre.ebooks.pdf.manipulate import info, merge, reverse, split, trim
 
 COMMANDS = {
              'info'    : info,
diff --git a/src/calibre/ebooks/pdf/info.py b/src/calibre/ebooks/pdf/manipulate/info.py
similarity index 100%
rename from src/calibre/ebooks/pdf/info.py
rename to src/calibre/ebooks/pdf/manipulate/info.py
diff --git a/src/calibre/ebooks/pdf/merge.py b/src/calibre/ebooks/pdf/manipulate/merge.py
similarity index 100%
rename from src/calibre/ebooks/pdf/merge.py
rename to src/calibre/ebooks/pdf/manipulate/merge.py
diff --git a/src/calibre/ebooks/pdf/reverse.py b/src/calibre/ebooks/pdf/manipulate/reverse.py
similarity index 100%
rename from src/calibre/ebooks/pdf/reverse.py
rename to src/calibre/ebooks/pdf/manipulate/reverse.py
diff --git a/src/calibre/ebooks/pdf/split.py b/src/calibre/ebooks/pdf/manipulate/split.py
similarity index 100%
rename from src/calibre/ebooks/pdf/split.py
rename to src/calibre/ebooks/pdf/manipulate/split.py
diff --git a/src/calibre/ebooks/pdf/trim.py b/src/calibre/ebooks/pdf/manipulate/trim.py
similarity index 100%
rename from src/calibre/ebooks/pdf/trim.py
rename to src/calibre/ebooks/pdf/manipulate/trim.py
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index b680ecc304..592a25c170 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -39,7 +39,7 @@ entry_points = {
              'calibre-fontconfig = calibre.utils.fontconfig:main',
              'calibre-parallel   = calibre.parallel:main',
              'calibre-customize  = calibre.customize.ui:main',
-             'pdfmanipulate      = calibre.ebooks.pdf.manipulate:main',
+             'pdfmanipulate      = calibre.ebooks.pdf.manipulate.cli:main',
              'fetch-ebook-metadata = calibre.ebooks.metadata.fetch:main',
              'calibre-smtp = calibre.utils.smtp:main',
         ],