diff --git a/.bzrignore b/.bzrignore
index 870b68c4ee..aaacc9f58a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,9 +3,9 @@
 src/calibre/plugins
 resources/images.qrc
 src/calibre/ebooks/oeb/display/test/*.js
-src/calibre/manual/.build/
-src/calibre/manual/cli/
-src/calibre/manual/template_ref.rst
+manual/.build/
+manual/cli/
+manual/template_ref.rst
 build
 dist
 docs
diff --git a/src/calibre/manual/Makefile b/manual/Makefile
similarity index 100%
rename from src/calibre/manual/Makefile
rename to manual/Makefile
diff --git a/src/calibre/manual/conf.py b/manual/conf.py
similarity index 97%
rename from src/calibre/manual/conf.py
rename to manual/conf.py
index b0f2cd4365..7b24f2f50a 100644
--- a/src/calibre/manual/conf.py
+++ b/manual/conf.py
@@ -14,7 +14,7 @@
 import sys, os
 
 # If your extensions are in another directory, add it here.
-sys.path.append(os.path.abspath('../../../'))
+sys.path.append(os.path.abspath('../src'))
 sys.path.append(os.path.abspath('.'))
 __appname__ = os.environ.get('__appname__', 'calibre')
 __version__ = os.environ.get('__version__', '0.0.0')
@@ -98,7 +98,7 @@ html_favicon = 'favicon.ico'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the built-in static files,
 # so a file named "default.css" will overwrite the built-in "default.css".
-html_static_path = ['resources', '../../../icons/favicon.ico']
+html_static_path = ['resources', '../icons/favicon.ico']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/src/calibre/manual/conversion.rst b/manual/conversion.rst
similarity index 100%
rename from src/calibre/manual/conversion.rst
rename to manual/conversion.rst
diff --git a/src/calibre/manual/creating_plugins.rst b/manual/creating_plugins.rst
similarity index 100%
rename from src/calibre/manual/creating_plugins.rst
rename to manual/creating_plugins.rst
diff --git a/src/calibre/manual/custom.py b/manual/custom.py
similarity index 98%
rename from src/calibre/manual/custom.py
rename to manual/custom.py
index bb4f0194db..fdfb5711bb 100644
--- a/src/calibre/manual/custom.py
+++ b/manual/custom.py
@@ -5,9 +5,9 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import sys, os, re, textwrap
 
-sys.path.insert(0, os.path.abspath('../../'))
-sys.extensions_location = '../plugins'
-sys.resources_location  = '../../../resources'
+sys.path.insert(0, os.path.abspath('../src'))
+sys.extensions_location = '../src/calibre/plugins'
+sys.resources_location  = '../resources'
 
 from sphinx.util.console import bold
 
diff --git a/src/calibre/manual/customize.rst b/manual/customize.rst
similarity index 98%
rename from src/calibre/manual/customize.rst
rename to manual/customize.rst
index 80da33356a..e2e2825de6 100644
--- a/src/calibre/manual/customize.rst
+++ b/manual/customize.rst
@@ -39,7 +39,7 @@ Tweaks
 Tweaks are small changes that you can specify to control various aspects of |app|'s behavior. You can change them by going to Preferences->Advanced->Tweaks.
 The default values for the tweaks are reproduced below
 
-.. literalinclude:: ../../../resources/default_tweaks.py
+.. literalinclude:: ../resources/default_tweaks.py
 
 
 Overriding icons, templates, et cetera
diff --git a/src/calibre/manual/develop.rst b/manual/develop.rst
similarity index 100%
rename from src/calibre/manual/develop.rst
rename to manual/develop.rst
diff --git a/src/calibre/manual/epub.py b/manual/epub.py
similarity index 100%
rename from src/calibre/manual/epub.py
rename to manual/epub.py
diff --git a/src/calibre/manual/faq.rst b/manual/faq.rst
similarity index 100%
rename from src/calibre/manual/faq.rst
rename to manual/faq.rst
diff --git a/src/calibre/manual/global.rst b/manual/global.rst
similarity index 100%
rename from src/calibre/manual/global.rst
rename to manual/global.rst
diff --git a/src/calibre/manual/glossary.rst b/manual/glossary.rst
similarity index 100%
rename from src/calibre/manual/glossary.rst
rename to manual/glossary.rst
diff --git a/src/calibre/manual/gui.rst b/manual/gui.rst
similarity index 100%
rename from src/calibre/manual/gui.rst
rename to manual/gui.rst
diff --git a/src/calibre/manual/images/actions.png b/manual/images/actions.png
similarity index 100%
rename from src/calibre/manual/images/actions.png
rename to manual/images/actions.png
diff --git a/src/calibre/manual/images/add_books.png b/manual/images/add_books.png
similarity index 100%
rename from src/calibre/manual/images/add_books.png
rename to manual/images/add_books.png
diff --git a/src/calibre/manual/images/added_books.png b/manual/images/added_books.png
similarity index 100%
rename from src/calibre/manual/images/added_books.png
rename to manual/images/added_books.png
diff --git a/src/calibre/manual/images/auto_author_sort.png b/manual/images/auto_author_sort.png
similarity index 100%
rename from src/calibre/manual/images/auto_author_sort.png
rename to manual/images/auto_author_sort.png
diff --git a/src/calibre/manual/images/bbc_advanced.png b/manual/images/bbc_advanced.png
similarity index 100%
rename from src/calibre/manual/images/bbc_advanced.png
rename to manual/images/bbc_advanced.png
diff --git a/src/calibre/manual/images/bbc_altered.png b/manual/images/bbc_altered.png
similarity index 100%
rename from src/calibre/manual/images/bbc_altered.png
rename to manual/images/bbc_altered.png
diff --git a/src/calibre/manual/images/bbc_altered1.png b/manual/images/bbc_altered1.png
similarity index 100%
rename from src/calibre/manual/images/bbc_altered1.png
rename to manual/images/bbc_altered1.png
diff --git a/src/calibre/manual/images/book_details.png b/manual/images/book_details.png
similarity index 100%
rename from src/calibre/manual/images/book_details.png
rename to manual/images/book_details.png
diff --git a/src/calibre/manual/images/bookmark.png b/manual/images/bookmark.png
similarity index 100%
rename from src/calibre/manual/images/bookmark.png
rename to manual/images/bookmark.png
diff --git a/src/calibre/manual/images/catalogs.png b/manual/images/catalogs.png
similarity index 100%
rename from src/calibre/manual/images/catalogs.png
rename to manual/images/catalogs.png
diff --git a/src/calibre/manual/images/cli.png b/manual/images/cli.png
similarity index 100%
rename from src/calibre/manual/images/cli.png
rename to manual/images/cli.png
diff --git a/src/calibre/manual/images/configuration.png b/manual/images/configuration.png
similarity index 100%
rename from src/calibre/manual/images/configuration.png
rename to manual/images/configuration.png
diff --git a/src/calibre/manual/images/connect_share.png b/manual/images/connect_share.png
similarity index 100%
rename from src/calibre/manual/images/connect_share.png
rename to manual/images/connect_share.png
diff --git a/src/calibre/manual/images/conv_dialog.png b/manual/images/conv_dialog.png
similarity index 100%
rename from src/calibre/manual/images/conv_dialog.png
rename to manual/images/conv_dialog.png
diff --git a/src/calibre/manual/images/convert_ebooks.png b/manual/images/convert_ebooks.png
similarity index 100%
rename from src/calibre/manual/images/convert_ebooks.png
rename to manual/images/convert_ebooks.png
diff --git a/src/calibre/manual/images/custom_news.png b/manual/images/custom_news.png
similarity index 100%
rename from src/calibre/manual/images/custom_news.png
rename to manual/images/custom_news.png
diff --git a/src/calibre/manual/images/debug.png b/manual/images/debug.png
similarity index 100%
rename from src/calibre/manual/images/debug.png
rename to manual/images/debug.png
diff --git a/src/calibre/manual/images/device.png b/manual/images/device.png
similarity index 100%
rename from src/calibre/manual/images/device.png
rename to manual/images/device.png
diff --git a/src/calibre/manual/images/edit_meta_information.png b/manual/images/edit_meta_information.png
similarity index 100%
rename from src/calibre/manual/images/edit_meta_information.png
rename to manual/images/edit_meta_information.png
diff --git a/src/calibre/manual/images/fetch_news.png b/manual/images/fetch_news.png
similarity index 100%
rename from src/calibre/manual/images/fetch_news.png
rename to manual/images/fetch_news.png
diff --git a/src/calibre/manual/images/folder_device.png b/manual/images/folder_device.png
similarity index 100%
rename from src/calibre/manual/images/folder_device.png
rename to manual/images/folder_device.png
diff --git a/src/calibre/manual/images/font_size.png b/manual/images/font_size.png
similarity index 100%
rename from src/calibre/manual/images/font_size.png
rename to manual/images/font_size.png
diff --git a/src/calibre/manual/images/full_screen.png b/manual/images/full_screen.png
similarity index 100%
rename from src/calibre/manual/images/full_screen.png
rename to manual/images/full_screen.png
diff --git a/src/calibre/manual/images/jobs.png b/manual/images/jobs.png
similarity index 100%
rename from src/calibre/manual/images/jobs.png
rename to manual/images/jobs.png
diff --git a/src/calibre/manual/images/library.png b/manual/images/library.png
similarity index 100%
rename from src/calibre/manual/images/library.png
rename to manual/images/library.png
diff --git a/src/calibre/manual/images/nav_pos.png b/manual/images/nav_pos.png
similarity index 100%
rename from src/calibre/manual/images/nav_pos.png
rename to manual/images/nav_pos.png
diff --git a/src/calibre/manual/images/news.png b/manual/images/news.png
similarity index 100%
rename from src/calibre/manual/images/news.png
rename to manual/images/news.png
diff --git a/src/calibre/manual/images/pipeline.pgf b/manual/images/pipeline.pgf
similarity index 100%
rename from src/calibre/manual/images/pipeline.pgf
rename to manual/images/pipeline.pgf
diff --git a/src/calibre/manual/images/pipeline.png b/manual/images/pipeline.png
similarity index 100%
rename from src/calibre/manual/images/pipeline.png
rename to manual/images/pipeline.png
diff --git a/src/calibre/manual/images/pref_button.png b/manual/images/pref_button.png
similarity index 100%
rename from src/calibre/manual/images/pref_button.png
rename to manual/images/pref_button.png
diff --git a/src/calibre/manual/images/preferences.png b/manual/images/preferences.png
similarity index 100%
rename from src/calibre/manual/images/preferences.png
rename to manual/images/preferences.png
diff --git a/src/calibre/manual/images/prev_next.png b/manual/images/prev_next.png
similarity index 100%
rename from src/calibre/manual/images/prev_next.png
rename to manual/images/prev_next.png
diff --git a/src/calibre/manual/images/ref_mode.png b/manual/images/ref_mode.png
similarity index 100%
rename from src/calibre/manual/images/ref_mode.png
rename to manual/images/ref_mode.png
diff --git a/src/calibre/manual/images/ref_mode_button.png b/manual/images/ref_mode_button.png
similarity index 100%
rename from src/calibre/manual/images/ref_mode_button.png
rename to manual/images/ref_mode_button.png
diff --git a/src/calibre/manual/images/remove_books.png b/manual/images/remove_books.png
similarity index 100%
rename from src/calibre/manual/images/remove_books.png
rename to manual/images/remove_books.png
diff --git a/src/calibre/manual/images/save_to_disk.png b/manual/images/save_to_disk.png
similarity index 100%
rename from src/calibre/manual/images/save_to_disk.png
rename to manual/images/save_to_disk.png
diff --git a/src/calibre/manual/images/search.png b/manual/images/search.png
similarity index 100%
rename from src/calibre/manual/images/search.png
rename to manual/images/search.png
diff --git a/src/calibre/manual/images/search_button.png b/manual/images/search_button.png
similarity index 100%
rename from src/calibre/manual/images/search_button.png
rename to manual/images/search_button.png
diff --git a/src/calibre/manual/images/search_sort.png b/manual/images/search_sort.png
similarity index 100%
rename from src/calibre/manual/images/search_sort.png
rename to manual/images/search_sort.png
diff --git a/src/calibre/manual/images/send_to_device.png b/manual/images/send_to_device.png
similarity index 100%
rename from src/calibre/manual/images/send_to_device.png
rename to manual/images/send_to_device.png
diff --git a/src/calibre/manual/images/sg_cc.jpg b/manual/images/sg_cc.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_cc.jpg
rename to manual/images/sg_cc.jpg
diff --git a/src/calibre/manual/images/sg_genre.jpg b/manual/images/sg_genre.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_genre.jpg
rename to manual/images/sg_genre.jpg
diff --git a/src/calibre/manual/images/sg_pref.jpg b/manual/images/sg_pref.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_pref.jpg
rename to manual/images/sg_pref.jpg
diff --git a/src/calibre/manual/images/sg_restrict.jpg b/manual/images/sg_restrict.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_restrict.jpg
rename to manual/images/sg_restrict.jpg
diff --git a/src/calibre/manual/images/sg_restrict2.jpg b/manual/images/sg_restrict2.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_restrict2.jpg
rename to manual/images/sg_restrict2.jpg
diff --git a/src/calibre/manual/images/sg_search.jpg b/manual/images/sg_search.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_search.jpg
rename to manual/images/sg_search.jpg
diff --git a/src/calibre/manual/images/sg_tb.jpg b/manual/images/sg_tb.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_tb.jpg
rename to manual/images/sg_tb.jpg
diff --git a/src/calibre/manual/images/sg_tree.jpg b/manual/images/sg_tree.jpg
similarity index 100%
rename from src/calibre/manual/images/sg_tree.jpg
rename to manual/images/sg_tree.jpg
diff --git a/src/calibre/manual/images/show_tag_editor.png b/manual/images/show_tag_editor.png
similarity index 100%
rename from src/calibre/manual/images/show_tag_editor.png
rename to manual/images/show_tag_editor.png
diff --git a/src/calibre/manual/images/swap_title_author.png b/manual/images/swap_title_author.png
similarity index 100%
rename from src/calibre/manual/images/swap_title_author.png
rename to manual/images/swap_title_author.png
diff --git a/src/calibre/manual/images/tag_browser.png b/manual/images/tag_browser.png
similarity index 100%
rename from src/calibre/manual/images/tag_browser.png
rename to manual/images/tag_browser.png
diff --git a/src/calibre/manual/images/toc.png b/manual/images/toc.png
similarity index 100%
rename from src/calibre/manual/images/toc.png
rename to manual/images/toc.png
diff --git a/src/calibre/manual/images/valid.png b/manual/images/valid.png
similarity index 100%
rename from src/calibre/manual/images/valid.png
rename to manual/images/valid.png
diff --git a/src/calibre/manual/images/view.png b/manual/images/view.png
similarity index 100%
rename from src/calibre/manual/images/view.png
rename to manual/images/view.png
diff --git a/src/calibre/manual/index.rst b/manual/index.rst
similarity index 100%
rename from src/calibre/manual/index.rst
rename to manual/index.rst
diff --git a/src/calibre/manual/metadata.rst b/manual/metadata.rst
similarity index 100%
rename from src/calibre/manual/metadata.rst
rename to manual/metadata.rst
diff --git a/src/calibre/manual/news.rst b/manual/news.rst
similarity index 100%
rename from src/calibre/manual/news.rst
rename to manual/news.rst
diff --git a/src/calibre/manual/news_recipe.rst b/manual/news_recipe.rst
similarity index 100%
rename from src/calibre/manual/news_recipe.rst
rename to manual/news_recipe.rst
diff --git a/src/calibre/manual/plugin_examples/helloworld/__init__.py b/manual/plugin_examples/helloworld/__init__.py
similarity index 100%
rename from src/calibre/manual/plugin_examples/helloworld/__init__.py
rename to manual/plugin_examples/helloworld/__init__.py
diff --git a/src/calibre/manual/plugin_examples/interface_demo/__init__.py b/manual/plugin_examples/interface_demo/__init__.py
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/__init__.py
rename to manual/plugin_examples/interface_demo/__init__.py
diff --git a/src/calibre/manual/plugin_examples/interface_demo/about.txt b/manual/plugin_examples/interface_demo/about.txt
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/about.txt
rename to manual/plugin_examples/interface_demo/about.txt
diff --git a/src/calibre/manual/plugin_examples/interface_demo/config.py b/manual/plugin_examples/interface_demo/config.py
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/config.py
rename to manual/plugin_examples/interface_demo/config.py
diff --git a/src/calibre/manual/plugin_examples/interface_demo/images/icon.png b/manual/plugin_examples/interface_demo/images/icon.png
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/images/icon.png
rename to manual/plugin_examples/interface_demo/images/icon.png
diff --git a/src/calibre/manual/plugin_examples/interface_demo/main.py b/manual/plugin_examples/interface_demo/main.py
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/main.py
rename to manual/plugin_examples/interface_demo/main.py
diff --git a/src/calibre/manual/plugin_examples/interface_demo/plugin-import-name-interface_demo.txt b/manual/plugin_examples/interface_demo/plugin-import-name-interface_demo.txt
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/plugin-import-name-interface_demo.txt
rename to manual/plugin_examples/interface_demo/plugin-import-name-interface_demo.txt
diff --git a/src/calibre/manual/plugin_examples/interface_demo/ui.py b/manual/plugin_examples/interface_demo/ui.py
similarity index 100%
rename from src/calibre/manual/plugin_examples/interface_demo/ui.py
rename to manual/plugin_examples/interface_demo/ui.py
diff --git a/src/calibre/manual/plugins.rst b/manual/plugins.rst
similarity index 100%
rename from src/calibre/manual/plugins.rst
rename to manual/plugins.rst
diff --git a/src/calibre/manual/qthelp.py b/manual/qthelp.py
similarity index 100%
rename from src/calibre/manual/qthelp.py
rename to manual/qthelp.py
diff --git a/src/calibre/manual/regexp.rst b/manual/regexp.rst
similarity index 100%
rename from src/calibre/manual/regexp.rst
rename to manual/regexp.rst
diff --git a/src/calibre/manual/resources/epub_cover.jpg b/manual/resources/epub_cover.jpg
similarity index 100%
rename from src/calibre/manual/resources/epub_cover.jpg
rename to manual/resources/epub_cover.jpg
diff --git a/src/calibre/manual/resources/logo.png b/manual/resources/logo.png
similarity index 100%
rename from src/calibre/manual/resources/logo.png
rename to manual/resources/logo.png
diff --git a/src/calibre/manual/server.rst b/manual/server.rst
similarity index 100%
rename from src/calibre/manual/server.rst
rename to manual/server.rst
diff --git a/src/calibre/manual/sub_groups.rst b/manual/sub_groups.rst
similarity index 100%
rename from src/calibre/manual/sub_groups.rst
rename to manual/sub_groups.rst
diff --git a/src/calibre/manual/template_lang.rst b/manual/template_lang.rst
similarity index 100%
rename from src/calibre/manual/template_lang.rst
rename to manual/template_lang.rst
diff --git a/src/calibre/manual/template_ref_generate.py b/manual/template_ref_generate.py
similarity index 97%
rename from src/calibre/manual/template_ref_generate.py
rename to manual/template_ref_generate.py
index 24f9bba9dc..b331345572 100644
--- a/src/calibre/manual/template_ref_generate.py
+++ b/manual/template_ref_generate.py
@@ -55,7 +55,7 @@ The python implementation of the template functions is passed in a Metadata obje
 
     The set of standard metadata fields.
 
-.. literalinclude:: ../ebooks/metadata/book/__init__.py
+.. literalinclude:: ../src/calibre/ebooks/metadata/book/__init__.py
    :lines: 7-
 '''
 
diff --git a/src/calibre/manual/templates/layout.html b/manual/templates/layout.html
similarity index 100%
rename from src/calibre/manual/templates/layout.html
rename to manual/templates/layout.html
diff --git a/src/calibre/manual/templates/search.html b/manual/templates/search.html
similarity index 100%
rename from src/calibre/manual/templates/search.html
rename to manual/templates/search.html
diff --git a/src/calibre/manual/tutorials.rst b/manual/tutorials.rst
similarity index 100%
rename from src/calibre/manual/tutorials.rst
rename to manual/tutorials.rst
diff --git a/src/calibre/manual/viewer.rst b/manual/viewer.rst
similarity index 100%
rename from src/calibre/manual/viewer.rst
rename to manual/viewer.rst
diff --git a/src/calibre/manual/xpath.rst b/manual/xpath.rst
similarity index 100%
rename from src/calibre/manual/xpath.rst
rename to manual/xpath.rst
diff --git a/src/calibre/manual/xpath.xhtml b/manual/xpath.xhtml
similarity index 100%
rename from src/calibre/manual/xpath.xhtml
rename to manual/xpath.xhtml
diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index 49ea1868f5..88b97c6e2d 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -189,7 +189,7 @@ class LinuxFreeze(Command):
         for x in os.listdir(self.SRC):
             shutil.copytree(self.j(self.SRC, x), self.j(dest, x),
                     ignore=ignore_in_lib)
-        for x in ('manual', 'trac'):
+        for x in ('trac',):
             x = self.j(dest, 'calibre', x)
             if os.path.exists(x):
                 shutil.rmtree(x)
diff --git a/setup/publish.py b/setup/publish.py
index 72bf6c9cbb..b7f1b4a597 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -66,7 +66,7 @@ class Manual(Command):
 
     def run(self, opts):
         cwd = os.path.abspath(os.getcwd())
-        os.chdir(os.path.join(self.SRC, 'calibre', 'manual'))
+        os.chdir(os.path.join(self.SRC, '..', 'manual'))
         try:
             for d in ('.build', 'cli'):
                 if os.path.exists(d):
diff --git a/setup/upload.py b/setup/upload.py
index 8d51d2550e..a73d0d2c31 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -177,12 +177,12 @@ class UploadUserManual(Command): # {{{
             subprocess.check_call(['scp', f.name, 'divok:'+dest])
 
     def run(self, opts):
-        path = self.j(self.SRC, 'calibre', 'manual', 'plugin_examples')
+        path = self.j(self.SRC, '..', 'manual', 'plugin_examples')
         for x in glob.glob(self.j(path, '*')):
             self.build_plugin_example(x)
 
         check_call(' '.join(['rsync', '-z', '-r', '--progress',
-            'src/calibre/manual/.build/html/',
+            'manual/.build/html/',
                     'bugs:%s'%USER_MANUAL]), shell=True)
 # }}}