Move lib to lib/Python/Lib

108 files changed, 11 insertions, 10 deletions

diff --git a/README.md b/README.md
index 7fb70fa1c..f01737341 100644
--- a/README.md
+++ b/README.md
@@ -110,6 +110,7 @@ Some extra features require additional software packages. See below:
 
  - **BeautifulSoup**                                  *Few plugins support*
  - **PIL** (python-imaging)                           *Captcha recognition*
+ - **Send2Trash**                                     *Trash support*
  - **colorlog**                                       *Colored log*
  - **bjoern** (<https://github.com/jonashaag/bjoern>) *More responsive web interface*
  - **feedparser**                                     *RSS parsing*
diff --git a/docs/build_docs.py b/docs/build_docs.py
index d4822ef94..82dd75e0b 100644
--- a/docs/build_docs.py
+++ b/docs/build_docs.py
@@ -23,7 +23,7 @@ sys.path.append(dir_name)
 
 if "64" in platform.machine():
     sys.path.append(os.path.join(os.path.dirname, "lib64"))
-sys.path.append(os.path.join(os.path.dirname, "lib"))
+sys.path.append(os.path.join(os.path.dirname, "lib", "Python", "Lib"))
 
 
 # If extensions (or modules to document with autodoc) are in another directory,
diff --git a/lib/BeautifulSoup.py b/lib/Python/Lib/BeautifulSoup.py
index 55567f588..55567f588 100644
--- a/lib/BeautifulSoup.py
+++ b/lib/Python/Lib/BeautifulSoup.py
diff --git a/lib/Getch.py b/lib/Python/Lib/Getch.py
index 22b7ea7f8..22b7ea7f8 100644
--- a/lib/Getch.py
+++ b/lib/Python/Lib/Getch.py
diff --git a/lib/MultipartPostHandler.py b/lib/Python/Lib/MultipartPostHandler.py
index 94aee0193..94aee0193 100644
--- a/lib/MultipartPostHandler.py
+++ b/lib/Python/Lib/MultipartPostHandler.py
diff --git a/lib/SafeEval.py b/lib/Python/Lib/SafeEval.py
index 8fc57f261..8fc57f261 100644
--- a/lib/SafeEval.py
+++ b/lib/Python/Lib/SafeEval.py
diff --git a/lib/Unzip.py b/lib/Python/Lib/Unzip.py
index f56fbe751..f56fbe751 100644
--- a/lib/Unzip.py
+++ b/lib/Python/Lib/Unzip.py
diff --git a/lib/__init__.py b/lib/Python/Lib/__init__.py
index e69de29bb..e69de29bb 100644
--- a/lib/__init__.py
+++ b/lib/Python/Lib/__init__.py
diff --git a/lib/beaker/__init__.py b/lib/Python/Lib/beaker/__init__.py
index 792d60054..792d60054 100644
--- a/lib/beaker/__init__.py
+++ b/lib/Python/Lib/beaker/__init__.py
diff --git a/lib/beaker/cache.py b/lib/Python/Lib/beaker/cache.py
index 4a96537ff..4a96537ff 100644
--- a/lib/beaker/cache.py
+++ b/lib/Python/Lib/beaker/cache.py
diff --git a/lib/beaker/container.py b/lib/Python/Lib/beaker/container.py
index 515e97af6..515e97af6 100644
--- a/lib/beaker/container.py
+++ b/lib/Python/Lib/beaker/container.py
diff --git a/lib/beaker/converters.py b/lib/Python/Lib/beaker/converters.py
index f0ad34963..f0ad34963 100644
--- a/lib/beaker/converters.py
+++ b/lib/Python/Lib/beaker/converters.py
diff --git a/lib/beaker/crypto/__init__.py b/lib/Python/Lib/beaker/crypto/__init__.py
index 3e26b0c13..3e26b0c13 100644
--- a/lib/beaker/crypto/__init__.py
+++ b/lib/Python/Lib/beaker/crypto/__init__.py
diff --git a/lib/beaker/crypto/jcecrypto.py b/lib/Python/Lib/beaker/crypto/jcecrypto.py
index 4062d513e..4062d513e 100644
--- a/lib/beaker/crypto/jcecrypto.py
+++ b/lib/Python/Lib/beaker/crypto/jcecrypto.py
diff --git a/lib/beaker/crypto/pbkdf2.py b/lib/Python/Lib/beaker/crypto/pbkdf2.py
index 96dc5fbb2..96dc5fbb2 100644
--- a/lib/beaker/crypto/pbkdf2.py
+++ b/lib/Python/Lib/beaker/crypto/pbkdf2.py
diff --git a/lib/beaker/crypto/pycrypto.py b/lib/Python/Lib/beaker/crypto/pycrypto.py
index a3eb4d9db..a3eb4d9db 100644
--- a/lib/beaker/crypto/pycrypto.py
+++ b/lib/Python/Lib/beaker/crypto/pycrypto.py
diff --git a/lib/beaker/crypto/util.py b/lib/Python/Lib/beaker/crypto/util.py
index d97e8ce6f..d97e8ce6f 100644
--- a/lib/beaker/crypto/util.py
+++ b/lib/Python/Lib/beaker/crypto/util.py
diff --git a/lib/beaker/exceptions.py b/lib/Python/Lib/beaker/exceptions.py
index cc0eed286..cc0eed286 100644
--- a/lib/beaker/exceptions.py
+++ b/lib/Python/Lib/beaker/exceptions.py
diff --git a/lib/beaker/ext/__init__.py b/lib/Python/Lib/beaker/ext/__init__.py
index e69de29bb..e69de29bb 100644
--- a/lib/beaker/ext/__init__.py
+++ b/lib/Python/Lib/beaker/ext/__init__.py
diff --git a/lib/beaker/ext/database.py b/lib/Python/Lib/beaker/ext/database.py
index 701e6f7d2..701e6f7d2 100644
--- a/lib/beaker/ext/database.py
+++ b/lib/Python/Lib/beaker/ext/database.py
diff --git a/lib/beaker/ext/google.py b/lib/Python/Lib/beaker/ext/google.py
index dd8380d7f..dd8380d7f 100644
--- a/lib/beaker/ext/google.py
+++ b/lib/Python/Lib/beaker/ext/google.py
diff --git a/lib/beaker/ext/memcached.py b/lib/Python/Lib/beaker/ext/memcached.py
index 96516953f..96516953f 100644
--- a/lib/beaker/ext/memcached.py
+++ b/lib/Python/Lib/beaker/ext/memcached.py
diff --git a/lib/beaker/ext/sqla.py b/lib/Python/Lib/beaker/ext/sqla.py
index 8c79633c1..8c79633c1 100644
--- a/lib/beaker/ext/sqla.py
+++ b/lib/Python/Lib/beaker/ext/sqla.py
diff --git a/lib/beaker/middleware.py b/lib/Python/Lib/beaker/middleware.py
index 7ba88b37d..7ba88b37d 100644
--- a/lib/beaker/middleware.py
+++ b/lib/Python/Lib/beaker/middleware.py
diff --git a/lib/beaker/session.py b/lib/Python/Lib/beaker/session.py
index 7d465530b..7d465530b 100644
--- a/lib/beaker/session.py
+++ b/lib/Python/Lib/beaker/session.py
diff --git a/lib/beaker/synchronization.py b/lib/Python/Lib/beaker/synchronization.py
index 761303707..761303707 100644
--- a/lib/beaker/synchronization.py
+++ b/lib/Python/Lib/beaker/synchronization.py
diff --git a/lib/beaker/util.py b/lib/Python/Lib/beaker/util.py
index 04c9617c5..04c9617c5 100644
--- a/lib/beaker/util.py
+++ b/lib/Python/Lib/beaker/util.py
diff --git a/lib/bottle.py b/lib/Python/Lib/bottle.py
index 2c243278e..2c243278e 100644
--- a/lib/bottle.py
+++ b/lib/Python/Lib/bottle.py
diff --git a/lib/colorama/__init__.py b/lib/Python/Lib/colorama/__init__.py
index 4af0c1e11..4af0c1e11 100644
--- a/lib/colorama/__init__.py
+++ b/lib/Python/Lib/colorama/__init__.py
diff --git a/lib/colorama/ansi.py b/lib/Python/Lib/colorama/ansi.py
index 1cc722500..1cc722500 100644
--- a/lib/colorama/ansi.py
+++ b/lib/Python/Lib/colorama/ansi.py
diff --git a/lib/colorama/ansitowin32.py b/lib/Python/Lib/colorama/ansitowin32.py
index 62e770c86..62e770c86 100644
--- a/lib/colorama/ansitowin32.py
+++ b/lib/Python/Lib/colorama/ansitowin32.py
diff --git a/lib/colorama/initialise.py b/lib/Python/Lib/colorama/initialise.py
index 7e27f84f8..7e27f84f8 100644
--- a/lib/colorama/initialise.py
+++ b/lib/Python/Lib/colorama/initialise.py
diff --git a/lib/colorama/win32.py b/lib/Python/Lib/colorama/win32.py
index c604f3721..c604f3721 100644
--- a/lib/colorama/win32.py
+++ b/lib/Python/Lib/colorama/win32.py
diff --git a/lib/colorama/winterm.py b/lib/Python/Lib/colorama/winterm.py
index fcc774ffa..fcc774ffa 100644
--- a/lib/colorama/winterm.py
+++ b/lib/Python/Lib/colorama/winterm.py
diff --git a/lib/colorlog/__init__.py b/lib/Python/Lib/colorlog/__init__.py
index 1d57f586d..1d57f586d 100644
--- a/lib/colorlog/__init__.py
+++ b/lib/Python/Lib/colorlog/__init__.py
diff --git a/lib/colorlog/colorlog.py b/lib/Python/Lib/colorlog/colorlog.py
index 49860dd50..49860dd50 100644
--- a/lib/colorlog/colorlog.py
+++ b/lib/Python/Lib/colorlog/colorlog.py
diff --git a/lib/colorlog/escape_codes.py b/lib/Python/Lib/colorlog/escape_codes.py
index 848eb6489..848eb6489 100644
--- a/lib/colorlog/escape_codes.py
+++ b/lib/Python/Lib/colorlog/escape_codes.py
diff --git a/lib/colorlog/logging.py b/lib/Python/Lib/colorlog/logging.py
index 13f0c4ffb..13f0c4ffb 100644
--- a/lib/colorlog/logging.py
+++ b/lib/Python/Lib/colorlog/logging.py
diff --git a/lib/feedparser.py b/lib/Python/Lib/feedparser.py
index a746ed8f5..a746ed8f5 100644
--- a/lib/feedparser.py
+++ b/lib/Python/Lib/feedparser.py
diff --git a/lib/jinja2/__init__.py b/lib/Python/Lib/jinja2/__init__.py
index f944e11b6..f944e11b6 100644
--- a/lib/jinja2/__init__.py
+++ b/lib/Python/Lib/jinja2/__init__.py
diff --git a/lib/jinja2/_markupsafe/__init__.py b/lib/Python/Lib/jinja2/_markupsafe/__init__.py
index ec7bd572d..ec7bd572d 100644
--- a/lib/jinja2/_markupsafe/__init__.py
+++ b/lib/Python/Lib/jinja2/_markupsafe/__init__.py
diff --git a/lib/jinja2/_markupsafe/_bundle.py b/lib/Python/Lib/jinja2/_markupsafe/_bundle.py
index e694faf23..e694faf23 100644
--- a/lib/jinja2/_markupsafe/_bundle.py
+++ b/lib/Python/Lib/jinja2/_markupsafe/_bundle.py
diff --git a/lib/jinja2/_markupsafe/_constants.py b/lib/Python/Lib/jinja2/_markupsafe/_constants.py
index 919bf03c5..919bf03c5 100644
--- a/lib/jinja2/_markupsafe/_constants.py
+++ b/lib/Python/Lib/jinja2/_markupsafe/_constants.py
diff --git a/lib/jinja2/_markupsafe/_native.py b/lib/Python/Lib/jinja2/_markupsafe/_native.py
index 7b95828ec..7b95828ec 100644
--- a/lib/jinja2/_markupsafe/_native.py
+++ b/lib/Python/Lib/jinja2/_markupsafe/_native.py
diff --git a/lib/jinja2/_markupsafe/tests.py b/lib/Python/Lib/jinja2/_markupsafe/tests.py
index c1ce3943a..c1ce3943a 100644
--- a/lib/jinja2/_markupsafe/tests.py
+++ b/lib/Python/Lib/jinja2/_markupsafe/tests.py
diff --git a/lib/jinja2/_stringdefs.py b/lib/Python/Lib/jinja2/_stringdefs.py
index 1161b7f4a..1161b7f4a 100644
--- a/lib/jinja2/_stringdefs.py
+++ b/lib/Python/Lib/jinja2/_stringdefs.py
diff --git a/lib/jinja2/bccache.py b/lib/Python/Lib/jinja2/bccache.py
index 1e2236c3a..1e2236c3a 100644
--- a/lib/jinja2/bccache.py
+++ b/lib/Python/Lib/jinja2/bccache.py
diff --git a/lib/jinja2/compiler.py b/lib/Python/Lib/jinja2/compiler.py
index 57641596a..57641596a 100644
--- a/lib/jinja2/compiler.py
+++ b/lib/Python/Lib/jinja2/compiler.py
diff --git a/lib/jinja2/constants.py b/lib/Python/Lib/jinja2/constants.py
index cab203cc7..cab203cc7 100644
--- a/lib/jinja2/constants.py
+++ b/lib/Python/Lib/jinja2/constants.py
diff --git a/lib/jinja2/debug.py b/lib/Python/Lib/jinja2/debug.py
index eb15456d1..eb15456d1 100644
--- a/lib/jinja2/debug.py
+++ b/lib/Python/Lib/jinja2/debug.py
diff --git a/lib/jinja2/defaults.py b/lib/Python/Lib/jinja2/defaults.py
index d2d45443a..d2d45443a 100644
--- a/lib/jinja2/defaults.py
+++ b/lib/Python/Lib/jinja2/defaults.py
diff --git a/lib/jinja2/environment.py b/lib/Python/Lib/jinja2/environment.py
index ac74a5c68..ac74a5c68 100644
--- a/lib/jinja2/environment.py
+++ b/lib/Python/Lib/jinja2/environment.py
diff --git a/lib/jinja2/exceptions.py b/lib/Python/Lib/jinja2/exceptions.py
index 771f6a8d7..771f6a8d7 100644
--- a/lib/jinja2/exceptions.py
+++ b/lib/Python/Lib/jinja2/exceptions.py
diff --git a/lib/jinja2/ext.py b/lib/Python/Lib/jinja2/ext.py
index ceb38953a..ceb38953a 100644
--- a/lib/jinja2/ext.py
+++ b/lib/Python/Lib/jinja2/ext.py
diff --git a/lib/jinja2/filters.py b/lib/Python/Lib/jinja2/filters.py
index d1848e434..d1848e434 100644
--- a/lib/jinja2/filters.py
+++ b/lib/Python/Lib/jinja2/filters.py
diff --git a/lib/jinja2/lexer.py b/lib/Python/Lib/jinja2/lexer.py
index 0d3f69617..0d3f69617 100644
--- a/lib/jinja2/lexer.py
+++ b/lib/Python/Lib/jinja2/lexer.py
diff --git a/lib/jinja2/loaders.py b/lib/Python/Lib/jinja2/loaders.py
index bd435e8b0..bd435e8b0 100644
--- a/lib/jinja2/loaders.py
+++ b/lib/Python/Lib/jinja2/loaders.py
diff --git a/lib/jinja2/meta.py b/lib/Python/Lib/jinja2/meta.py
index 3a779a5e9..3a779a5e9 100644
--- a/lib/jinja2/meta.py
+++ b/lib/Python/Lib/jinja2/meta.py
diff --git a/lib/jinja2/nodes.py b/lib/Python/Lib/jinja2/nodes.py
index 6446c70ea..6446c70ea 100644
--- a/lib/jinja2/nodes.py
+++ b/lib/Python/Lib/jinja2/nodes.py
diff --git a/lib/jinja2/optimizer.py b/lib/Python/Lib/jinja2/optimizer.py
index 00eab115e..00eab115e 100644
--- a/lib/jinja2/optimizer.py
+++ b/lib/Python/Lib/jinja2/optimizer.py
diff --git a/lib/jinja2/parser.py b/lib/Python/Lib/jinja2/parser.py
index d44229ad0..d44229ad0 100644
--- a/lib/jinja2/parser.py
+++ b/lib/Python/Lib/jinja2/parser.py
diff --git a/lib/jinja2/runtime.py b/lib/Python/Lib/jinja2/runtime.py
index 6fea3aa4f..6fea3aa4f 100644
--- a/lib/jinja2/runtime.py
+++ b/lib/Python/Lib/jinja2/runtime.py
diff --git a/lib/jinja2/sandbox.py b/lib/Python/Lib/jinja2/sandbox.py
index 749719548..749719548 100644
--- a/lib/jinja2/sandbox.py
+++ b/lib/Python/Lib/jinja2/sandbox.py
diff --git a/lib/jinja2/tests.py b/lib/Python/Lib/jinja2/tests.py
index d257eca0a..d257eca0a 100644
--- a/lib/jinja2/tests.py
+++ b/lib/Python/Lib/jinja2/tests.py
diff --git a/lib/jinja2/utils.py b/lib/Python/Lib/jinja2/utils.py
index 7b77b8eb7..7b77b8eb7 100644
--- a/lib/jinja2/utils.py
+++ b/lib/Python/Lib/jinja2/utils.py
diff --git a/lib/jinja2/visitor.py b/lib/Python/Lib/jinja2/visitor.py
index 413e7c309..413e7c309 100644
--- a/lib/jinja2/visitor.py
+++ b/lib/Python/Lib/jinja2/visitor.py
diff --git a/lib/rename_process.py b/lib/Python/Lib/rename_process.py
index 2527cef39..2527cef39 100644
--- a/lib/rename_process.py
+++ b/lib/Python/Lib/rename_process.py
diff --git a/lib/send2trash/__init__.py b/lib/Python/Lib/send2trash/__init__.py
index 8a059a058..8a059a058 100644
--- a/lib/send2trash/__init__.py
+++ b/lib/Python/Lib/send2trash/__init__.py
diff --git a/lib/send2trash/compat.py b/lib/Python/Lib/send2trash/compat.py
index 0f3a48972..0f3a48972 100644
--- a/lib/send2trash/compat.py
+++ b/lib/Python/Lib/send2trash/compat.py
diff --git a/lib/send2trash/plat_gio.py b/lib/Python/Lib/send2trash/plat_gio.py
index 9282d90a3..9282d90a3 100644
--- a/lib/send2trash/plat_gio.py
+++ b/lib/Python/Lib/send2trash/plat_gio.py
diff --git a/lib/send2trash/plat_osx.py b/lib/Python/Lib/send2trash/plat_osx.py
index fa2c2c85c..fa2c2c85c 100644
--- a/lib/send2trash/plat_osx.py
+++ b/lib/Python/Lib/send2trash/plat_osx.py
diff --git a/lib/send2trash/plat_other.py b/lib/Python/Lib/send2trash/plat_other.py
index 59000eca9..59000eca9 100644
--- a/lib/send2trash/plat_other.py
+++ b/lib/Python/Lib/send2trash/plat_other.py
diff --git a/lib/send2trash/plat_win.py b/lib/Python/Lib/send2trash/plat_win.py
index 3a55b9d3b..3a55b9d3b 100644
--- a/lib/send2trash/plat_win.py
+++ b/lib/Python/Lib/send2trash/plat_win.py
diff --git a/lib/simplejson/__init__.py b/lib/Python/Lib/simplejson/__init__.py
index ef5c0db48..ef5c0db48 100644
--- a/lib/simplejson/__init__.py
+++ b/lib/Python/Lib/simplejson/__init__.py
diff --git a/lib/simplejson/decoder.py b/lib/Python/Lib/simplejson/decoder.py
index e5496d6e7..e5496d6e7 100644
--- a/lib/simplejson/decoder.py
+++ b/lib/Python/Lib/simplejson/decoder.py
diff --git a/lib/simplejson/encoder.py b/lib/Python/Lib/simplejson/encoder.py
index 5ec7440f1..5ec7440f1 100644
--- a/lib/simplejson/encoder.py
+++ b/lib/Python/Lib/simplejson/encoder.py
diff --git a/lib/simplejson/ordered_dict.py b/lib/Python/Lib/simplejson/ordered_dict.py
index 87ad88824..87ad88824 100644
--- a/lib/simplejson/ordered_dict.py
+++ b/lib/Python/Lib/simplejson/ordered_dict.py
diff --git a/lib/simplejson/scanner.py b/lib/Python/Lib/simplejson/scanner.py
index 54593a371..54593a371 100644
--- a/lib/simplejson/scanner.py
+++ b/lib/Python/Lib/simplejson/scanner.py
diff --git a/lib/simplejson/tool.py b/lib/Python/Lib/simplejson/tool.py
index 73370db55..73370db55 100644
--- a/lib/simplejson/tool.py
+++ b/lib/Python/Lib/simplejson/tool.py
diff --git a/lib/thrift/TSCons.py b/lib/Python/Lib/thrift/TSCons.py
index 24046256c..24046256c 100644
--- a/lib/thrift/TSCons.py
+++ b/lib/Python/Lib/thrift/TSCons.py
diff --git a/lib/thrift/TSerialization.py b/lib/Python/Lib/thrift/TSerialization.py
index b19f98aa8..b19f98aa8 100644
--- a/lib/thrift/TSerialization.py
+++ b/lib/Python/Lib/thrift/TSerialization.py
diff --git a/lib/thrift/Thrift.py b/lib/Python/Lib/thrift/Thrift.py
index 1d271fcff..1d271fcff 100644
--- a/lib/thrift/Thrift.py
+++ b/lib/Python/Lib/thrift/Thrift.py
diff --git a/lib/thrift/__init__.py b/lib/Python/Lib/thrift/__init__.py
index 48d659c40..48d659c40 100644
--- a/lib/thrift/__init__.py
+++ b/lib/Python/Lib/thrift/__init__.py
diff --git a/lib/thrift/protocol/TBase.py b/lib/Python/Lib/thrift/protocol/TBase.py
index e675c7dc0..e675c7dc0 100644
--- a/lib/thrift/protocol/TBase.py
+++ b/lib/Python/Lib/thrift/protocol/TBase.py
diff --git a/lib/thrift/protocol/TBinaryProtocol.py b/lib/Python/Lib/thrift/protocol/TBinaryProtocol.py
index 50c6aa896..50c6aa896 100644
--- a/lib/thrift/protocol/TBinaryProtocol.py
+++ b/lib/Python/Lib/thrift/protocol/TBinaryProtocol.py
diff --git a/lib/thrift/protocol/TCompactProtocol.py b/lib/Python/Lib/thrift/protocol/TCompactProtocol.py
index 016a33171..016a33171 100644
--- a/lib/thrift/protocol/TCompactProtocol.py
+++ b/lib/Python/Lib/thrift/protocol/TCompactProtocol.py
diff --git a/lib/thrift/protocol/TProtocol.py b/lib/Python/Lib/thrift/protocol/TProtocol.py
index 7338ff68a..7338ff68a 100644
--- a/lib/thrift/protocol/TProtocol.py
+++ b/lib/Python/Lib/thrift/protocol/TProtocol.py
diff --git a/lib/thrift/protocol/__init__.py b/lib/Python/Lib/thrift/protocol/__init__.py
index d53359b28..d53359b28 100644
--- a/lib/thrift/protocol/__init__.py
+++ b/lib/Python/Lib/thrift/protocol/__init__.py
diff --git a/lib/thrift/server/THttpServer.py b/lib/Python/Lib/thrift/server/THttpServer.py
index 3047d9c00..3047d9c00 100644
--- a/lib/thrift/server/THttpServer.py
+++ b/lib/Python/Lib/thrift/server/THttpServer.py
diff --git a/lib/thrift/server/TNonblockingServer.py b/lib/Python/Lib/thrift/server/TNonblockingServer.py
index ea348a0b6..ea348a0b6 100644
--- a/lib/thrift/server/TNonblockingServer.py
+++ b/lib/Python/Lib/thrift/server/TNonblockingServer.py
diff --git a/lib/thrift/server/TProcessPoolServer.py b/lib/Python/Lib/thrift/server/TProcessPoolServer.py
index 7ed814a88..7ed814a88 100644
--- a/lib/thrift/server/TProcessPoolServer.py
+++ b/lib/Python/Lib/thrift/server/TProcessPoolServer.py
diff --git a/lib/thrift/server/TServer.py b/lib/Python/Lib/thrift/server/TServer.py
index 8456e2d40..8456e2d40 100644
--- a/lib/thrift/server/TServer.py
+++ b/lib/Python/Lib/thrift/server/TServer.py
diff --git a/lib/thrift/server/__init__.py b/lib/Python/Lib/thrift/server/__init__.py
index 1bf6e254e..1bf6e254e 100644
--- a/lib/thrift/server/__init__.py
+++ b/lib/Python/Lib/thrift/server/__init__.py
diff --git a/lib/thrift/transport/THttpClient.py b/lib/Python/Lib/thrift/transport/THttpClient.py
index 50269785c..50269785c 100644
--- a/lib/thrift/transport/THttpClient.py
+++ b/lib/Python/Lib/thrift/transport/THttpClient.py
diff --git a/lib/thrift/transport/TSocket.py b/lib/Python/Lib/thrift/transport/TSocket.py
index 4e0e1874f..4e0e1874f 100644
--- a/lib/thrift/transport/TSocket.py
+++ b/lib/Python/Lib/thrift/transport/TSocket.py
diff --git a/lib/thrift/transport/TTransport.py b/lib/Python/Lib/thrift/transport/TTransport.py
index 12e51a9bf..12e51a9bf 100644
--- a/lib/thrift/transport/TTransport.py
+++ b/lib/Python/Lib/thrift/transport/TTransport.py
diff --git a/lib/thrift/transport/TTwisted.py b/lib/Python/Lib/thrift/transport/TTwisted.py
index b6dcb4e0b..b6dcb4e0b 100644
--- a/lib/thrift/transport/TTwisted.py
+++ b/lib/Python/Lib/thrift/transport/TTwisted.py
diff --git a/lib/thrift/transport/TZlibTransport.py b/lib/Python/Lib/thrift/transport/TZlibTransport.py
index 784d4e1e0..784d4e1e0 100644
--- a/lib/thrift/transport/TZlibTransport.py
+++ b/lib/Python/Lib/thrift/transport/TZlibTransport.py
diff --git a/lib/thrift/transport/__init__.py b/lib/Python/Lib/thrift/transport/__init__.py
index 46e54fe6b..46e54fe6b 100644
--- a/lib/thrift/transport/__init__.py
+++ b/lib/Python/Lib/thrift/transport/__init__.py
diff --git a/lib/wsgiserver/LICENSE.txt b/lib/Python/Lib/wsgiserver/LICENSE.txt
index a15165ee2..a15165ee2 100644
--- a/lib/wsgiserver/LICENSE.txt
+++ b/lib/Python/Lib/wsgiserver/LICENSE.txt
diff --git a/lib/wsgiserver/__init__.py b/lib/Python/Lib/wsgiserver/__init__.py
index c380e18b0..c380e18b0 100644
--- a/lib/wsgiserver/__init__.py
+++ b/lib/Python/Lib/wsgiserver/__init__.py
diff --git a/locale/core.pot b/locale/core.pot
index 028c0c14e..65970823f 100644
--- a/locale/core.pot
+++ b/locale/core.pot
@@ -283,7 +283,7 @@ msgid ""
 msgstr ""
 
 #: pyload/threads/ServerThread.py:60
-msgid "Copy the boern.so to the lib folder or use setup.py install"
+msgid "Copy the boern.so file to lib/Python/Lib or use setup.py install"
 msgstr ""
 
 #: pyload/threads/ServerThread.py:61
diff --git a/pyload/__init__.py b/pyload/__init__.py
index e29c81ad7..1ca7c4fdc 100644
--- a/pyload/__init__.py
+++ b/pyload/__init__.py
@@ -54,7 +54,7 @@ __builtin__.pypath    = os.path.abspath(os.path.join(rootdir, ".."))
 
 if "64" in platform.machine():
     sys.path.append(os.path.join(pypath, "lib64"))
-sys.path.append(os.path.join(pypath, "lib"))
+sys.path.append(os.path.join(pypath, "lib", "Python", "Lib"))
 
 sys.stdout = getwriter(get_console_encoding(sys.stdout.encoding))(sys.stdout, errors="replace")
 
diff --git a/pyload/manager/thread/Server.py b/pyload/manager/thread/Server.py
index 5962981e8..b724ad2f9 100644
--- a/pyload/manager/thread/Server.py
+++ b/pyload/manager/thread/Server.py
@@ -61,7 +61,7 @@ class WebServer(threading.Thread):
                 except Exception, e:
                     log.error(_("Error importing lightweight server: %s") % e)
                     log.warning(_("You need to download and compile bjoern, https://github.com/jonashaag/bjoern"))
-                    log.warning(_("Copy the boern.so to the lib folder or use setup.py install"))
+                    log.warning(_("Copy the boern.so file to lib/Python/Lib or use setup.py install"))
                     log.warning(_("Of course you need to be familiar with linux and know how to compile software"))
                     self.server = "builtin"
             else:
diff --git a/pyload/remote/socketbackend/create_ttypes.py b/pyload/remote/socketbackend/create_ttypes.py
index 5bfbcafa0..8c03b8576 100644
--- a/pyload/remote/socketbackend/create_ttypes.py
+++ b/pyload/remote/socketbackend/create_ttypes.py
@@ -8,7 +8,7 @@ import sys
 
 if "64" in platform.machine():
     sys.path.append(os.path.join(pypath, "lib64"))
-sys.path.append(os.path.join(pypath, "lib"))
+sys.path.append(os.path.join(pypath, "lib", "Python", "Lib"))
 
 sys.path.append(os.path.join(pypath, "pyload", "remote"))
 
diff --git a/pyload/remote/thriftbackend/ThriftClient.py b/pyload/remote/thriftbackend/ThriftClient.py
index 7c2a1cb01..26658e341 100644
--- a/pyload/remote/thriftbackend/ThriftClient.py
+++ b/pyload/remote/thriftbackend/ThriftClient.py
@@ -12,7 +12,7 @@ except ImportError:
 
     if "64" in platform.machine():
         sys.path.append(os.path.join(pypath, "lib64"))
-    sys.path.append(os.path.join(pypath, "lib"))
+    sys.path.append(os.path.join(pypath, "lib", "Python", "Lib"))
 
 from thrift.transport import TTransport
 #from thrift.transport.TZlibTransport import TZlibTransport
diff --git a/pyload/remote/thriftbackend/ThriftTest.py b/pyload/remote/thriftbackend/ThriftTest.py
index c9c0d3cf3..f4c927bd7 100644
--- a/pyload/remote/thriftbackend/ThriftTest.py
+++ b/pyload/remote/thriftbackend/ThriftTest.py
@@ -6,7 +6,7 @@ import sys
 
 if "64" in platform.machine():
     sys.path.append(os.path.join(pypath, "lib64"))
-sys.path.append(os.path.join(pypath, "lib"))
+sys.path.append(os.path.join(pypath, "lib", "Python", "Lib"))
 
 
 from pyload.remote.thriftbackend.thriftgen.pyload import Pyload
diff --git a/setup.py b/setup.py
index 13d4a5c63..27b85b58e 100755
--- a/setup.py
+++ b/setup.py
@@ -64,14 +64,14 @@ setup(
 
     extras_require={
         'Few plugins dependencies': ["BeautifulSoup >= 3.2, < 3.3"],
+        'Captcha recognition'     : ["PIL"],
+        'Trash support'           : ["Send2Trash"],
         'Colored log'             : ["colorlog"],
         'Lightweight webserver'   : ["bjoern"],
         'RSS support'             : ["feedparser"],
         'SSL support'             : ["pyOpenSSL"],
         'RSDF/CCF/DLC support'    : ["pycrypto"],
-        'Captcha recognition'     : ["PIL"],
-        'JSON speedup'            : ["simplejson"],
-        'Trash support'           : ["Send2Trash"]
+        'JSON speedup'            : ["simplejson"]
     },
 
     #setup_requires=["setuptools_hg"],