diff --git a/extensions/jython/module/MOD-INF/controller.js b/extensions/jython/jython/MOD-INF/controller.js
similarity index 100%
rename from extensions/jython/module/MOD-INF/controller.js
rename to extensions/jython/jython/MOD-INF/controller.js
diff --git a/extensions/jython/module/MOD-INF/lib/jython-2.5.1.jar b/extensions/jython/jython/MOD-INF/lib/jython-2.5.1.jar
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython-2.5.1.jar
rename to extensions/jython/jython/MOD-INF/lib/jython-2.5.1.jar
diff --git a/extensions/jython/module/MOD-INF/lib/jython/BaseHTTPServer.py b/extensions/jython/jython/MOD-INF/lib/jython/BaseHTTPServer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/BaseHTTPServer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/BaseHTTPServer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/CGIHTTPServer.py b/extensions/jython/jython/MOD-INF/lib/jython/CGIHTTPServer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/CGIHTTPServer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/CGIHTTPServer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/ConfigParser.py b/extensions/jython/jython/MOD-INF/lib/jython/ConfigParser.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/ConfigParser.py
rename to extensions/jython/jython/MOD-INF/lib/jython/ConfigParser.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/Cookie.py b/extensions/jython/jython/MOD-INF/lib/jython/Cookie.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/Cookie.py
rename to extensions/jython/jython/MOD-INF/lib/jython/Cookie.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/DocXMLRPCServer.py b/extensions/jython/jython/MOD-INF/lib/jython/DocXMLRPCServer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/DocXMLRPCServer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/DocXMLRPCServer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/EastAsianWidth.txt b/extensions/jython/jython/MOD-INF/lib/jython/EastAsianWidth.txt
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/EastAsianWidth.txt
rename to extensions/jython/jython/MOD-INF/lib/jython/EastAsianWidth.txt
diff --git a/extensions/jython/module/MOD-INF/lib/jython/HTMLParser.py b/extensions/jython/jython/MOD-INF/lib/jython/HTMLParser.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/HTMLParser.py
rename to extensions/jython/jython/MOD-INF/lib/jython/HTMLParser.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/MimeWriter.py b/extensions/jython/jython/MOD-INF/lib/jython/MimeWriter.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/MimeWriter.py
rename to extensions/jython/jython/MOD-INF/lib/jython/MimeWriter.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/Queue.py b/extensions/jython/jython/MOD-INF/lib/jython/Queue.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/Queue.py
rename to extensions/jython/jython/MOD-INF/lib/jython/Queue.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/SimpleHTTPServer.py b/extensions/jython/jython/MOD-INF/lib/jython/SimpleHTTPServer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/SimpleHTTPServer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/SimpleHTTPServer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/SimpleXMLRPCServer.py b/extensions/jython/jython/MOD-INF/lib/jython/SimpleXMLRPCServer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/SimpleXMLRPCServer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/SimpleXMLRPCServer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/SocketServer.py b/extensions/jython/jython/MOD-INF/lib/jython/SocketServer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/SocketServer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/SocketServer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/StringIO.py b/extensions/jython/jython/MOD-INF/lib/jython/StringIO.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/StringIO.py
rename to extensions/jython/jython/MOD-INF/lib/jython/StringIO.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/UnicodeData.txt b/extensions/jython/jython/MOD-INF/lib/jython/UnicodeData.txt
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/UnicodeData.txt
rename to extensions/jython/jython/MOD-INF/lib/jython/UnicodeData.txt
diff --git a/extensions/jython/module/MOD-INF/lib/jython/UserDict.py b/extensions/jython/jython/MOD-INF/lib/jython/UserDict.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/UserDict.py
rename to extensions/jython/jython/MOD-INF/lib/jython/UserDict.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/UserList.py b/extensions/jython/jython/MOD-INF/lib/jython/UserList.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/UserList.py
rename to extensions/jython/jython/MOD-INF/lib/jython/UserList.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/UserString.py b/extensions/jython/jython/MOD-INF/lib/jython/UserString.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/UserString.py
rename to extensions/jython/jython/MOD-INF/lib/jython/UserString.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/_LWPCookieJar.py b/extensions/jython/jython/MOD-INF/lib/jython/_LWPCookieJar.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/_LWPCookieJar.py
rename to extensions/jython/jython/MOD-INF/lib/jython/_LWPCookieJar.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/_MozillaCookieJar.py b/extensions/jython/jython/MOD-INF/lib/jython/_MozillaCookieJar.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/_MozillaCookieJar.py
rename to extensions/jython/jython/MOD-INF/lib/jython/_MozillaCookieJar.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/__future__.py b/extensions/jython/jython/MOD-INF/lib/jython/__future__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/__future__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/__future__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/_rawffi.py b/extensions/jython/jython/MOD-INF/lib/jython/_rawffi.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/_rawffi.py
rename to extensions/jython/jython/MOD-INF/lib/jython/_rawffi.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/_strptime.py b/extensions/jython/jython/MOD-INF/lib/jython/_strptime.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/_strptime.py
rename to extensions/jython/jython/MOD-INF/lib/jython/_strptime.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/_threading_local.py b/extensions/jython/jython/MOD-INF/lib/jython/_threading_local.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/_threading_local.py
rename to extensions/jython/jython/MOD-INF/lib/jython/_threading_local.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/aifc.py b/extensions/jython/jython/MOD-INF/lib/jython/aifc.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/aifc.py
rename to extensions/jython/jython/MOD-INF/lib/jython/aifc.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/anydbm.py b/extensions/jython/jython/MOD-INF/lib/jython/anydbm.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/anydbm.py
rename to extensions/jython/jython/MOD-INF/lib/jython/anydbm.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/ast.py b/extensions/jython/jython/MOD-INF/lib/jython/ast.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/ast.py
rename to extensions/jython/jython/MOD-INF/lib/jython/ast.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/asynchat.py b/extensions/jython/jython/MOD-INF/lib/jython/asynchat.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/asynchat.py
rename to extensions/jython/jython/MOD-INF/lib/jython/asynchat.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/asyncore.py b/extensions/jython/jython/MOD-INF/lib/jython/asyncore.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/asyncore.py
rename to extensions/jython/jython/MOD-INF/lib/jython/asyncore.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/atexit.py b/extensions/jython/jython/MOD-INF/lib/jython/atexit.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/atexit.py
rename to extensions/jython/jython/MOD-INF/lib/jython/atexit.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/base64.py b/extensions/jython/jython/MOD-INF/lib/jython/base64.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/base64.py
rename to extensions/jython/jython/MOD-INF/lib/jython/base64.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/bdb.py b/extensions/jython/jython/MOD-INF/lib/jython/bdb.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/bdb.py
rename to extensions/jython/jython/MOD-INF/lib/jython/bdb.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/binhex.py b/extensions/jython/jython/MOD-INF/lib/jython/binhex.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/binhex.py
rename to extensions/jython/jython/MOD-INF/lib/jython/binhex.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/bisect.py b/extensions/jython/jython/MOD-INF/lib/jython/bisect.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/bisect.py
rename to extensions/jython/jython/MOD-INF/lib/jython/bisect.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/calendar.py b/extensions/jython/jython/MOD-INF/lib/jython/calendar.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/calendar.py
rename to extensions/jython/jython/MOD-INF/lib/jython/calendar.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/cgi.py b/extensions/jython/jython/MOD-INF/lib/jython/cgi.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/cgi.py
rename to extensions/jython/jython/MOD-INF/lib/jython/cgi.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/cgitb.py b/extensions/jython/jython/MOD-INF/lib/jython/cgitb.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/cgitb.py
rename to extensions/jython/jython/MOD-INF/lib/jython/cgitb.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/chunk.py b/extensions/jython/jython/MOD-INF/lib/jython/chunk.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/chunk.py
rename to extensions/jython/jython/MOD-INF/lib/jython/chunk.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/cmd.py b/extensions/jython/jython/MOD-INF/lib/jython/cmd.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/cmd.py
rename to extensions/jython/jython/MOD-INF/lib/jython/cmd.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/code.py b/extensions/jython/jython/MOD-INF/lib/jython/code.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/code.py
rename to extensions/jython/jython/MOD-INF/lib/jython/code.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/codecs.py b/extensions/jython/jython/MOD-INF/lib/jython/codecs.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/codecs.py
rename to extensions/jython/jython/MOD-INF/lib/jython/codecs.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/codeop.py b/extensions/jython/jython/MOD-INF/lib/jython/codeop.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/codeop.py
rename to extensions/jython/jython/MOD-INF/lib/jython/codeop.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/collections/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/collections/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/collections/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/collections/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/colorsys.py b/extensions/jython/jython/MOD-INF/lib/jython/colorsys.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/colorsys.py
rename to extensions/jython/jython/MOD-INF/lib/jython/colorsys.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/commands.py b/extensions/jython/jython/MOD-INF/lib/jython/commands.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/commands.py
rename to extensions/jython/jython/MOD-INF/lib/jython/commands.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compileall.py b/extensions/jython/jython/MOD-INF/lib/jython/compileall.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compileall.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compileall.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/ast.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/ast.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/ast.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/ast.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/consts.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/consts.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/consts.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/consts.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/future.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/future.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/future.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/future.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/misc.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/misc.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/misc.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/misc.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/pyassem.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/pyassem.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/pyassem.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/pyassem.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/pycodegen.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/pycodegen.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/pycodegen.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/pycodegen.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/symbols.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/symbols.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/symbols.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/symbols.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/syntax.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/syntax.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/syntax.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/syntax.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/transformer.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/transformer.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/transformer.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/transformer.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/compiler/visitor.py b/extensions/jython/jython/MOD-INF/lib/jython/compiler/visitor.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/compiler/visitor.py
rename to extensions/jython/jython/MOD-INF/lib/jython/compiler/visitor.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/contextlib.py b/extensions/jython/jython/MOD-INF/lib/jython/contextlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/contextlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/contextlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/cookielib.py b/extensions/jython/jython/MOD-INF/lib/jython/cookielib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/cookielib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/cookielib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/copy.py b/extensions/jython/jython/MOD-INF/lib/jython/copy.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/copy.py
rename to extensions/jython/jython/MOD-INF/lib/jython/copy.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/copy_reg.py b/extensions/jython/jython/MOD-INF/lib/jython/copy_reg.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/copy_reg.py
rename to extensions/jython/jython/MOD-INF/lib/jython/copy_reg.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/csv.py b/extensions/jython/jython/MOD-INF/lib/jython/csv.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/csv.py
rename to extensions/jython/jython/MOD-INF/lib/jython/csv.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/datetime.py b/extensions/jython/jython/MOD-INF/lib/jython/datetime.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/datetime.py
rename to extensions/jython/jython/MOD-INF/lib/jython/datetime.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/dbexts.py b/extensions/jython/jython/MOD-INF/lib/jython/dbexts.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/dbexts.py
rename to extensions/jython/jython/MOD-INF/lib/jython/dbexts.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/decimal.py b/extensions/jython/jython/MOD-INF/lib/jython/decimal.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/decimal.py
rename to extensions/jython/jython/MOD-INF/lib/jython/decimal.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/difflib.py b/extensions/jython/jython/MOD-INF/lib/jython/difflib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/difflib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/difflib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/dircache.py b/extensions/jython/jython/MOD-INF/lib/jython/dircache.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/dircache.py
rename to extensions/jython/jython/MOD-INF/lib/jython/dircache.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/dis.py b/extensions/jython/jython/MOD-INF/lib/jython/dis.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/dis.py
rename to extensions/jython/jython/MOD-INF/lib/jython/dis.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/README b/extensions/jython/jython/MOD-INF/lib/jython/distutils/README
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/README
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/README
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/archive_util.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/archive_util.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/archive_util.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/archive_util.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/bcppcompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/bcppcompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/bcppcompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/bcppcompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/ccompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/ccompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/ccompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/ccompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/cmd.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/cmd.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/cmd.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/cmd.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_dumb.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_dumb.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_dumb.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_dumb.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_msi.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_msi.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_msi.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_msi.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_rpm.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_rpm.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_rpm.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_rpm.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_wininst.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_wininst.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/bdist_wininst.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/bdist_wininst.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/build.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/build.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_clib.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_clib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_clib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_clib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_ext.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_ext.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_ext.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_ext.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_py.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_py.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_py.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_py.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_scripts.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_scripts.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/build_scripts.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/build_scripts.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/clean.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/clean.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/clean.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/clean.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/command_template b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/command_template
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/command_template
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/command_template
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/config.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/config.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/config.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/config.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/install.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/install.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_data.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_data.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_data.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_data.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_egg_info.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_egg_info.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_egg_info.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_egg_info.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_headers.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_headers.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_headers.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_headers.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_lib.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_lib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_lib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_lib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_scripts.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_scripts.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/install_scripts.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/install_scripts.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/register.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/register.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/register.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/register.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/sdist.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/sdist.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/sdist.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/sdist.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/upload.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/upload.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/upload.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/upload.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/wininst-6.exe b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/wininst-6.exe
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/wininst-6.exe
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/wininst-6.exe
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/command/wininst-7.1.exe b/extensions/jython/jython/MOD-INF/lib/jython/distutils/command/wininst-7.1.exe
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/command/wininst-7.1.exe
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/command/wininst-7.1.exe
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/core.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/core.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/core.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/core.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/cygwinccompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/cygwinccompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/cygwinccompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/cygwinccompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/debug.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/debug.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/debug.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/debug.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/dep_util.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/dep_util.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/dep_util.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/dep_util.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/dir_util.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/dir_util.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/dir_util.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/dir_util.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/dist.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/dist.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/dist.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/dist.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/emxccompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/emxccompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/emxccompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/emxccompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/errors.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/errors.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/errors.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/errors.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/extension.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/extension.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/extension.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/extension.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/fancy_getopt.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/fancy_getopt.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/fancy_getopt.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/fancy_getopt.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/file_util.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/file_util.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/file_util.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/file_util.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/filelist.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/filelist.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/filelist.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/filelist.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/jythoncompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/jythoncompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/jythoncompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/jythoncompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/log.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/log.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/log.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/log.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/msvccompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/msvccompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/msvccompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/msvccompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/mwerkscompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/mwerkscompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/mwerkscompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/mwerkscompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/spawn.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/spawn.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/spawn.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/spawn.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/sysconfig.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/sysconfig.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/sysconfig.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/sysconfig.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/support.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/support.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/support.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/support.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_build_py.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_build_py.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_build_py.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_build_py.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_build_scripts.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_build_scripts.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_build_scripts.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_build_scripts.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_dist.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_dist.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_dist.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_dist.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_install.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_install.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_install.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_install.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_install_scripts.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_install_scripts.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_install_scripts.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_install_scripts.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_versionpredicate.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_versionpredicate.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/tests/test_versionpredicate.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/tests/test_versionpredicate.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/text_file.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/text_file.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/text_file.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/text_file.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/unixccompiler.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/unixccompiler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/unixccompiler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/unixccompiler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/util.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/util.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/util.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/util.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/version.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/version.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/version.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/version.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/distutils/versionpredicate.py b/extensions/jython/jython/MOD-INF/lib/jython/distutils/versionpredicate.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/distutils/versionpredicate.py
rename to extensions/jython/jython/MOD-INF/lib/jython/distutils/versionpredicate.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/doctest.py b/extensions/jython/jython/MOD-INF/lib/jython/doctest.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/doctest.py
rename to extensions/jython/jython/MOD-INF/lib/jython/doctest.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/dumbdbm.py b/extensions/jython/jython/MOD-INF/lib/jython/dumbdbm.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/dumbdbm.py
rename to extensions/jython/jython/MOD-INF/lib/jython/dumbdbm.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/dummy_thread.py b/extensions/jython/jython/MOD-INF/lib/jython/dummy_thread.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/dummy_thread.py
rename to extensions/jython/jython/MOD-INF/lib/jython/dummy_thread.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/dummy_threading.py b/extensions/jython/jython/MOD-INF/lib/jython/dummy_threading.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/dummy_threading.py
rename to extensions/jython/jython/MOD-INF/lib/jython/dummy_threading.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/email/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/_parseaddr.py b/extensions/jython/jython/MOD-INF/lib/jython/email/_parseaddr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/_parseaddr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/_parseaddr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/base64mime.py b/extensions/jython/jython/MOD-INF/lib/jython/email/base64mime.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/base64mime.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/base64mime.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/charset.py b/extensions/jython/jython/MOD-INF/lib/jython/email/charset.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/charset.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/charset.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/encoders.py b/extensions/jython/jython/MOD-INF/lib/jython/email/encoders.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/encoders.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/encoders.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/errors.py b/extensions/jython/jython/MOD-INF/lib/jython/email/errors.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/errors.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/errors.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/feedparser.py b/extensions/jython/jython/MOD-INF/lib/jython/email/feedparser.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/feedparser.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/feedparser.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/generator.py b/extensions/jython/jython/MOD-INF/lib/jython/email/generator.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/generator.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/generator.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/header.py b/extensions/jython/jython/MOD-INF/lib/jython/email/header.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/header.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/header.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/iterators.py b/extensions/jython/jython/MOD-INF/lib/jython/email/iterators.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/iterators.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/iterators.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/message.py b/extensions/jython/jython/MOD-INF/lib/jython/email/message.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/message.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/message.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/application.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/application.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/application.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/application.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/audio.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/audio.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/audio.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/audio.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/base.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/base.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/base.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/base.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/image.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/image.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/image.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/image.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/message.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/message.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/message.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/message.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/multipart.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/multipart.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/multipart.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/multipart.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/nonmultipart.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/nonmultipart.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/nonmultipart.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/nonmultipart.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/mime/text.py b/extensions/jython/jython/MOD-INF/lib/jython/email/mime/text.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/mime/text.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/mime/text.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/parser.py b/extensions/jython/jython/MOD-INF/lib/jython/email/parser.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/parser.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/parser.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/quoprimime.py b/extensions/jython/jython/MOD-INF/lib/jython/email/quoprimime.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/quoprimime.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/quoprimime.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/email/utils.py b/extensions/jython/jython/MOD-INF/lib/jython/email/utils.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/email/utils.py
rename to extensions/jython/jython/MOD-INF/lib/jython/email/utils.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/aliases.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/aliases.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/aliases.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/aliases.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/ascii.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/ascii.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/ascii.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/ascii.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/base64_codec.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/base64_codec.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/base64_codec.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/base64_codec.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/big5.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/big5.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/big5.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/big5.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/big5hkscs.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/big5hkscs.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/big5hkscs.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/big5hkscs.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/bz2_codec.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/bz2_codec.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/bz2_codec.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/bz2_codec.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/charmap.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/charmap.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/charmap.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/charmap.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp037.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp037.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp037.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp037.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1006.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1006.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1006.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1006.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1026.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1026.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1026.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1026.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1140.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1140.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1140.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1140.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1250.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1250.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1250.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1250.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1251.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1251.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1251.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1251.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1252.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1252.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1252.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1252.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1253.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1253.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1253.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1253.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1254.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1254.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1254.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1254.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1255.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1255.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1255.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1255.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1256.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1256.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1256.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1256.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1257.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1257.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1257.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1257.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp1258.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1258.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp1258.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp1258.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp424.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp424.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp424.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp424.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp437.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp437.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp437.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp437.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp500.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp500.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp500.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp500.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp737.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp737.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp737.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp737.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp775.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp775.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp775.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp775.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp850.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp850.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp850.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp850.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp852.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp852.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp852.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp852.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp855.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp855.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp855.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp855.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp856.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp856.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp856.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp856.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp857.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp857.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp857.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp857.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp860.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp860.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp860.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp860.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp861.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp861.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp861.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp861.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp862.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp862.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp862.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp862.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp863.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp863.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp863.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp863.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp864.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp864.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp864.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp864.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp865.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp865.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp865.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp865.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp866.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp866.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp866.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp866.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp869.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp869.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp869.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp869.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp874.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp874.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp874.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp874.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp875.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp875.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp875.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp875.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp932.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp932.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp932.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp932.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp949.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp949.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp949.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp949.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/cp950.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/cp950.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/cp950.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/cp950.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/euc_jis_2004.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_jis_2004.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/euc_jis_2004.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_jis_2004.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/euc_jisx0213.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_jisx0213.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/euc_jisx0213.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_jisx0213.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/euc_jp.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_jp.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/euc_jp.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_jp.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/euc_kr.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_kr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/euc_kr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/euc_kr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/gb18030.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/gb18030.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/gb18030.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/gb18030.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/gb2312.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/gb2312.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/gb2312.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/gb2312.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/gbk.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/gbk.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/gbk.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/gbk.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/hex_codec.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/hex_codec.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/hex_codec.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/hex_codec.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/hp_roman8.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/hp_roman8.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/hp_roman8.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/hp_roman8.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/hz.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/hz.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/hz.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/hz.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/idna.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/idna.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/idna.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/idna.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_1.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_1.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_1.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_1.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_2.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_2.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_2.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_2.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_2004.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_2004.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_2004.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_2004.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_3.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_3.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_3.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_3.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_ext.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_ext.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_jp_ext.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_jp_ext.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_kr.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_kr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso2022_kr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso2022_kr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_1.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_1.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_1.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_1.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_10.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_10.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_10.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_10.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_11.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_11.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_11.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_11.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_13.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_13.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_13.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_13.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_14.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_14.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_14.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_14.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_15.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_15.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_15.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_15.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_16.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_16.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_16.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_16.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_2.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_2.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_2.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_2.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_3.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_3.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_3.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_3.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_4.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_4.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_4.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_4.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_5.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_5.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_5.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_5.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_6.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_6.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_6.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_6.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_7.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_7.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_7.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_7.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_8.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_8.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_8.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_8.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_9.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_9.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/iso8859_9.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/iso8859_9.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/johab.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/johab.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/johab.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/johab.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/koi8_r.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/koi8_r.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/koi8_r.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/koi8_r.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/koi8_u.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/koi8_u.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/koi8_u.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/koi8_u.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/latin_1.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/latin_1.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/latin_1.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/latin_1.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_arabic.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_arabic.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_arabic.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_arabic.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_centeuro.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_centeuro.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_centeuro.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_centeuro.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_croatian.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_croatian.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_croatian.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_croatian.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_cyrillic.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_cyrillic.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_cyrillic.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_cyrillic.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_farsi.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_farsi.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_farsi.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_farsi.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_greek.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_greek.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_greek.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_greek.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_iceland.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_iceland.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_iceland.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_iceland.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_latin2.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_latin2.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_latin2.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_latin2.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_roman.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_roman.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_roman.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_roman.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_romanian.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_romanian.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_romanian.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_romanian.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mac_turkish.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_turkish.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mac_turkish.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mac_turkish.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/mbcs.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/mbcs.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/mbcs.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/mbcs.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/palmos.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/palmos.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/palmos.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/palmos.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/ptcp154.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/ptcp154.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/ptcp154.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/ptcp154.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/punycode.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/punycode.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/punycode.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/punycode.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/quopri_codec.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/quopri_codec.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/quopri_codec.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/quopri_codec.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/raw_unicode_escape.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/raw_unicode_escape.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/raw_unicode_escape.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/raw_unicode_escape.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/rot_13.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/rot_13.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/rot_13.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/rot_13.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/shift_jis.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/shift_jis.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/shift_jis.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/shift_jis.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/shift_jis_2004.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/shift_jis_2004.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/shift_jis_2004.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/shift_jis_2004.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/shift_jisx0213.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/shift_jisx0213.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/shift_jisx0213.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/shift_jisx0213.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/string_escape.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/string_escape.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/string_escape.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/string_escape.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/tis_620.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/tis_620.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/tis_620.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/tis_620.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/undefined.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/undefined.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/undefined.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/undefined.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/unicode_escape.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/unicode_escape.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/unicode_escape.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/unicode_escape.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/unicode_internal.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/unicode_internal.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/unicode_internal.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/unicode_internal.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/utf_16.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_16.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/utf_16.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_16.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/utf_16_be.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_16_be.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/utf_16_be.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_16_be.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/utf_16_le.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_16_le.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/utf_16_le.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_16_le.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/utf_7.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_7.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/utf_7.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_7.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/utf_8.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_8.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/utf_8.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_8.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/utf_8_sig.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_8_sig.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/utf_8_sig.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/utf_8_sig.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/uu_codec.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/uu_codec.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/uu_codec.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/uu_codec.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/encodings/zlib_codec.py b/extensions/jython/jython/MOD-INF/lib/jython/encodings/zlib_codec.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/encodings/zlib_codec.py
rename to extensions/jython/jython/MOD-INF/lib/jython/encodings/zlib_codec.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/filecmp.py b/extensions/jython/jython/MOD-INF/lib/jython/filecmp.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/filecmp.py
rename to extensions/jython/jython/MOD-INF/lib/jython/filecmp.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/fileinput.py b/extensions/jython/jython/MOD-INF/lib/jython/fileinput.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/fileinput.py
rename to extensions/jython/jython/MOD-INF/lib/jython/fileinput.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/fnmatch.py b/extensions/jython/jython/MOD-INF/lib/jython/fnmatch.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/fnmatch.py
rename to extensions/jython/jython/MOD-INF/lib/jython/fnmatch.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/formatter.py b/extensions/jython/jython/MOD-INF/lib/jython/formatter.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/formatter.py
rename to extensions/jython/jython/MOD-INF/lib/jython/formatter.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/fpformat.py b/extensions/jython/jython/MOD-INF/lib/jython/fpformat.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/fpformat.py
rename to extensions/jython/jython/MOD-INF/lib/jython/fpformat.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/ftplib.py b/extensions/jython/jython/MOD-INF/lib/jython/ftplib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/ftplib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/ftplib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/functools.py b/extensions/jython/jython/MOD-INF/lib/jython/functools.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/functools.py
rename to extensions/jython/jython/MOD-INF/lib/jython/functools.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/getopt.py b/extensions/jython/jython/MOD-INF/lib/jython/getopt.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/getopt.py
rename to extensions/jython/jython/MOD-INF/lib/jython/getopt.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/getpass.py b/extensions/jython/jython/MOD-INF/lib/jython/getpass.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/getpass.py
rename to extensions/jython/jython/MOD-INF/lib/jython/getpass.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/gettext.py b/extensions/jython/jython/MOD-INF/lib/jython/gettext.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/gettext.py
rename to extensions/jython/jython/MOD-INF/lib/jython/gettext.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/glob.py b/extensions/jython/jython/MOD-INF/lib/jython/glob.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/glob.py
rename to extensions/jython/jython/MOD-INF/lib/jython/glob.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/gopherlib.py b/extensions/jython/jython/MOD-INF/lib/jython/gopherlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/gopherlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/gopherlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/grp.py b/extensions/jython/jython/MOD-INF/lib/jython/grp.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/grp.py
rename to extensions/jython/jython/MOD-INF/lib/jython/grp.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/gzip.py b/extensions/jython/jython/MOD-INF/lib/jython/gzip.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/gzip.py
rename to extensions/jython/jython/MOD-INF/lib/jython/gzip.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/hashlib.py b/extensions/jython/jython/MOD-INF/lib/jython/hashlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/hashlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/hashlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/heapq.py b/extensions/jython/jython/MOD-INF/lib/jython/heapq.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/heapq.py
rename to extensions/jython/jython/MOD-INF/lib/jython/heapq.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/hmac.py b/extensions/jython/jython/MOD-INF/lib/jython/hmac.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/hmac.py
rename to extensions/jython/jython/MOD-INF/lib/jython/hmac.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/htmlentitydefs.py b/extensions/jython/jython/MOD-INF/lib/jython/htmlentitydefs.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/htmlentitydefs.py
rename to extensions/jython/jython/MOD-INF/lib/jython/htmlentitydefs.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/htmllib.py b/extensions/jython/jython/MOD-INF/lib/jython/htmllib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/htmllib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/htmllib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/httplib.py b/extensions/jython/jython/MOD-INF/lib/jython/httplib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/httplib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/httplib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/ihooks.py b/extensions/jython/jython/MOD-INF/lib/jython/ihooks.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/ihooks.py
rename to extensions/jython/jython/MOD-INF/lib/jython/ihooks.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/imaplib.py b/extensions/jython/jython/MOD-INF/lib/jython/imaplib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/imaplib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/imaplib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/imghdr.py b/extensions/jython/jython/MOD-INF/lib/jython/imghdr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/imghdr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/imghdr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/inspect.py b/extensions/jython/jython/MOD-INF/lib/jython/inspect.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/inspect.py
rename to extensions/jython/jython/MOD-INF/lib/jython/inspect.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/isql.py b/extensions/jython/jython/MOD-INF/lib/jython/isql.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/isql.py
rename to extensions/jython/jython/MOD-INF/lib/jython/isql.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/javapath.py b/extensions/jython/jython/MOD-INF/lib/jython/javapath.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/javapath.py
rename to extensions/jython/jython/MOD-INF/lib/jython/javapath.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/javashell.py b/extensions/jython/jython/MOD-INF/lib/jython/javashell.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/javashell.py
rename to extensions/jython/jython/MOD-INF/lib/jython/javashell.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/keyword.py b/extensions/jython/jython/MOD-INF/lib/jython/keyword.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/keyword.py
rename to extensions/jython/jython/MOD-INF/lib/jython/keyword.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/linecache.py b/extensions/jython/jython/MOD-INF/lib/jython/linecache.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/linecache.py
rename to extensions/jython/jython/MOD-INF/lib/jython/linecache.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/locale.py b/extensions/jython/jython/MOD-INF/lib/jython/locale.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/locale.py
rename to extensions/jython/jython/MOD-INF/lib/jython/locale.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/logging/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/logging/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/logging/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/logging/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/logging/config.py b/extensions/jython/jython/MOD-INF/lib/jython/logging/config.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/logging/config.py
rename to extensions/jython/jython/MOD-INF/lib/jython/logging/config.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/logging/handlers.py b/extensions/jython/jython/MOD-INF/lib/jython/logging/handlers.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/logging/handlers.py
rename to extensions/jython/jython/MOD-INF/lib/jython/logging/handlers.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/macpath.py b/extensions/jython/jython/MOD-INF/lib/jython/macpath.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/macpath.py
rename to extensions/jython/jython/MOD-INF/lib/jython/macpath.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/macurl2path.py b/extensions/jython/jython/MOD-INF/lib/jython/macurl2path.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/macurl2path.py
rename to extensions/jython/jython/MOD-INF/lib/jython/macurl2path.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mailbox.py b/extensions/jython/jython/MOD-INF/lib/jython/mailbox.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mailbox.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mailbox.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mailcap.py b/extensions/jython/jython/MOD-INF/lib/jython/mailcap.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mailcap.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mailcap.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/markupbase.py b/extensions/jython/jython/MOD-INF/lib/jython/markupbase.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/markupbase.py
rename to extensions/jython/jython/MOD-INF/lib/jython/markupbase.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/marshal.py b/extensions/jython/jython/MOD-INF/lib/jython/marshal.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/marshal.py
rename to extensions/jython/jython/MOD-INF/lib/jython/marshal.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/md5.py b/extensions/jython/jython/MOD-INF/lib/jython/md5.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/md5.py
rename to extensions/jython/jython/MOD-INF/lib/jython/md5.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mhlib.py b/extensions/jython/jython/MOD-INF/lib/jython/mhlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mhlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mhlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mimetools.py b/extensions/jython/jython/MOD-INF/lib/jython/mimetools.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mimetools.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mimetools.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mimetypes.py b/extensions/jython/jython/MOD-INF/lib/jython/mimetypes.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mimetypes.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mimetypes.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mimify.py b/extensions/jython/jython/MOD-INF/lib/jython/mimify.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mimify.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mimify.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/modulefinder.py b/extensions/jython/jython/MOD-INF/lib/jython/modulefinder.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/modulefinder.py
rename to extensions/jython/jython/MOD-INF/lib/jython/modulefinder.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/multifile.py b/extensions/jython/jython/MOD-INF/lib/jython/multifile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/multifile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/multifile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/mutex.py b/extensions/jython/jython/MOD-INF/lib/jython/mutex.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/mutex.py
rename to extensions/jython/jython/MOD-INF/lib/jython/mutex.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/netrc.py b/extensions/jython/jython/MOD-INF/lib/jython/netrc.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/netrc.py
rename to extensions/jython/jython/MOD-INF/lib/jython/netrc.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/new.py b/extensions/jython/jython/MOD-INF/lib/jython/new.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/new.py
rename to extensions/jython/jython/MOD-INF/lib/jython/new.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/nntplib.py b/extensions/jython/jython/MOD-INF/lib/jython/nntplib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/nntplib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/nntplib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/ntpath.py b/extensions/jython/jython/MOD-INF/lib/jython/ntpath.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/ntpath.py
rename to extensions/jython/jython/MOD-INF/lib/jython/ntpath.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/nturl2path.py b/extensions/jython/jython/MOD-INF/lib/jython/nturl2path.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/nturl2path.py
rename to extensions/jython/jython/MOD-INF/lib/jython/nturl2path.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/opcode.py b/extensions/jython/jython/MOD-INF/lib/jython/opcode.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/opcode.py
rename to extensions/jython/jython/MOD-INF/lib/jython/opcode.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/optparse.py b/extensions/jython/jython/MOD-INF/lib/jython/optparse.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/optparse.py
rename to extensions/jython/jython/MOD-INF/lib/jython/optparse.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/os.py b/extensions/jython/jython/MOD-INF/lib/jython/os.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/os.py
rename to extensions/jython/jython/MOD-INF/lib/jython/os.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pdb.py b/extensions/jython/jython/MOD-INF/lib/jython/pdb.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pdb.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pdb.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pickle.py b/extensions/jython/jython/MOD-INF/lib/jython/pickle.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pickle.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pickle.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pickletools.py b/extensions/jython/jython/MOD-INF/lib/jython/pickletools.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pickletools.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pickletools.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pipes.py b/extensions/jython/jython/MOD-INF/lib/jython/pipes.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pipes.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pipes.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pkgutil.py b/extensions/jython/jython/MOD-INF/lib/jython/pkgutil.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pkgutil.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pkgutil.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/platform.py b/extensions/jython/jython/MOD-INF/lib/jython/platform.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/platform.py
rename to extensions/jython/jython/MOD-INF/lib/jython/platform.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/popen2.py b/extensions/jython/jython/MOD-INF/lib/jython/popen2.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/popen2.py
rename to extensions/jython/jython/MOD-INF/lib/jython/popen2.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/poplib.py b/extensions/jython/jython/MOD-INF/lib/jython/poplib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/poplib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/poplib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/posix.py b/extensions/jython/jython/MOD-INF/lib/jython/posix.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/posix.py
rename to extensions/jython/jython/MOD-INF/lib/jython/posix.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/posixfile.py b/extensions/jython/jython/MOD-INF/lib/jython/posixfile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/posixfile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/posixfile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/posixpath.py b/extensions/jython/jython/MOD-INF/lib/jython/posixpath.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/posixpath.py
rename to extensions/jython/jython/MOD-INF/lib/jython/posixpath.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pprint.py b/extensions/jython/jython/MOD-INF/lib/jython/pprint.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pprint.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pprint.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/profile.py b/extensions/jython/jython/MOD-INF/lib/jython/profile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/profile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/profile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pstats.py b/extensions/jython/jython/MOD-INF/lib/jython/pstats.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pstats.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pstats.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pwd.py b/extensions/jython/jython/MOD-INF/lib/jython/pwd.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pwd.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pwd.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/py_compile.py b/extensions/jython/jython/MOD-INF/lib/jython/py_compile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/py_compile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/py_compile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pycimport.py b/extensions/jython/jython/MOD-INF/lib/jython/pycimport.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pycimport.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pycimport.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pyclbr.py b/extensions/jython/jython/MOD-INF/lib/jython/pyclbr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pyclbr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pyclbr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pydoc.py b/extensions/jython/jython/MOD-INF/lib/jython/pydoc.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pydoc.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pydoc.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/pyexpat.py b/extensions/jython/jython/MOD-INF/lib/jython/pyexpat.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/pyexpat.py
rename to extensions/jython/jython/MOD-INF/lib/jython/pyexpat.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/quopri.py b/extensions/jython/jython/MOD-INF/lib/jython/quopri.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/quopri.py
rename to extensions/jython/jython/MOD-INF/lib/jython/quopri.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/random.py b/extensions/jython/jython/MOD-INF/lib/jython/random.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/random.py
rename to extensions/jython/jython/MOD-INF/lib/jython/random.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/re.py b/extensions/jython/jython/MOD-INF/lib/jython/re.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/re.py
rename to extensions/jython/jython/MOD-INF/lib/jython/re.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/readline.py b/extensions/jython/jython/MOD-INF/lib/jython/readline.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/readline.py
rename to extensions/jython/jython/MOD-INF/lib/jython/readline.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/repr.py b/extensions/jython/jython/MOD-INF/lib/jython/repr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/repr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/repr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/rfc822.py b/extensions/jython/jython/MOD-INF/lib/jython/rfc822.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/rfc822.py
rename to extensions/jython/jython/MOD-INF/lib/jython/rfc822.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/rlcompleter.py b/extensions/jython/jython/MOD-INF/lib/jython/rlcompleter.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/rlcompleter.py
rename to extensions/jython/jython/MOD-INF/lib/jython/rlcompleter.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/robotparser.py b/extensions/jython/jython/MOD-INF/lib/jython/robotparser.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/robotparser.py
rename to extensions/jython/jython/MOD-INF/lib/jython/robotparser.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/runpy.py b/extensions/jython/jython/MOD-INF/lib/jython/runpy.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/runpy.py
rename to extensions/jython/jython/MOD-INF/lib/jython/runpy.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sched.py b/extensions/jython/jython/MOD-INF/lib/jython/sched.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sched.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sched.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/select.py b/extensions/jython/jython/MOD-INF/lib/jython/select.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/select.py
rename to extensions/jython/jython/MOD-INF/lib/jython/select.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sets.py b/extensions/jython/jython/MOD-INF/lib/jython/sets.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sets.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sets.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sgmllib.py b/extensions/jython/jython/MOD-INF/lib/jython/sgmllib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sgmllib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sgmllib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sha.py b/extensions/jython/jython/MOD-INF/lib/jython/sha.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sha.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sha.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/shelve.py b/extensions/jython/jython/MOD-INF/lib/jython/shelve.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/shelve.py
rename to extensions/jython/jython/MOD-INF/lib/jython/shelve.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/shlex.py b/extensions/jython/jython/MOD-INF/lib/jython/shlex.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/shlex.py
rename to extensions/jython/jython/MOD-INF/lib/jython/shlex.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/shutil.py b/extensions/jython/jython/MOD-INF/lib/jython/shutil.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/shutil.py
rename to extensions/jython/jython/MOD-INF/lib/jython/shutil.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/signal.py b/extensions/jython/jython/MOD-INF/lib/jython/signal.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/signal.py
rename to extensions/jython/jython/MOD-INF/lib/jython/signal.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/site-packages/README b/extensions/jython/jython/MOD-INF/lib/jython/site-packages/README
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/site-packages/README
rename to extensions/jython/jython/MOD-INF/lib/jython/site-packages/README
diff --git a/extensions/jython/module/MOD-INF/lib/jython/site.py b/extensions/jython/jython/MOD-INF/lib/jython/site.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/site.py
rename to extensions/jython/jython/MOD-INF/lib/jython/site.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/smtpd.py b/extensions/jython/jython/MOD-INF/lib/jython/smtpd.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/smtpd.py
rename to extensions/jython/jython/MOD-INF/lib/jython/smtpd.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/smtplib.py b/extensions/jython/jython/MOD-INF/lib/jython/smtplib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/smtplib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/smtplib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sndhdr.py b/extensions/jython/jython/MOD-INF/lib/jython/sndhdr.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sndhdr.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sndhdr.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/socket.py b/extensions/jython/jython/MOD-INF/lib/jython/socket.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/socket.py
rename to extensions/jython/jython/MOD-INF/lib/jython/socket.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sre.py b/extensions/jython/jython/MOD-INF/lib/jython/sre.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sre.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sre.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sre_compile.py b/extensions/jython/jython/MOD-INF/lib/jython/sre_compile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sre_compile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sre_compile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sre_constants.py b/extensions/jython/jython/MOD-INF/lib/jython/sre_constants.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sre_constants.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sre_constants.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/sre_parse.py b/extensions/jython/jython/MOD-INF/lib/jython/sre_parse.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/sre_parse.py
rename to extensions/jython/jython/MOD-INF/lib/jython/sre_parse.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/stat.py b/extensions/jython/jython/MOD-INF/lib/jython/stat.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/stat.py
rename to extensions/jython/jython/MOD-INF/lib/jython/stat.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/string.py b/extensions/jython/jython/MOD-INF/lib/jython/string.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/string.py
rename to extensions/jython/jython/MOD-INF/lib/jython/string.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/subprocess.py b/extensions/jython/jython/MOD-INF/lib/jython/subprocess.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/subprocess.py
rename to extensions/jython/jython/MOD-INF/lib/jython/subprocess.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/symbol.py b/extensions/jython/jython/MOD-INF/lib/jython/symbol.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/symbol.py
rename to extensions/jython/jython/MOD-INF/lib/jython/symbol.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/tabnanny.py b/extensions/jython/jython/MOD-INF/lib/jython/tabnanny.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/tabnanny.py
rename to extensions/jython/jython/MOD-INF/lib/jython/tabnanny.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/tarfile.py b/extensions/jython/jython/MOD-INF/lib/jython/tarfile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/tarfile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/tarfile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/telnetlib.py b/extensions/jython/jython/MOD-INF/lib/jython/telnetlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/telnetlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/telnetlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/tempfile.py b/extensions/jython/jython/MOD-INF/lib/jython/tempfile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/tempfile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/tempfile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/textwrap.py b/extensions/jython/jython/MOD-INF/lib/jython/textwrap.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/textwrap.py
rename to extensions/jython/jython/MOD-INF/lib/jython/textwrap.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/this.py b/extensions/jython/jython/MOD-INF/lib/jython/this.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/this.py
rename to extensions/jython/jython/MOD-INF/lib/jython/this.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/threading.py b/extensions/jython/jython/MOD-INF/lib/jython/threading.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/threading.py
rename to extensions/jython/jython/MOD-INF/lib/jython/threading.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/timeit.py b/extensions/jython/jython/MOD-INF/lib/jython/timeit.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/timeit.py
rename to extensions/jython/jython/MOD-INF/lib/jython/timeit.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/token.py b/extensions/jython/jython/MOD-INF/lib/jython/token.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/token.py
rename to extensions/jython/jython/MOD-INF/lib/jython/token.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/tokenize.py b/extensions/jython/jython/MOD-INF/lib/jython/tokenize.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/tokenize.py
rename to extensions/jython/jython/MOD-INF/lib/jython/tokenize.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/trace.py b/extensions/jython/jython/MOD-INF/lib/jython/trace.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/trace.py
rename to extensions/jython/jython/MOD-INF/lib/jython/trace.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/traceback.py b/extensions/jython/jython/MOD-INF/lib/jython/traceback.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/traceback.py
rename to extensions/jython/jython/MOD-INF/lib/jython/traceback.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/types.py b/extensions/jython/jython/MOD-INF/lib/jython/types.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/types.py
rename to extensions/jython/jython/MOD-INF/lib/jython/types.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/unicodedata.py b/extensions/jython/jython/MOD-INF/lib/jython/unicodedata.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/unicodedata.py
rename to extensions/jython/jython/MOD-INF/lib/jython/unicodedata.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/unittest.py b/extensions/jython/jython/MOD-INF/lib/jython/unittest.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/unittest.py
rename to extensions/jython/jython/MOD-INF/lib/jython/unittest.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/urllib.py b/extensions/jython/jython/MOD-INF/lib/jython/urllib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/urllib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/urllib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/urllib2.py b/extensions/jython/jython/MOD-INF/lib/jython/urllib2.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/urllib2.py
rename to extensions/jython/jython/MOD-INF/lib/jython/urllib2.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/urlparse.py b/extensions/jython/jython/MOD-INF/lib/jython/urlparse.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/urlparse.py
rename to extensions/jython/jython/MOD-INF/lib/jython/urlparse.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/user.py b/extensions/jython/jython/MOD-INF/lib/jython/user.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/user.py
rename to extensions/jython/jython/MOD-INF/lib/jython/user.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/uu.py b/extensions/jython/jython/MOD-INF/lib/jython/uu.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/uu.py
rename to extensions/jython/jython/MOD-INF/lib/jython/uu.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/uuid.py b/extensions/jython/jython/MOD-INF/lib/jython/uuid.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/uuid.py
rename to extensions/jython/jython/MOD-INF/lib/jython/uuid.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/warnings.py b/extensions/jython/jython/MOD-INF/lib/jython/warnings.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/warnings.py
rename to extensions/jython/jython/MOD-INF/lib/jython/warnings.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/weakref.py b/extensions/jython/jython/MOD-INF/lib/jython/weakref.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/weakref.py
rename to extensions/jython/jython/MOD-INF/lib/jython/weakref.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/whichdb.py b/extensions/jython/jython/MOD-INF/lib/jython/whichdb.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/whichdb.py
rename to extensions/jython/jython/MOD-INF/lib/jython/whichdb.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/wsgiref.egg-info b/extensions/jython/jython/MOD-INF/lib/jython/wsgiref.egg-info
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/wsgiref.egg-info
rename to extensions/jython/jython/MOD-INF/lib/jython/wsgiref.egg-info
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xdrlib.py b/extensions/jython/jython/MOD-INF/lib/jython/xdrlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xdrlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xdrlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/FtCore.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/FtCore.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/FtCore.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/FtCore.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/Uri.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/Uri.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/Uri.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/Uri.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/MessageSource.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/MessageSource.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/MessageSource.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/MessageSource.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/NodeFilter.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/NodeFilter.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/NodeFilter.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/NodeFilter.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/domreg.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/domreg.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/domreg.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/domreg.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/minicompat.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/minicompat.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/minicompat.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/minicompat.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/minidom.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/minidom.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/minidom.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/minidom.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/pulldom.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/pulldom.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/pulldom.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/pulldom.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/dom/xmlbuilder.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/dom/xmlbuilder.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/dom/xmlbuilder.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/dom/xmlbuilder.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/etree/ElementInclude.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/etree/ElementInclude.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/etree/ElementInclude.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/etree/ElementInclude.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/etree/ElementPath.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/etree/ElementPath.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/etree/ElementPath.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/etree/ElementPath.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/etree/ElementTree.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/etree/ElementTree.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/etree/ElementTree.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/etree/ElementTree.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/etree/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/etree/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/etree/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/etree/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/etree/cElementTree.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/etree/cElementTree.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/etree/cElementTree.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/etree/cElementTree.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/parsers/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/parsers/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/parsers/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/parsers/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/parsers/expat.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/parsers/expat.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/parsers/expat.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/parsers/expat.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/_exceptions.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/_exceptions.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/_exceptions.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/_exceptions.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/drivers2/__init__.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/drivers2/__init__.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/drivers2/__init__.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/drivers2/__init__.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/drivers2/drv_javasax.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/drivers2/drv_javasax.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/drivers2/drv_javasax.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/drivers2/drv_javasax.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/handler.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/handler.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/handler.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/handler.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/saxlib.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/saxlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/saxlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/saxlib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/saxutils.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/saxutils.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/saxutils.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/saxutils.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xml/sax/xmlreader.py b/extensions/jython/jython/MOD-INF/lib/jython/xml/sax/xmlreader.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xml/sax/xmlreader.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xml/sax/xmlreader.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xmllib.py b/extensions/jython/jython/MOD-INF/lib/jython/xmllib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xmllib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xmllib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/xmlrpclib.py b/extensions/jython/jython/MOD-INF/lib/jython/xmlrpclib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/xmlrpclib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/xmlrpclib.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/zipfile.py b/extensions/jython/jython/MOD-INF/lib/jython/zipfile.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/zipfile.py
rename to extensions/jython/jython/MOD-INF/lib/jython/zipfile.py
diff --git a/extensions/jython/module/MOD-INF/lib/jython/zlib.py b/extensions/jython/jython/MOD-INF/lib/jython/zlib.py
similarity index 100%
rename from extensions/jython/module/MOD-INF/lib/jython/zlib.py
rename to extensions/jython/jython/MOD-INF/lib/jython/zlib.py
diff --git a/extensions/jython/module/MOD-INF/module.properties b/extensions/jython/jython/MOD-INF/module.properties
similarity index 100%
rename from extensions/jython/module/MOD-INF/module.properties
rename to extensions/jython/jython/MOD-INF/module.properties