Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/web/__init__.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/pattern/web/__init__.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/web/__init__.py
@@ -31,13 +31,12 @@ import itertools
 import new
 
 import api
-import feed
 import oauth
-import json
+import simplejson as json
 import locale
 
-from feed import feedparser
-from soup import BeautifulSoup
+import feedparser
+import BeautifulSoup
 
 try:
     # Import persistent Cache.
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/setup.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/setup.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/setup.py
@@ -57,13 +57,10 @@ setup(
         "pattern.web",
         "pattern.web.cache",
         "pattern.web.docx",
-        "pattern.web.feed",
         "pattern.web.imap",
-        "pattern.web.json",
         "pattern.web.locale",
         "pattern.web.oauth",
         "pattern.web.pdf",
-        "pattern.web.soup",
         "pattern.db",
         "pattern.text",
         "pattern.text.de",
@@ -84,11 +81,8 @@ setup(
         "pattern"                 : ["*.js"],
         "pattern.web.cache"       : ["tmp/*"],
         "pattern.web.docx"        : ["*"],
-        "pattern.web.feed"        : ["*"],
-        "pattern.web.json"        : ["*"],
         "pattern.web.locale"      : ["*"],
         "pattern.web.pdf"         : ["*.txt", "cmap/*"],
-        "pattern.web.soup"        : ["*"],
         "pattern.text.de"         : ["*.txt", "*.xml"],
         "pattern.text.en"         : ["*.txt", "*.xml", "*.slp"],
         "pattern.text.en.wordlist": ["*.txt"],
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/__init__.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/pattern/vector/svm/__init__.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/__init__.py
@@ -1,7 +1,7 @@
 LIBSVM = LIBLINEAR = True
 
 try:
-    import libsvm
+    from svm import libsvm
     import libsvmutil
 except ImportError as e:
     LIBSVM = False
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/libsvmutil.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/pattern/vector/svm/libsvmutil.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/libsvmutil.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from libsvm import *
+from svm import *
 
 import os, sys
 sys.path = [os.path.dirname(os.path.abspath(__file__))] + sys.path