diff --git a/LICENSES.txt b/LICENSES.txt
index 545e9bc7..170f2d2d 100644
--- a/LICENSES.txt
+++ b/LICENSES.txt
@@ -4,17 +4,17 @@ per-file license information).
 There are copies of various JavaScript and CSS libraries embedded within the
 source tree, which have their own licenses as follows:
 
-  libcpychecker/html/extlib/jquery-1.7.1.min.js:
+  libcpychecker_html/extlib/jquery-1.7.1.min.js:
      jquery.org/license (MIT or GPLv2)
 
-  libcpychecker/html/extlib/prefixfree-1.0.4.min.js:
+  libcpychecker_html/extlib/prefixfree-1.0.4.min.js:
      MIT license
 
-  libcpychecker/html/extlib/reset-20110126.css:
+  libcpychecker_html/extlib/reset-20110126.css:
      Public Domain
 
 There are also various images within:
-   libcpychecker/html/images
+   libcpychecke_/html/images
 These were taken from:
   http://code.google.com/p/fugue-icons-src/
 and are:
@@ -25,6 +25,6 @@ and are:
 
 The test code contains historical examples of reference-count bugs:
 
-  * libcpychecker/html/test/example2
+  * libcpychecker_html/test/example2
       contains an embedded copy of part of an old version of pylibmc, which
       is under a 3-clause BSD license
diff --git a/Makefile b/Makefile
index 1e8a58a5..6ad5ff40 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,7 @@ demo: plugin
 	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-cpychecker -c $(PYTHON_INCLUDES) demo.c
 
 json-examples: plugin
-	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-cpychecker -I/usr/include/python2.7 -c libcpychecker/html/test/example1/bug.c
+	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-cpychecker -I/usr/include/python2.7 -c libcpychecker_html/test/example1/bug.c
 
 test-suite: plugin print-gcc-version
 	$(INVOCATION_ENV_VARS) $(PYTHON) run-test-suite.py
diff --git a/libcpychecker/html/TODO b/libcpychecker_html/TODO
similarity index 100%
rename from libcpychecker/html/TODO
rename to libcpychecker_html/TODO
diff --git a/libcpychecker/html/c-api.txt b/libcpychecker_html/c-api.txt
similarity index 100%
rename from libcpychecker/html/c-api.txt
rename to libcpychecker_html/c-api.txt
diff --git a/libcpychecker/html/capi.py b/libcpychecker_html/capi.py
similarity index 100%
rename from libcpychecker/html/capi.py
rename to libcpychecker_html/capi.py
diff --git a/libcpychecker/html/extlib/jquery-1.7.1.min.js b/libcpychecker_html/extlib/jquery-1.7.1.min.js
similarity index 100%
rename from libcpychecker/html/extlib/jquery-1.7.1.min.js
rename to libcpychecker_html/extlib/jquery-1.7.1.min.js
diff --git a/libcpychecker/html/extlib/prefixfree-1.0.4.min.js b/libcpychecker_html/extlib/prefixfree-1.0.4.min.js
similarity index 100%
rename from libcpychecker/html/extlib/prefixfree-1.0.4.min.js
rename to libcpychecker_html/extlib/prefixfree-1.0.4.min.js
diff --git a/libcpychecker/html/extlib/reset-20110126.css b/libcpychecker_html/extlib/reset-20110126.css
similarity index 100%
rename from libcpychecker/html/extlib/reset-20110126.css
rename to libcpychecker_html/extlib/reset-20110126.css
diff --git a/libcpychecker/html/html_to_lxml.py b/libcpychecker_html/html_to_lxml.py
similarity index 100%
rename from libcpychecker/html/html_to_lxml.py
rename to libcpychecker_html/html_to_lxml.py
diff --git a/libcpychecker/html/images/arrow-180.png b/libcpychecker_html/images/arrow-180.png
similarity index 100%
rename from libcpychecker/html/images/arrow-180.png
rename to libcpychecker_html/images/arrow-180.png
diff --git a/libcpychecker/html/images/arrow.png b/libcpychecker_html/images/arrow.png
similarity index 100%
rename from libcpychecker/html/images/arrow.png
rename to libcpychecker_html/images/arrow.png
diff --git a/libcpychecker/html/images/bug--arrow.png b/libcpychecker_html/images/bug--arrow.png
similarity index 100%
rename from libcpychecker/html/images/bug--arrow.png
rename to libcpychecker_html/images/bug--arrow.png
diff --git a/libcpychecker/html/images/bug.png b/libcpychecker_html/images/bug.png
similarity index 100%
rename from libcpychecker/html/images/bug.png
rename to libcpychecker_html/images/bug.png
diff --git a/libcpychecker/html/images/exclamation.png b/libcpychecker_html/images/exclamation.png
similarity index 100%
rename from libcpychecker/html/images/exclamation.png
rename to libcpychecker_html/images/exclamation.png
diff --git a/libcpychecker/html/images/footer-bg.png b/libcpychecker_html/images/footer-bg.png
similarity index 100%
rename from libcpychecker/html/images/footer-bg.png
rename to libcpychecker_html/images/footer-bg.png
diff --git a/libcpychecker/html/images/header-bg.png b/libcpychecker_html/images/header-bg.png
similarity index 100%
rename from libcpychecker/html/images/header-bg.png
rename to libcpychecker_html/images/header-bg.png
diff --git a/libcpychecker/html/json.rst b/libcpychecker_html/json.rst
similarity index 99%
rename from libcpychecker/html/json.rst
rename to libcpychecker_html/json.rst
index c48aa5c0..91117e5a 100644
--- a/libcpychecker/html/json.rst
+++ b/libcpychecker_html/json.rst
@@ -5,7 +5,7 @@ At the top level::
 
    {
        # Path to the source file being analyzed:
-       "filename": "libcpychecker/html/test/example1/bug.c", 
+       "filename": "libcpychecker_html/test/example1/bug.c", 
 
        # The particular function containing the error:
        "function": {
diff --git a/libcpychecker/html/make_html.py b/libcpychecker_html/make_html.py
similarity index 100%
rename from libcpychecker/html/make_html.py
rename to libcpychecker_html/make_html.py
diff --git a/libcpychecker/html/pygments_c.css b/libcpychecker_html/pygments_c.css
similarity index 100%
rename from libcpychecker/html/pygments_c.css
rename to libcpychecker_html/pygments_c.css
diff --git a/libcpychecker/html/script.js b/libcpychecker_html/script.js
similarity index 100%
rename from libcpychecker/html/script.js
rename to libcpychecker_html/script.js
diff --git a/libcpychecker/html/style.css b/libcpychecker_html/style.css
similarity index 100%
rename from libcpychecker/html/style.css
rename to libcpychecker_html/style.css
diff --git a/libcpychecker/html/test/example1/bug.c b/libcpychecker_html/test/example1/bug.c
similarity index 100%
rename from libcpychecker/html/test/example1/bug.c
rename to libcpychecker_html/test/example1/bug.c
diff --git a/libcpychecker/html/test/example1/bug.c.make_a_list_of_random_ints_badly.json b/libcpychecker_html/test/example1/bug.c.make_a_list_of_random_ints_badly.json
similarity index 99%
rename from libcpychecker/html/test/example1/bug.c.make_a_list_of_random_ints_badly.json
rename to libcpychecker_html/test/example1/bug.c.make_a_list_of_random_ints_badly.json
index 3fc882a9..5961c4a7 100644
--- a/libcpychecker/html/test/example1/bug.c.make_a_list_of_random_ints_badly.json
+++ b/libcpychecker_html/test/example1/bug.c.make_a_list_of_random_ints_badly.json
@@ -1,5 +1,5 @@
 {
-    "filename": "libcpychecker/html/test/example1/bug.c", 
+    "filename": "libcpychecker_html/test/example1/bug.c", 
     "function": {
         "lines": [
             3, 
@@ -4354,7 +4354,7 @@
                             "line": 16
                         }
                     ], 
-                    "message": "when considering count.0 == (int)1 from libcpychecker/html/test/example1/bug.c:10", 
+                    "message": "when considering count.0 == (int)1 from libcpychecker_html/test/example1/bug.c:10", 
                     "variables": {
                         "<retval>": {
                             "gcctype": "struct PyObject *", 
@@ -6399,7 +6399,7 @@
             ]
         }, 
         {
-            "message": "calling PyList_Append with NULL as argument 1 (list) at libcpychecker/html/test/example1/bug.c:18", 
+            "message": "calling PyList_Append with NULL as argument 1 (list) at libcpychecker_html/test/example1/bug.c:18", 
             "notes": [
                 {
                     "location": [
@@ -9202,4 +9202,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libcpychecker/html/test/example2/_pylibmcmodule.h b/libcpychecker_html/test/example2/_pylibmcmodule.h
similarity index 100%
rename from libcpychecker/html/test/example2/_pylibmcmodule.h
rename to libcpychecker_html/test/example2/_pylibmcmodule.h
diff --git a/libcpychecker/html/test/example2/pylibmc-issue-68.c b/libcpychecker_html/test/example2/pylibmc-issue-68.c
similarity index 100%
rename from libcpychecker/html/test/example2/pylibmc-issue-68.c
rename to libcpychecker_html/test/example2/pylibmc-issue-68.c
diff --git a/libcpychecker/html/test/example2/pylibmc-issue-68.c.PylibMC_Client_get_multi.json b/libcpychecker_html/test/example2/pylibmc-issue-68.c.PylibMC_Client_get_multi.json
similarity index 99%
rename from libcpychecker/html/test/example2/pylibmc-issue-68.c.PylibMC_Client_get_multi.json
rename to libcpychecker_html/test/example2/pylibmc-issue-68.c.PylibMC_Client_get_multi.json
index 04f9bba1..3ccd6a3c 100644
--- a/libcpychecker/html/test/example2/pylibmc-issue-68.c.PylibMC_Client_get_multi.json
+++ b/libcpychecker_html/test/example2/pylibmc-issue-68.c.PylibMC_Client_get_multi.json
@@ -1,5 +1,5 @@
 {
-    "filename": "libcpychecker/html/test/example2/pylibmc-issue-68.c", 
+    "filename": "libcpychecker_html/test/example2/pylibmc-issue-68.c", 
     "function": {
         "lines": [
             52, 
@@ -822,7 +822,7 @@
                             "line": 114
                         }
                     ], 
-                    "message": "when treating unknown const char * from libcpychecker/html/test/example2/pylibmc-issue-68.c:68 as non-NULL"
+                    "message": "when treating unknown const char * from libcpychecker_html/test/example2/pylibmc-issue-68.c:68 as non-NULL"
                 }, 
                 {
                     "location": [
@@ -1446,7 +1446,7 @@
                             "line": 154
                         }
                     ], 
-                    "message": "when considering value == (int)0 from libcpychecker/html/test/example2/pylibmc-issue-68.c:148"
+                    "message": "when considering value == (int)0 from libcpychecker_html/test/example2/pylibmc-issue-68.c:148"
                 }, 
                 {
                     "location": [
@@ -1771,7 +1771,7 @@
                             "line": 177
                         }
                     ], 
-                    "message": "when treating unknown struct PyObject * from libcpychecker/html/test/example2/pylibmc-issue-68.c:176 as non-NULL"
+                    "message": "when treating unknown struct PyObject * from libcpychecker_html/test/example2/pylibmc-issue-68.c:176 as non-NULL"
                 }, 
                 {
                     "location": [
@@ -2065,7 +2065,7 @@
                             "line": 190
                         }
                     ], 
-                    "message": "calling tp_dealloc on PyDictObject allocated at libcpychecker/html/test/example2/pylibmc-issue-68.c:159"
+                    "message": "calling tp_dealloc on PyDictObject allocated at libcpychecker_html/test/example2/pylibmc-issue-68.c:159"
                 }, 
                 {
                     "location": null, 
@@ -2086,7 +2086,7 @@
                             "line": 195
                         }
                     ], 
-                    "message": "calling PyMem_Free on PyMem_Malloc allocated at libcpychecker/html/test/example2/pylibmc-issue-68.c:77"
+                    "message": "calling PyMem_Free on PyMem_Malloc allocated at libcpychecker_html/test/example2/pylibmc-issue-68.c:77"
                 }, 
                 {
                     "location": [
@@ -2099,7 +2099,7 @@
                             "line": 196
                         }
                     ], 
-                    "message": "calling PyMem_Free on PyMem_Malloc allocated at libcpychecker/html/test/example2/pylibmc-issue-68.c:76"
+                    "message": "calling PyMem_Free on PyMem_Malloc allocated at libcpychecker_html/test/example2/pylibmc-issue-68.c:76"
                 }, 
                 {
                     "location": [
@@ -2307,7 +2307,7 @@
                             "line": 200
                         }
                     ], 
-                    "message": "calling PyMem_Free on PyMem_Malloc allocated at libcpychecker/html/test/example2/pylibmc-issue-68.c:78"
+                    "message": "calling PyMem_Free on PyMem_Malloc allocated at libcpychecker_html/test/example2/pylibmc-issue-68.c:78"
                 }, 
                 {
                     "location": [
@@ -2333,7 +2333,7 @@
                             "line": 202
                         }
                     ], 
-                    "message": "when treating unknown struct memcached_result_st * * from libcpychecker/html/test/example2/pylibmc-issue-68.c:148 as non-NULL"
+                    "message": "when treating unknown struct memcached_result_st * * from libcpychecker_html/test/example2/pylibmc-issue-68.c:148 as non-NULL"
                 }, 
                 {
                     "location": [
@@ -2593,4 +2593,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}