diff --git a/core/__init__.py b/core/__init__.py index c1fb443d..212158ca 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -11,11 +11,13 @@ import subprocess import sys import time +import libs.autoload +import libs.util -# init libs -PROGRAM_DIR = os.path.dirname(os.path.normpath(os.path.abspath(os.path.join(__file__, os.pardir)))) -LIBS_DIR = os.path.join(PROGRAM_DIR, 'libs') -sys.path.insert(0, LIBS_DIR) +if not libs.autoload.completed: + sys.exit('Could not load vendored libraries.') + +PROGRAM_DIR = libs.util.module_root() # init preliminaries SYS_ARGV = sys.argv[1:] @@ -28,7 +30,7 @@ CONFIG_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg') CONFIG_SPEC_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg.spec') CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg') CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg') -TEST_FILE = os.path.join(os.path.join(PROGRAM_DIR, 'tests'), 'test.mp4') +TEST_FILE = os.path.join(PROGRAM_DIR, 'tests', 'test.mp4') MYAPP = None import six diff --git a/libs/__init__.py b/libs/__init__.py index e69de29b..154178ec 100644 --- a/libs/__init__.py +++ b/libs/__init__.py @@ -0,0 +1,47 @@ + +import os +import sys + +import libs.util + +ROOT_DIR = libs.util.module_root() +LIB_DIR = os.path.join(ROOT_DIR, 'libs') + +COMMON = 'common' +CUSTOM = 'custom' +PY2 = 'py2' +WIN = 'win' + +LOADED = {} +MANDATORY = { + COMMON, + CUSTOM, +} +DIRECTORY = { + lib: os.path.join(LIB_DIR, lib) + for lib in [COMMON, CUSTOM, PY2, WIN] +} + +if sys.platform == 'win32': + MANDATORY.add(WIN) + +if sys.version_info < (3, ): + MANDATORY.add(PY2) + + +def add_libs(name): + if name in MANDATORY and name not in LOADED: + path = libs.util.add_path(DIRECTORY[name]) + if path: + LOADED[name] = path + return path + + +def add_all_libs(): + for lib in MANDATORY: + add_libs(lib) + return is_finished() + + +def is_finished(): + return MANDATORY.issubset(LOADED.keys()) diff --git a/libs/__main__.py b/libs/__main__.py new file mode 100644 index 00000000..f82ad647 --- /dev/null +++ b/libs/__main__.py @@ -0,0 +1,20 @@ + +import shutil +import os +import time +import libs + +if __name__ == '__main__': + os.chdir(libs.LIB_DIR) + for lib, directory in libs.DIRECTORY.items(): + if lib == 'custom': + continue + try: + shutil.rmtree(directory) + except FileNotFoundError: + pass + else: + print('Removed', directory) + time.sleep(10) + requirements = 'requirements-{name}.txt'.format(name=lib) + libs.util.install_requirements(requirements, file=True, path=directory) diff --git a/libs/autoload.py b/libs/autoload.py new file mode 100644 index 00000000..23205448 --- /dev/null +++ b/libs/autoload.py @@ -0,0 +1,6 @@ + +import libs + +__all__ = ['completed'] + +completed = libs.add_all_libs() diff --git a/libs/backports.functools_lru_cache-1.2.1-py3.5-nspkg.pth b/libs/backports.functools_lru_cache-1.2.1-py3.5-nspkg.pth deleted file mode 100644 index 0b1f79dd..00000000 --- a/libs/backports.functools_lru_cache-1.2.1-py3.5-nspkg.pth +++ /dev/null @@ -1 +0,0 @@ -import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('backports',));ie = os.path.exists(os.path.join(p,'__init__.py'));m = not ie and sys.modules.setdefault('backports', types.ModuleType('backports'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p) diff --git a/libs/_version.py b/libs/common/_version.py similarity index 100% rename from libs/_version.py rename to libs/common/_version.py diff --git a/libs/_yaml.cp37-win32.pyd b/libs/common/_yaml.cp37-win32.pyd similarity index 100% rename from libs/_yaml.cp37-win32.pyd rename to libs/common/_yaml.cp37-win32.pyd diff --git a/libs/appdirs.py b/libs/common/appdirs.py similarity index 100% rename from libs/appdirs.py rename to libs/common/appdirs.py diff --git a/libs/babelfish/__init__.py b/libs/common/babelfish/__init__.py similarity index 100% rename from libs/babelfish/__init__.py rename to libs/common/babelfish/__init__.py diff --git a/libs/babelfish/converters/__init__.py b/libs/common/babelfish/converters/__init__.py similarity index 100% rename from libs/babelfish/converters/__init__.py rename to libs/common/babelfish/converters/__init__.py diff --git a/libs/babelfish/converters/alpha2.py b/libs/common/babelfish/converters/alpha2.py similarity index 100% rename from libs/babelfish/converters/alpha2.py rename to libs/common/babelfish/converters/alpha2.py diff --git a/libs/babelfish/converters/alpha3b.py b/libs/common/babelfish/converters/alpha3b.py similarity index 100% rename from libs/babelfish/converters/alpha3b.py rename to libs/common/babelfish/converters/alpha3b.py diff --git a/libs/babelfish/converters/alpha3t.py b/libs/common/babelfish/converters/alpha3t.py similarity index 100% rename from libs/babelfish/converters/alpha3t.py rename to libs/common/babelfish/converters/alpha3t.py diff --git a/libs/babelfish/converters/countryname.py b/libs/common/babelfish/converters/countryname.py similarity index 100% rename from libs/babelfish/converters/countryname.py rename to libs/common/babelfish/converters/countryname.py diff --git a/libs/babelfish/converters/name.py b/libs/common/babelfish/converters/name.py similarity index 100% rename from libs/babelfish/converters/name.py rename to libs/common/babelfish/converters/name.py diff --git a/libs/babelfish/converters/opensubtitles.py b/libs/common/babelfish/converters/opensubtitles.py similarity index 100% rename from libs/babelfish/converters/opensubtitles.py rename to libs/common/babelfish/converters/opensubtitles.py diff --git a/libs/babelfish/converters/scope.py b/libs/common/babelfish/converters/scope.py similarity index 100% rename from libs/babelfish/converters/scope.py rename to libs/common/babelfish/converters/scope.py diff --git a/libs/babelfish/converters/type.py b/libs/common/babelfish/converters/type.py similarity index 100% rename from libs/babelfish/converters/type.py rename to libs/common/babelfish/converters/type.py diff --git a/libs/babelfish/country.py b/libs/common/babelfish/country.py similarity index 100% rename from libs/babelfish/country.py rename to libs/common/babelfish/country.py diff --git a/libs/babelfish/data/iso-3166-1.txt b/libs/common/babelfish/data/iso-3166-1.txt similarity index 100% rename from libs/babelfish/data/iso-3166-1.txt rename to libs/common/babelfish/data/iso-3166-1.txt diff --git a/libs/babelfish/data/iso-639-3.tab b/libs/common/babelfish/data/iso-639-3.tab similarity index 100% rename from libs/babelfish/data/iso-639-3.tab rename to libs/common/babelfish/data/iso-639-3.tab diff --git a/libs/babelfish/data/iso15924-utf8-20131012.txt b/libs/common/babelfish/data/iso15924-utf8-20131012.txt similarity index 100% rename from libs/babelfish/data/iso15924-utf8-20131012.txt rename to libs/common/babelfish/data/iso15924-utf8-20131012.txt diff --git a/libs/babelfish/data/opensubtitles_languages.txt b/libs/common/babelfish/data/opensubtitles_languages.txt similarity index 100% rename from libs/babelfish/data/opensubtitles_languages.txt rename to libs/common/babelfish/data/opensubtitles_languages.txt diff --git a/libs/babelfish/exceptions.py b/libs/common/babelfish/exceptions.py similarity index 100% rename from libs/babelfish/exceptions.py rename to libs/common/babelfish/exceptions.py diff --git a/libs/babelfish/language.py b/libs/common/babelfish/language.py similarity index 100% rename from libs/babelfish/language.py rename to libs/common/babelfish/language.py diff --git a/libs/babelfish/script.py b/libs/common/babelfish/script.py similarity index 100% rename from libs/babelfish/script.py rename to libs/common/babelfish/script.py diff --git a/libs/babelfish/tests.py b/libs/common/babelfish/tests.py similarity index 100% rename from libs/babelfish/tests.py rename to libs/common/babelfish/tests.py diff --git a/libs/beets/__init__.py b/libs/common/beets/__init__.py similarity index 100% rename from libs/beets/__init__.py rename to libs/common/beets/__init__.py diff --git a/libs/beets/__main__.py b/libs/common/beets/__main__.py similarity index 100% rename from libs/beets/__main__.py rename to libs/common/beets/__main__.py diff --git a/libs/beets/art.py b/libs/common/beets/art.py similarity index 100% rename from libs/beets/art.py rename to libs/common/beets/art.py diff --git a/libs/beets/autotag/__init__.py b/libs/common/beets/autotag/__init__.py similarity index 100% rename from libs/beets/autotag/__init__.py rename to libs/common/beets/autotag/__init__.py diff --git a/libs/beets/autotag/hooks.py b/libs/common/beets/autotag/hooks.py similarity index 100% rename from libs/beets/autotag/hooks.py rename to libs/common/beets/autotag/hooks.py diff --git a/libs/beets/autotag/match.py b/libs/common/beets/autotag/match.py similarity index 100% rename from libs/beets/autotag/match.py rename to libs/common/beets/autotag/match.py diff --git a/libs/beets/autotag/mb.py b/libs/common/beets/autotag/mb.py similarity index 100% rename from libs/beets/autotag/mb.py rename to libs/common/beets/autotag/mb.py diff --git a/libs/beets/config_default.yaml b/libs/common/beets/config_default.yaml similarity index 100% rename from libs/beets/config_default.yaml rename to libs/common/beets/config_default.yaml diff --git a/libs/beets/dbcore/__init__.py b/libs/common/beets/dbcore/__init__.py similarity index 100% rename from libs/beets/dbcore/__init__.py rename to libs/common/beets/dbcore/__init__.py diff --git a/libs/beets/dbcore/db.py b/libs/common/beets/dbcore/db.py similarity index 100% rename from libs/beets/dbcore/db.py rename to libs/common/beets/dbcore/db.py diff --git a/libs/beets/dbcore/query.py b/libs/common/beets/dbcore/query.py similarity index 100% rename from libs/beets/dbcore/query.py rename to libs/common/beets/dbcore/query.py diff --git a/libs/beets/dbcore/queryparse.py b/libs/common/beets/dbcore/queryparse.py similarity index 100% rename from libs/beets/dbcore/queryparse.py rename to libs/common/beets/dbcore/queryparse.py diff --git a/libs/beets/dbcore/types.py b/libs/common/beets/dbcore/types.py similarity index 100% rename from libs/beets/dbcore/types.py rename to libs/common/beets/dbcore/types.py diff --git a/libs/beets/importer.py b/libs/common/beets/importer.py similarity index 100% rename from libs/beets/importer.py rename to libs/common/beets/importer.py diff --git a/libs/beets/library.py b/libs/common/beets/library.py similarity index 100% rename from libs/beets/library.py rename to libs/common/beets/library.py diff --git a/libs/beets/logging.py b/libs/common/beets/logging.py similarity index 100% rename from libs/beets/logging.py rename to libs/common/beets/logging.py diff --git a/libs/beets/mediafile.py b/libs/common/beets/mediafile.py similarity index 100% rename from libs/beets/mediafile.py rename to libs/common/beets/mediafile.py diff --git a/libs/beets/plugins.py b/libs/common/beets/plugins.py similarity index 100% rename from libs/beets/plugins.py rename to libs/common/beets/plugins.py diff --git a/libs/beets/ui/__init__.py b/libs/common/beets/ui/__init__.py similarity index 100% rename from libs/beets/ui/__init__.py rename to libs/common/beets/ui/__init__.py diff --git a/libs/beets/ui/commands.py b/libs/common/beets/ui/commands.py similarity index 100% rename from libs/beets/ui/commands.py rename to libs/common/beets/ui/commands.py diff --git a/libs/beets/ui/completion_base.sh b/libs/common/beets/ui/completion_base.sh similarity index 100% rename from libs/beets/ui/completion_base.sh rename to libs/common/beets/ui/completion_base.sh diff --git a/libs/beets/util/__init__.py b/libs/common/beets/util/__init__.py similarity index 100% rename from libs/beets/util/__init__.py rename to libs/common/beets/util/__init__.py diff --git a/libs/beets/util/artresizer.py b/libs/common/beets/util/artresizer.py similarity index 100% rename from libs/beets/util/artresizer.py rename to libs/common/beets/util/artresizer.py diff --git a/libs/beets/util/bluelet.py b/libs/common/beets/util/bluelet.py similarity index 100% rename from libs/beets/util/bluelet.py rename to libs/common/beets/util/bluelet.py diff --git a/libs/beets/util/confit.py b/libs/common/beets/util/confit.py similarity index 100% rename from libs/beets/util/confit.py rename to libs/common/beets/util/confit.py diff --git a/libs/beets/util/enumeration.py b/libs/common/beets/util/enumeration.py similarity index 100% rename from libs/beets/util/enumeration.py rename to libs/common/beets/util/enumeration.py diff --git a/libs/beets/util/functemplate.py b/libs/common/beets/util/functemplate.py similarity index 100% rename from libs/beets/util/functemplate.py rename to libs/common/beets/util/functemplate.py diff --git a/libs/beets/util/hidden.py b/libs/common/beets/util/hidden.py similarity index 100% rename from libs/beets/util/hidden.py rename to libs/common/beets/util/hidden.py diff --git a/libs/beets/util/pipeline.py b/libs/common/beets/util/pipeline.py similarity index 100% rename from libs/beets/util/pipeline.py rename to libs/common/beets/util/pipeline.py diff --git a/libs/beets/vfs.py b/libs/common/beets/vfs.py similarity index 100% rename from libs/beets/vfs.py rename to libs/common/beets/vfs.py diff --git a/libs/beetsplug/__init__.py b/libs/common/beetsplug/__init__.py similarity index 100% rename from libs/beetsplug/__init__.py rename to libs/common/beetsplug/__init__.py diff --git a/libs/beetsplug/absubmit.py b/libs/common/beetsplug/absubmit.py similarity index 100% rename from libs/beetsplug/absubmit.py rename to libs/common/beetsplug/absubmit.py diff --git a/libs/beetsplug/acousticbrainz.py b/libs/common/beetsplug/acousticbrainz.py similarity index 100% rename from libs/beetsplug/acousticbrainz.py rename to libs/common/beetsplug/acousticbrainz.py diff --git a/libs/beetsplug/badfiles.py b/libs/common/beetsplug/badfiles.py similarity index 100% rename from libs/beetsplug/badfiles.py rename to libs/common/beetsplug/badfiles.py diff --git a/libs/beetsplug/beatport.py b/libs/common/beetsplug/beatport.py similarity index 100% rename from libs/beetsplug/beatport.py rename to libs/common/beetsplug/beatport.py diff --git a/libs/beetsplug/bench.py b/libs/common/beetsplug/bench.py similarity index 100% rename from libs/beetsplug/bench.py rename to libs/common/beetsplug/bench.py diff --git a/libs/beetsplug/bpd/__init__.py b/libs/common/beetsplug/bpd/__init__.py similarity index 100% rename from libs/beetsplug/bpd/__init__.py rename to libs/common/beetsplug/bpd/__init__.py diff --git a/libs/beetsplug/bpd/gstplayer.py b/libs/common/beetsplug/bpd/gstplayer.py similarity index 100% rename from libs/beetsplug/bpd/gstplayer.py rename to libs/common/beetsplug/bpd/gstplayer.py diff --git a/libs/beetsplug/bpm.py b/libs/common/beetsplug/bpm.py similarity index 100% rename from libs/beetsplug/bpm.py rename to libs/common/beetsplug/bpm.py diff --git a/libs/beetsplug/bucket.py b/libs/common/beetsplug/bucket.py similarity index 100% rename from libs/beetsplug/bucket.py rename to libs/common/beetsplug/bucket.py diff --git a/libs/beetsplug/chroma.py b/libs/common/beetsplug/chroma.py similarity index 100% rename from libs/beetsplug/chroma.py rename to libs/common/beetsplug/chroma.py diff --git a/libs/beetsplug/convert.py b/libs/common/beetsplug/convert.py similarity index 100% rename from libs/beetsplug/convert.py rename to libs/common/beetsplug/convert.py diff --git a/libs/beetsplug/cue.py b/libs/common/beetsplug/cue.py similarity index 100% rename from libs/beetsplug/cue.py rename to libs/common/beetsplug/cue.py diff --git a/libs/beetsplug/discogs.py b/libs/common/beetsplug/discogs.py similarity index 100% rename from libs/beetsplug/discogs.py rename to libs/common/beetsplug/discogs.py diff --git a/libs/beetsplug/duplicates.py b/libs/common/beetsplug/duplicates.py similarity index 100% rename from libs/beetsplug/duplicates.py rename to libs/common/beetsplug/duplicates.py diff --git a/libs/beetsplug/edit.py b/libs/common/beetsplug/edit.py similarity index 100% rename from libs/beetsplug/edit.py rename to libs/common/beetsplug/edit.py diff --git a/libs/beetsplug/embedart.py b/libs/common/beetsplug/embedart.py similarity index 100% rename from libs/beetsplug/embedart.py rename to libs/common/beetsplug/embedart.py diff --git a/libs/beetsplug/embyupdate.py b/libs/common/beetsplug/embyupdate.py similarity index 100% rename from libs/beetsplug/embyupdate.py rename to libs/common/beetsplug/embyupdate.py diff --git a/libs/beetsplug/export.py b/libs/common/beetsplug/export.py similarity index 100% rename from libs/beetsplug/export.py rename to libs/common/beetsplug/export.py diff --git a/libs/beetsplug/fetchart.py b/libs/common/beetsplug/fetchart.py similarity index 100% rename from libs/beetsplug/fetchart.py rename to libs/common/beetsplug/fetchart.py diff --git a/libs/beetsplug/filefilter.py b/libs/common/beetsplug/filefilter.py similarity index 100% rename from libs/beetsplug/filefilter.py rename to libs/common/beetsplug/filefilter.py diff --git a/libs/beetsplug/freedesktop.py b/libs/common/beetsplug/freedesktop.py similarity index 100% rename from libs/beetsplug/freedesktop.py rename to libs/common/beetsplug/freedesktop.py diff --git a/libs/beetsplug/fromfilename.py b/libs/common/beetsplug/fromfilename.py similarity index 100% rename from libs/beetsplug/fromfilename.py rename to libs/common/beetsplug/fromfilename.py diff --git a/libs/beetsplug/ftintitle.py b/libs/common/beetsplug/ftintitle.py similarity index 100% rename from libs/beetsplug/ftintitle.py rename to libs/common/beetsplug/ftintitle.py diff --git a/libs/beetsplug/fuzzy.py b/libs/common/beetsplug/fuzzy.py similarity index 100% rename from libs/beetsplug/fuzzy.py rename to libs/common/beetsplug/fuzzy.py diff --git a/libs/beetsplug/gmusic.py b/libs/common/beetsplug/gmusic.py similarity index 100% rename from libs/beetsplug/gmusic.py rename to libs/common/beetsplug/gmusic.py diff --git a/libs/beetsplug/hook.py b/libs/common/beetsplug/hook.py similarity index 100% rename from libs/beetsplug/hook.py rename to libs/common/beetsplug/hook.py diff --git a/libs/beetsplug/ihate.py b/libs/common/beetsplug/ihate.py similarity index 100% rename from libs/beetsplug/ihate.py rename to libs/common/beetsplug/ihate.py diff --git a/libs/beetsplug/importadded.py b/libs/common/beetsplug/importadded.py similarity index 100% rename from libs/beetsplug/importadded.py rename to libs/common/beetsplug/importadded.py diff --git a/libs/beetsplug/importfeeds.py b/libs/common/beetsplug/importfeeds.py similarity index 100% rename from libs/beetsplug/importfeeds.py rename to libs/common/beetsplug/importfeeds.py diff --git a/libs/beetsplug/info.py b/libs/common/beetsplug/info.py similarity index 100% rename from libs/beetsplug/info.py rename to libs/common/beetsplug/info.py diff --git a/libs/beetsplug/inline.py b/libs/common/beetsplug/inline.py similarity index 100% rename from libs/beetsplug/inline.py rename to libs/common/beetsplug/inline.py diff --git a/libs/beetsplug/ipfs.py b/libs/common/beetsplug/ipfs.py similarity index 100% rename from libs/beetsplug/ipfs.py rename to libs/common/beetsplug/ipfs.py diff --git a/libs/beetsplug/keyfinder.py b/libs/common/beetsplug/keyfinder.py similarity index 100% rename from libs/beetsplug/keyfinder.py rename to libs/common/beetsplug/keyfinder.py diff --git a/libs/beetsplug/kodiupdate.py b/libs/common/beetsplug/kodiupdate.py similarity index 100% rename from libs/beetsplug/kodiupdate.py rename to libs/common/beetsplug/kodiupdate.py diff --git a/libs/beetsplug/lastgenre/__init__.py b/libs/common/beetsplug/lastgenre/__init__.py similarity index 100% rename from libs/beetsplug/lastgenre/__init__.py rename to libs/common/beetsplug/lastgenre/__init__.py diff --git a/libs/beetsplug/lastgenre/genres-tree.yaml b/libs/common/beetsplug/lastgenre/genres-tree.yaml similarity index 100% rename from libs/beetsplug/lastgenre/genres-tree.yaml rename to libs/common/beetsplug/lastgenre/genres-tree.yaml diff --git a/libs/beetsplug/lastgenre/genres.txt b/libs/common/beetsplug/lastgenre/genres.txt similarity index 100% rename from libs/beetsplug/lastgenre/genres.txt rename to libs/common/beetsplug/lastgenre/genres.txt diff --git a/libs/beetsplug/lastimport.py b/libs/common/beetsplug/lastimport.py similarity index 100% rename from libs/beetsplug/lastimport.py rename to libs/common/beetsplug/lastimport.py diff --git a/libs/beetsplug/lyrics.py b/libs/common/beetsplug/lyrics.py similarity index 100% rename from libs/beetsplug/lyrics.py rename to libs/common/beetsplug/lyrics.py diff --git a/libs/beetsplug/mbcollection.py b/libs/common/beetsplug/mbcollection.py similarity index 100% rename from libs/beetsplug/mbcollection.py rename to libs/common/beetsplug/mbcollection.py diff --git a/libs/beetsplug/mbsubmit.py b/libs/common/beetsplug/mbsubmit.py similarity index 100% rename from libs/beetsplug/mbsubmit.py rename to libs/common/beetsplug/mbsubmit.py diff --git a/libs/beetsplug/mbsync.py b/libs/common/beetsplug/mbsync.py similarity index 100% rename from libs/beetsplug/mbsync.py rename to libs/common/beetsplug/mbsync.py diff --git a/libs/beetsplug/metasync/__init__.py b/libs/common/beetsplug/metasync/__init__.py similarity index 100% rename from libs/beetsplug/metasync/__init__.py rename to libs/common/beetsplug/metasync/__init__.py diff --git a/libs/beetsplug/metasync/amarok.py b/libs/common/beetsplug/metasync/amarok.py similarity index 100% rename from libs/beetsplug/metasync/amarok.py rename to libs/common/beetsplug/metasync/amarok.py diff --git a/libs/beetsplug/metasync/itunes.py b/libs/common/beetsplug/metasync/itunes.py similarity index 100% rename from libs/beetsplug/metasync/itunes.py rename to libs/common/beetsplug/metasync/itunes.py diff --git a/libs/beetsplug/missing.py b/libs/common/beetsplug/missing.py similarity index 100% rename from libs/beetsplug/missing.py rename to libs/common/beetsplug/missing.py diff --git a/libs/beetsplug/mpdstats.py b/libs/common/beetsplug/mpdstats.py similarity index 100% rename from libs/beetsplug/mpdstats.py rename to libs/common/beetsplug/mpdstats.py diff --git a/libs/beetsplug/mpdupdate.py b/libs/common/beetsplug/mpdupdate.py similarity index 100% rename from libs/beetsplug/mpdupdate.py rename to libs/common/beetsplug/mpdupdate.py diff --git a/libs/beetsplug/permissions.py b/libs/common/beetsplug/permissions.py similarity index 100% rename from libs/beetsplug/permissions.py rename to libs/common/beetsplug/permissions.py diff --git a/libs/beetsplug/play.py b/libs/common/beetsplug/play.py similarity index 100% rename from libs/beetsplug/play.py rename to libs/common/beetsplug/play.py diff --git a/libs/beetsplug/plexupdate.py b/libs/common/beetsplug/plexupdate.py similarity index 100% rename from libs/beetsplug/plexupdate.py rename to libs/common/beetsplug/plexupdate.py diff --git a/libs/beetsplug/random.py b/libs/common/beetsplug/random.py similarity index 100% rename from libs/beetsplug/random.py rename to libs/common/beetsplug/random.py diff --git a/libs/beetsplug/replaygain.py b/libs/common/beetsplug/replaygain.py similarity index 100% rename from libs/beetsplug/replaygain.py rename to libs/common/beetsplug/replaygain.py diff --git a/libs/beetsplug/rewrite.py b/libs/common/beetsplug/rewrite.py similarity index 100% rename from libs/beetsplug/rewrite.py rename to libs/common/beetsplug/rewrite.py diff --git a/libs/beetsplug/scrub.py b/libs/common/beetsplug/scrub.py similarity index 100% rename from libs/beetsplug/scrub.py rename to libs/common/beetsplug/scrub.py diff --git a/libs/beetsplug/smartplaylist.py b/libs/common/beetsplug/smartplaylist.py similarity index 100% rename from libs/beetsplug/smartplaylist.py rename to libs/common/beetsplug/smartplaylist.py diff --git a/libs/beetsplug/sonosupdate.py b/libs/common/beetsplug/sonosupdate.py similarity index 100% rename from libs/beetsplug/sonosupdate.py rename to libs/common/beetsplug/sonosupdate.py diff --git a/libs/beetsplug/spotify.py b/libs/common/beetsplug/spotify.py similarity index 100% rename from libs/beetsplug/spotify.py rename to libs/common/beetsplug/spotify.py diff --git a/libs/beetsplug/the.py b/libs/common/beetsplug/the.py similarity index 100% rename from libs/beetsplug/the.py rename to libs/common/beetsplug/the.py diff --git a/libs/beetsplug/thumbnails.py b/libs/common/beetsplug/thumbnails.py similarity index 100% rename from libs/beetsplug/thumbnails.py rename to libs/common/beetsplug/thumbnails.py diff --git a/libs/beetsplug/types.py b/libs/common/beetsplug/types.py similarity index 100% rename from libs/beetsplug/types.py rename to libs/common/beetsplug/types.py diff --git a/libs/beetsplug/web/__init__.py b/libs/common/beetsplug/web/__init__.py similarity index 100% rename from libs/beetsplug/web/__init__.py rename to libs/common/beetsplug/web/__init__.py diff --git a/libs/beetsplug/web/static/backbone.js b/libs/common/beetsplug/web/static/backbone.js similarity index 100% rename from libs/beetsplug/web/static/backbone.js rename to libs/common/beetsplug/web/static/backbone.js diff --git a/libs/beetsplug/web/static/beets.css b/libs/common/beetsplug/web/static/beets.css similarity index 100% rename from libs/beetsplug/web/static/beets.css rename to libs/common/beetsplug/web/static/beets.css diff --git a/libs/beetsplug/web/static/beets.js b/libs/common/beetsplug/web/static/beets.js similarity index 100% rename from libs/beetsplug/web/static/beets.js rename to libs/common/beetsplug/web/static/beets.js diff --git a/libs/beetsplug/web/static/jquery.js b/libs/common/beetsplug/web/static/jquery.js similarity index 100% rename from libs/beetsplug/web/static/jquery.js rename to libs/common/beetsplug/web/static/jquery.js diff --git a/libs/beetsplug/web/static/underscore.js b/libs/common/beetsplug/web/static/underscore.js similarity index 100% rename from libs/beetsplug/web/static/underscore.js rename to libs/common/beetsplug/web/static/underscore.js diff --git a/libs/beetsplug/web/templates/index.html b/libs/common/beetsplug/web/templates/index.html similarity index 100% rename from libs/beetsplug/web/templates/index.html rename to libs/common/beetsplug/web/templates/index.html diff --git a/libs/beetsplug/zero.py b/libs/common/beetsplug/zero.py similarity index 100% rename from libs/beetsplug/zero.py rename to libs/common/beetsplug/zero.py diff --git a/libs/bin/beet.exe b/libs/common/bin/beet.exe similarity index 99% rename from libs/bin/beet.exe rename to libs/common/bin/beet.exe index 2028d200..e91e175e 100644 Binary files a/libs/bin/beet.exe and b/libs/common/bin/beet.exe differ diff --git a/libs/bin/chardetect.exe b/libs/common/bin/chardetect.exe similarity index 99% rename from libs/bin/chardetect.exe rename to libs/common/bin/chardetect.exe index a19f47a0..17242a80 100644 Binary files a/libs/bin/chardetect.exe and b/libs/common/bin/chardetect.exe differ diff --git a/libs/bin/easy_install-3.7.exe b/libs/common/bin/easy_install-3.7.exe similarity index 99% rename from libs/bin/easy_install-3.7.exe rename to libs/common/bin/easy_install-3.7.exe index 65388f40..ba897f33 100644 Binary files a/libs/bin/easy_install-3.7.exe and b/libs/common/bin/easy_install-3.7.exe differ diff --git a/libs/bin/easy_install.exe b/libs/common/bin/easy_install.exe similarity index 99% rename from libs/bin/easy_install.exe rename to libs/common/bin/easy_install.exe index 65388f40..ba897f33 100644 Binary files a/libs/bin/easy_install.exe and b/libs/common/bin/easy_install.exe differ diff --git a/libs/bin/guessit.exe b/libs/common/bin/guessit.exe similarity index 99% rename from libs/bin/guessit.exe rename to libs/common/bin/guessit.exe index 0645fb74..099b3bfb 100644 Binary files a/libs/bin/guessit.exe and b/libs/common/bin/guessit.exe differ diff --git a/libs/bin/mid3cp b/libs/common/bin/mid3cp similarity index 90% rename from libs/bin/mid3cp rename to libs/common/bin/mid3cp index 2020a753..8a773e56 100644 --- a/libs/bin/mid3cp +++ b/libs/common/bin/mid3cp @@ -1,4 +1,4 @@ -#!h:\src\env\nzbtomedia\scripts\python.exe +#!C:\Python\3.7\python.exe # -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # diff --git a/libs/bin/mid3iconv b/libs/common/bin/mid3iconv similarity index 90% rename from libs/bin/mid3iconv rename to libs/common/bin/mid3iconv index b15ad500..332f6b70 100644 --- a/libs/bin/mid3iconv +++ b/libs/common/bin/mid3iconv @@ -1,4 +1,4 @@ -#!h:\src\env\nzbtomedia\scripts\python.exe +#!C:\Python\3.7\python.exe # -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # diff --git a/libs/bin/mid3v2 b/libs/common/bin/mid3v2 similarity index 90% rename from libs/bin/mid3v2 rename to libs/common/bin/mid3v2 index 34064886..1bf2d13d 100644 --- a/libs/bin/mid3v2 +++ b/libs/common/bin/mid3v2 @@ -1,4 +1,4 @@ -#!h:\src\env\nzbtomedia\scripts\python.exe +#!C:\Python\3.7\python.exe # -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # diff --git a/libs/bin/moggsplit b/libs/common/bin/moggsplit similarity index 90% rename from libs/bin/moggsplit rename to libs/common/bin/moggsplit index 005789e4..f43d1360 100644 --- a/libs/bin/moggsplit +++ b/libs/common/bin/moggsplit @@ -1,4 +1,4 @@ -#!h:\src\env\nzbtomedia\scripts\python.exe +#!C:\Python\3.7\python.exe # -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # diff --git a/libs/bin/mutagen-inspect b/libs/common/bin/mutagen-inspect similarity index 90% rename from libs/bin/mutagen-inspect rename to libs/common/bin/mutagen-inspect index 2e10d131..746b414e 100644 --- a/libs/bin/mutagen-inspect +++ b/libs/common/bin/mutagen-inspect @@ -1,4 +1,4 @@ -#!h:\src\env\nzbtomedia\scripts\python.exe +#!C:\Python\3.7\python.exe # -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # diff --git a/libs/bin/mutagen-pony b/libs/common/bin/mutagen-pony similarity index 90% rename from libs/bin/mutagen-pony rename to libs/common/bin/mutagen-pony index a03cd90f..a289a988 100644 --- a/libs/bin/mutagen-pony +++ b/libs/common/bin/mutagen-pony @@ -1,4 +1,4 @@ -#!h:\src\env\nzbtomedia\scripts\python.exe +#!C:\Python\3.7\python.exe # -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # diff --git a/libs/bin/pbr.exe b/libs/common/bin/pbr.exe similarity index 99% rename from libs/bin/pbr.exe rename to libs/common/bin/pbr.exe index 9021803a..e7eab92c 100644 Binary files a/libs/bin/pbr.exe and b/libs/common/bin/pbr.exe differ diff --git a/libs/bin/srt.exe b/libs/common/bin/srt.exe similarity index 99% rename from libs/bin/srt.exe rename to libs/common/bin/srt.exe index 57a09da5..90e6494d 100644 Binary files a/libs/bin/srt.exe and b/libs/common/bin/srt.exe differ diff --git a/libs/bin/subliminal.exe b/libs/common/bin/subliminal.exe similarity index 99% rename from libs/bin/subliminal.exe rename to libs/common/bin/subliminal.exe index 51c897be..280ce315 100644 Binary files a/libs/bin/subliminal.exe and b/libs/common/bin/subliminal.exe differ diff --git a/libs/bin/unidecode.exe b/libs/common/bin/unidecode.exe similarity index 99% rename from libs/bin/unidecode.exe rename to libs/common/bin/unidecode.exe index 07a0e413..0880f1b8 100644 Binary files a/libs/bin/unidecode.exe and b/libs/common/bin/unidecode.exe differ diff --git a/libs/bs4/__init__.py b/libs/common/bs4/__init__.py similarity index 100% rename from libs/bs4/__init__.py rename to libs/common/bs4/__init__.py diff --git a/libs/bs4/builder/__init__.py b/libs/common/bs4/builder/__init__.py similarity index 100% rename from libs/bs4/builder/__init__.py rename to libs/common/bs4/builder/__init__.py diff --git a/libs/bs4/builder/_html5lib.py b/libs/common/bs4/builder/_html5lib.py similarity index 100% rename from libs/bs4/builder/_html5lib.py rename to libs/common/bs4/builder/_html5lib.py diff --git a/libs/bs4/builder/_htmlparser.py b/libs/common/bs4/builder/_htmlparser.py similarity index 100% rename from libs/bs4/builder/_htmlparser.py rename to libs/common/bs4/builder/_htmlparser.py diff --git a/libs/bs4/builder/_lxml.py b/libs/common/bs4/builder/_lxml.py similarity index 100% rename from libs/bs4/builder/_lxml.py rename to libs/common/bs4/builder/_lxml.py diff --git a/libs/bs4/dammit.py b/libs/common/bs4/dammit.py similarity index 100% rename from libs/bs4/dammit.py rename to libs/common/bs4/dammit.py diff --git a/libs/bs4/diagnose.py b/libs/common/bs4/diagnose.py similarity index 100% rename from libs/bs4/diagnose.py rename to libs/common/bs4/diagnose.py diff --git a/libs/bs4/element.py b/libs/common/bs4/element.py similarity index 100% rename from libs/bs4/element.py rename to libs/common/bs4/element.py diff --git a/libs/bs4/testing.py b/libs/common/bs4/testing.py similarity index 100% rename from libs/bs4/testing.py rename to libs/common/bs4/testing.py diff --git a/libs/bs4/tests/__init__.py b/libs/common/bs4/tests/__init__.py similarity index 100% rename from libs/bs4/tests/__init__.py rename to libs/common/bs4/tests/__init__.py diff --git a/libs/bs4/tests/test_builder_registry.py b/libs/common/bs4/tests/test_builder_registry.py similarity index 100% rename from libs/bs4/tests/test_builder_registry.py rename to libs/common/bs4/tests/test_builder_registry.py diff --git a/libs/bs4/tests/test_docs.py b/libs/common/bs4/tests/test_docs.py similarity index 100% rename from libs/bs4/tests/test_docs.py rename to libs/common/bs4/tests/test_docs.py diff --git a/libs/bs4/tests/test_html5lib.py b/libs/common/bs4/tests/test_html5lib.py similarity index 100% rename from libs/bs4/tests/test_html5lib.py rename to libs/common/bs4/tests/test_html5lib.py diff --git a/libs/bs4/tests/test_htmlparser.py b/libs/common/bs4/tests/test_htmlparser.py similarity index 100% rename from libs/bs4/tests/test_htmlparser.py rename to libs/common/bs4/tests/test_htmlparser.py diff --git a/libs/bs4/tests/test_lxml.py b/libs/common/bs4/tests/test_lxml.py similarity index 100% rename from libs/bs4/tests/test_lxml.py rename to libs/common/bs4/tests/test_lxml.py diff --git a/libs/bs4/tests/test_soup.py b/libs/common/bs4/tests/test_soup.py similarity index 100% rename from libs/bs4/tests/test_soup.py rename to libs/common/bs4/tests/test_soup.py diff --git a/libs/bs4/tests/test_tree.py b/libs/common/bs4/tests/test_tree.py similarity index 100% rename from libs/bs4/tests/test_tree.py rename to libs/common/bs4/tests/test_tree.py diff --git a/libs/certifi/__init__.py b/libs/common/certifi/__init__.py similarity index 100% rename from libs/certifi/__init__.py rename to libs/common/certifi/__init__.py diff --git a/libs/certifi/__main__.py b/libs/common/certifi/__main__.py similarity index 100% rename from libs/certifi/__main__.py rename to libs/common/certifi/__main__.py diff --git a/libs/certifi/cacert.pem b/libs/common/certifi/cacert.pem similarity index 100% rename from libs/certifi/cacert.pem rename to libs/common/certifi/cacert.pem diff --git a/libs/certifi/core.py b/libs/common/certifi/core.py similarity index 100% rename from libs/certifi/core.py rename to libs/common/certifi/core.py diff --git a/libs/chardet/__init__.py b/libs/common/chardet/__init__.py similarity index 100% rename from libs/chardet/__init__.py rename to libs/common/chardet/__init__.py diff --git a/libs/chardet/big5freq.py b/libs/common/chardet/big5freq.py similarity index 100% rename from libs/chardet/big5freq.py rename to libs/common/chardet/big5freq.py diff --git a/libs/chardet/big5prober.py b/libs/common/chardet/big5prober.py similarity index 100% rename from libs/chardet/big5prober.py rename to libs/common/chardet/big5prober.py diff --git a/libs/chardet/chardistribution.py b/libs/common/chardet/chardistribution.py similarity index 100% rename from libs/chardet/chardistribution.py rename to libs/common/chardet/chardistribution.py diff --git a/libs/chardet/charsetgroupprober.py b/libs/common/chardet/charsetgroupprober.py similarity index 100% rename from libs/chardet/charsetgroupprober.py rename to libs/common/chardet/charsetgroupprober.py diff --git a/libs/chardet/charsetprober.py b/libs/common/chardet/charsetprober.py similarity index 100% rename from libs/chardet/charsetprober.py rename to libs/common/chardet/charsetprober.py diff --git a/libs/chardet/cli/__init__.py b/libs/common/chardet/cli/__init__.py similarity index 100% rename from libs/chardet/cli/__init__.py rename to libs/common/chardet/cli/__init__.py diff --git a/libs/chardet/cli/chardetect.py b/libs/common/chardet/cli/chardetect.py similarity index 100% rename from libs/chardet/cli/chardetect.py rename to libs/common/chardet/cli/chardetect.py diff --git a/libs/chardet/codingstatemachine.py b/libs/common/chardet/codingstatemachine.py similarity index 100% rename from libs/chardet/codingstatemachine.py rename to libs/common/chardet/codingstatemachine.py diff --git a/libs/chardet/compat.py b/libs/common/chardet/compat.py similarity index 100% rename from libs/chardet/compat.py rename to libs/common/chardet/compat.py diff --git a/libs/chardet/cp949prober.py b/libs/common/chardet/cp949prober.py similarity index 100% rename from libs/chardet/cp949prober.py rename to libs/common/chardet/cp949prober.py diff --git a/libs/chardet/enums.py b/libs/common/chardet/enums.py similarity index 100% rename from libs/chardet/enums.py rename to libs/common/chardet/enums.py diff --git a/libs/chardet/escprober.py b/libs/common/chardet/escprober.py similarity index 100% rename from libs/chardet/escprober.py rename to libs/common/chardet/escprober.py diff --git a/libs/chardet/escsm.py b/libs/common/chardet/escsm.py similarity index 100% rename from libs/chardet/escsm.py rename to libs/common/chardet/escsm.py diff --git a/libs/chardet/eucjpprober.py b/libs/common/chardet/eucjpprober.py similarity index 100% rename from libs/chardet/eucjpprober.py rename to libs/common/chardet/eucjpprober.py diff --git a/libs/chardet/euckrfreq.py b/libs/common/chardet/euckrfreq.py similarity index 100% rename from libs/chardet/euckrfreq.py rename to libs/common/chardet/euckrfreq.py diff --git a/libs/chardet/euckrprober.py b/libs/common/chardet/euckrprober.py similarity index 100% rename from libs/chardet/euckrprober.py rename to libs/common/chardet/euckrprober.py diff --git a/libs/chardet/euctwfreq.py b/libs/common/chardet/euctwfreq.py similarity index 100% rename from libs/chardet/euctwfreq.py rename to libs/common/chardet/euctwfreq.py diff --git a/libs/chardet/euctwprober.py b/libs/common/chardet/euctwprober.py similarity index 100% rename from libs/chardet/euctwprober.py rename to libs/common/chardet/euctwprober.py diff --git a/libs/chardet/gb2312freq.py b/libs/common/chardet/gb2312freq.py similarity index 100% rename from libs/chardet/gb2312freq.py rename to libs/common/chardet/gb2312freq.py diff --git a/libs/chardet/gb2312prober.py b/libs/common/chardet/gb2312prober.py similarity index 100% rename from libs/chardet/gb2312prober.py rename to libs/common/chardet/gb2312prober.py diff --git a/libs/chardet/hebrewprober.py b/libs/common/chardet/hebrewprober.py similarity index 100% rename from libs/chardet/hebrewprober.py rename to libs/common/chardet/hebrewprober.py diff --git a/libs/chardet/jisfreq.py b/libs/common/chardet/jisfreq.py similarity index 100% rename from libs/chardet/jisfreq.py rename to libs/common/chardet/jisfreq.py diff --git a/libs/chardet/jpcntx.py b/libs/common/chardet/jpcntx.py similarity index 100% rename from libs/chardet/jpcntx.py rename to libs/common/chardet/jpcntx.py diff --git a/libs/chardet/langbulgarianmodel.py b/libs/common/chardet/langbulgarianmodel.py similarity index 100% rename from libs/chardet/langbulgarianmodel.py rename to libs/common/chardet/langbulgarianmodel.py diff --git a/libs/chardet/langcyrillicmodel.py b/libs/common/chardet/langcyrillicmodel.py similarity index 100% rename from libs/chardet/langcyrillicmodel.py rename to libs/common/chardet/langcyrillicmodel.py diff --git a/libs/chardet/langgreekmodel.py b/libs/common/chardet/langgreekmodel.py similarity index 100% rename from libs/chardet/langgreekmodel.py rename to libs/common/chardet/langgreekmodel.py diff --git a/libs/chardet/langhebrewmodel.py b/libs/common/chardet/langhebrewmodel.py similarity index 100% rename from libs/chardet/langhebrewmodel.py rename to libs/common/chardet/langhebrewmodel.py diff --git a/libs/chardet/langhungarianmodel.py b/libs/common/chardet/langhungarianmodel.py similarity index 100% rename from libs/chardet/langhungarianmodel.py rename to libs/common/chardet/langhungarianmodel.py diff --git a/libs/chardet/langthaimodel.py b/libs/common/chardet/langthaimodel.py similarity index 100% rename from libs/chardet/langthaimodel.py rename to libs/common/chardet/langthaimodel.py diff --git a/libs/chardet/langturkishmodel.py b/libs/common/chardet/langturkishmodel.py similarity index 100% rename from libs/chardet/langturkishmodel.py rename to libs/common/chardet/langturkishmodel.py diff --git a/libs/chardet/latin1prober.py b/libs/common/chardet/latin1prober.py similarity index 100% rename from libs/chardet/latin1prober.py rename to libs/common/chardet/latin1prober.py diff --git a/libs/chardet/mbcharsetprober.py b/libs/common/chardet/mbcharsetprober.py similarity index 100% rename from libs/chardet/mbcharsetprober.py rename to libs/common/chardet/mbcharsetprober.py diff --git a/libs/chardet/mbcsgroupprober.py b/libs/common/chardet/mbcsgroupprober.py similarity index 100% rename from libs/chardet/mbcsgroupprober.py rename to libs/common/chardet/mbcsgroupprober.py diff --git a/libs/chardet/mbcssm.py b/libs/common/chardet/mbcssm.py similarity index 100% rename from libs/chardet/mbcssm.py rename to libs/common/chardet/mbcssm.py diff --git a/libs/chardet/sbcharsetprober.py b/libs/common/chardet/sbcharsetprober.py similarity index 100% rename from libs/chardet/sbcharsetprober.py rename to libs/common/chardet/sbcharsetprober.py diff --git a/libs/chardet/sbcsgroupprober.py b/libs/common/chardet/sbcsgroupprober.py similarity index 100% rename from libs/chardet/sbcsgroupprober.py rename to libs/common/chardet/sbcsgroupprober.py diff --git a/libs/chardet/sjisprober.py b/libs/common/chardet/sjisprober.py similarity index 100% rename from libs/chardet/sjisprober.py rename to libs/common/chardet/sjisprober.py diff --git a/libs/chardet/universaldetector.py b/libs/common/chardet/universaldetector.py similarity index 100% rename from libs/chardet/universaldetector.py rename to libs/common/chardet/universaldetector.py diff --git a/libs/chardet/utf8prober.py b/libs/common/chardet/utf8prober.py similarity index 100% rename from libs/chardet/utf8prober.py rename to libs/common/chardet/utf8prober.py diff --git a/libs/chardet/version.py b/libs/common/chardet/version.py similarity index 100% rename from libs/chardet/version.py rename to libs/common/chardet/version.py diff --git a/libs/click/__init__.py b/libs/common/click/__init__.py similarity index 100% rename from libs/click/__init__.py rename to libs/common/click/__init__.py diff --git a/libs/click/_bashcomplete.py b/libs/common/click/_bashcomplete.py similarity index 100% rename from libs/click/_bashcomplete.py rename to libs/common/click/_bashcomplete.py diff --git a/libs/click/_compat.py b/libs/common/click/_compat.py similarity index 100% rename from libs/click/_compat.py rename to libs/common/click/_compat.py diff --git a/libs/click/_termui_impl.py b/libs/common/click/_termui_impl.py similarity index 100% rename from libs/click/_termui_impl.py rename to libs/common/click/_termui_impl.py diff --git a/libs/click/_textwrap.py b/libs/common/click/_textwrap.py similarity index 100% rename from libs/click/_textwrap.py rename to libs/common/click/_textwrap.py diff --git a/libs/click/_unicodefun.py b/libs/common/click/_unicodefun.py similarity index 100% rename from libs/click/_unicodefun.py rename to libs/common/click/_unicodefun.py diff --git a/libs/click/_winconsole.py b/libs/common/click/_winconsole.py similarity index 100% rename from libs/click/_winconsole.py rename to libs/common/click/_winconsole.py diff --git a/libs/click/core.py b/libs/common/click/core.py similarity index 100% rename from libs/click/core.py rename to libs/common/click/core.py diff --git a/libs/click/decorators.py b/libs/common/click/decorators.py similarity index 100% rename from libs/click/decorators.py rename to libs/common/click/decorators.py diff --git a/libs/click/exceptions.py b/libs/common/click/exceptions.py similarity index 100% rename from libs/click/exceptions.py rename to libs/common/click/exceptions.py diff --git a/libs/click/formatting.py b/libs/common/click/formatting.py similarity index 100% rename from libs/click/formatting.py rename to libs/common/click/formatting.py diff --git a/libs/click/globals.py b/libs/common/click/globals.py similarity index 100% rename from libs/click/globals.py rename to libs/common/click/globals.py diff --git a/libs/click/parser.py b/libs/common/click/parser.py similarity index 100% rename from libs/click/parser.py rename to libs/common/click/parser.py diff --git a/libs/click/termui.py b/libs/common/click/termui.py similarity index 100% rename from libs/click/termui.py rename to libs/common/click/termui.py diff --git a/libs/click/testing.py b/libs/common/click/testing.py similarity index 100% rename from libs/click/testing.py rename to libs/common/click/testing.py diff --git a/libs/click/types.py b/libs/common/click/types.py similarity index 100% rename from libs/click/types.py rename to libs/common/click/types.py diff --git a/libs/click/utils.py b/libs/common/click/utils.py similarity index 100% rename from libs/click/utils.py rename to libs/common/click/utils.py diff --git a/libs/colorama/__init__.py b/libs/common/colorama/__init__.py similarity index 100% rename from libs/colorama/__init__.py rename to libs/common/colorama/__init__.py diff --git a/libs/colorama/ansi.py b/libs/common/colorama/ansi.py similarity index 100% rename from libs/colorama/ansi.py rename to libs/common/colorama/ansi.py diff --git a/libs/colorama/ansitowin32.py b/libs/common/colorama/ansitowin32.py similarity index 100% rename from libs/colorama/ansitowin32.py rename to libs/common/colorama/ansitowin32.py diff --git a/libs/colorama/initialise.py b/libs/common/colorama/initialise.py similarity index 100% rename from libs/colorama/initialise.py rename to libs/common/colorama/initialise.py diff --git a/libs/colorama/win32.py b/libs/common/colorama/win32.py similarity index 100% rename from libs/colorama/win32.py rename to libs/common/colorama/win32.py diff --git a/libs/colorama/winterm.py b/libs/common/colorama/winterm.py similarity index 100% rename from libs/colorama/winterm.py rename to libs/common/colorama/winterm.py diff --git a/libs/configobj.py b/libs/common/configobj.py similarity index 100% rename from libs/configobj.py rename to libs/common/configobj.py diff --git a/libs/dateutil/__init__.py b/libs/common/dateutil/__init__.py similarity index 100% rename from libs/dateutil/__init__.py rename to libs/common/dateutil/__init__.py diff --git a/libs/dateutil/_common.py b/libs/common/dateutil/_common.py similarity index 100% rename from libs/dateutil/_common.py rename to libs/common/dateutil/_common.py diff --git a/libs/dateutil/_version.py b/libs/common/dateutil/_version.py similarity index 100% rename from libs/dateutil/_version.py rename to libs/common/dateutil/_version.py diff --git a/libs/dateutil/easter.py b/libs/common/dateutil/easter.py similarity index 100% rename from libs/dateutil/easter.py rename to libs/common/dateutil/easter.py diff --git a/libs/dateutil/parser/__init__.py b/libs/common/dateutil/parser/__init__.py similarity index 100% rename from libs/dateutil/parser/__init__.py rename to libs/common/dateutil/parser/__init__.py diff --git a/libs/dateutil/parser/_parser.py b/libs/common/dateutil/parser/_parser.py similarity index 100% rename from libs/dateutil/parser/_parser.py rename to libs/common/dateutil/parser/_parser.py diff --git a/libs/dateutil/parser/isoparser.py b/libs/common/dateutil/parser/isoparser.py similarity index 100% rename from libs/dateutil/parser/isoparser.py rename to libs/common/dateutil/parser/isoparser.py diff --git a/libs/dateutil/relativedelta.py b/libs/common/dateutil/relativedelta.py similarity index 100% rename from libs/dateutil/relativedelta.py rename to libs/common/dateutil/relativedelta.py diff --git a/libs/dateutil/rrule.py b/libs/common/dateutil/rrule.py similarity index 100% rename from libs/dateutil/rrule.py rename to libs/common/dateutil/rrule.py diff --git a/libs/dateutil/tz/__init__.py b/libs/common/dateutil/tz/__init__.py similarity index 100% rename from libs/dateutil/tz/__init__.py rename to libs/common/dateutil/tz/__init__.py diff --git a/libs/dateutil/tz/_common.py b/libs/common/dateutil/tz/_common.py similarity index 100% rename from libs/dateutil/tz/_common.py rename to libs/common/dateutil/tz/_common.py diff --git a/libs/dateutil/tz/_factories.py b/libs/common/dateutil/tz/_factories.py similarity index 100% rename from libs/dateutil/tz/_factories.py rename to libs/common/dateutil/tz/_factories.py diff --git a/libs/dateutil/tz/tz.py b/libs/common/dateutil/tz/tz.py similarity index 100% rename from libs/dateutil/tz/tz.py rename to libs/common/dateutil/tz/tz.py diff --git a/libs/dateutil/tz/win.py b/libs/common/dateutil/tz/win.py similarity index 100% rename from libs/dateutil/tz/win.py rename to libs/common/dateutil/tz/win.py diff --git a/libs/dateutil/tzwin.py b/libs/common/dateutil/tzwin.py similarity index 100% rename from libs/dateutil/tzwin.py rename to libs/common/dateutil/tzwin.py diff --git a/libs/dateutil/utils.py b/libs/common/dateutil/utils.py similarity index 100% rename from libs/dateutil/utils.py rename to libs/common/dateutil/utils.py diff --git a/libs/dateutil/zoneinfo/__init__.py b/libs/common/dateutil/zoneinfo/__init__.py similarity index 100% rename from libs/dateutil/zoneinfo/__init__.py rename to libs/common/dateutil/zoneinfo/__init__.py diff --git a/libs/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz b/libs/common/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz similarity index 100% rename from libs/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz rename to libs/common/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz diff --git a/libs/dateutil/zoneinfo/rebuild.py b/libs/common/dateutil/zoneinfo/rebuild.py similarity index 100% rename from libs/dateutil/zoneinfo/rebuild.py rename to libs/common/dateutil/zoneinfo/rebuild.py diff --git a/libs/decorator.py b/libs/common/decorator.py similarity index 100% rename from libs/decorator.py rename to libs/common/decorator.py diff --git a/libs/dogpile/__init__.py b/libs/common/dogpile/__init__.py similarity index 100% rename from libs/dogpile/__init__.py rename to libs/common/dogpile/__init__.py diff --git a/libs/dogpile/cache/__init__.py b/libs/common/dogpile/cache/__init__.py similarity index 100% rename from libs/dogpile/cache/__init__.py rename to libs/common/dogpile/cache/__init__.py diff --git a/libs/dogpile/cache/api.py b/libs/common/dogpile/cache/api.py similarity index 100% rename from libs/dogpile/cache/api.py rename to libs/common/dogpile/cache/api.py diff --git a/libs/dogpile/cache/backends/__init__.py b/libs/common/dogpile/cache/backends/__init__.py similarity index 100% rename from libs/dogpile/cache/backends/__init__.py rename to libs/common/dogpile/cache/backends/__init__.py diff --git a/libs/dogpile/cache/backends/file.py b/libs/common/dogpile/cache/backends/file.py similarity index 100% rename from libs/dogpile/cache/backends/file.py rename to libs/common/dogpile/cache/backends/file.py diff --git a/libs/dogpile/cache/backends/memcached.py b/libs/common/dogpile/cache/backends/memcached.py similarity index 100% rename from libs/dogpile/cache/backends/memcached.py rename to libs/common/dogpile/cache/backends/memcached.py diff --git a/libs/dogpile/cache/backends/memory.py b/libs/common/dogpile/cache/backends/memory.py similarity index 100% rename from libs/dogpile/cache/backends/memory.py rename to libs/common/dogpile/cache/backends/memory.py diff --git a/libs/dogpile/cache/backends/null.py b/libs/common/dogpile/cache/backends/null.py similarity index 100% rename from libs/dogpile/cache/backends/null.py rename to libs/common/dogpile/cache/backends/null.py diff --git a/libs/dogpile/cache/backends/redis.py b/libs/common/dogpile/cache/backends/redis.py similarity index 100% rename from libs/dogpile/cache/backends/redis.py rename to libs/common/dogpile/cache/backends/redis.py diff --git a/libs/dogpile/cache/exception.py b/libs/common/dogpile/cache/exception.py similarity index 100% rename from libs/dogpile/cache/exception.py rename to libs/common/dogpile/cache/exception.py diff --git a/libs/dogpile/cache/plugins/__init__.py b/libs/common/dogpile/cache/plugins/__init__.py similarity index 100% rename from libs/dogpile/cache/plugins/__init__.py rename to libs/common/dogpile/cache/plugins/__init__.py diff --git a/libs/dogpile/cache/plugins/mako_cache.py b/libs/common/dogpile/cache/plugins/mako_cache.py similarity index 100% rename from libs/dogpile/cache/plugins/mako_cache.py rename to libs/common/dogpile/cache/plugins/mako_cache.py diff --git a/libs/dogpile/cache/proxy.py b/libs/common/dogpile/cache/proxy.py similarity index 100% rename from libs/dogpile/cache/proxy.py rename to libs/common/dogpile/cache/proxy.py diff --git a/libs/dogpile/cache/region.py b/libs/common/dogpile/cache/region.py similarity index 100% rename from libs/dogpile/cache/region.py rename to libs/common/dogpile/cache/region.py diff --git a/libs/dogpile/cache/util.py b/libs/common/dogpile/cache/util.py similarity index 100% rename from libs/dogpile/cache/util.py rename to libs/common/dogpile/cache/util.py diff --git a/libs/dogpile/core.py b/libs/common/dogpile/core.py similarity index 100% rename from libs/dogpile/core.py rename to libs/common/dogpile/core.py diff --git a/libs/dogpile/lock.py b/libs/common/dogpile/lock.py similarity index 100% rename from libs/dogpile/lock.py rename to libs/common/dogpile/lock.py diff --git a/libs/dogpile/util/__init__.py b/libs/common/dogpile/util/__init__.py similarity index 100% rename from libs/dogpile/util/__init__.py rename to libs/common/dogpile/util/__init__.py diff --git a/libs/dogpile/util/compat.py b/libs/common/dogpile/util/compat.py similarity index 100% rename from libs/dogpile/util/compat.py rename to libs/common/dogpile/util/compat.py diff --git a/libs/dogpile/util/langhelpers.py b/libs/common/dogpile/util/langhelpers.py similarity index 100% rename from libs/dogpile/util/langhelpers.py rename to libs/common/dogpile/util/langhelpers.py diff --git a/libs/dogpile/util/nameregistry.py b/libs/common/dogpile/util/nameregistry.py similarity index 100% rename from libs/dogpile/util/nameregistry.py rename to libs/common/dogpile/util/nameregistry.py diff --git a/libs/dogpile/util/readwrite_lock.py b/libs/common/dogpile/util/readwrite_lock.py similarity index 100% rename from libs/dogpile/util/readwrite_lock.py rename to libs/common/dogpile/util/readwrite_lock.py diff --git a/libs/easy_install.py b/libs/common/easy_install.py similarity index 100% rename from libs/easy_install.py rename to libs/common/easy_install.py diff --git a/libs/enzyme/__init__.py b/libs/common/enzyme/__init__.py similarity index 100% rename from libs/enzyme/__init__.py rename to libs/common/enzyme/__init__.py diff --git a/libs/enzyme/compat.py b/libs/common/enzyme/compat.py similarity index 100% rename from libs/enzyme/compat.py rename to libs/common/enzyme/compat.py diff --git a/libs/enzyme/exceptions.py b/libs/common/enzyme/exceptions.py similarity index 100% rename from libs/enzyme/exceptions.py rename to libs/common/enzyme/exceptions.py diff --git a/libs/enzyme/mkv.py b/libs/common/enzyme/mkv.py similarity index 100% rename from libs/enzyme/mkv.py rename to libs/common/enzyme/mkv.py diff --git a/libs/enzyme/parsers/__init__.py b/libs/common/enzyme/parsers/__init__.py similarity index 100% rename from libs/enzyme/parsers/__init__.py rename to libs/common/enzyme/parsers/__init__.py diff --git a/libs/enzyme/parsers/ebml/__init__.py b/libs/common/enzyme/parsers/ebml/__init__.py similarity index 100% rename from libs/enzyme/parsers/ebml/__init__.py rename to libs/common/enzyme/parsers/ebml/__init__.py diff --git a/libs/enzyme/parsers/ebml/core.py b/libs/common/enzyme/parsers/ebml/core.py similarity index 100% rename from libs/enzyme/parsers/ebml/core.py rename to libs/common/enzyme/parsers/ebml/core.py diff --git a/libs/enzyme/parsers/ebml/readers.py b/libs/common/enzyme/parsers/ebml/readers.py similarity index 100% rename from libs/enzyme/parsers/ebml/readers.py rename to libs/common/enzyme/parsers/ebml/readers.py diff --git a/libs/enzyme/parsers/ebml/specs/matroska.xml b/libs/common/enzyme/parsers/ebml/specs/matroska.xml similarity index 100% rename from libs/enzyme/parsers/ebml/specs/matroska.xml rename to libs/common/enzyme/parsers/ebml/specs/matroska.xml diff --git a/libs/enzyme/tests/__init__.py b/libs/common/enzyme/tests/__init__.py similarity index 100% rename from libs/enzyme/tests/__init__.py rename to libs/common/enzyme/tests/__init__.py diff --git a/libs/enzyme/tests/parsers/ebml/test1.mkv.yml b/libs/common/enzyme/tests/parsers/ebml/test1.mkv.yml similarity index 100% rename from libs/enzyme/tests/parsers/ebml/test1.mkv.yml rename to libs/common/enzyme/tests/parsers/ebml/test1.mkv.yml diff --git a/libs/enzyme/tests/test_mkv.py b/libs/common/enzyme/tests/test_mkv.py similarity index 100% rename from libs/enzyme/tests/test_mkv.py rename to libs/common/enzyme/tests/test_mkv.py diff --git a/libs/enzyme/tests/test_parsers.py b/libs/common/enzyme/tests/test_parsers.py similarity index 100% rename from libs/enzyme/tests/test_parsers.py rename to libs/common/enzyme/tests/test_parsers.py diff --git a/libs/guessit/__init__.py b/libs/common/guessit/__init__.py similarity index 100% rename from libs/guessit/__init__.py rename to libs/common/guessit/__init__.py diff --git a/libs/guessit/__main__.py b/libs/common/guessit/__main__.py similarity index 100% rename from libs/guessit/__main__.py rename to libs/common/guessit/__main__.py diff --git a/libs/guessit/__version__.py b/libs/common/guessit/__version__.py similarity index 100% rename from libs/guessit/__version__.py rename to libs/common/guessit/__version__.py diff --git a/libs/guessit/api.py b/libs/common/guessit/api.py similarity index 100% rename from libs/guessit/api.py rename to libs/common/guessit/api.py diff --git a/libs/guessit/backports.py b/libs/common/guessit/backports.py similarity index 100% rename from libs/guessit/backports.py rename to libs/common/guessit/backports.py diff --git a/libs/guessit/config/options.json b/libs/common/guessit/config/options.json similarity index 100% rename from libs/guessit/config/options.json rename to libs/common/guessit/config/options.json diff --git a/libs/guessit/jsonutils.py b/libs/common/guessit/jsonutils.py similarity index 100% rename from libs/guessit/jsonutils.py rename to libs/common/guessit/jsonutils.py diff --git a/libs/guessit/monkeypatch.py b/libs/common/guessit/monkeypatch.py similarity index 100% rename from libs/guessit/monkeypatch.py rename to libs/common/guessit/monkeypatch.py diff --git a/libs/guessit/options.py b/libs/common/guessit/options.py similarity index 100% rename from libs/guessit/options.py rename to libs/common/guessit/options.py diff --git a/libs/guessit/reutils.py b/libs/common/guessit/reutils.py similarity index 100% rename from libs/guessit/reutils.py rename to libs/common/guessit/reutils.py diff --git a/libs/guessit/rules/__init__.py b/libs/common/guessit/rules/__init__.py similarity index 100% rename from libs/guessit/rules/__init__.py rename to libs/common/guessit/rules/__init__.py diff --git a/libs/guessit/rules/common/__init__.py b/libs/common/guessit/rules/common/__init__.py similarity index 100% rename from libs/guessit/rules/common/__init__.py rename to libs/common/guessit/rules/common/__init__.py diff --git a/libs/guessit/rules/common/comparators.py b/libs/common/guessit/rules/common/comparators.py similarity index 100% rename from libs/guessit/rules/common/comparators.py rename to libs/common/guessit/rules/common/comparators.py diff --git a/libs/guessit/rules/common/date.py b/libs/common/guessit/rules/common/date.py similarity index 100% rename from libs/guessit/rules/common/date.py rename to libs/common/guessit/rules/common/date.py diff --git a/libs/guessit/rules/common/expected.py b/libs/common/guessit/rules/common/expected.py similarity index 100% rename from libs/guessit/rules/common/expected.py rename to libs/common/guessit/rules/common/expected.py diff --git a/libs/guessit/rules/common/formatters.py b/libs/common/guessit/rules/common/formatters.py similarity index 100% rename from libs/guessit/rules/common/formatters.py rename to libs/common/guessit/rules/common/formatters.py diff --git a/libs/guessit/rules/common/numeral.py b/libs/common/guessit/rules/common/numeral.py similarity index 100% rename from libs/guessit/rules/common/numeral.py rename to libs/common/guessit/rules/common/numeral.py diff --git a/libs/guessit/rules/common/pattern.py b/libs/common/guessit/rules/common/pattern.py similarity index 100% rename from libs/guessit/rules/common/pattern.py rename to libs/common/guessit/rules/common/pattern.py diff --git a/libs/guessit/rules/common/quantity.py b/libs/common/guessit/rules/common/quantity.py similarity index 100% rename from libs/guessit/rules/common/quantity.py rename to libs/common/guessit/rules/common/quantity.py diff --git a/libs/guessit/rules/common/validators.py b/libs/common/guessit/rules/common/validators.py similarity index 100% rename from libs/guessit/rules/common/validators.py rename to libs/common/guessit/rules/common/validators.py diff --git a/libs/guessit/rules/common/words.py b/libs/common/guessit/rules/common/words.py similarity index 100% rename from libs/guessit/rules/common/words.py rename to libs/common/guessit/rules/common/words.py diff --git a/libs/guessit/rules/markers/__init__.py b/libs/common/guessit/rules/markers/__init__.py similarity index 100% rename from libs/guessit/rules/markers/__init__.py rename to libs/common/guessit/rules/markers/__init__.py diff --git a/libs/guessit/rules/markers/groups.py b/libs/common/guessit/rules/markers/groups.py similarity index 100% rename from libs/guessit/rules/markers/groups.py rename to libs/common/guessit/rules/markers/groups.py diff --git a/libs/guessit/rules/markers/path.py b/libs/common/guessit/rules/markers/path.py similarity index 100% rename from libs/guessit/rules/markers/path.py rename to libs/common/guessit/rules/markers/path.py diff --git a/libs/guessit/rules/processors.py b/libs/common/guessit/rules/processors.py similarity index 100% rename from libs/guessit/rules/processors.py rename to libs/common/guessit/rules/processors.py diff --git a/libs/guessit/rules/properties/__init__.py b/libs/common/guessit/rules/properties/__init__.py similarity index 100% rename from libs/guessit/rules/properties/__init__.py rename to libs/common/guessit/rules/properties/__init__.py diff --git a/libs/guessit/rules/properties/audio_codec.py b/libs/common/guessit/rules/properties/audio_codec.py similarity index 100% rename from libs/guessit/rules/properties/audio_codec.py rename to libs/common/guessit/rules/properties/audio_codec.py diff --git a/libs/guessit/rules/properties/bit_rate.py b/libs/common/guessit/rules/properties/bit_rate.py similarity index 100% rename from libs/guessit/rules/properties/bit_rate.py rename to libs/common/guessit/rules/properties/bit_rate.py diff --git a/libs/guessit/rules/properties/bonus.py b/libs/common/guessit/rules/properties/bonus.py similarity index 100% rename from libs/guessit/rules/properties/bonus.py rename to libs/common/guessit/rules/properties/bonus.py diff --git a/libs/guessit/rules/properties/cds.py b/libs/common/guessit/rules/properties/cds.py similarity index 100% rename from libs/guessit/rules/properties/cds.py rename to libs/common/guessit/rules/properties/cds.py diff --git a/libs/guessit/rules/properties/container.py b/libs/common/guessit/rules/properties/container.py similarity index 100% rename from libs/guessit/rules/properties/container.py rename to libs/common/guessit/rules/properties/container.py diff --git a/libs/guessit/rules/properties/country.py b/libs/common/guessit/rules/properties/country.py similarity index 100% rename from libs/guessit/rules/properties/country.py rename to libs/common/guessit/rules/properties/country.py diff --git a/libs/guessit/rules/properties/crc.py b/libs/common/guessit/rules/properties/crc.py similarity index 100% rename from libs/guessit/rules/properties/crc.py rename to libs/common/guessit/rules/properties/crc.py diff --git a/libs/guessit/rules/properties/date.py b/libs/common/guessit/rules/properties/date.py similarity index 100% rename from libs/guessit/rules/properties/date.py rename to libs/common/guessit/rules/properties/date.py diff --git a/libs/guessit/rules/properties/edition.py b/libs/common/guessit/rules/properties/edition.py similarity index 100% rename from libs/guessit/rules/properties/edition.py rename to libs/common/guessit/rules/properties/edition.py diff --git a/libs/guessit/rules/properties/episode_title.py b/libs/common/guessit/rules/properties/episode_title.py similarity index 100% rename from libs/guessit/rules/properties/episode_title.py rename to libs/common/guessit/rules/properties/episode_title.py diff --git a/libs/guessit/rules/properties/episodes.py b/libs/common/guessit/rules/properties/episodes.py similarity index 100% rename from libs/guessit/rules/properties/episodes.py rename to libs/common/guessit/rules/properties/episodes.py diff --git a/libs/guessit/rules/properties/film.py b/libs/common/guessit/rules/properties/film.py similarity index 100% rename from libs/guessit/rules/properties/film.py rename to libs/common/guessit/rules/properties/film.py diff --git a/libs/guessit/rules/properties/language.py b/libs/common/guessit/rules/properties/language.py similarity index 100% rename from libs/guessit/rules/properties/language.py rename to libs/common/guessit/rules/properties/language.py diff --git a/libs/guessit/rules/properties/mimetype.py b/libs/common/guessit/rules/properties/mimetype.py similarity index 100% rename from libs/guessit/rules/properties/mimetype.py rename to libs/common/guessit/rules/properties/mimetype.py diff --git a/libs/guessit/rules/properties/other.py b/libs/common/guessit/rules/properties/other.py similarity index 100% rename from libs/guessit/rules/properties/other.py rename to libs/common/guessit/rules/properties/other.py diff --git a/libs/guessit/rules/properties/part.py b/libs/common/guessit/rules/properties/part.py similarity index 100% rename from libs/guessit/rules/properties/part.py rename to libs/common/guessit/rules/properties/part.py diff --git a/libs/guessit/rules/properties/release_group.py b/libs/common/guessit/rules/properties/release_group.py similarity index 100% rename from libs/guessit/rules/properties/release_group.py rename to libs/common/guessit/rules/properties/release_group.py diff --git a/libs/guessit/rules/properties/screen_size.py b/libs/common/guessit/rules/properties/screen_size.py similarity index 100% rename from libs/guessit/rules/properties/screen_size.py rename to libs/common/guessit/rules/properties/screen_size.py diff --git a/libs/guessit/rules/properties/size.py b/libs/common/guessit/rules/properties/size.py similarity index 100% rename from libs/guessit/rules/properties/size.py rename to libs/common/guessit/rules/properties/size.py diff --git a/libs/guessit/rules/properties/source.py b/libs/common/guessit/rules/properties/source.py similarity index 100% rename from libs/guessit/rules/properties/source.py rename to libs/common/guessit/rules/properties/source.py diff --git a/libs/guessit/rules/properties/streaming_service.py b/libs/common/guessit/rules/properties/streaming_service.py similarity index 100% rename from libs/guessit/rules/properties/streaming_service.py rename to libs/common/guessit/rules/properties/streaming_service.py diff --git a/libs/guessit/rules/properties/title.py b/libs/common/guessit/rules/properties/title.py similarity index 100% rename from libs/guessit/rules/properties/title.py rename to libs/common/guessit/rules/properties/title.py diff --git a/libs/guessit/rules/properties/type.py b/libs/common/guessit/rules/properties/type.py similarity index 100% rename from libs/guessit/rules/properties/type.py rename to libs/common/guessit/rules/properties/type.py diff --git a/libs/guessit/rules/properties/video_codec.py b/libs/common/guessit/rules/properties/video_codec.py similarity index 100% rename from libs/guessit/rules/properties/video_codec.py rename to libs/common/guessit/rules/properties/video_codec.py diff --git a/libs/guessit/rules/properties/website.py b/libs/common/guessit/rules/properties/website.py similarity index 100% rename from libs/guessit/rules/properties/website.py rename to libs/common/guessit/rules/properties/website.py diff --git a/libs/guessit/test/__init__.py b/libs/common/guessit/test/__init__.py similarity index 100% rename from libs/guessit/test/__init__.py rename to libs/common/guessit/test/__init__.py diff --git a/libs/guessit/test/config/dummy.txt b/libs/common/guessit/test/config/dummy.txt similarity index 100% rename from libs/guessit/test/config/dummy.txt rename to libs/common/guessit/test/config/dummy.txt diff --git a/libs/guessit/test/config/test.json b/libs/common/guessit/test/config/test.json similarity index 100% rename from libs/guessit/test/config/test.json rename to libs/common/guessit/test/config/test.json diff --git a/libs/guessit/test/config/test.yaml b/libs/common/guessit/test/config/test.yaml similarity index 100% rename from libs/guessit/test/config/test.yaml rename to libs/common/guessit/test/config/test.yaml diff --git a/libs/guessit/test/config/test.yml b/libs/common/guessit/test/config/test.yml similarity index 100% rename from libs/guessit/test/config/test.yml rename to libs/common/guessit/test/config/test.yml diff --git a/libs/guessit/test/enable_disable_properties.yml b/libs/common/guessit/test/enable_disable_properties.yml similarity index 100% rename from libs/guessit/test/enable_disable_properties.yml rename to libs/common/guessit/test/enable_disable_properties.yml diff --git a/libs/guessit/test/episodes.yml b/libs/common/guessit/test/episodes.yml similarity index 100% rename from libs/guessit/test/episodes.yml rename to libs/common/guessit/test/episodes.yml diff --git a/libs/guessit/test/movies.yml b/libs/common/guessit/test/movies.yml similarity index 100% rename from libs/guessit/test/movies.yml rename to libs/common/guessit/test/movies.yml diff --git a/libs/guessit/test/rules/__init__.py b/libs/common/guessit/test/rules/__init__.py similarity index 100% rename from libs/guessit/test/rules/__init__.py rename to libs/common/guessit/test/rules/__init__.py diff --git a/libs/guessit/test/rules/audio_codec.yml b/libs/common/guessit/test/rules/audio_codec.yml similarity index 100% rename from libs/guessit/test/rules/audio_codec.yml rename to libs/common/guessit/test/rules/audio_codec.yml diff --git a/libs/guessit/test/rules/bonus.yml b/libs/common/guessit/test/rules/bonus.yml similarity index 100% rename from libs/guessit/test/rules/bonus.yml rename to libs/common/guessit/test/rules/bonus.yml diff --git a/libs/guessit/test/rules/cds.yml b/libs/common/guessit/test/rules/cds.yml similarity index 100% rename from libs/guessit/test/rules/cds.yml rename to libs/common/guessit/test/rules/cds.yml diff --git a/libs/guessit/test/rules/country.yml b/libs/common/guessit/test/rules/country.yml similarity index 100% rename from libs/guessit/test/rules/country.yml rename to libs/common/guessit/test/rules/country.yml diff --git a/libs/guessit/test/rules/date.yml b/libs/common/guessit/test/rules/date.yml similarity index 100% rename from libs/guessit/test/rules/date.yml rename to libs/common/guessit/test/rules/date.yml diff --git a/libs/guessit/test/rules/edition.yml b/libs/common/guessit/test/rules/edition.yml similarity index 100% rename from libs/guessit/test/rules/edition.yml rename to libs/common/guessit/test/rules/edition.yml diff --git a/libs/guessit/test/rules/episodes.yml b/libs/common/guessit/test/rules/episodes.yml similarity index 100% rename from libs/guessit/test/rules/episodes.yml rename to libs/common/guessit/test/rules/episodes.yml diff --git a/libs/guessit/test/rules/film.yml b/libs/common/guessit/test/rules/film.yml similarity index 100% rename from libs/guessit/test/rules/film.yml rename to libs/common/guessit/test/rules/film.yml diff --git a/libs/guessit/test/rules/language.yml b/libs/common/guessit/test/rules/language.yml similarity index 100% rename from libs/guessit/test/rules/language.yml rename to libs/common/guessit/test/rules/language.yml diff --git a/libs/guessit/test/rules/other.yml b/libs/common/guessit/test/rules/other.yml similarity index 100% rename from libs/guessit/test/rules/other.yml rename to libs/common/guessit/test/rules/other.yml diff --git a/libs/guessit/test/rules/part.yml b/libs/common/guessit/test/rules/part.yml similarity index 100% rename from libs/guessit/test/rules/part.yml rename to libs/common/guessit/test/rules/part.yml diff --git a/libs/guessit/test/rules/processors.yml b/libs/common/guessit/test/rules/processors.yml similarity index 100% rename from libs/guessit/test/rules/processors.yml rename to libs/common/guessit/test/rules/processors.yml diff --git a/libs/guessit/test/rules/processors_test.py b/libs/common/guessit/test/rules/processors_test.py similarity index 100% rename from libs/guessit/test/rules/processors_test.py rename to libs/common/guessit/test/rules/processors_test.py diff --git a/libs/guessit/test/rules/release_group.yml b/libs/common/guessit/test/rules/release_group.yml similarity index 100% rename from libs/guessit/test/rules/release_group.yml rename to libs/common/guessit/test/rules/release_group.yml diff --git a/libs/guessit/test/rules/screen_size.yml b/libs/common/guessit/test/rules/screen_size.yml similarity index 100% rename from libs/guessit/test/rules/screen_size.yml rename to libs/common/guessit/test/rules/screen_size.yml diff --git a/libs/guessit/test/rules/size.yml b/libs/common/guessit/test/rules/size.yml similarity index 100% rename from libs/guessit/test/rules/size.yml rename to libs/common/guessit/test/rules/size.yml diff --git a/libs/guessit/test/rules/source.yml b/libs/common/guessit/test/rules/source.yml similarity index 100% rename from libs/guessit/test/rules/source.yml rename to libs/common/guessit/test/rules/source.yml diff --git a/libs/guessit/test/rules/title.yml b/libs/common/guessit/test/rules/title.yml similarity index 100% rename from libs/guessit/test/rules/title.yml rename to libs/common/guessit/test/rules/title.yml diff --git a/libs/guessit/test/rules/video_codec.yml b/libs/common/guessit/test/rules/video_codec.yml similarity index 100% rename from libs/guessit/test/rules/video_codec.yml rename to libs/common/guessit/test/rules/video_codec.yml diff --git a/libs/guessit/test/rules/website.yml b/libs/common/guessit/test/rules/website.yml similarity index 100% rename from libs/guessit/test/rules/website.yml rename to libs/common/guessit/test/rules/website.yml diff --git a/libs/guessit/test/streaming_services.yaml b/libs/common/guessit/test/streaming_services.yaml similarity index 100% rename from libs/guessit/test/streaming_services.yaml rename to libs/common/guessit/test/streaming_services.yaml diff --git a/libs/guessit/test/test-input-file.txt b/libs/common/guessit/test/test-input-file.txt similarity index 100% rename from libs/guessit/test/test-input-file.txt rename to libs/common/guessit/test/test-input-file.txt diff --git a/libs/guessit/test/test_api.py b/libs/common/guessit/test/test_api.py similarity index 100% rename from libs/guessit/test/test_api.py rename to libs/common/guessit/test/test_api.py diff --git a/libs/guessit/test/test_api_unicode_literals.py b/libs/common/guessit/test/test_api_unicode_literals.py similarity index 100% rename from libs/guessit/test/test_api_unicode_literals.py rename to libs/common/guessit/test/test_api_unicode_literals.py diff --git a/libs/guessit/test/test_benchmark.py b/libs/common/guessit/test/test_benchmark.py similarity index 100% rename from libs/guessit/test/test_benchmark.py rename to libs/common/guessit/test/test_benchmark.py diff --git a/libs/guessit/test/test_main.py b/libs/common/guessit/test/test_main.py similarity index 100% rename from libs/guessit/test/test_main.py rename to libs/common/guessit/test/test_main.py diff --git a/libs/guessit/test/test_options.py b/libs/common/guessit/test/test_options.py similarity index 100% rename from libs/guessit/test/test_options.py rename to libs/common/guessit/test/test_options.py diff --git a/libs/guessit/test/test_yml.py b/libs/common/guessit/test/test_yml.py similarity index 100% rename from libs/guessit/test/test_yml.py rename to libs/common/guessit/test/test_yml.py diff --git a/libs/guessit/test/various.yml b/libs/common/guessit/test/various.yml similarity index 100% rename from libs/guessit/test/various.yml rename to libs/common/guessit/test/various.yml diff --git a/libs/guessit/tlds-alpha-by-domain.txt b/libs/common/guessit/tlds-alpha-by-domain.txt similarity index 100% rename from libs/guessit/tlds-alpha-by-domain.txt rename to libs/common/guessit/tlds-alpha-by-domain.txt diff --git a/libs/guessit/yamlutils.py b/libs/common/guessit/yamlutils.py similarity index 100% rename from libs/guessit/yamlutils.py rename to libs/common/guessit/yamlutils.py diff --git a/libs/idna/__init__.py b/libs/common/idna/__init__.py similarity index 100% rename from libs/idna/__init__.py rename to libs/common/idna/__init__.py diff --git a/libs/idna/codec.py b/libs/common/idna/codec.py similarity index 100% rename from libs/idna/codec.py rename to libs/common/idna/codec.py diff --git a/libs/idna/compat.py b/libs/common/idna/compat.py similarity index 100% rename from libs/idna/compat.py rename to libs/common/idna/compat.py diff --git a/libs/idna/core.py b/libs/common/idna/core.py similarity index 100% rename from libs/idna/core.py rename to libs/common/idna/core.py diff --git a/libs/idna/idnadata.py b/libs/common/idna/idnadata.py similarity index 100% rename from libs/idna/idnadata.py rename to libs/common/idna/idnadata.py diff --git a/libs/idna/intranges.py b/libs/common/idna/intranges.py similarity index 100% rename from libs/idna/intranges.py rename to libs/common/idna/intranges.py diff --git a/libs/idna/package_data.py b/libs/common/idna/package_data.py similarity index 100% rename from libs/idna/package_data.py rename to libs/common/idna/package_data.py diff --git a/libs/idna/uts46data.py b/libs/common/idna/uts46data.py similarity index 100% rename from libs/idna/uts46data.py rename to libs/common/idna/uts46data.py diff --git a/libs/jellyfish/__init__.py b/libs/common/jellyfish/__init__.py similarity index 100% rename from libs/jellyfish/__init__.py rename to libs/common/jellyfish/__init__.py diff --git a/libs/jellyfish/_jellyfish.py b/libs/common/jellyfish/_jellyfish.py similarity index 100% rename from libs/jellyfish/_jellyfish.py rename to libs/common/jellyfish/_jellyfish.py diff --git a/libs/jellyfish/compat.py b/libs/common/jellyfish/compat.py similarity index 100% rename from libs/jellyfish/compat.py rename to libs/common/jellyfish/compat.py diff --git a/libs/jellyfish/porter.py b/libs/common/jellyfish/porter.py similarity index 100% rename from libs/jellyfish/porter.py rename to libs/common/jellyfish/porter.py diff --git a/libs/jellyfish/test.py b/libs/common/jellyfish/test.py similarity index 100% rename from libs/jellyfish/test.py rename to libs/common/jellyfish/test.py diff --git a/libs/linktastic.py b/libs/common/linktastic.py similarity index 100% rename from libs/linktastic.py rename to libs/common/linktastic.py diff --git a/libs/munkres.py b/libs/common/munkres.py similarity index 100% rename from libs/munkres.py rename to libs/common/munkres.py diff --git a/libs/musicbrainzngs/__init__.py b/libs/common/musicbrainzngs/__init__.py similarity index 100% rename from libs/musicbrainzngs/__init__.py rename to libs/common/musicbrainzngs/__init__.py diff --git a/libs/musicbrainzngs/caa.py b/libs/common/musicbrainzngs/caa.py similarity index 100% rename from libs/musicbrainzngs/caa.py rename to libs/common/musicbrainzngs/caa.py diff --git a/libs/musicbrainzngs/compat.py b/libs/common/musicbrainzngs/compat.py similarity index 100% rename from libs/musicbrainzngs/compat.py rename to libs/common/musicbrainzngs/compat.py diff --git a/libs/musicbrainzngs/mbxml.py b/libs/common/musicbrainzngs/mbxml.py similarity index 100% rename from libs/musicbrainzngs/mbxml.py rename to libs/common/musicbrainzngs/mbxml.py diff --git a/libs/musicbrainzngs/musicbrainz.py b/libs/common/musicbrainzngs/musicbrainz.py similarity index 100% rename from libs/musicbrainzngs/musicbrainz.py rename to libs/common/musicbrainzngs/musicbrainz.py diff --git a/libs/musicbrainzngs/util.py b/libs/common/musicbrainzngs/util.py similarity index 100% rename from libs/musicbrainzngs/util.py rename to libs/common/musicbrainzngs/util.py diff --git a/libs/mutagen/__init__.py b/libs/common/mutagen/__init__.py similarity index 100% rename from libs/mutagen/__init__.py rename to libs/common/mutagen/__init__.py diff --git a/libs/mutagen/_compat.py b/libs/common/mutagen/_compat.py similarity index 100% rename from libs/mutagen/_compat.py rename to libs/common/mutagen/_compat.py diff --git a/libs/mutagen/_constants.py b/libs/common/mutagen/_constants.py similarity index 100% rename from libs/mutagen/_constants.py rename to libs/common/mutagen/_constants.py diff --git a/libs/mutagen/_file.py b/libs/common/mutagen/_file.py similarity index 100% rename from libs/mutagen/_file.py rename to libs/common/mutagen/_file.py diff --git a/libs/mutagen/_senf/__init__.py b/libs/common/mutagen/_senf/__init__.py similarity index 100% rename from libs/mutagen/_senf/__init__.py rename to libs/common/mutagen/_senf/__init__.py diff --git a/libs/mutagen/_senf/_argv.py b/libs/common/mutagen/_senf/_argv.py similarity index 100% rename from libs/mutagen/_senf/_argv.py rename to libs/common/mutagen/_senf/_argv.py diff --git a/libs/mutagen/_senf/_compat.py b/libs/common/mutagen/_senf/_compat.py similarity index 100% rename from libs/mutagen/_senf/_compat.py rename to libs/common/mutagen/_senf/_compat.py diff --git a/libs/mutagen/_senf/_environ.py b/libs/common/mutagen/_senf/_environ.py similarity index 100% rename from libs/mutagen/_senf/_environ.py rename to libs/common/mutagen/_senf/_environ.py diff --git a/libs/mutagen/_senf/_fsnative.py b/libs/common/mutagen/_senf/_fsnative.py similarity index 100% rename from libs/mutagen/_senf/_fsnative.py rename to libs/common/mutagen/_senf/_fsnative.py diff --git a/libs/mutagen/_senf/_print.py b/libs/common/mutagen/_senf/_print.py similarity index 100% rename from libs/mutagen/_senf/_print.py rename to libs/common/mutagen/_senf/_print.py diff --git a/libs/mutagen/_senf/_stdlib.py b/libs/common/mutagen/_senf/_stdlib.py similarity index 100% rename from libs/mutagen/_senf/_stdlib.py rename to libs/common/mutagen/_senf/_stdlib.py diff --git a/libs/mutagen/_senf/_temp.py b/libs/common/mutagen/_senf/_temp.py similarity index 100% rename from libs/mutagen/_senf/_temp.py rename to libs/common/mutagen/_senf/_temp.py diff --git a/libs/mutagen/_senf/_winansi.py b/libs/common/mutagen/_senf/_winansi.py similarity index 100% rename from libs/mutagen/_senf/_winansi.py rename to libs/common/mutagen/_senf/_winansi.py diff --git a/libs/mutagen/_senf/_winapi.py b/libs/common/mutagen/_senf/_winapi.py similarity index 100% rename from libs/mutagen/_senf/_winapi.py rename to libs/common/mutagen/_senf/_winapi.py diff --git a/libs/mutagen/_tags.py b/libs/common/mutagen/_tags.py similarity index 100% rename from libs/mutagen/_tags.py rename to libs/common/mutagen/_tags.py diff --git a/libs/mutagen/_tools/__init__.py b/libs/common/mutagen/_tools/__init__.py similarity index 100% rename from libs/mutagen/_tools/__init__.py rename to libs/common/mutagen/_tools/__init__.py diff --git a/libs/mutagen/_tools/_util.py b/libs/common/mutagen/_tools/_util.py similarity index 100% rename from libs/mutagen/_tools/_util.py rename to libs/common/mutagen/_tools/_util.py diff --git a/libs/mutagen/_tools/mid3cp.py b/libs/common/mutagen/_tools/mid3cp.py similarity index 100% rename from libs/mutagen/_tools/mid3cp.py rename to libs/common/mutagen/_tools/mid3cp.py diff --git a/libs/mutagen/_tools/mid3iconv.py b/libs/common/mutagen/_tools/mid3iconv.py similarity index 100% rename from libs/mutagen/_tools/mid3iconv.py rename to libs/common/mutagen/_tools/mid3iconv.py diff --git a/libs/mutagen/_tools/mid3v2.py b/libs/common/mutagen/_tools/mid3v2.py similarity index 100% rename from libs/mutagen/_tools/mid3v2.py rename to libs/common/mutagen/_tools/mid3v2.py diff --git a/libs/mutagen/_tools/moggsplit.py b/libs/common/mutagen/_tools/moggsplit.py similarity index 100% rename from libs/mutagen/_tools/moggsplit.py rename to libs/common/mutagen/_tools/moggsplit.py diff --git a/libs/mutagen/_tools/mutagen_inspect.py b/libs/common/mutagen/_tools/mutagen_inspect.py similarity index 100% rename from libs/mutagen/_tools/mutagen_inspect.py rename to libs/common/mutagen/_tools/mutagen_inspect.py diff --git a/libs/mutagen/_tools/mutagen_pony.py b/libs/common/mutagen/_tools/mutagen_pony.py similarity index 100% rename from libs/mutagen/_tools/mutagen_pony.py rename to libs/common/mutagen/_tools/mutagen_pony.py diff --git a/libs/mutagen/_util.py b/libs/common/mutagen/_util.py similarity index 100% rename from libs/mutagen/_util.py rename to libs/common/mutagen/_util.py diff --git a/libs/mutagen/_vorbis.py b/libs/common/mutagen/_vorbis.py similarity index 100% rename from libs/mutagen/_vorbis.py rename to libs/common/mutagen/_vorbis.py diff --git a/libs/mutagen/aac.py b/libs/common/mutagen/aac.py similarity index 100% rename from libs/mutagen/aac.py rename to libs/common/mutagen/aac.py diff --git a/libs/mutagen/aiff.py b/libs/common/mutagen/aiff.py similarity index 100% rename from libs/mutagen/aiff.py rename to libs/common/mutagen/aiff.py diff --git a/libs/mutagen/apev2.py b/libs/common/mutagen/apev2.py similarity index 100% rename from libs/mutagen/apev2.py rename to libs/common/mutagen/apev2.py diff --git a/libs/mutagen/asf/__init__.py b/libs/common/mutagen/asf/__init__.py similarity index 100% rename from libs/mutagen/asf/__init__.py rename to libs/common/mutagen/asf/__init__.py diff --git a/libs/mutagen/asf/_attrs.py b/libs/common/mutagen/asf/_attrs.py similarity index 100% rename from libs/mutagen/asf/_attrs.py rename to libs/common/mutagen/asf/_attrs.py diff --git a/libs/mutagen/asf/_objects.py b/libs/common/mutagen/asf/_objects.py similarity index 100% rename from libs/mutagen/asf/_objects.py rename to libs/common/mutagen/asf/_objects.py diff --git a/libs/mutagen/asf/_util.py b/libs/common/mutagen/asf/_util.py similarity index 100% rename from libs/mutagen/asf/_util.py rename to libs/common/mutagen/asf/_util.py diff --git a/libs/mutagen/dsf.py b/libs/common/mutagen/dsf.py similarity index 100% rename from libs/mutagen/dsf.py rename to libs/common/mutagen/dsf.py diff --git a/libs/mutagen/easyid3.py b/libs/common/mutagen/easyid3.py similarity index 100% rename from libs/mutagen/easyid3.py rename to libs/common/mutagen/easyid3.py diff --git a/libs/mutagen/easymp4.py b/libs/common/mutagen/easymp4.py similarity index 100% rename from libs/mutagen/easymp4.py rename to libs/common/mutagen/easymp4.py diff --git a/libs/mutagen/flac.py b/libs/common/mutagen/flac.py similarity index 100% rename from libs/mutagen/flac.py rename to libs/common/mutagen/flac.py diff --git a/libs/mutagen/id3/__init__.py b/libs/common/mutagen/id3/__init__.py similarity index 100% rename from libs/mutagen/id3/__init__.py rename to libs/common/mutagen/id3/__init__.py diff --git a/libs/mutagen/id3/_file.py b/libs/common/mutagen/id3/_file.py similarity index 100% rename from libs/mutagen/id3/_file.py rename to libs/common/mutagen/id3/_file.py diff --git a/libs/mutagen/id3/_frames.py b/libs/common/mutagen/id3/_frames.py similarity index 100% rename from libs/mutagen/id3/_frames.py rename to libs/common/mutagen/id3/_frames.py diff --git a/libs/mutagen/id3/_id3v1.py b/libs/common/mutagen/id3/_id3v1.py similarity index 100% rename from libs/mutagen/id3/_id3v1.py rename to libs/common/mutagen/id3/_id3v1.py diff --git a/libs/mutagen/id3/_specs.py b/libs/common/mutagen/id3/_specs.py similarity index 100% rename from libs/mutagen/id3/_specs.py rename to libs/common/mutagen/id3/_specs.py diff --git a/libs/mutagen/id3/_tags.py b/libs/common/mutagen/id3/_tags.py similarity index 100% rename from libs/mutagen/id3/_tags.py rename to libs/common/mutagen/id3/_tags.py diff --git a/libs/mutagen/id3/_util.py b/libs/common/mutagen/id3/_util.py similarity index 100% rename from libs/mutagen/id3/_util.py rename to libs/common/mutagen/id3/_util.py diff --git a/libs/mutagen/m4a.py b/libs/common/mutagen/m4a.py similarity index 100% rename from libs/mutagen/m4a.py rename to libs/common/mutagen/m4a.py diff --git a/libs/mutagen/monkeysaudio.py b/libs/common/mutagen/monkeysaudio.py similarity index 100% rename from libs/mutagen/monkeysaudio.py rename to libs/common/mutagen/monkeysaudio.py diff --git a/libs/mutagen/mp3/__init__.py b/libs/common/mutagen/mp3/__init__.py similarity index 100% rename from libs/mutagen/mp3/__init__.py rename to libs/common/mutagen/mp3/__init__.py diff --git a/libs/mutagen/mp3/_util.py b/libs/common/mutagen/mp3/_util.py similarity index 100% rename from libs/mutagen/mp3/_util.py rename to libs/common/mutagen/mp3/_util.py diff --git a/libs/mutagen/mp4/__init__.py b/libs/common/mutagen/mp4/__init__.py similarity index 100% rename from libs/mutagen/mp4/__init__.py rename to libs/common/mutagen/mp4/__init__.py diff --git a/libs/mutagen/mp4/_as_entry.py b/libs/common/mutagen/mp4/_as_entry.py similarity index 100% rename from libs/mutagen/mp4/_as_entry.py rename to libs/common/mutagen/mp4/_as_entry.py diff --git a/libs/mutagen/mp4/_atom.py b/libs/common/mutagen/mp4/_atom.py similarity index 100% rename from libs/mutagen/mp4/_atom.py rename to libs/common/mutagen/mp4/_atom.py diff --git a/libs/mutagen/mp4/_util.py b/libs/common/mutagen/mp4/_util.py similarity index 100% rename from libs/mutagen/mp4/_util.py rename to libs/common/mutagen/mp4/_util.py diff --git a/libs/mutagen/musepack.py b/libs/common/mutagen/musepack.py similarity index 100% rename from libs/mutagen/musepack.py rename to libs/common/mutagen/musepack.py diff --git a/libs/mutagen/ogg.py b/libs/common/mutagen/ogg.py similarity index 100% rename from libs/mutagen/ogg.py rename to libs/common/mutagen/ogg.py diff --git a/libs/mutagen/oggflac.py b/libs/common/mutagen/oggflac.py similarity index 100% rename from libs/mutagen/oggflac.py rename to libs/common/mutagen/oggflac.py diff --git a/libs/mutagen/oggopus.py b/libs/common/mutagen/oggopus.py similarity index 100% rename from libs/mutagen/oggopus.py rename to libs/common/mutagen/oggopus.py diff --git a/libs/mutagen/oggspeex.py b/libs/common/mutagen/oggspeex.py similarity index 100% rename from libs/mutagen/oggspeex.py rename to libs/common/mutagen/oggspeex.py diff --git a/libs/mutagen/oggtheora.py b/libs/common/mutagen/oggtheora.py similarity index 100% rename from libs/mutagen/oggtheora.py rename to libs/common/mutagen/oggtheora.py diff --git a/libs/mutagen/oggvorbis.py b/libs/common/mutagen/oggvorbis.py similarity index 100% rename from libs/mutagen/oggvorbis.py rename to libs/common/mutagen/oggvorbis.py diff --git a/libs/mutagen/optimfrog.py b/libs/common/mutagen/optimfrog.py similarity index 100% rename from libs/mutagen/optimfrog.py rename to libs/common/mutagen/optimfrog.py diff --git a/libs/mutagen/smf.py b/libs/common/mutagen/smf.py similarity index 100% rename from libs/mutagen/smf.py rename to libs/common/mutagen/smf.py diff --git a/libs/mutagen/trueaudio.py b/libs/common/mutagen/trueaudio.py similarity index 100% rename from libs/mutagen/trueaudio.py rename to libs/common/mutagen/trueaudio.py diff --git a/libs/mutagen/wavpack.py b/libs/common/mutagen/wavpack.py similarity index 100% rename from libs/mutagen/wavpack.py rename to libs/common/mutagen/wavpack.py diff --git a/libs/importlib_metadata/docs/__init__.py b/libs/common/pbr/__init__.py similarity index 100% rename from libs/importlib_metadata/docs/__init__.py rename to libs/common/pbr/__init__.py diff --git a/libs/pbr/builddoc.py b/libs/common/pbr/builddoc.py similarity index 100% rename from libs/pbr/builddoc.py rename to libs/common/pbr/builddoc.py diff --git a/libs/importlib_metadata/tests/__init__.py b/libs/common/pbr/cmd/__init__.py similarity index 100% rename from libs/importlib_metadata/tests/__init__.py rename to libs/common/pbr/cmd/__init__.py diff --git a/libs/pbr/cmd/main.py b/libs/common/pbr/cmd/main.py similarity index 100% rename from libs/pbr/cmd/main.py rename to libs/common/pbr/cmd/main.py diff --git a/libs/pbr/core.py b/libs/common/pbr/core.py similarity index 100% rename from libs/pbr/core.py rename to libs/common/pbr/core.py diff --git a/libs/pbr/extra_files.py b/libs/common/pbr/extra_files.py similarity index 100% rename from libs/pbr/extra_files.py rename to libs/common/pbr/extra_files.py diff --git a/libs/pbr/find_package.py b/libs/common/pbr/find_package.py similarity index 100% rename from libs/pbr/find_package.py rename to libs/common/pbr/find_package.py diff --git a/libs/pbr/git.py b/libs/common/pbr/git.py similarity index 100% rename from libs/pbr/git.py rename to libs/common/pbr/git.py diff --git a/libs/pbr/hooks/__init__.py b/libs/common/pbr/hooks/__init__.py similarity index 100% rename from libs/pbr/hooks/__init__.py rename to libs/common/pbr/hooks/__init__.py diff --git a/libs/pbr/hooks/backwards.py b/libs/common/pbr/hooks/backwards.py similarity index 100% rename from libs/pbr/hooks/backwards.py rename to libs/common/pbr/hooks/backwards.py diff --git a/libs/pbr/hooks/base.py b/libs/common/pbr/hooks/base.py similarity index 100% rename from libs/pbr/hooks/base.py rename to libs/common/pbr/hooks/base.py diff --git a/libs/pbr/hooks/commands.py b/libs/common/pbr/hooks/commands.py similarity index 100% rename from libs/pbr/hooks/commands.py rename to libs/common/pbr/hooks/commands.py diff --git a/libs/pbr/hooks/files.py b/libs/common/pbr/hooks/files.py similarity index 100% rename from libs/pbr/hooks/files.py rename to libs/common/pbr/hooks/files.py diff --git a/libs/pbr/hooks/metadata.py b/libs/common/pbr/hooks/metadata.py similarity index 100% rename from libs/pbr/hooks/metadata.py rename to libs/common/pbr/hooks/metadata.py diff --git a/libs/pbr/options.py b/libs/common/pbr/options.py similarity index 100% rename from libs/pbr/options.py rename to libs/common/pbr/options.py diff --git a/libs/pbr/packaging.py b/libs/common/pbr/packaging.py similarity index 100% rename from libs/pbr/packaging.py rename to libs/common/pbr/packaging.py diff --git a/libs/pbr/pbr_json.py b/libs/common/pbr/pbr_json.py similarity index 100% rename from libs/pbr/pbr_json.py rename to libs/common/pbr/pbr_json.py diff --git a/libs/pbr/sphinxext.py b/libs/common/pbr/sphinxext.py similarity index 100% rename from libs/pbr/sphinxext.py rename to libs/common/pbr/sphinxext.py diff --git a/libs/pbr/testr_command.py b/libs/common/pbr/testr_command.py similarity index 100% rename from libs/pbr/testr_command.py rename to libs/common/pbr/testr_command.py diff --git a/libs/pbr/tests/__init__.py b/libs/common/pbr/tests/__init__.py similarity index 100% rename from libs/pbr/tests/__init__.py rename to libs/common/pbr/tests/__init__.py diff --git a/libs/pbr/tests/base.py b/libs/common/pbr/tests/base.py similarity index 100% rename from libs/pbr/tests/base.py rename to libs/common/pbr/tests/base.py diff --git a/libs/pbr/tests/test_commands.py b/libs/common/pbr/tests/test_commands.py similarity index 100% rename from libs/pbr/tests/test_commands.py rename to libs/common/pbr/tests/test_commands.py diff --git a/libs/pbr/tests/test_core.py b/libs/common/pbr/tests/test_core.py similarity index 100% rename from libs/pbr/tests/test_core.py rename to libs/common/pbr/tests/test_core.py diff --git a/libs/pbr/tests/test_files.py b/libs/common/pbr/tests/test_files.py similarity index 100% rename from libs/pbr/tests/test_files.py rename to libs/common/pbr/tests/test_files.py diff --git a/libs/pbr/tests/test_hooks.py b/libs/common/pbr/tests/test_hooks.py similarity index 100% rename from libs/pbr/tests/test_hooks.py rename to libs/common/pbr/tests/test_hooks.py diff --git a/libs/pbr/tests/test_integration.py b/libs/common/pbr/tests/test_integration.py similarity index 100% rename from libs/pbr/tests/test_integration.py rename to libs/common/pbr/tests/test_integration.py diff --git a/libs/pbr/tests/test_packaging.py b/libs/common/pbr/tests/test_packaging.py similarity index 100% rename from libs/pbr/tests/test_packaging.py rename to libs/common/pbr/tests/test_packaging.py diff --git a/libs/pbr/tests/test_pbr_json.py b/libs/common/pbr/tests/test_pbr_json.py similarity index 100% rename from libs/pbr/tests/test_pbr_json.py rename to libs/common/pbr/tests/test_pbr_json.py diff --git a/libs/pbr/tests/test_setup.py b/libs/common/pbr/tests/test_setup.py similarity index 100% rename from libs/pbr/tests/test_setup.py rename to libs/common/pbr/tests/test_setup.py diff --git a/libs/pbr/tests/test_util.py b/libs/common/pbr/tests/test_util.py similarity index 100% rename from libs/pbr/tests/test_util.py rename to libs/common/pbr/tests/test_util.py diff --git a/libs/pbr/tests/test_version.py b/libs/common/pbr/tests/test_version.py similarity index 100% rename from libs/pbr/tests/test_version.py rename to libs/common/pbr/tests/test_version.py diff --git a/libs/pbr/tests/test_wsgi.py b/libs/common/pbr/tests/test_wsgi.py similarity index 100% rename from libs/pbr/tests/test_wsgi.py rename to libs/common/pbr/tests/test_wsgi.py diff --git a/libs/pbr/tests/testpackage/CHANGES.txt b/libs/common/pbr/tests/testpackage/CHANGES.txt similarity index 100% rename from libs/pbr/tests/testpackage/CHANGES.txt rename to libs/common/pbr/tests/testpackage/CHANGES.txt diff --git a/libs/pbr/tests/testpackage/LICENSE.txt b/libs/common/pbr/tests/testpackage/LICENSE.txt similarity index 100% rename from libs/pbr/tests/testpackage/LICENSE.txt rename to libs/common/pbr/tests/testpackage/LICENSE.txt diff --git a/libs/pbr/tests/testpackage/MANIFEST.in b/libs/common/pbr/tests/testpackage/MANIFEST.in similarity index 100% rename from libs/pbr/tests/testpackage/MANIFEST.in rename to libs/common/pbr/tests/testpackage/MANIFEST.in diff --git a/libs/pbr/tests/testpackage/README.txt b/libs/common/pbr/tests/testpackage/README.txt similarity index 100% rename from libs/pbr/tests/testpackage/README.txt rename to libs/common/pbr/tests/testpackage/README.txt diff --git a/libs/pbr/tests/testpackage/data_files/a.txt b/libs/common/pbr/tests/testpackage/data_files/a.txt similarity index 100% rename from libs/pbr/tests/testpackage/data_files/a.txt rename to libs/common/pbr/tests/testpackage/data_files/a.txt diff --git a/libs/pbr/tests/testpackage/data_files/b.txt b/libs/common/pbr/tests/testpackage/data_files/b.txt similarity index 100% rename from libs/pbr/tests/testpackage/data_files/b.txt rename to libs/common/pbr/tests/testpackage/data_files/b.txt diff --git a/libs/pbr/tests/testpackage/data_files/c.rst b/libs/common/pbr/tests/testpackage/data_files/c.rst similarity index 100% rename from libs/pbr/tests/testpackage/data_files/c.rst rename to libs/common/pbr/tests/testpackage/data_files/c.rst diff --git a/libs/pbr/tests/testpackage/doc/source/conf.py b/libs/common/pbr/tests/testpackage/doc/source/conf.py similarity index 100% rename from libs/pbr/tests/testpackage/doc/source/conf.py rename to libs/common/pbr/tests/testpackage/doc/source/conf.py diff --git a/libs/pbr/tests/testpackage/doc/source/index.rst b/libs/common/pbr/tests/testpackage/doc/source/index.rst similarity index 100% rename from libs/pbr/tests/testpackage/doc/source/index.rst rename to libs/common/pbr/tests/testpackage/doc/source/index.rst diff --git a/libs/pbr/tests/testpackage/doc/source/installation.rst b/libs/common/pbr/tests/testpackage/doc/source/installation.rst similarity index 100% rename from libs/pbr/tests/testpackage/doc/source/installation.rst rename to libs/common/pbr/tests/testpackage/doc/source/installation.rst diff --git a/libs/pbr/tests/testpackage/doc/source/usage.rst b/libs/common/pbr/tests/testpackage/doc/source/usage.rst similarity index 100% rename from libs/pbr/tests/testpackage/doc/source/usage.rst rename to libs/common/pbr/tests/testpackage/doc/source/usage.rst diff --git a/libs/pbr/tests/testpackage/extra-file.txt b/libs/common/pbr/tests/testpackage/extra-file.txt similarity index 100% rename from libs/pbr/tests/testpackage/extra-file.txt rename to libs/common/pbr/tests/testpackage/extra-file.txt diff --git a/libs/pbr/tests/testpackage/git-extra-file.txt b/libs/common/pbr/tests/testpackage/git-extra-file.txt similarity index 100% rename from libs/pbr/tests/testpackage/git-extra-file.txt rename to libs/common/pbr/tests/testpackage/git-extra-file.txt diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/__init__.py b/libs/common/pbr/tests/testpackage/pbr_testpackage/__init__.py similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/__init__.py rename to libs/common/pbr/tests/testpackage/pbr_testpackage/__init__.py diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/_setup_hooks.py b/libs/common/pbr/tests/testpackage/pbr_testpackage/_setup_hooks.py similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/_setup_hooks.py rename to libs/common/pbr/tests/testpackage/pbr_testpackage/_setup_hooks.py diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/cmd.py b/libs/common/pbr/tests/testpackage/pbr_testpackage/cmd.py similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/cmd.py rename to libs/common/pbr/tests/testpackage/pbr_testpackage/cmd.py diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/extra.py b/libs/common/pbr/tests/testpackage/pbr_testpackage/extra.py similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/extra.py rename to libs/common/pbr/tests/testpackage/pbr_testpackage/extra.py diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/package_data/1.txt b/libs/common/pbr/tests/testpackage/pbr_testpackage/package_data/1.txt similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/package_data/1.txt rename to libs/common/pbr/tests/testpackage/pbr_testpackage/package_data/1.txt diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/package_data/2.txt b/libs/common/pbr/tests/testpackage/pbr_testpackage/package_data/2.txt similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/package_data/2.txt rename to libs/common/pbr/tests/testpackage/pbr_testpackage/package_data/2.txt diff --git a/libs/pbr/tests/testpackage/pbr_testpackage/wsgi.py b/libs/common/pbr/tests/testpackage/pbr_testpackage/wsgi.py similarity index 100% rename from libs/pbr/tests/testpackage/pbr_testpackage/wsgi.py rename to libs/common/pbr/tests/testpackage/pbr_testpackage/wsgi.py diff --git a/libs/pbr/tests/testpackage/setup.py b/libs/common/pbr/tests/testpackage/setup.py similarity index 100% rename from libs/pbr/tests/testpackage/setup.py rename to libs/common/pbr/tests/testpackage/setup.py diff --git a/libs/pbr/tests/testpackage/src/testext.c b/libs/common/pbr/tests/testpackage/src/testext.c similarity index 100% rename from libs/pbr/tests/testpackage/src/testext.c rename to libs/common/pbr/tests/testpackage/src/testext.c diff --git a/libs/pbr/tests/testpackage/test-requirements.txt b/libs/common/pbr/tests/testpackage/test-requirements.txt similarity index 100% rename from libs/pbr/tests/testpackage/test-requirements.txt rename to libs/common/pbr/tests/testpackage/test-requirements.txt diff --git a/libs/pbr/tests/util.py b/libs/common/pbr/tests/util.py similarity index 100% rename from libs/pbr/tests/util.py rename to libs/common/pbr/tests/util.py diff --git a/libs/pbr/util.py b/libs/common/pbr/util.py similarity index 100% rename from libs/pbr/util.py rename to libs/common/pbr/util.py diff --git a/libs/pbr/version.py b/libs/common/pbr/version.py similarity index 100% rename from libs/pbr/version.py rename to libs/common/pbr/version.py diff --git a/libs/pkg_resources/__init__.py b/libs/common/pkg_resources/__init__.py similarity index 100% rename from libs/pkg_resources/__init__.py rename to libs/common/pkg_resources/__init__.py diff --git a/libs/importlib_metadata/tests/data/__init__.py b/libs/common/pkg_resources/_vendor/__init__.py similarity index 100% rename from libs/importlib_metadata/tests/data/__init__.py rename to libs/common/pkg_resources/_vendor/__init__.py diff --git a/libs/pkg_resources/_vendor/appdirs.py b/libs/common/pkg_resources/_vendor/appdirs.py similarity index 100% rename from libs/pkg_resources/_vendor/appdirs.py rename to libs/common/pkg_resources/_vendor/appdirs.py diff --git a/libs/pkg_resources/_vendor/packaging/__about__.py b/libs/common/pkg_resources/_vendor/packaging/__about__.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/__about__.py rename to libs/common/pkg_resources/_vendor/packaging/__about__.py diff --git a/libs/pkg_resources/_vendor/packaging/__init__.py b/libs/common/pkg_resources/_vendor/packaging/__init__.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/__init__.py rename to libs/common/pkg_resources/_vendor/packaging/__init__.py diff --git a/libs/pkg_resources/_vendor/packaging/_compat.py b/libs/common/pkg_resources/_vendor/packaging/_compat.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/_compat.py rename to libs/common/pkg_resources/_vendor/packaging/_compat.py diff --git a/libs/pkg_resources/_vendor/packaging/_structures.py b/libs/common/pkg_resources/_vendor/packaging/_structures.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/_structures.py rename to libs/common/pkg_resources/_vendor/packaging/_structures.py diff --git a/libs/pkg_resources/_vendor/packaging/markers.py b/libs/common/pkg_resources/_vendor/packaging/markers.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/markers.py rename to libs/common/pkg_resources/_vendor/packaging/markers.py diff --git a/libs/pkg_resources/_vendor/packaging/requirements.py b/libs/common/pkg_resources/_vendor/packaging/requirements.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/requirements.py rename to libs/common/pkg_resources/_vendor/packaging/requirements.py diff --git a/libs/pkg_resources/_vendor/packaging/specifiers.py b/libs/common/pkg_resources/_vendor/packaging/specifiers.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/specifiers.py rename to libs/common/pkg_resources/_vendor/packaging/specifiers.py diff --git a/libs/pkg_resources/_vendor/packaging/utils.py b/libs/common/pkg_resources/_vendor/packaging/utils.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/utils.py rename to libs/common/pkg_resources/_vendor/packaging/utils.py diff --git a/libs/pkg_resources/_vendor/packaging/version.py b/libs/common/pkg_resources/_vendor/packaging/version.py similarity index 100% rename from libs/pkg_resources/_vendor/packaging/version.py rename to libs/common/pkg_resources/_vendor/packaging/version.py diff --git a/libs/pkg_resources/_vendor/pyparsing.py b/libs/common/pkg_resources/_vendor/pyparsing.py similarity index 100% rename from libs/pkg_resources/_vendor/pyparsing.py rename to libs/common/pkg_resources/_vendor/pyparsing.py diff --git a/libs/pkg_resources/_vendor/six.py b/libs/common/pkg_resources/_vendor/six.py similarity index 100% rename from libs/pkg_resources/_vendor/six.py rename to libs/common/pkg_resources/_vendor/six.py diff --git a/libs/pkg_resources/extern/__init__.py b/libs/common/pkg_resources/extern/__init__.py similarity index 100% rename from libs/pkg_resources/extern/__init__.py rename to libs/common/pkg_resources/extern/__init__.py diff --git a/libs/pkg_resources/py31compat.py b/libs/common/pkg_resources/py31compat.py similarity index 100% rename from libs/pkg_resources/py31compat.py rename to libs/common/pkg_resources/py31compat.py diff --git a/libs/pysrt/__init__.py b/libs/common/pysrt/__init__.py similarity index 100% rename from libs/pysrt/__init__.py rename to libs/common/pysrt/__init__.py diff --git a/libs/pysrt/commands.py b/libs/common/pysrt/commands.py old mode 100755 new mode 100644 similarity index 100% rename from libs/pysrt/commands.py rename to libs/common/pysrt/commands.py diff --git a/libs/pysrt/comparablemixin.py b/libs/common/pysrt/comparablemixin.py similarity index 100% rename from libs/pysrt/comparablemixin.py rename to libs/common/pysrt/comparablemixin.py diff --git a/libs/pysrt/compat.py b/libs/common/pysrt/compat.py similarity index 100% rename from libs/pysrt/compat.py rename to libs/common/pysrt/compat.py diff --git a/libs/pysrt/srtexc.py b/libs/common/pysrt/srtexc.py similarity index 100% rename from libs/pysrt/srtexc.py rename to libs/common/pysrt/srtexc.py diff --git a/libs/pysrt/srtfile.py b/libs/common/pysrt/srtfile.py similarity index 100% rename from libs/pysrt/srtfile.py rename to libs/common/pysrt/srtfile.py diff --git a/libs/pysrt/srtitem.py b/libs/common/pysrt/srtitem.py similarity index 100% rename from libs/pysrt/srtitem.py rename to libs/common/pysrt/srtitem.py diff --git a/libs/pysrt/srttime.py b/libs/common/pysrt/srttime.py similarity index 100% rename from libs/pysrt/srttime.py rename to libs/common/pysrt/srttime.py diff --git a/libs/pysrt/version.py b/libs/common/pysrt/version.py similarity index 100% rename from libs/pysrt/version.py rename to libs/common/pysrt/version.py diff --git a/libs/pytz/__init__.py b/libs/common/pytz/__init__.py similarity index 100% rename from libs/pytz/__init__.py rename to libs/common/pytz/__init__.py diff --git a/libs/pytz/exceptions.py b/libs/common/pytz/exceptions.py similarity index 100% rename from libs/pytz/exceptions.py rename to libs/common/pytz/exceptions.py diff --git a/libs/pytz/lazy.py b/libs/common/pytz/lazy.py similarity index 100% rename from libs/pytz/lazy.py rename to libs/common/pytz/lazy.py diff --git a/libs/pytz/reference.py b/libs/common/pytz/reference.py similarity index 100% rename from libs/pytz/reference.py rename to libs/common/pytz/reference.py diff --git a/libs/pytz/tzfile.py b/libs/common/pytz/tzfile.py similarity index 100% rename from libs/pytz/tzfile.py rename to libs/common/pytz/tzfile.py diff --git a/libs/pytz/tzinfo.py b/libs/common/pytz/tzinfo.py similarity index 100% rename from libs/pytz/tzinfo.py rename to libs/common/pytz/tzinfo.py diff --git a/libs/pytz/zoneinfo/Africa/Abidjan b/libs/common/pytz/zoneinfo/Africa/Abidjan similarity index 100% rename from libs/pytz/zoneinfo/Africa/Abidjan rename to libs/common/pytz/zoneinfo/Africa/Abidjan diff --git a/libs/pytz/zoneinfo/Africa/Accra b/libs/common/pytz/zoneinfo/Africa/Accra similarity index 100% rename from libs/pytz/zoneinfo/Africa/Accra rename to libs/common/pytz/zoneinfo/Africa/Accra diff --git a/libs/pytz/zoneinfo/Africa/Addis_Ababa b/libs/common/pytz/zoneinfo/Africa/Addis_Ababa similarity index 100% rename from libs/pytz/zoneinfo/Africa/Addis_Ababa rename to libs/common/pytz/zoneinfo/Africa/Addis_Ababa diff --git a/libs/pytz/zoneinfo/Africa/Algiers b/libs/common/pytz/zoneinfo/Africa/Algiers similarity index 100% rename from libs/pytz/zoneinfo/Africa/Algiers rename to libs/common/pytz/zoneinfo/Africa/Algiers diff --git a/libs/pytz/zoneinfo/Africa/Asmara b/libs/common/pytz/zoneinfo/Africa/Asmara similarity index 100% rename from libs/pytz/zoneinfo/Africa/Asmara rename to libs/common/pytz/zoneinfo/Africa/Asmara diff --git a/libs/pytz/zoneinfo/Africa/Asmera b/libs/common/pytz/zoneinfo/Africa/Asmera similarity index 100% rename from libs/pytz/zoneinfo/Africa/Asmera rename to libs/common/pytz/zoneinfo/Africa/Asmera diff --git a/libs/pytz/zoneinfo/Africa/Bamako b/libs/common/pytz/zoneinfo/Africa/Bamako similarity index 100% rename from libs/pytz/zoneinfo/Africa/Bamako rename to libs/common/pytz/zoneinfo/Africa/Bamako diff --git a/libs/pytz/zoneinfo/Africa/Bangui b/libs/common/pytz/zoneinfo/Africa/Bangui similarity index 100% rename from libs/pytz/zoneinfo/Africa/Bangui rename to libs/common/pytz/zoneinfo/Africa/Bangui diff --git a/libs/pytz/zoneinfo/Africa/Banjul b/libs/common/pytz/zoneinfo/Africa/Banjul similarity index 100% rename from libs/pytz/zoneinfo/Africa/Banjul rename to libs/common/pytz/zoneinfo/Africa/Banjul diff --git a/libs/pytz/zoneinfo/Africa/Bissau b/libs/common/pytz/zoneinfo/Africa/Bissau similarity index 100% rename from libs/pytz/zoneinfo/Africa/Bissau rename to libs/common/pytz/zoneinfo/Africa/Bissau diff --git a/libs/pytz/zoneinfo/Africa/Blantyre b/libs/common/pytz/zoneinfo/Africa/Blantyre similarity index 100% rename from libs/pytz/zoneinfo/Africa/Blantyre rename to libs/common/pytz/zoneinfo/Africa/Blantyre diff --git a/libs/pytz/zoneinfo/Africa/Brazzaville b/libs/common/pytz/zoneinfo/Africa/Brazzaville similarity index 100% rename from libs/pytz/zoneinfo/Africa/Brazzaville rename to libs/common/pytz/zoneinfo/Africa/Brazzaville diff --git a/libs/pytz/zoneinfo/Africa/Bujumbura b/libs/common/pytz/zoneinfo/Africa/Bujumbura similarity index 100% rename from libs/pytz/zoneinfo/Africa/Bujumbura rename to libs/common/pytz/zoneinfo/Africa/Bujumbura diff --git a/libs/pytz/zoneinfo/Africa/Cairo b/libs/common/pytz/zoneinfo/Africa/Cairo similarity index 100% rename from libs/pytz/zoneinfo/Africa/Cairo rename to libs/common/pytz/zoneinfo/Africa/Cairo diff --git a/libs/pytz/zoneinfo/Africa/Casablanca b/libs/common/pytz/zoneinfo/Africa/Casablanca similarity index 100% rename from libs/pytz/zoneinfo/Africa/Casablanca rename to libs/common/pytz/zoneinfo/Africa/Casablanca diff --git a/libs/pytz/zoneinfo/Africa/Ceuta b/libs/common/pytz/zoneinfo/Africa/Ceuta similarity index 100% rename from libs/pytz/zoneinfo/Africa/Ceuta rename to libs/common/pytz/zoneinfo/Africa/Ceuta diff --git a/libs/pytz/zoneinfo/Africa/Conakry b/libs/common/pytz/zoneinfo/Africa/Conakry similarity index 100% rename from libs/pytz/zoneinfo/Africa/Conakry rename to libs/common/pytz/zoneinfo/Africa/Conakry diff --git a/libs/pytz/zoneinfo/Africa/Dakar b/libs/common/pytz/zoneinfo/Africa/Dakar similarity index 100% rename from libs/pytz/zoneinfo/Africa/Dakar rename to libs/common/pytz/zoneinfo/Africa/Dakar diff --git a/libs/pytz/zoneinfo/Africa/Dar_es_Salaam b/libs/common/pytz/zoneinfo/Africa/Dar_es_Salaam similarity index 100% rename from libs/pytz/zoneinfo/Africa/Dar_es_Salaam rename to libs/common/pytz/zoneinfo/Africa/Dar_es_Salaam diff --git a/libs/pytz/zoneinfo/Africa/Djibouti b/libs/common/pytz/zoneinfo/Africa/Djibouti similarity index 100% rename from libs/pytz/zoneinfo/Africa/Djibouti rename to libs/common/pytz/zoneinfo/Africa/Djibouti diff --git a/libs/pytz/zoneinfo/Africa/Douala b/libs/common/pytz/zoneinfo/Africa/Douala similarity index 100% rename from libs/pytz/zoneinfo/Africa/Douala rename to libs/common/pytz/zoneinfo/Africa/Douala diff --git a/libs/pytz/zoneinfo/Africa/El_Aaiun b/libs/common/pytz/zoneinfo/Africa/El_Aaiun similarity index 100% rename from libs/pytz/zoneinfo/Africa/El_Aaiun rename to libs/common/pytz/zoneinfo/Africa/El_Aaiun diff --git a/libs/pytz/zoneinfo/Africa/Freetown b/libs/common/pytz/zoneinfo/Africa/Freetown similarity index 100% rename from libs/pytz/zoneinfo/Africa/Freetown rename to libs/common/pytz/zoneinfo/Africa/Freetown diff --git a/libs/pytz/zoneinfo/Africa/Gaborone b/libs/common/pytz/zoneinfo/Africa/Gaborone similarity index 100% rename from libs/pytz/zoneinfo/Africa/Gaborone rename to libs/common/pytz/zoneinfo/Africa/Gaborone diff --git a/libs/pytz/zoneinfo/Africa/Harare b/libs/common/pytz/zoneinfo/Africa/Harare similarity index 100% rename from libs/pytz/zoneinfo/Africa/Harare rename to libs/common/pytz/zoneinfo/Africa/Harare diff --git a/libs/pytz/zoneinfo/Africa/Johannesburg b/libs/common/pytz/zoneinfo/Africa/Johannesburg similarity index 100% rename from libs/pytz/zoneinfo/Africa/Johannesburg rename to libs/common/pytz/zoneinfo/Africa/Johannesburg diff --git a/libs/pytz/zoneinfo/Africa/Juba b/libs/common/pytz/zoneinfo/Africa/Juba similarity index 100% rename from libs/pytz/zoneinfo/Africa/Juba rename to libs/common/pytz/zoneinfo/Africa/Juba diff --git a/libs/pytz/zoneinfo/Africa/Kampala b/libs/common/pytz/zoneinfo/Africa/Kampala similarity index 100% rename from libs/pytz/zoneinfo/Africa/Kampala rename to libs/common/pytz/zoneinfo/Africa/Kampala diff --git a/libs/pytz/zoneinfo/Africa/Khartoum b/libs/common/pytz/zoneinfo/Africa/Khartoum similarity index 100% rename from libs/pytz/zoneinfo/Africa/Khartoum rename to libs/common/pytz/zoneinfo/Africa/Khartoum diff --git a/libs/pytz/zoneinfo/Africa/Kigali b/libs/common/pytz/zoneinfo/Africa/Kigali similarity index 100% rename from libs/pytz/zoneinfo/Africa/Kigali rename to libs/common/pytz/zoneinfo/Africa/Kigali diff --git a/libs/pytz/zoneinfo/Africa/Kinshasa b/libs/common/pytz/zoneinfo/Africa/Kinshasa similarity index 100% rename from libs/pytz/zoneinfo/Africa/Kinshasa rename to libs/common/pytz/zoneinfo/Africa/Kinshasa diff --git a/libs/pytz/zoneinfo/Africa/Lagos b/libs/common/pytz/zoneinfo/Africa/Lagos similarity index 100% rename from libs/pytz/zoneinfo/Africa/Lagos rename to libs/common/pytz/zoneinfo/Africa/Lagos diff --git a/libs/pytz/zoneinfo/Africa/Libreville b/libs/common/pytz/zoneinfo/Africa/Libreville similarity index 100% rename from libs/pytz/zoneinfo/Africa/Libreville rename to libs/common/pytz/zoneinfo/Africa/Libreville diff --git a/libs/pytz/zoneinfo/Africa/Lome b/libs/common/pytz/zoneinfo/Africa/Lome similarity index 100% rename from libs/pytz/zoneinfo/Africa/Lome rename to libs/common/pytz/zoneinfo/Africa/Lome diff --git a/libs/pytz/zoneinfo/Africa/Luanda b/libs/common/pytz/zoneinfo/Africa/Luanda similarity index 100% rename from libs/pytz/zoneinfo/Africa/Luanda rename to libs/common/pytz/zoneinfo/Africa/Luanda diff --git a/libs/pytz/zoneinfo/Africa/Lubumbashi b/libs/common/pytz/zoneinfo/Africa/Lubumbashi similarity index 100% rename from libs/pytz/zoneinfo/Africa/Lubumbashi rename to libs/common/pytz/zoneinfo/Africa/Lubumbashi diff --git a/libs/pytz/zoneinfo/Africa/Lusaka b/libs/common/pytz/zoneinfo/Africa/Lusaka similarity index 100% rename from libs/pytz/zoneinfo/Africa/Lusaka rename to libs/common/pytz/zoneinfo/Africa/Lusaka diff --git a/libs/pytz/zoneinfo/Africa/Malabo b/libs/common/pytz/zoneinfo/Africa/Malabo similarity index 100% rename from libs/pytz/zoneinfo/Africa/Malabo rename to libs/common/pytz/zoneinfo/Africa/Malabo diff --git a/libs/pytz/zoneinfo/Africa/Maputo b/libs/common/pytz/zoneinfo/Africa/Maputo similarity index 100% rename from libs/pytz/zoneinfo/Africa/Maputo rename to libs/common/pytz/zoneinfo/Africa/Maputo diff --git a/libs/pytz/zoneinfo/Africa/Maseru b/libs/common/pytz/zoneinfo/Africa/Maseru similarity index 100% rename from libs/pytz/zoneinfo/Africa/Maseru rename to libs/common/pytz/zoneinfo/Africa/Maseru diff --git a/libs/pytz/zoneinfo/Africa/Mbabane b/libs/common/pytz/zoneinfo/Africa/Mbabane similarity index 100% rename from libs/pytz/zoneinfo/Africa/Mbabane rename to libs/common/pytz/zoneinfo/Africa/Mbabane diff --git a/libs/pytz/zoneinfo/Africa/Mogadishu b/libs/common/pytz/zoneinfo/Africa/Mogadishu similarity index 100% rename from libs/pytz/zoneinfo/Africa/Mogadishu rename to libs/common/pytz/zoneinfo/Africa/Mogadishu diff --git a/libs/pytz/zoneinfo/Africa/Monrovia b/libs/common/pytz/zoneinfo/Africa/Monrovia similarity index 100% rename from libs/pytz/zoneinfo/Africa/Monrovia rename to libs/common/pytz/zoneinfo/Africa/Monrovia diff --git a/libs/pytz/zoneinfo/Africa/Nairobi b/libs/common/pytz/zoneinfo/Africa/Nairobi similarity index 100% rename from libs/pytz/zoneinfo/Africa/Nairobi rename to libs/common/pytz/zoneinfo/Africa/Nairobi diff --git a/libs/pytz/zoneinfo/Africa/Ndjamena b/libs/common/pytz/zoneinfo/Africa/Ndjamena similarity index 100% rename from libs/pytz/zoneinfo/Africa/Ndjamena rename to libs/common/pytz/zoneinfo/Africa/Ndjamena diff --git a/libs/pytz/zoneinfo/Africa/Niamey b/libs/common/pytz/zoneinfo/Africa/Niamey similarity index 100% rename from libs/pytz/zoneinfo/Africa/Niamey rename to libs/common/pytz/zoneinfo/Africa/Niamey diff --git a/libs/pytz/zoneinfo/Africa/Nouakchott b/libs/common/pytz/zoneinfo/Africa/Nouakchott similarity index 100% rename from libs/pytz/zoneinfo/Africa/Nouakchott rename to libs/common/pytz/zoneinfo/Africa/Nouakchott diff --git a/libs/pytz/zoneinfo/Africa/Ouagadougou b/libs/common/pytz/zoneinfo/Africa/Ouagadougou similarity index 100% rename from libs/pytz/zoneinfo/Africa/Ouagadougou rename to libs/common/pytz/zoneinfo/Africa/Ouagadougou diff --git a/libs/pytz/zoneinfo/Africa/Porto-Novo b/libs/common/pytz/zoneinfo/Africa/Porto-Novo similarity index 100% rename from libs/pytz/zoneinfo/Africa/Porto-Novo rename to libs/common/pytz/zoneinfo/Africa/Porto-Novo diff --git a/libs/pytz/zoneinfo/Africa/Sao_Tome b/libs/common/pytz/zoneinfo/Africa/Sao_Tome similarity index 100% rename from libs/pytz/zoneinfo/Africa/Sao_Tome rename to libs/common/pytz/zoneinfo/Africa/Sao_Tome diff --git a/libs/pytz/zoneinfo/Africa/Timbuktu b/libs/common/pytz/zoneinfo/Africa/Timbuktu similarity index 100% rename from libs/pytz/zoneinfo/Africa/Timbuktu rename to libs/common/pytz/zoneinfo/Africa/Timbuktu diff --git a/libs/pytz/zoneinfo/Africa/Tripoli b/libs/common/pytz/zoneinfo/Africa/Tripoli similarity index 100% rename from libs/pytz/zoneinfo/Africa/Tripoli rename to libs/common/pytz/zoneinfo/Africa/Tripoli diff --git a/libs/pytz/zoneinfo/Africa/Tunis b/libs/common/pytz/zoneinfo/Africa/Tunis similarity index 100% rename from libs/pytz/zoneinfo/Africa/Tunis rename to libs/common/pytz/zoneinfo/Africa/Tunis diff --git a/libs/pytz/zoneinfo/Africa/Windhoek b/libs/common/pytz/zoneinfo/Africa/Windhoek similarity index 100% rename from libs/pytz/zoneinfo/Africa/Windhoek rename to libs/common/pytz/zoneinfo/Africa/Windhoek diff --git a/libs/pytz/zoneinfo/America/Adak b/libs/common/pytz/zoneinfo/America/Adak similarity index 100% rename from libs/pytz/zoneinfo/America/Adak rename to libs/common/pytz/zoneinfo/America/Adak diff --git a/libs/pytz/zoneinfo/America/Anchorage b/libs/common/pytz/zoneinfo/America/Anchorage similarity index 100% rename from libs/pytz/zoneinfo/America/Anchorage rename to libs/common/pytz/zoneinfo/America/Anchorage diff --git a/libs/pytz/zoneinfo/America/Anguilla b/libs/common/pytz/zoneinfo/America/Anguilla similarity index 100% rename from libs/pytz/zoneinfo/America/Anguilla rename to libs/common/pytz/zoneinfo/America/Anguilla diff --git a/libs/pytz/zoneinfo/America/Antigua b/libs/common/pytz/zoneinfo/America/Antigua similarity index 100% rename from libs/pytz/zoneinfo/America/Antigua rename to libs/common/pytz/zoneinfo/America/Antigua diff --git a/libs/pytz/zoneinfo/America/Araguaina b/libs/common/pytz/zoneinfo/America/Araguaina similarity index 100% rename from libs/pytz/zoneinfo/America/Araguaina rename to libs/common/pytz/zoneinfo/America/Araguaina diff --git a/libs/pytz/zoneinfo/America/Argentina/Buenos_Aires b/libs/common/pytz/zoneinfo/America/Argentina/Buenos_Aires similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Buenos_Aires rename to libs/common/pytz/zoneinfo/America/Argentina/Buenos_Aires diff --git a/libs/pytz/zoneinfo/America/Argentina/Catamarca b/libs/common/pytz/zoneinfo/America/Argentina/Catamarca similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Catamarca rename to libs/common/pytz/zoneinfo/America/Argentina/Catamarca diff --git a/libs/pytz/zoneinfo/America/Argentina/ComodRivadavia b/libs/common/pytz/zoneinfo/America/Argentina/ComodRivadavia similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/ComodRivadavia rename to libs/common/pytz/zoneinfo/America/Argentina/ComodRivadavia diff --git a/libs/pytz/zoneinfo/America/Argentina/Cordoba b/libs/common/pytz/zoneinfo/America/Argentina/Cordoba similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Cordoba rename to libs/common/pytz/zoneinfo/America/Argentina/Cordoba diff --git a/libs/pytz/zoneinfo/America/Argentina/Jujuy b/libs/common/pytz/zoneinfo/America/Argentina/Jujuy similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Jujuy rename to libs/common/pytz/zoneinfo/America/Argentina/Jujuy diff --git a/libs/pytz/zoneinfo/America/Argentina/La_Rioja b/libs/common/pytz/zoneinfo/America/Argentina/La_Rioja similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/La_Rioja rename to libs/common/pytz/zoneinfo/America/Argentina/La_Rioja diff --git a/libs/pytz/zoneinfo/America/Argentina/Mendoza b/libs/common/pytz/zoneinfo/America/Argentina/Mendoza similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Mendoza rename to libs/common/pytz/zoneinfo/America/Argentina/Mendoza diff --git a/libs/pytz/zoneinfo/America/Argentina/Rio_Gallegos b/libs/common/pytz/zoneinfo/America/Argentina/Rio_Gallegos similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Rio_Gallegos rename to libs/common/pytz/zoneinfo/America/Argentina/Rio_Gallegos diff --git a/libs/pytz/zoneinfo/America/Argentina/Salta b/libs/common/pytz/zoneinfo/America/Argentina/Salta similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Salta rename to libs/common/pytz/zoneinfo/America/Argentina/Salta diff --git a/libs/pytz/zoneinfo/America/Argentina/San_Juan b/libs/common/pytz/zoneinfo/America/Argentina/San_Juan similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/San_Juan rename to libs/common/pytz/zoneinfo/America/Argentina/San_Juan diff --git a/libs/pytz/zoneinfo/America/Argentina/San_Luis b/libs/common/pytz/zoneinfo/America/Argentina/San_Luis similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/San_Luis rename to libs/common/pytz/zoneinfo/America/Argentina/San_Luis diff --git a/libs/pytz/zoneinfo/America/Argentina/Tucuman b/libs/common/pytz/zoneinfo/America/Argentina/Tucuman similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Tucuman rename to libs/common/pytz/zoneinfo/America/Argentina/Tucuman diff --git a/libs/pytz/zoneinfo/America/Argentina/Ushuaia b/libs/common/pytz/zoneinfo/America/Argentina/Ushuaia similarity index 100% rename from libs/pytz/zoneinfo/America/Argentina/Ushuaia rename to libs/common/pytz/zoneinfo/America/Argentina/Ushuaia diff --git a/libs/pytz/zoneinfo/America/Aruba b/libs/common/pytz/zoneinfo/America/Aruba similarity index 100% rename from libs/pytz/zoneinfo/America/Aruba rename to libs/common/pytz/zoneinfo/America/Aruba diff --git a/libs/pytz/zoneinfo/America/Asuncion b/libs/common/pytz/zoneinfo/America/Asuncion similarity index 100% rename from libs/pytz/zoneinfo/America/Asuncion rename to libs/common/pytz/zoneinfo/America/Asuncion diff --git a/libs/pytz/zoneinfo/America/Atikokan b/libs/common/pytz/zoneinfo/America/Atikokan similarity index 100% rename from libs/pytz/zoneinfo/America/Atikokan rename to libs/common/pytz/zoneinfo/America/Atikokan diff --git a/libs/pytz/zoneinfo/America/Atka b/libs/common/pytz/zoneinfo/America/Atka similarity index 100% rename from libs/pytz/zoneinfo/America/Atka rename to libs/common/pytz/zoneinfo/America/Atka diff --git a/libs/pytz/zoneinfo/America/Bahia b/libs/common/pytz/zoneinfo/America/Bahia similarity index 100% rename from libs/pytz/zoneinfo/America/Bahia rename to libs/common/pytz/zoneinfo/America/Bahia diff --git a/libs/pytz/zoneinfo/America/Bahia_Banderas b/libs/common/pytz/zoneinfo/America/Bahia_Banderas similarity index 100% rename from libs/pytz/zoneinfo/America/Bahia_Banderas rename to libs/common/pytz/zoneinfo/America/Bahia_Banderas diff --git a/libs/pytz/zoneinfo/America/Barbados b/libs/common/pytz/zoneinfo/America/Barbados similarity index 100% rename from libs/pytz/zoneinfo/America/Barbados rename to libs/common/pytz/zoneinfo/America/Barbados diff --git a/libs/pytz/zoneinfo/America/Belem b/libs/common/pytz/zoneinfo/America/Belem similarity index 100% rename from libs/pytz/zoneinfo/America/Belem rename to libs/common/pytz/zoneinfo/America/Belem diff --git a/libs/pytz/zoneinfo/America/Belize b/libs/common/pytz/zoneinfo/America/Belize similarity index 100% rename from libs/pytz/zoneinfo/America/Belize rename to libs/common/pytz/zoneinfo/America/Belize diff --git a/libs/pytz/zoneinfo/America/Blanc-Sablon b/libs/common/pytz/zoneinfo/America/Blanc-Sablon similarity index 100% rename from libs/pytz/zoneinfo/America/Blanc-Sablon rename to libs/common/pytz/zoneinfo/America/Blanc-Sablon diff --git a/libs/pytz/zoneinfo/America/Boa_Vista b/libs/common/pytz/zoneinfo/America/Boa_Vista similarity index 100% rename from libs/pytz/zoneinfo/America/Boa_Vista rename to libs/common/pytz/zoneinfo/America/Boa_Vista diff --git a/libs/pytz/zoneinfo/America/Bogota b/libs/common/pytz/zoneinfo/America/Bogota similarity index 100% rename from libs/pytz/zoneinfo/America/Bogota rename to libs/common/pytz/zoneinfo/America/Bogota diff --git a/libs/pytz/zoneinfo/America/Boise b/libs/common/pytz/zoneinfo/America/Boise similarity index 100% rename from libs/pytz/zoneinfo/America/Boise rename to libs/common/pytz/zoneinfo/America/Boise diff --git a/libs/pytz/zoneinfo/America/Buenos_Aires b/libs/common/pytz/zoneinfo/America/Buenos_Aires similarity index 100% rename from libs/pytz/zoneinfo/America/Buenos_Aires rename to libs/common/pytz/zoneinfo/America/Buenos_Aires diff --git a/libs/pytz/zoneinfo/America/Cambridge_Bay b/libs/common/pytz/zoneinfo/America/Cambridge_Bay similarity index 100% rename from libs/pytz/zoneinfo/America/Cambridge_Bay rename to libs/common/pytz/zoneinfo/America/Cambridge_Bay diff --git a/libs/pytz/zoneinfo/America/Campo_Grande b/libs/common/pytz/zoneinfo/America/Campo_Grande similarity index 100% rename from libs/pytz/zoneinfo/America/Campo_Grande rename to libs/common/pytz/zoneinfo/America/Campo_Grande diff --git a/libs/pytz/zoneinfo/America/Cancun b/libs/common/pytz/zoneinfo/America/Cancun similarity index 100% rename from libs/pytz/zoneinfo/America/Cancun rename to libs/common/pytz/zoneinfo/America/Cancun diff --git a/libs/pytz/zoneinfo/America/Caracas b/libs/common/pytz/zoneinfo/America/Caracas similarity index 100% rename from libs/pytz/zoneinfo/America/Caracas rename to libs/common/pytz/zoneinfo/America/Caracas diff --git a/libs/pytz/zoneinfo/America/Catamarca b/libs/common/pytz/zoneinfo/America/Catamarca similarity index 100% rename from libs/pytz/zoneinfo/America/Catamarca rename to libs/common/pytz/zoneinfo/America/Catamarca diff --git a/libs/pytz/zoneinfo/America/Cayenne b/libs/common/pytz/zoneinfo/America/Cayenne similarity index 100% rename from libs/pytz/zoneinfo/America/Cayenne rename to libs/common/pytz/zoneinfo/America/Cayenne diff --git a/libs/pytz/zoneinfo/America/Cayman b/libs/common/pytz/zoneinfo/America/Cayman similarity index 100% rename from libs/pytz/zoneinfo/America/Cayman rename to libs/common/pytz/zoneinfo/America/Cayman diff --git a/libs/pytz/zoneinfo/America/Chicago b/libs/common/pytz/zoneinfo/America/Chicago similarity index 100% rename from libs/pytz/zoneinfo/America/Chicago rename to libs/common/pytz/zoneinfo/America/Chicago diff --git a/libs/pytz/zoneinfo/America/Chihuahua b/libs/common/pytz/zoneinfo/America/Chihuahua similarity index 100% rename from libs/pytz/zoneinfo/America/Chihuahua rename to libs/common/pytz/zoneinfo/America/Chihuahua diff --git a/libs/pytz/zoneinfo/America/Coral_Harbour b/libs/common/pytz/zoneinfo/America/Coral_Harbour similarity index 100% rename from libs/pytz/zoneinfo/America/Coral_Harbour rename to libs/common/pytz/zoneinfo/America/Coral_Harbour diff --git a/libs/pytz/zoneinfo/America/Cordoba b/libs/common/pytz/zoneinfo/America/Cordoba similarity index 100% rename from libs/pytz/zoneinfo/America/Cordoba rename to libs/common/pytz/zoneinfo/America/Cordoba diff --git a/libs/pytz/zoneinfo/America/Costa_Rica b/libs/common/pytz/zoneinfo/America/Costa_Rica similarity index 100% rename from libs/pytz/zoneinfo/America/Costa_Rica rename to libs/common/pytz/zoneinfo/America/Costa_Rica diff --git a/libs/pytz/zoneinfo/America/Creston b/libs/common/pytz/zoneinfo/America/Creston similarity index 100% rename from libs/pytz/zoneinfo/America/Creston rename to libs/common/pytz/zoneinfo/America/Creston diff --git a/libs/pytz/zoneinfo/America/Cuiaba b/libs/common/pytz/zoneinfo/America/Cuiaba similarity index 100% rename from libs/pytz/zoneinfo/America/Cuiaba rename to libs/common/pytz/zoneinfo/America/Cuiaba diff --git a/libs/pytz/zoneinfo/America/Curacao b/libs/common/pytz/zoneinfo/America/Curacao similarity index 100% rename from libs/pytz/zoneinfo/America/Curacao rename to libs/common/pytz/zoneinfo/America/Curacao diff --git a/libs/pytz/zoneinfo/America/Danmarkshavn b/libs/common/pytz/zoneinfo/America/Danmarkshavn similarity index 100% rename from libs/pytz/zoneinfo/America/Danmarkshavn rename to libs/common/pytz/zoneinfo/America/Danmarkshavn diff --git a/libs/pytz/zoneinfo/America/Dawson b/libs/common/pytz/zoneinfo/America/Dawson similarity index 100% rename from libs/pytz/zoneinfo/America/Dawson rename to libs/common/pytz/zoneinfo/America/Dawson diff --git a/libs/pytz/zoneinfo/America/Dawson_Creek b/libs/common/pytz/zoneinfo/America/Dawson_Creek similarity index 100% rename from libs/pytz/zoneinfo/America/Dawson_Creek rename to libs/common/pytz/zoneinfo/America/Dawson_Creek diff --git a/libs/pytz/zoneinfo/America/Denver b/libs/common/pytz/zoneinfo/America/Denver similarity index 100% rename from libs/pytz/zoneinfo/America/Denver rename to libs/common/pytz/zoneinfo/America/Denver diff --git a/libs/pytz/zoneinfo/America/Detroit b/libs/common/pytz/zoneinfo/America/Detroit similarity index 100% rename from libs/pytz/zoneinfo/America/Detroit rename to libs/common/pytz/zoneinfo/America/Detroit diff --git a/libs/pytz/zoneinfo/America/Dominica b/libs/common/pytz/zoneinfo/America/Dominica similarity index 100% rename from libs/pytz/zoneinfo/America/Dominica rename to libs/common/pytz/zoneinfo/America/Dominica diff --git a/libs/pytz/zoneinfo/America/Edmonton b/libs/common/pytz/zoneinfo/America/Edmonton similarity index 100% rename from libs/pytz/zoneinfo/America/Edmonton rename to libs/common/pytz/zoneinfo/America/Edmonton diff --git a/libs/pytz/zoneinfo/America/Eirunepe b/libs/common/pytz/zoneinfo/America/Eirunepe similarity index 100% rename from libs/pytz/zoneinfo/America/Eirunepe rename to libs/common/pytz/zoneinfo/America/Eirunepe diff --git a/libs/pytz/zoneinfo/America/El_Salvador b/libs/common/pytz/zoneinfo/America/El_Salvador similarity index 100% rename from libs/pytz/zoneinfo/America/El_Salvador rename to libs/common/pytz/zoneinfo/America/El_Salvador diff --git a/libs/pytz/zoneinfo/America/Ensenada b/libs/common/pytz/zoneinfo/America/Ensenada similarity index 100% rename from libs/pytz/zoneinfo/America/Ensenada rename to libs/common/pytz/zoneinfo/America/Ensenada diff --git a/libs/pytz/zoneinfo/America/Fort_Nelson b/libs/common/pytz/zoneinfo/America/Fort_Nelson similarity index 100% rename from libs/pytz/zoneinfo/America/Fort_Nelson rename to libs/common/pytz/zoneinfo/America/Fort_Nelson diff --git a/libs/pytz/zoneinfo/America/Fort_Wayne b/libs/common/pytz/zoneinfo/America/Fort_Wayne similarity index 100% rename from libs/pytz/zoneinfo/America/Fort_Wayne rename to libs/common/pytz/zoneinfo/America/Fort_Wayne diff --git a/libs/pytz/zoneinfo/America/Fortaleza b/libs/common/pytz/zoneinfo/America/Fortaleza similarity index 100% rename from libs/pytz/zoneinfo/America/Fortaleza rename to libs/common/pytz/zoneinfo/America/Fortaleza diff --git a/libs/pytz/zoneinfo/America/Glace_Bay b/libs/common/pytz/zoneinfo/America/Glace_Bay similarity index 100% rename from libs/pytz/zoneinfo/America/Glace_Bay rename to libs/common/pytz/zoneinfo/America/Glace_Bay diff --git a/libs/pytz/zoneinfo/America/Godthab b/libs/common/pytz/zoneinfo/America/Godthab similarity index 100% rename from libs/pytz/zoneinfo/America/Godthab rename to libs/common/pytz/zoneinfo/America/Godthab diff --git a/libs/pytz/zoneinfo/America/Goose_Bay b/libs/common/pytz/zoneinfo/America/Goose_Bay similarity index 100% rename from libs/pytz/zoneinfo/America/Goose_Bay rename to libs/common/pytz/zoneinfo/America/Goose_Bay diff --git a/libs/pytz/zoneinfo/America/Grand_Turk b/libs/common/pytz/zoneinfo/America/Grand_Turk similarity index 100% rename from libs/pytz/zoneinfo/America/Grand_Turk rename to libs/common/pytz/zoneinfo/America/Grand_Turk diff --git a/libs/pytz/zoneinfo/America/Grenada b/libs/common/pytz/zoneinfo/America/Grenada similarity index 100% rename from libs/pytz/zoneinfo/America/Grenada rename to libs/common/pytz/zoneinfo/America/Grenada diff --git a/libs/pytz/zoneinfo/America/Guadeloupe b/libs/common/pytz/zoneinfo/America/Guadeloupe similarity index 100% rename from libs/pytz/zoneinfo/America/Guadeloupe rename to libs/common/pytz/zoneinfo/America/Guadeloupe diff --git a/libs/pytz/zoneinfo/America/Guatemala b/libs/common/pytz/zoneinfo/America/Guatemala similarity index 100% rename from libs/pytz/zoneinfo/America/Guatemala rename to libs/common/pytz/zoneinfo/America/Guatemala diff --git a/libs/pytz/zoneinfo/America/Guayaquil b/libs/common/pytz/zoneinfo/America/Guayaquil similarity index 100% rename from libs/pytz/zoneinfo/America/Guayaquil rename to libs/common/pytz/zoneinfo/America/Guayaquil diff --git a/libs/pytz/zoneinfo/America/Guyana b/libs/common/pytz/zoneinfo/America/Guyana similarity index 100% rename from libs/pytz/zoneinfo/America/Guyana rename to libs/common/pytz/zoneinfo/America/Guyana diff --git a/libs/pytz/zoneinfo/America/Halifax b/libs/common/pytz/zoneinfo/America/Halifax similarity index 100% rename from libs/pytz/zoneinfo/America/Halifax rename to libs/common/pytz/zoneinfo/America/Halifax diff --git a/libs/pytz/zoneinfo/America/Havana b/libs/common/pytz/zoneinfo/America/Havana similarity index 100% rename from libs/pytz/zoneinfo/America/Havana rename to libs/common/pytz/zoneinfo/America/Havana diff --git a/libs/pytz/zoneinfo/America/Hermosillo b/libs/common/pytz/zoneinfo/America/Hermosillo similarity index 100% rename from libs/pytz/zoneinfo/America/Hermosillo rename to libs/common/pytz/zoneinfo/America/Hermosillo diff --git a/libs/pytz/zoneinfo/America/Indiana/Indianapolis b/libs/common/pytz/zoneinfo/America/Indiana/Indianapolis similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Indianapolis rename to libs/common/pytz/zoneinfo/America/Indiana/Indianapolis diff --git a/libs/pytz/zoneinfo/America/Indiana/Knox b/libs/common/pytz/zoneinfo/America/Indiana/Knox similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Knox rename to libs/common/pytz/zoneinfo/America/Indiana/Knox diff --git a/libs/pytz/zoneinfo/America/Indiana/Marengo b/libs/common/pytz/zoneinfo/America/Indiana/Marengo similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Marengo rename to libs/common/pytz/zoneinfo/America/Indiana/Marengo diff --git a/libs/pytz/zoneinfo/America/Indiana/Petersburg b/libs/common/pytz/zoneinfo/America/Indiana/Petersburg similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Petersburg rename to libs/common/pytz/zoneinfo/America/Indiana/Petersburg diff --git a/libs/pytz/zoneinfo/America/Indiana/Tell_City b/libs/common/pytz/zoneinfo/America/Indiana/Tell_City similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Tell_City rename to libs/common/pytz/zoneinfo/America/Indiana/Tell_City diff --git a/libs/pytz/zoneinfo/America/Indiana/Vevay b/libs/common/pytz/zoneinfo/America/Indiana/Vevay similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Vevay rename to libs/common/pytz/zoneinfo/America/Indiana/Vevay diff --git a/libs/pytz/zoneinfo/America/Indiana/Vincennes b/libs/common/pytz/zoneinfo/America/Indiana/Vincennes similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Vincennes rename to libs/common/pytz/zoneinfo/America/Indiana/Vincennes diff --git a/libs/pytz/zoneinfo/America/Indiana/Winamac b/libs/common/pytz/zoneinfo/America/Indiana/Winamac similarity index 100% rename from libs/pytz/zoneinfo/America/Indiana/Winamac rename to libs/common/pytz/zoneinfo/America/Indiana/Winamac diff --git a/libs/pytz/zoneinfo/America/Indianapolis b/libs/common/pytz/zoneinfo/America/Indianapolis similarity index 100% rename from libs/pytz/zoneinfo/America/Indianapolis rename to libs/common/pytz/zoneinfo/America/Indianapolis diff --git a/libs/pytz/zoneinfo/America/Inuvik b/libs/common/pytz/zoneinfo/America/Inuvik similarity index 100% rename from libs/pytz/zoneinfo/America/Inuvik rename to libs/common/pytz/zoneinfo/America/Inuvik diff --git a/libs/pytz/zoneinfo/America/Iqaluit b/libs/common/pytz/zoneinfo/America/Iqaluit similarity index 100% rename from libs/pytz/zoneinfo/America/Iqaluit rename to libs/common/pytz/zoneinfo/America/Iqaluit diff --git a/libs/pytz/zoneinfo/America/Jamaica b/libs/common/pytz/zoneinfo/America/Jamaica similarity index 100% rename from libs/pytz/zoneinfo/America/Jamaica rename to libs/common/pytz/zoneinfo/America/Jamaica diff --git a/libs/pytz/zoneinfo/America/Jujuy b/libs/common/pytz/zoneinfo/America/Jujuy similarity index 100% rename from libs/pytz/zoneinfo/America/Jujuy rename to libs/common/pytz/zoneinfo/America/Jujuy diff --git a/libs/pytz/zoneinfo/America/Juneau b/libs/common/pytz/zoneinfo/America/Juneau similarity index 100% rename from libs/pytz/zoneinfo/America/Juneau rename to libs/common/pytz/zoneinfo/America/Juneau diff --git a/libs/pytz/zoneinfo/America/Kentucky/Louisville b/libs/common/pytz/zoneinfo/America/Kentucky/Louisville similarity index 100% rename from libs/pytz/zoneinfo/America/Kentucky/Louisville rename to libs/common/pytz/zoneinfo/America/Kentucky/Louisville diff --git a/libs/pytz/zoneinfo/America/Kentucky/Monticello b/libs/common/pytz/zoneinfo/America/Kentucky/Monticello similarity index 100% rename from libs/pytz/zoneinfo/America/Kentucky/Monticello rename to libs/common/pytz/zoneinfo/America/Kentucky/Monticello diff --git a/libs/pytz/zoneinfo/America/Knox_IN b/libs/common/pytz/zoneinfo/America/Knox_IN similarity index 100% rename from libs/pytz/zoneinfo/America/Knox_IN rename to libs/common/pytz/zoneinfo/America/Knox_IN diff --git a/libs/pytz/zoneinfo/America/Kralendijk b/libs/common/pytz/zoneinfo/America/Kralendijk similarity index 100% rename from libs/pytz/zoneinfo/America/Kralendijk rename to libs/common/pytz/zoneinfo/America/Kralendijk diff --git a/libs/pytz/zoneinfo/America/La_Paz b/libs/common/pytz/zoneinfo/America/La_Paz similarity index 100% rename from libs/pytz/zoneinfo/America/La_Paz rename to libs/common/pytz/zoneinfo/America/La_Paz diff --git a/libs/pytz/zoneinfo/America/Lima b/libs/common/pytz/zoneinfo/America/Lima similarity index 100% rename from libs/pytz/zoneinfo/America/Lima rename to libs/common/pytz/zoneinfo/America/Lima diff --git a/libs/pytz/zoneinfo/America/Los_Angeles b/libs/common/pytz/zoneinfo/America/Los_Angeles similarity index 100% rename from libs/pytz/zoneinfo/America/Los_Angeles rename to libs/common/pytz/zoneinfo/America/Los_Angeles diff --git a/libs/pytz/zoneinfo/America/Louisville b/libs/common/pytz/zoneinfo/America/Louisville similarity index 100% rename from libs/pytz/zoneinfo/America/Louisville rename to libs/common/pytz/zoneinfo/America/Louisville diff --git a/libs/pytz/zoneinfo/America/Lower_Princes b/libs/common/pytz/zoneinfo/America/Lower_Princes similarity index 100% rename from libs/pytz/zoneinfo/America/Lower_Princes rename to libs/common/pytz/zoneinfo/America/Lower_Princes diff --git a/libs/pytz/zoneinfo/America/Maceio b/libs/common/pytz/zoneinfo/America/Maceio similarity index 100% rename from libs/pytz/zoneinfo/America/Maceio rename to libs/common/pytz/zoneinfo/America/Maceio diff --git a/libs/pytz/zoneinfo/America/Managua b/libs/common/pytz/zoneinfo/America/Managua similarity index 100% rename from libs/pytz/zoneinfo/America/Managua rename to libs/common/pytz/zoneinfo/America/Managua diff --git a/libs/pytz/zoneinfo/America/Manaus b/libs/common/pytz/zoneinfo/America/Manaus similarity index 100% rename from libs/pytz/zoneinfo/America/Manaus rename to libs/common/pytz/zoneinfo/America/Manaus diff --git a/libs/pytz/zoneinfo/America/Marigot b/libs/common/pytz/zoneinfo/America/Marigot similarity index 100% rename from libs/pytz/zoneinfo/America/Marigot rename to libs/common/pytz/zoneinfo/America/Marigot diff --git a/libs/pytz/zoneinfo/America/Martinique b/libs/common/pytz/zoneinfo/America/Martinique similarity index 100% rename from libs/pytz/zoneinfo/America/Martinique rename to libs/common/pytz/zoneinfo/America/Martinique diff --git a/libs/pytz/zoneinfo/America/Matamoros b/libs/common/pytz/zoneinfo/America/Matamoros similarity index 100% rename from libs/pytz/zoneinfo/America/Matamoros rename to libs/common/pytz/zoneinfo/America/Matamoros diff --git a/libs/pytz/zoneinfo/America/Mazatlan b/libs/common/pytz/zoneinfo/America/Mazatlan similarity index 100% rename from libs/pytz/zoneinfo/America/Mazatlan rename to libs/common/pytz/zoneinfo/America/Mazatlan diff --git a/libs/pytz/zoneinfo/America/Mendoza b/libs/common/pytz/zoneinfo/America/Mendoza similarity index 100% rename from libs/pytz/zoneinfo/America/Mendoza rename to libs/common/pytz/zoneinfo/America/Mendoza diff --git a/libs/pytz/zoneinfo/America/Menominee b/libs/common/pytz/zoneinfo/America/Menominee similarity index 100% rename from libs/pytz/zoneinfo/America/Menominee rename to libs/common/pytz/zoneinfo/America/Menominee diff --git a/libs/pytz/zoneinfo/America/Merida b/libs/common/pytz/zoneinfo/America/Merida similarity index 100% rename from libs/pytz/zoneinfo/America/Merida rename to libs/common/pytz/zoneinfo/America/Merida diff --git a/libs/pytz/zoneinfo/America/Metlakatla b/libs/common/pytz/zoneinfo/America/Metlakatla similarity index 100% rename from libs/pytz/zoneinfo/America/Metlakatla rename to libs/common/pytz/zoneinfo/America/Metlakatla diff --git a/libs/pytz/zoneinfo/America/Mexico_City b/libs/common/pytz/zoneinfo/America/Mexico_City similarity index 100% rename from libs/pytz/zoneinfo/America/Mexico_City rename to libs/common/pytz/zoneinfo/America/Mexico_City diff --git a/libs/pytz/zoneinfo/America/Miquelon b/libs/common/pytz/zoneinfo/America/Miquelon similarity index 100% rename from libs/pytz/zoneinfo/America/Miquelon rename to libs/common/pytz/zoneinfo/America/Miquelon diff --git a/libs/pytz/zoneinfo/America/Moncton b/libs/common/pytz/zoneinfo/America/Moncton similarity index 100% rename from libs/pytz/zoneinfo/America/Moncton rename to libs/common/pytz/zoneinfo/America/Moncton diff --git a/libs/pytz/zoneinfo/America/Monterrey b/libs/common/pytz/zoneinfo/America/Monterrey similarity index 100% rename from libs/pytz/zoneinfo/America/Monterrey rename to libs/common/pytz/zoneinfo/America/Monterrey diff --git a/libs/pytz/zoneinfo/America/Montevideo b/libs/common/pytz/zoneinfo/America/Montevideo similarity index 100% rename from libs/pytz/zoneinfo/America/Montevideo rename to libs/common/pytz/zoneinfo/America/Montevideo diff --git a/libs/pytz/zoneinfo/America/Montreal b/libs/common/pytz/zoneinfo/America/Montreal similarity index 100% rename from libs/pytz/zoneinfo/America/Montreal rename to libs/common/pytz/zoneinfo/America/Montreal diff --git a/libs/pytz/zoneinfo/America/Montserrat b/libs/common/pytz/zoneinfo/America/Montserrat similarity index 100% rename from libs/pytz/zoneinfo/America/Montserrat rename to libs/common/pytz/zoneinfo/America/Montserrat diff --git a/libs/pytz/zoneinfo/America/Nassau b/libs/common/pytz/zoneinfo/America/Nassau similarity index 100% rename from libs/pytz/zoneinfo/America/Nassau rename to libs/common/pytz/zoneinfo/America/Nassau diff --git a/libs/pytz/zoneinfo/America/New_York b/libs/common/pytz/zoneinfo/America/New_York similarity index 100% rename from libs/pytz/zoneinfo/America/New_York rename to libs/common/pytz/zoneinfo/America/New_York diff --git a/libs/pytz/zoneinfo/America/Nipigon b/libs/common/pytz/zoneinfo/America/Nipigon similarity index 100% rename from libs/pytz/zoneinfo/America/Nipigon rename to libs/common/pytz/zoneinfo/America/Nipigon diff --git a/libs/pytz/zoneinfo/America/Nome b/libs/common/pytz/zoneinfo/America/Nome similarity index 100% rename from libs/pytz/zoneinfo/America/Nome rename to libs/common/pytz/zoneinfo/America/Nome diff --git a/libs/pytz/zoneinfo/America/Noronha b/libs/common/pytz/zoneinfo/America/Noronha similarity index 100% rename from libs/pytz/zoneinfo/America/Noronha rename to libs/common/pytz/zoneinfo/America/Noronha diff --git a/libs/pytz/zoneinfo/America/North_Dakota/Beulah b/libs/common/pytz/zoneinfo/America/North_Dakota/Beulah similarity index 100% rename from libs/pytz/zoneinfo/America/North_Dakota/Beulah rename to libs/common/pytz/zoneinfo/America/North_Dakota/Beulah diff --git a/libs/pytz/zoneinfo/America/North_Dakota/Center b/libs/common/pytz/zoneinfo/America/North_Dakota/Center similarity index 100% rename from libs/pytz/zoneinfo/America/North_Dakota/Center rename to libs/common/pytz/zoneinfo/America/North_Dakota/Center diff --git a/libs/pytz/zoneinfo/America/North_Dakota/New_Salem b/libs/common/pytz/zoneinfo/America/North_Dakota/New_Salem similarity index 100% rename from libs/pytz/zoneinfo/America/North_Dakota/New_Salem rename to libs/common/pytz/zoneinfo/America/North_Dakota/New_Salem diff --git a/libs/pytz/zoneinfo/America/Ojinaga b/libs/common/pytz/zoneinfo/America/Ojinaga similarity index 100% rename from libs/pytz/zoneinfo/America/Ojinaga rename to libs/common/pytz/zoneinfo/America/Ojinaga diff --git a/libs/pytz/zoneinfo/America/Panama b/libs/common/pytz/zoneinfo/America/Panama similarity index 100% rename from libs/pytz/zoneinfo/America/Panama rename to libs/common/pytz/zoneinfo/America/Panama diff --git a/libs/pytz/zoneinfo/America/Pangnirtung b/libs/common/pytz/zoneinfo/America/Pangnirtung similarity index 100% rename from libs/pytz/zoneinfo/America/Pangnirtung rename to libs/common/pytz/zoneinfo/America/Pangnirtung diff --git a/libs/pytz/zoneinfo/America/Paramaribo b/libs/common/pytz/zoneinfo/America/Paramaribo similarity index 100% rename from libs/pytz/zoneinfo/America/Paramaribo rename to libs/common/pytz/zoneinfo/America/Paramaribo diff --git a/libs/pytz/zoneinfo/America/Phoenix b/libs/common/pytz/zoneinfo/America/Phoenix similarity index 100% rename from libs/pytz/zoneinfo/America/Phoenix rename to libs/common/pytz/zoneinfo/America/Phoenix diff --git a/libs/pytz/zoneinfo/America/Port-au-Prince b/libs/common/pytz/zoneinfo/America/Port-au-Prince similarity index 100% rename from libs/pytz/zoneinfo/America/Port-au-Prince rename to libs/common/pytz/zoneinfo/America/Port-au-Prince diff --git a/libs/pytz/zoneinfo/America/Port_of_Spain b/libs/common/pytz/zoneinfo/America/Port_of_Spain similarity index 100% rename from libs/pytz/zoneinfo/America/Port_of_Spain rename to libs/common/pytz/zoneinfo/America/Port_of_Spain diff --git a/libs/pytz/zoneinfo/America/Porto_Acre b/libs/common/pytz/zoneinfo/America/Porto_Acre similarity index 100% rename from libs/pytz/zoneinfo/America/Porto_Acre rename to libs/common/pytz/zoneinfo/America/Porto_Acre diff --git a/libs/pytz/zoneinfo/America/Porto_Velho b/libs/common/pytz/zoneinfo/America/Porto_Velho similarity index 100% rename from libs/pytz/zoneinfo/America/Porto_Velho rename to libs/common/pytz/zoneinfo/America/Porto_Velho diff --git a/libs/pytz/zoneinfo/America/Puerto_Rico b/libs/common/pytz/zoneinfo/America/Puerto_Rico similarity index 100% rename from libs/pytz/zoneinfo/America/Puerto_Rico rename to libs/common/pytz/zoneinfo/America/Puerto_Rico diff --git a/libs/pytz/zoneinfo/America/Punta_Arenas b/libs/common/pytz/zoneinfo/America/Punta_Arenas similarity index 100% rename from libs/pytz/zoneinfo/America/Punta_Arenas rename to libs/common/pytz/zoneinfo/America/Punta_Arenas diff --git a/libs/pytz/zoneinfo/America/Rainy_River b/libs/common/pytz/zoneinfo/America/Rainy_River similarity index 100% rename from libs/pytz/zoneinfo/America/Rainy_River rename to libs/common/pytz/zoneinfo/America/Rainy_River diff --git a/libs/pytz/zoneinfo/America/Rankin_Inlet b/libs/common/pytz/zoneinfo/America/Rankin_Inlet similarity index 100% rename from libs/pytz/zoneinfo/America/Rankin_Inlet rename to libs/common/pytz/zoneinfo/America/Rankin_Inlet diff --git a/libs/pytz/zoneinfo/America/Recife b/libs/common/pytz/zoneinfo/America/Recife similarity index 100% rename from libs/pytz/zoneinfo/America/Recife rename to libs/common/pytz/zoneinfo/America/Recife diff --git a/libs/pytz/zoneinfo/America/Regina b/libs/common/pytz/zoneinfo/America/Regina similarity index 100% rename from libs/pytz/zoneinfo/America/Regina rename to libs/common/pytz/zoneinfo/America/Regina diff --git a/libs/pytz/zoneinfo/America/Resolute b/libs/common/pytz/zoneinfo/America/Resolute similarity index 100% rename from libs/pytz/zoneinfo/America/Resolute rename to libs/common/pytz/zoneinfo/America/Resolute diff --git a/libs/pytz/zoneinfo/America/Rio_Branco b/libs/common/pytz/zoneinfo/America/Rio_Branco similarity index 100% rename from libs/pytz/zoneinfo/America/Rio_Branco rename to libs/common/pytz/zoneinfo/America/Rio_Branco diff --git a/libs/pytz/zoneinfo/America/Rosario b/libs/common/pytz/zoneinfo/America/Rosario similarity index 100% rename from libs/pytz/zoneinfo/America/Rosario rename to libs/common/pytz/zoneinfo/America/Rosario diff --git a/libs/pytz/zoneinfo/America/Santa_Isabel b/libs/common/pytz/zoneinfo/America/Santa_Isabel similarity index 100% rename from libs/pytz/zoneinfo/America/Santa_Isabel rename to libs/common/pytz/zoneinfo/America/Santa_Isabel diff --git a/libs/pytz/zoneinfo/America/Santarem b/libs/common/pytz/zoneinfo/America/Santarem similarity index 100% rename from libs/pytz/zoneinfo/America/Santarem rename to libs/common/pytz/zoneinfo/America/Santarem diff --git a/libs/pytz/zoneinfo/America/Santiago b/libs/common/pytz/zoneinfo/America/Santiago similarity index 100% rename from libs/pytz/zoneinfo/America/Santiago rename to libs/common/pytz/zoneinfo/America/Santiago diff --git a/libs/pytz/zoneinfo/America/Santo_Domingo b/libs/common/pytz/zoneinfo/America/Santo_Domingo similarity index 100% rename from libs/pytz/zoneinfo/America/Santo_Domingo rename to libs/common/pytz/zoneinfo/America/Santo_Domingo diff --git a/libs/pytz/zoneinfo/America/Sao_Paulo b/libs/common/pytz/zoneinfo/America/Sao_Paulo similarity index 100% rename from libs/pytz/zoneinfo/America/Sao_Paulo rename to libs/common/pytz/zoneinfo/America/Sao_Paulo diff --git a/libs/pytz/zoneinfo/America/Scoresbysund b/libs/common/pytz/zoneinfo/America/Scoresbysund similarity index 100% rename from libs/pytz/zoneinfo/America/Scoresbysund rename to libs/common/pytz/zoneinfo/America/Scoresbysund diff --git a/libs/pytz/zoneinfo/America/Shiprock b/libs/common/pytz/zoneinfo/America/Shiprock similarity index 100% rename from libs/pytz/zoneinfo/America/Shiprock rename to libs/common/pytz/zoneinfo/America/Shiprock diff --git a/libs/pytz/zoneinfo/America/Sitka b/libs/common/pytz/zoneinfo/America/Sitka similarity index 100% rename from libs/pytz/zoneinfo/America/Sitka rename to libs/common/pytz/zoneinfo/America/Sitka diff --git a/libs/pytz/zoneinfo/America/St_Barthelemy b/libs/common/pytz/zoneinfo/America/St_Barthelemy similarity index 100% rename from libs/pytz/zoneinfo/America/St_Barthelemy rename to libs/common/pytz/zoneinfo/America/St_Barthelemy diff --git a/libs/pytz/zoneinfo/America/St_Johns b/libs/common/pytz/zoneinfo/America/St_Johns similarity index 100% rename from libs/pytz/zoneinfo/America/St_Johns rename to libs/common/pytz/zoneinfo/America/St_Johns diff --git a/libs/pytz/zoneinfo/America/St_Kitts b/libs/common/pytz/zoneinfo/America/St_Kitts similarity index 100% rename from libs/pytz/zoneinfo/America/St_Kitts rename to libs/common/pytz/zoneinfo/America/St_Kitts diff --git a/libs/pytz/zoneinfo/America/St_Lucia b/libs/common/pytz/zoneinfo/America/St_Lucia similarity index 100% rename from libs/pytz/zoneinfo/America/St_Lucia rename to libs/common/pytz/zoneinfo/America/St_Lucia diff --git a/libs/pytz/zoneinfo/America/St_Thomas b/libs/common/pytz/zoneinfo/America/St_Thomas similarity index 100% rename from libs/pytz/zoneinfo/America/St_Thomas rename to libs/common/pytz/zoneinfo/America/St_Thomas diff --git a/libs/pytz/zoneinfo/America/St_Vincent b/libs/common/pytz/zoneinfo/America/St_Vincent similarity index 100% rename from libs/pytz/zoneinfo/America/St_Vincent rename to libs/common/pytz/zoneinfo/America/St_Vincent diff --git a/libs/pytz/zoneinfo/America/Swift_Current b/libs/common/pytz/zoneinfo/America/Swift_Current similarity index 100% rename from libs/pytz/zoneinfo/America/Swift_Current rename to libs/common/pytz/zoneinfo/America/Swift_Current diff --git a/libs/pytz/zoneinfo/America/Tegucigalpa b/libs/common/pytz/zoneinfo/America/Tegucigalpa similarity index 100% rename from libs/pytz/zoneinfo/America/Tegucigalpa rename to libs/common/pytz/zoneinfo/America/Tegucigalpa diff --git a/libs/pytz/zoneinfo/America/Thule b/libs/common/pytz/zoneinfo/America/Thule similarity index 100% rename from libs/pytz/zoneinfo/America/Thule rename to libs/common/pytz/zoneinfo/America/Thule diff --git a/libs/pytz/zoneinfo/America/Thunder_Bay b/libs/common/pytz/zoneinfo/America/Thunder_Bay similarity index 100% rename from libs/pytz/zoneinfo/America/Thunder_Bay rename to libs/common/pytz/zoneinfo/America/Thunder_Bay diff --git a/libs/pytz/zoneinfo/America/Tijuana b/libs/common/pytz/zoneinfo/America/Tijuana similarity index 100% rename from libs/pytz/zoneinfo/America/Tijuana rename to libs/common/pytz/zoneinfo/America/Tijuana diff --git a/libs/pytz/zoneinfo/America/Toronto b/libs/common/pytz/zoneinfo/America/Toronto similarity index 100% rename from libs/pytz/zoneinfo/America/Toronto rename to libs/common/pytz/zoneinfo/America/Toronto diff --git a/libs/pytz/zoneinfo/America/Tortola b/libs/common/pytz/zoneinfo/America/Tortola similarity index 100% rename from libs/pytz/zoneinfo/America/Tortola rename to libs/common/pytz/zoneinfo/America/Tortola diff --git a/libs/pytz/zoneinfo/America/Vancouver b/libs/common/pytz/zoneinfo/America/Vancouver similarity index 100% rename from libs/pytz/zoneinfo/America/Vancouver rename to libs/common/pytz/zoneinfo/America/Vancouver diff --git a/libs/pytz/zoneinfo/America/Virgin b/libs/common/pytz/zoneinfo/America/Virgin similarity index 100% rename from libs/pytz/zoneinfo/America/Virgin rename to libs/common/pytz/zoneinfo/America/Virgin diff --git a/libs/pytz/zoneinfo/America/Whitehorse b/libs/common/pytz/zoneinfo/America/Whitehorse similarity index 100% rename from libs/pytz/zoneinfo/America/Whitehorse rename to libs/common/pytz/zoneinfo/America/Whitehorse diff --git a/libs/pytz/zoneinfo/America/Winnipeg b/libs/common/pytz/zoneinfo/America/Winnipeg similarity index 100% rename from libs/pytz/zoneinfo/America/Winnipeg rename to libs/common/pytz/zoneinfo/America/Winnipeg diff --git a/libs/pytz/zoneinfo/America/Yakutat b/libs/common/pytz/zoneinfo/America/Yakutat similarity index 100% rename from libs/pytz/zoneinfo/America/Yakutat rename to libs/common/pytz/zoneinfo/America/Yakutat diff --git a/libs/pytz/zoneinfo/America/Yellowknife b/libs/common/pytz/zoneinfo/America/Yellowknife similarity index 100% rename from libs/pytz/zoneinfo/America/Yellowknife rename to libs/common/pytz/zoneinfo/America/Yellowknife diff --git a/libs/pytz/zoneinfo/Antarctica/Casey b/libs/common/pytz/zoneinfo/Antarctica/Casey similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Casey rename to libs/common/pytz/zoneinfo/Antarctica/Casey diff --git a/libs/pytz/zoneinfo/Antarctica/Davis b/libs/common/pytz/zoneinfo/Antarctica/Davis similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Davis rename to libs/common/pytz/zoneinfo/Antarctica/Davis diff --git a/libs/pytz/zoneinfo/Antarctica/DumontDUrville b/libs/common/pytz/zoneinfo/Antarctica/DumontDUrville similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/DumontDUrville rename to libs/common/pytz/zoneinfo/Antarctica/DumontDUrville diff --git a/libs/pytz/zoneinfo/Antarctica/Macquarie b/libs/common/pytz/zoneinfo/Antarctica/Macquarie similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Macquarie rename to libs/common/pytz/zoneinfo/Antarctica/Macquarie diff --git a/libs/pytz/zoneinfo/Antarctica/Mawson b/libs/common/pytz/zoneinfo/Antarctica/Mawson similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Mawson rename to libs/common/pytz/zoneinfo/Antarctica/Mawson diff --git a/libs/pytz/zoneinfo/Antarctica/McMurdo b/libs/common/pytz/zoneinfo/Antarctica/McMurdo similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/McMurdo rename to libs/common/pytz/zoneinfo/Antarctica/McMurdo diff --git a/libs/pytz/zoneinfo/Antarctica/Palmer b/libs/common/pytz/zoneinfo/Antarctica/Palmer similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Palmer rename to libs/common/pytz/zoneinfo/Antarctica/Palmer diff --git a/libs/pytz/zoneinfo/Antarctica/Rothera b/libs/common/pytz/zoneinfo/Antarctica/Rothera similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Rothera rename to libs/common/pytz/zoneinfo/Antarctica/Rothera diff --git a/libs/pytz/zoneinfo/Antarctica/South_Pole b/libs/common/pytz/zoneinfo/Antarctica/South_Pole similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/South_Pole rename to libs/common/pytz/zoneinfo/Antarctica/South_Pole diff --git a/libs/pytz/zoneinfo/Antarctica/Syowa b/libs/common/pytz/zoneinfo/Antarctica/Syowa similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Syowa rename to libs/common/pytz/zoneinfo/Antarctica/Syowa diff --git a/libs/pytz/zoneinfo/Antarctica/Troll b/libs/common/pytz/zoneinfo/Antarctica/Troll similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Troll rename to libs/common/pytz/zoneinfo/Antarctica/Troll diff --git a/libs/pytz/zoneinfo/Antarctica/Vostok b/libs/common/pytz/zoneinfo/Antarctica/Vostok similarity index 100% rename from libs/pytz/zoneinfo/Antarctica/Vostok rename to libs/common/pytz/zoneinfo/Antarctica/Vostok diff --git a/libs/pytz/zoneinfo/Arctic/Longyearbyen b/libs/common/pytz/zoneinfo/Arctic/Longyearbyen similarity index 100% rename from libs/pytz/zoneinfo/Arctic/Longyearbyen rename to libs/common/pytz/zoneinfo/Arctic/Longyearbyen diff --git a/libs/pytz/zoneinfo/Asia/Aden b/libs/common/pytz/zoneinfo/Asia/Aden similarity index 100% rename from libs/pytz/zoneinfo/Asia/Aden rename to libs/common/pytz/zoneinfo/Asia/Aden diff --git a/libs/pytz/zoneinfo/Asia/Almaty b/libs/common/pytz/zoneinfo/Asia/Almaty similarity index 100% rename from libs/pytz/zoneinfo/Asia/Almaty rename to libs/common/pytz/zoneinfo/Asia/Almaty diff --git a/libs/pytz/zoneinfo/Asia/Amman b/libs/common/pytz/zoneinfo/Asia/Amman similarity index 100% rename from libs/pytz/zoneinfo/Asia/Amman rename to libs/common/pytz/zoneinfo/Asia/Amman diff --git a/libs/pytz/zoneinfo/Asia/Anadyr b/libs/common/pytz/zoneinfo/Asia/Anadyr similarity index 100% rename from libs/pytz/zoneinfo/Asia/Anadyr rename to libs/common/pytz/zoneinfo/Asia/Anadyr diff --git a/libs/pytz/zoneinfo/Asia/Aqtau b/libs/common/pytz/zoneinfo/Asia/Aqtau similarity index 100% rename from libs/pytz/zoneinfo/Asia/Aqtau rename to libs/common/pytz/zoneinfo/Asia/Aqtau diff --git a/libs/pytz/zoneinfo/Asia/Aqtobe b/libs/common/pytz/zoneinfo/Asia/Aqtobe similarity index 100% rename from libs/pytz/zoneinfo/Asia/Aqtobe rename to libs/common/pytz/zoneinfo/Asia/Aqtobe diff --git a/libs/pytz/zoneinfo/Asia/Ashgabat b/libs/common/pytz/zoneinfo/Asia/Ashgabat similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ashgabat rename to libs/common/pytz/zoneinfo/Asia/Ashgabat diff --git a/libs/pytz/zoneinfo/Asia/Ashkhabad b/libs/common/pytz/zoneinfo/Asia/Ashkhabad similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ashkhabad rename to libs/common/pytz/zoneinfo/Asia/Ashkhabad diff --git a/libs/pytz/zoneinfo/Asia/Atyrau b/libs/common/pytz/zoneinfo/Asia/Atyrau similarity index 100% rename from libs/pytz/zoneinfo/Asia/Atyrau rename to libs/common/pytz/zoneinfo/Asia/Atyrau diff --git a/libs/pytz/zoneinfo/Asia/Baghdad b/libs/common/pytz/zoneinfo/Asia/Baghdad similarity index 100% rename from libs/pytz/zoneinfo/Asia/Baghdad rename to libs/common/pytz/zoneinfo/Asia/Baghdad diff --git a/libs/pytz/zoneinfo/Asia/Bahrain b/libs/common/pytz/zoneinfo/Asia/Bahrain similarity index 100% rename from libs/pytz/zoneinfo/Asia/Bahrain rename to libs/common/pytz/zoneinfo/Asia/Bahrain diff --git a/libs/pytz/zoneinfo/Asia/Baku b/libs/common/pytz/zoneinfo/Asia/Baku similarity index 100% rename from libs/pytz/zoneinfo/Asia/Baku rename to libs/common/pytz/zoneinfo/Asia/Baku diff --git a/libs/pytz/zoneinfo/Asia/Bangkok b/libs/common/pytz/zoneinfo/Asia/Bangkok similarity index 100% rename from libs/pytz/zoneinfo/Asia/Bangkok rename to libs/common/pytz/zoneinfo/Asia/Bangkok diff --git a/libs/pytz/zoneinfo/Asia/Barnaul b/libs/common/pytz/zoneinfo/Asia/Barnaul similarity index 100% rename from libs/pytz/zoneinfo/Asia/Barnaul rename to libs/common/pytz/zoneinfo/Asia/Barnaul diff --git a/libs/pytz/zoneinfo/Asia/Beirut b/libs/common/pytz/zoneinfo/Asia/Beirut similarity index 100% rename from libs/pytz/zoneinfo/Asia/Beirut rename to libs/common/pytz/zoneinfo/Asia/Beirut diff --git a/libs/pytz/zoneinfo/Asia/Bishkek b/libs/common/pytz/zoneinfo/Asia/Bishkek similarity index 100% rename from libs/pytz/zoneinfo/Asia/Bishkek rename to libs/common/pytz/zoneinfo/Asia/Bishkek diff --git a/libs/pytz/zoneinfo/Asia/Brunei b/libs/common/pytz/zoneinfo/Asia/Brunei similarity index 100% rename from libs/pytz/zoneinfo/Asia/Brunei rename to libs/common/pytz/zoneinfo/Asia/Brunei diff --git a/libs/pytz/zoneinfo/Asia/Calcutta b/libs/common/pytz/zoneinfo/Asia/Calcutta similarity index 100% rename from libs/pytz/zoneinfo/Asia/Calcutta rename to libs/common/pytz/zoneinfo/Asia/Calcutta diff --git a/libs/pytz/zoneinfo/Asia/Chita b/libs/common/pytz/zoneinfo/Asia/Chita similarity index 100% rename from libs/pytz/zoneinfo/Asia/Chita rename to libs/common/pytz/zoneinfo/Asia/Chita diff --git a/libs/pytz/zoneinfo/Asia/Choibalsan b/libs/common/pytz/zoneinfo/Asia/Choibalsan similarity index 100% rename from libs/pytz/zoneinfo/Asia/Choibalsan rename to libs/common/pytz/zoneinfo/Asia/Choibalsan diff --git a/libs/pytz/zoneinfo/Asia/Chongqing b/libs/common/pytz/zoneinfo/Asia/Chongqing similarity index 100% rename from libs/pytz/zoneinfo/Asia/Chongqing rename to libs/common/pytz/zoneinfo/Asia/Chongqing diff --git a/libs/pytz/zoneinfo/Asia/Chungking b/libs/common/pytz/zoneinfo/Asia/Chungking similarity index 100% rename from libs/pytz/zoneinfo/Asia/Chungking rename to libs/common/pytz/zoneinfo/Asia/Chungking diff --git a/libs/pytz/zoneinfo/Asia/Colombo b/libs/common/pytz/zoneinfo/Asia/Colombo similarity index 100% rename from libs/pytz/zoneinfo/Asia/Colombo rename to libs/common/pytz/zoneinfo/Asia/Colombo diff --git a/libs/pytz/zoneinfo/Asia/Dacca b/libs/common/pytz/zoneinfo/Asia/Dacca similarity index 100% rename from libs/pytz/zoneinfo/Asia/Dacca rename to libs/common/pytz/zoneinfo/Asia/Dacca diff --git a/libs/pytz/zoneinfo/Asia/Damascus b/libs/common/pytz/zoneinfo/Asia/Damascus similarity index 100% rename from libs/pytz/zoneinfo/Asia/Damascus rename to libs/common/pytz/zoneinfo/Asia/Damascus diff --git a/libs/pytz/zoneinfo/Asia/Dhaka b/libs/common/pytz/zoneinfo/Asia/Dhaka similarity index 100% rename from libs/pytz/zoneinfo/Asia/Dhaka rename to libs/common/pytz/zoneinfo/Asia/Dhaka diff --git a/libs/pytz/zoneinfo/Asia/Dili b/libs/common/pytz/zoneinfo/Asia/Dili similarity index 100% rename from libs/pytz/zoneinfo/Asia/Dili rename to libs/common/pytz/zoneinfo/Asia/Dili diff --git a/libs/pytz/zoneinfo/Asia/Dubai b/libs/common/pytz/zoneinfo/Asia/Dubai similarity index 100% rename from libs/pytz/zoneinfo/Asia/Dubai rename to libs/common/pytz/zoneinfo/Asia/Dubai diff --git a/libs/pytz/zoneinfo/Asia/Dushanbe b/libs/common/pytz/zoneinfo/Asia/Dushanbe similarity index 100% rename from libs/pytz/zoneinfo/Asia/Dushanbe rename to libs/common/pytz/zoneinfo/Asia/Dushanbe diff --git a/libs/pytz/zoneinfo/Asia/Famagusta b/libs/common/pytz/zoneinfo/Asia/Famagusta similarity index 100% rename from libs/pytz/zoneinfo/Asia/Famagusta rename to libs/common/pytz/zoneinfo/Asia/Famagusta diff --git a/libs/pytz/zoneinfo/Asia/Gaza b/libs/common/pytz/zoneinfo/Asia/Gaza similarity index 100% rename from libs/pytz/zoneinfo/Asia/Gaza rename to libs/common/pytz/zoneinfo/Asia/Gaza diff --git a/libs/pytz/zoneinfo/Asia/Harbin b/libs/common/pytz/zoneinfo/Asia/Harbin similarity index 100% rename from libs/pytz/zoneinfo/Asia/Harbin rename to libs/common/pytz/zoneinfo/Asia/Harbin diff --git a/libs/pytz/zoneinfo/Asia/Hebron b/libs/common/pytz/zoneinfo/Asia/Hebron similarity index 100% rename from libs/pytz/zoneinfo/Asia/Hebron rename to libs/common/pytz/zoneinfo/Asia/Hebron diff --git a/libs/pytz/zoneinfo/Asia/Ho_Chi_Minh b/libs/common/pytz/zoneinfo/Asia/Ho_Chi_Minh similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ho_Chi_Minh rename to libs/common/pytz/zoneinfo/Asia/Ho_Chi_Minh diff --git a/libs/pytz/zoneinfo/Asia/Hong_Kong b/libs/common/pytz/zoneinfo/Asia/Hong_Kong similarity index 100% rename from libs/pytz/zoneinfo/Asia/Hong_Kong rename to libs/common/pytz/zoneinfo/Asia/Hong_Kong diff --git a/libs/pytz/zoneinfo/Asia/Hovd b/libs/common/pytz/zoneinfo/Asia/Hovd similarity index 100% rename from libs/pytz/zoneinfo/Asia/Hovd rename to libs/common/pytz/zoneinfo/Asia/Hovd diff --git a/libs/pytz/zoneinfo/Asia/Irkutsk b/libs/common/pytz/zoneinfo/Asia/Irkutsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Irkutsk rename to libs/common/pytz/zoneinfo/Asia/Irkutsk diff --git a/libs/pytz/zoneinfo/Asia/Istanbul b/libs/common/pytz/zoneinfo/Asia/Istanbul similarity index 100% rename from libs/pytz/zoneinfo/Asia/Istanbul rename to libs/common/pytz/zoneinfo/Asia/Istanbul diff --git a/libs/pytz/zoneinfo/Asia/Jakarta b/libs/common/pytz/zoneinfo/Asia/Jakarta similarity index 100% rename from libs/pytz/zoneinfo/Asia/Jakarta rename to libs/common/pytz/zoneinfo/Asia/Jakarta diff --git a/libs/pytz/zoneinfo/Asia/Jayapura b/libs/common/pytz/zoneinfo/Asia/Jayapura similarity index 100% rename from libs/pytz/zoneinfo/Asia/Jayapura rename to libs/common/pytz/zoneinfo/Asia/Jayapura diff --git a/libs/pytz/zoneinfo/Asia/Jerusalem b/libs/common/pytz/zoneinfo/Asia/Jerusalem similarity index 100% rename from libs/pytz/zoneinfo/Asia/Jerusalem rename to libs/common/pytz/zoneinfo/Asia/Jerusalem diff --git a/libs/pytz/zoneinfo/Asia/Kabul b/libs/common/pytz/zoneinfo/Asia/Kabul similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kabul rename to libs/common/pytz/zoneinfo/Asia/Kabul diff --git a/libs/pytz/zoneinfo/Asia/Kamchatka b/libs/common/pytz/zoneinfo/Asia/Kamchatka similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kamchatka rename to libs/common/pytz/zoneinfo/Asia/Kamchatka diff --git a/libs/pytz/zoneinfo/Asia/Karachi b/libs/common/pytz/zoneinfo/Asia/Karachi similarity index 100% rename from libs/pytz/zoneinfo/Asia/Karachi rename to libs/common/pytz/zoneinfo/Asia/Karachi diff --git a/libs/pytz/zoneinfo/Asia/Kashgar b/libs/common/pytz/zoneinfo/Asia/Kashgar similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kashgar rename to libs/common/pytz/zoneinfo/Asia/Kashgar diff --git a/libs/pytz/zoneinfo/Asia/Kathmandu b/libs/common/pytz/zoneinfo/Asia/Kathmandu similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kathmandu rename to libs/common/pytz/zoneinfo/Asia/Kathmandu diff --git a/libs/pytz/zoneinfo/Asia/Katmandu b/libs/common/pytz/zoneinfo/Asia/Katmandu similarity index 100% rename from libs/pytz/zoneinfo/Asia/Katmandu rename to libs/common/pytz/zoneinfo/Asia/Katmandu diff --git a/libs/pytz/zoneinfo/Asia/Khandyga b/libs/common/pytz/zoneinfo/Asia/Khandyga similarity index 100% rename from libs/pytz/zoneinfo/Asia/Khandyga rename to libs/common/pytz/zoneinfo/Asia/Khandyga diff --git a/libs/pytz/zoneinfo/Asia/Kolkata b/libs/common/pytz/zoneinfo/Asia/Kolkata similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kolkata rename to libs/common/pytz/zoneinfo/Asia/Kolkata diff --git a/libs/pytz/zoneinfo/Asia/Krasnoyarsk b/libs/common/pytz/zoneinfo/Asia/Krasnoyarsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Krasnoyarsk rename to libs/common/pytz/zoneinfo/Asia/Krasnoyarsk diff --git a/libs/pytz/zoneinfo/Asia/Kuala_Lumpur b/libs/common/pytz/zoneinfo/Asia/Kuala_Lumpur similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kuala_Lumpur rename to libs/common/pytz/zoneinfo/Asia/Kuala_Lumpur diff --git a/libs/pytz/zoneinfo/Asia/Kuching b/libs/common/pytz/zoneinfo/Asia/Kuching similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kuching rename to libs/common/pytz/zoneinfo/Asia/Kuching diff --git a/libs/pytz/zoneinfo/Asia/Kuwait b/libs/common/pytz/zoneinfo/Asia/Kuwait similarity index 100% rename from libs/pytz/zoneinfo/Asia/Kuwait rename to libs/common/pytz/zoneinfo/Asia/Kuwait diff --git a/libs/pytz/zoneinfo/Asia/Macao b/libs/common/pytz/zoneinfo/Asia/Macao similarity index 100% rename from libs/pytz/zoneinfo/Asia/Macao rename to libs/common/pytz/zoneinfo/Asia/Macao diff --git a/libs/pytz/zoneinfo/Asia/Macau b/libs/common/pytz/zoneinfo/Asia/Macau similarity index 100% rename from libs/pytz/zoneinfo/Asia/Macau rename to libs/common/pytz/zoneinfo/Asia/Macau diff --git a/libs/pytz/zoneinfo/Asia/Magadan b/libs/common/pytz/zoneinfo/Asia/Magadan similarity index 100% rename from libs/pytz/zoneinfo/Asia/Magadan rename to libs/common/pytz/zoneinfo/Asia/Magadan diff --git a/libs/pytz/zoneinfo/Asia/Makassar b/libs/common/pytz/zoneinfo/Asia/Makassar similarity index 100% rename from libs/pytz/zoneinfo/Asia/Makassar rename to libs/common/pytz/zoneinfo/Asia/Makassar diff --git a/libs/pytz/zoneinfo/Asia/Manila b/libs/common/pytz/zoneinfo/Asia/Manila similarity index 100% rename from libs/pytz/zoneinfo/Asia/Manila rename to libs/common/pytz/zoneinfo/Asia/Manila diff --git a/libs/pytz/zoneinfo/Asia/Muscat b/libs/common/pytz/zoneinfo/Asia/Muscat similarity index 100% rename from libs/pytz/zoneinfo/Asia/Muscat rename to libs/common/pytz/zoneinfo/Asia/Muscat diff --git a/libs/pytz/zoneinfo/Asia/Nicosia b/libs/common/pytz/zoneinfo/Asia/Nicosia similarity index 100% rename from libs/pytz/zoneinfo/Asia/Nicosia rename to libs/common/pytz/zoneinfo/Asia/Nicosia diff --git a/libs/pytz/zoneinfo/Asia/Novokuznetsk b/libs/common/pytz/zoneinfo/Asia/Novokuznetsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Novokuznetsk rename to libs/common/pytz/zoneinfo/Asia/Novokuznetsk diff --git a/libs/pytz/zoneinfo/Asia/Novosibirsk b/libs/common/pytz/zoneinfo/Asia/Novosibirsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Novosibirsk rename to libs/common/pytz/zoneinfo/Asia/Novosibirsk diff --git a/libs/pytz/zoneinfo/Asia/Omsk b/libs/common/pytz/zoneinfo/Asia/Omsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Omsk rename to libs/common/pytz/zoneinfo/Asia/Omsk diff --git a/libs/pytz/zoneinfo/Asia/Oral b/libs/common/pytz/zoneinfo/Asia/Oral similarity index 100% rename from libs/pytz/zoneinfo/Asia/Oral rename to libs/common/pytz/zoneinfo/Asia/Oral diff --git a/libs/pytz/zoneinfo/Asia/Phnom_Penh b/libs/common/pytz/zoneinfo/Asia/Phnom_Penh similarity index 100% rename from libs/pytz/zoneinfo/Asia/Phnom_Penh rename to libs/common/pytz/zoneinfo/Asia/Phnom_Penh diff --git a/libs/pytz/zoneinfo/Asia/Pontianak b/libs/common/pytz/zoneinfo/Asia/Pontianak similarity index 100% rename from libs/pytz/zoneinfo/Asia/Pontianak rename to libs/common/pytz/zoneinfo/Asia/Pontianak diff --git a/libs/pytz/zoneinfo/Asia/Pyongyang b/libs/common/pytz/zoneinfo/Asia/Pyongyang similarity index 100% rename from libs/pytz/zoneinfo/Asia/Pyongyang rename to libs/common/pytz/zoneinfo/Asia/Pyongyang diff --git a/libs/pytz/zoneinfo/Asia/Qatar b/libs/common/pytz/zoneinfo/Asia/Qatar similarity index 100% rename from libs/pytz/zoneinfo/Asia/Qatar rename to libs/common/pytz/zoneinfo/Asia/Qatar diff --git a/libs/pytz/zoneinfo/Asia/Qyzylorda b/libs/common/pytz/zoneinfo/Asia/Qyzylorda similarity index 100% rename from libs/pytz/zoneinfo/Asia/Qyzylorda rename to libs/common/pytz/zoneinfo/Asia/Qyzylorda diff --git a/libs/pytz/zoneinfo/Asia/Rangoon b/libs/common/pytz/zoneinfo/Asia/Rangoon similarity index 100% rename from libs/pytz/zoneinfo/Asia/Rangoon rename to libs/common/pytz/zoneinfo/Asia/Rangoon diff --git a/libs/pytz/zoneinfo/Asia/Riyadh b/libs/common/pytz/zoneinfo/Asia/Riyadh similarity index 100% rename from libs/pytz/zoneinfo/Asia/Riyadh rename to libs/common/pytz/zoneinfo/Asia/Riyadh diff --git a/libs/pytz/zoneinfo/Asia/Saigon b/libs/common/pytz/zoneinfo/Asia/Saigon similarity index 100% rename from libs/pytz/zoneinfo/Asia/Saigon rename to libs/common/pytz/zoneinfo/Asia/Saigon diff --git a/libs/pytz/zoneinfo/Asia/Sakhalin b/libs/common/pytz/zoneinfo/Asia/Sakhalin similarity index 100% rename from libs/pytz/zoneinfo/Asia/Sakhalin rename to libs/common/pytz/zoneinfo/Asia/Sakhalin diff --git a/libs/pytz/zoneinfo/Asia/Samarkand b/libs/common/pytz/zoneinfo/Asia/Samarkand similarity index 100% rename from libs/pytz/zoneinfo/Asia/Samarkand rename to libs/common/pytz/zoneinfo/Asia/Samarkand diff --git a/libs/pytz/zoneinfo/Asia/Seoul b/libs/common/pytz/zoneinfo/Asia/Seoul similarity index 100% rename from libs/pytz/zoneinfo/Asia/Seoul rename to libs/common/pytz/zoneinfo/Asia/Seoul diff --git a/libs/pytz/zoneinfo/Asia/Shanghai b/libs/common/pytz/zoneinfo/Asia/Shanghai similarity index 100% rename from libs/pytz/zoneinfo/Asia/Shanghai rename to libs/common/pytz/zoneinfo/Asia/Shanghai diff --git a/libs/pytz/zoneinfo/Asia/Singapore b/libs/common/pytz/zoneinfo/Asia/Singapore similarity index 100% rename from libs/pytz/zoneinfo/Asia/Singapore rename to libs/common/pytz/zoneinfo/Asia/Singapore diff --git a/libs/pytz/zoneinfo/Asia/Srednekolymsk b/libs/common/pytz/zoneinfo/Asia/Srednekolymsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Srednekolymsk rename to libs/common/pytz/zoneinfo/Asia/Srednekolymsk diff --git a/libs/pytz/zoneinfo/Asia/Taipei b/libs/common/pytz/zoneinfo/Asia/Taipei similarity index 100% rename from libs/pytz/zoneinfo/Asia/Taipei rename to libs/common/pytz/zoneinfo/Asia/Taipei diff --git a/libs/pytz/zoneinfo/Asia/Tashkent b/libs/common/pytz/zoneinfo/Asia/Tashkent similarity index 100% rename from libs/pytz/zoneinfo/Asia/Tashkent rename to libs/common/pytz/zoneinfo/Asia/Tashkent diff --git a/libs/pytz/zoneinfo/Asia/Tbilisi b/libs/common/pytz/zoneinfo/Asia/Tbilisi similarity index 100% rename from libs/pytz/zoneinfo/Asia/Tbilisi rename to libs/common/pytz/zoneinfo/Asia/Tbilisi diff --git a/libs/pytz/zoneinfo/Asia/Tehran b/libs/common/pytz/zoneinfo/Asia/Tehran similarity index 100% rename from libs/pytz/zoneinfo/Asia/Tehran rename to libs/common/pytz/zoneinfo/Asia/Tehran diff --git a/libs/pytz/zoneinfo/Asia/Tel_Aviv b/libs/common/pytz/zoneinfo/Asia/Tel_Aviv similarity index 100% rename from libs/pytz/zoneinfo/Asia/Tel_Aviv rename to libs/common/pytz/zoneinfo/Asia/Tel_Aviv diff --git a/libs/pytz/zoneinfo/Asia/Thimbu b/libs/common/pytz/zoneinfo/Asia/Thimbu similarity index 100% rename from libs/pytz/zoneinfo/Asia/Thimbu rename to libs/common/pytz/zoneinfo/Asia/Thimbu diff --git a/libs/pytz/zoneinfo/Asia/Thimphu b/libs/common/pytz/zoneinfo/Asia/Thimphu similarity index 100% rename from libs/pytz/zoneinfo/Asia/Thimphu rename to libs/common/pytz/zoneinfo/Asia/Thimphu diff --git a/libs/pytz/zoneinfo/Asia/Tokyo b/libs/common/pytz/zoneinfo/Asia/Tokyo similarity index 100% rename from libs/pytz/zoneinfo/Asia/Tokyo rename to libs/common/pytz/zoneinfo/Asia/Tokyo diff --git a/libs/pytz/zoneinfo/Asia/Tomsk b/libs/common/pytz/zoneinfo/Asia/Tomsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Tomsk rename to libs/common/pytz/zoneinfo/Asia/Tomsk diff --git a/libs/pytz/zoneinfo/Asia/Ujung_Pandang b/libs/common/pytz/zoneinfo/Asia/Ujung_Pandang similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ujung_Pandang rename to libs/common/pytz/zoneinfo/Asia/Ujung_Pandang diff --git a/libs/pytz/zoneinfo/Asia/Ulaanbaatar b/libs/common/pytz/zoneinfo/Asia/Ulaanbaatar similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ulaanbaatar rename to libs/common/pytz/zoneinfo/Asia/Ulaanbaatar diff --git a/libs/pytz/zoneinfo/Asia/Ulan_Bator b/libs/common/pytz/zoneinfo/Asia/Ulan_Bator similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ulan_Bator rename to libs/common/pytz/zoneinfo/Asia/Ulan_Bator diff --git a/libs/pytz/zoneinfo/Asia/Urumqi b/libs/common/pytz/zoneinfo/Asia/Urumqi similarity index 100% rename from libs/pytz/zoneinfo/Asia/Urumqi rename to libs/common/pytz/zoneinfo/Asia/Urumqi diff --git a/libs/pytz/zoneinfo/Asia/Ust-Nera b/libs/common/pytz/zoneinfo/Asia/Ust-Nera similarity index 100% rename from libs/pytz/zoneinfo/Asia/Ust-Nera rename to libs/common/pytz/zoneinfo/Asia/Ust-Nera diff --git a/libs/pytz/zoneinfo/Asia/Vientiane b/libs/common/pytz/zoneinfo/Asia/Vientiane similarity index 100% rename from libs/pytz/zoneinfo/Asia/Vientiane rename to libs/common/pytz/zoneinfo/Asia/Vientiane diff --git a/libs/pytz/zoneinfo/Asia/Vladivostok b/libs/common/pytz/zoneinfo/Asia/Vladivostok similarity index 100% rename from libs/pytz/zoneinfo/Asia/Vladivostok rename to libs/common/pytz/zoneinfo/Asia/Vladivostok diff --git a/libs/pytz/zoneinfo/Asia/Yakutsk b/libs/common/pytz/zoneinfo/Asia/Yakutsk similarity index 100% rename from libs/pytz/zoneinfo/Asia/Yakutsk rename to libs/common/pytz/zoneinfo/Asia/Yakutsk diff --git a/libs/pytz/zoneinfo/Asia/Yangon b/libs/common/pytz/zoneinfo/Asia/Yangon similarity index 100% rename from libs/pytz/zoneinfo/Asia/Yangon rename to libs/common/pytz/zoneinfo/Asia/Yangon diff --git a/libs/pytz/zoneinfo/Asia/Yekaterinburg b/libs/common/pytz/zoneinfo/Asia/Yekaterinburg similarity index 100% rename from libs/pytz/zoneinfo/Asia/Yekaterinburg rename to libs/common/pytz/zoneinfo/Asia/Yekaterinburg diff --git a/libs/pytz/zoneinfo/Asia/Yerevan b/libs/common/pytz/zoneinfo/Asia/Yerevan similarity index 100% rename from libs/pytz/zoneinfo/Asia/Yerevan rename to libs/common/pytz/zoneinfo/Asia/Yerevan diff --git a/libs/pytz/zoneinfo/Atlantic/Azores b/libs/common/pytz/zoneinfo/Atlantic/Azores similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Azores rename to libs/common/pytz/zoneinfo/Atlantic/Azores diff --git a/libs/pytz/zoneinfo/Atlantic/Bermuda b/libs/common/pytz/zoneinfo/Atlantic/Bermuda similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Bermuda rename to libs/common/pytz/zoneinfo/Atlantic/Bermuda diff --git a/libs/pytz/zoneinfo/Atlantic/Canary b/libs/common/pytz/zoneinfo/Atlantic/Canary similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Canary rename to libs/common/pytz/zoneinfo/Atlantic/Canary diff --git a/libs/pytz/zoneinfo/Atlantic/Cape_Verde b/libs/common/pytz/zoneinfo/Atlantic/Cape_Verde similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Cape_Verde rename to libs/common/pytz/zoneinfo/Atlantic/Cape_Verde diff --git a/libs/pytz/zoneinfo/Atlantic/Faeroe b/libs/common/pytz/zoneinfo/Atlantic/Faeroe similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Faeroe rename to libs/common/pytz/zoneinfo/Atlantic/Faeroe diff --git a/libs/pytz/zoneinfo/Atlantic/Faroe b/libs/common/pytz/zoneinfo/Atlantic/Faroe similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Faroe rename to libs/common/pytz/zoneinfo/Atlantic/Faroe diff --git a/libs/pytz/zoneinfo/Atlantic/Jan_Mayen b/libs/common/pytz/zoneinfo/Atlantic/Jan_Mayen similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Jan_Mayen rename to libs/common/pytz/zoneinfo/Atlantic/Jan_Mayen diff --git a/libs/pytz/zoneinfo/Atlantic/Madeira b/libs/common/pytz/zoneinfo/Atlantic/Madeira similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Madeira rename to libs/common/pytz/zoneinfo/Atlantic/Madeira diff --git a/libs/pytz/zoneinfo/Atlantic/Reykjavik b/libs/common/pytz/zoneinfo/Atlantic/Reykjavik similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Reykjavik rename to libs/common/pytz/zoneinfo/Atlantic/Reykjavik diff --git a/libs/pytz/zoneinfo/Atlantic/South_Georgia b/libs/common/pytz/zoneinfo/Atlantic/South_Georgia similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/South_Georgia rename to libs/common/pytz/zoneinfo/Atlantic/South_Georgia diff --git a/libs/pytz/zoneinfo/Atlantic/St_Helena b/libs/common/pytz/zoneinfo/Atlantic/St_Helena similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/St_Helena rename to libs/common/pytz/zoneinfo/Atlantic/St_Helena diff --git a/libs/pytz/zoneinfo/Atlantic/Stanley b/libs/common/pytz/zoneinfo/Atlantic/Stanley similarity index 100% rename from libs/pytz/zoneinfo/Atlantic/Stanley rename to libs/common/pytz/zoneinfo/Atlantic/Stanley diff --git a/libs/pytz/zoneinfo/Australia/ACT b/libs/common/pytz/zoneinfo/Australia/ACT similarity index 100% rename from libs/pytz/zoneinfo/Australia/ACT rename to libs/common/pytz/zoneinfo/Australia/ACT diff --git a/libs/pytz/zoneinfo/Australia/Adelaide b/libs/common/pytz/zoneinfo/Australia/Adelaide similarity index 100% rename from libs/pytz/zoneinfo/Australia/Adelaide rename to libs/common/pytz/zoneinfo/Australia/Adelaide diff --git a/libs/pytz/zoneinfo/Australia/Brisbane b/libs/common/pytz/zoneinfo/Australia/Brisbane similarity index 100% rename from libs/pytz/zoneinfo/Australia/Brisbane rename to libs/common/pytz/zoneinfo/Australia/Brisbane diff --git a/libs/pytz/zoneinfo/Australia/Broken_Hill b/libs/common/pytz/zoneinfo/Australia/Broken_Hill similarity index 100% rename from libs/pytz/zoneinfo/Australia/Broken_Hill rename to libs/common/pytz/zoneinfo/Australia/Broken_Hill diff --git a/libs/pytz/zoneinfo/Australia/Canberra b/libs/common/pytz/zoneinfo/Australia/Canberra similarity index 100% rename from libs/pytz/zoneinfo/Australia/Canberra rename to libs/common/pytz/zoneinfo/Australia/Canberra diff --git a/libs/pytz/zoneinfo/Australia/Currie b/libs/common/pytz/zoneinfo/Australia/Currie similarity index 100% rename from libs/pytz/zoneinfo/Australia/Currie rename to libs/common/pytz/zoneinfo/Australia/Currie diff --git a/libs/pytz/zoneinfo/Australia/Darwin b/libs/common/pytz/zoneinfo/Australia/Darwin similarity index 100% rename from libs/pytz/zoneinfo/Australia/Darwin rename to libs/common/pytz/zoneinfo/Australia/Darwin diff --git a/libs/pytz/zoneinfo/Australia/Eucla b/libs/common/pytz/zoneinfo/Australia/Eucla similarity index 100% rename from libs/pytz/zoneinfo/Australia/Eucla rename to libs/common/pytz/zoneinfo/Australia/Eucla diff --git a/libs/pytz/zoneinfo/Australia/Hobart b/libs/common/pytz/zoneinfo/Australia/Hobart similarity index 100% rename from libs/pytz/zoneinfo/Australia/Hobart rename to libs/common/pytz/zoneinfo/Australia/Hobart diff --git a/libs/pytz/zoneinfo/Australia/LHI b/libs/common/pytz/zoneinfo/Australia/LHI similarity index 100% rename from libs/pytz/zoneinfo/Australia/LHI rename to libs/common/pytz/zoneinfo/Australia/LHI diff --git a/libs/pytz/zoneinfo/Australia/Lindeman b/libs/common/pytz/zoneinfo/Australia/Lindeman similarity index 100% rename from libs/pytz/zoneinfo/Australia/Lindeman rename to libs/common/pytz/zoneinfo/Australia/Lindeman diff --git a/libs/pytz/zoneinfo/Australia/Lord_Howe b/libs/common/pytz/zoneinfo/Australia/Lord_Howe similarity index 100% rename from libs/pytz/zoneinfo/Australia/Lord_Howe rename to libs/common/pytz/zoneinfo/Australia/Lord_Howe diff --git a/libs/pytz/zoneinfo/Australia/Melbourne b/libs/common/pytz/zoneinfo/Australia/Melbourne similarity index 100% rename from libs/pytz/zoneinfo/Australia/Melbourne rename to libs/common/pytz/zoneinfo/Australia/Melbourne diff --git a/libs/pytz/zoneinfo/Australia/NSW b/libs/common/pytz/zoneinfo/Australia/NSW similarity index 100% rename from libs/pytz/zoneinfo/Australia/NSW rename to libs/common/pytz/zoneinfo/Australia/NSW diff --git a/libs/pytz/zoneinfo/Australia/North b/libs/common/pytz/zoneinfo/Australia/North similarity index 100% rename from libs/pytz/zoneinfo/Australia/North rename to libs/common/pytz/zoneinfo/Australia/North diff --git a/libs/pytz/zoneinfo/Australia/Perth b/libs/common/pytz/zoneinfo/Australia/Perth similarity index 100% rename from libs/pytz/zoneinfo/Australia/Perth rename to libs/common/pytz/zoneinfo/Australia/Perth diff --git a/libs/pytz/zoneinfo/Australia/Queensland b/libs/common/pytz/zoneinfo/Australia/Queensland similarity index 100% rename from libs/pytz/zoneinfo/Australia/Queensland rename to libs/common/pytz/zoneinfo/Australia/Queensland diff --git a/libs/pytz/zoneinfo/Australia/South b/libs/common/pytz/zoneinfo/Australia/South similarity index 100% rename from libs/pytz/zoneinfo/Australia/South rename to libs/common/pytz/zoneinfo/Australia/South diff --git a/libs/pytz/zoneinfo/Australia/Sydney b/libs/common/pytz/zoneinfo/Australia/Sydney similarity index 100% rename from libs/pytz/zoneinfo/Australia/Sydney rename to libs/common/pytz/zoneinfo/Australia/Sydney diff --git a/libs/pytz/zoneinfo/Australia/Tasmania b/libs/common/pytz/zoneinfo/Australia/Tasmania similarity index 100% rename from libs/pytz/zoneinfo/Australia/Tasmania rename to libs/common/pytz/zoneinfo/Australia/Tasmania diff --git a/libs/pytz/zoneinfo/Australia/Victoria b/libs/common/pytz/zoneinfo/Australia/Victoria similarity index 100% rename from libs/pytz/zoneinfo/Australia/Victoria rename to libs/common/pytz/zoneinfo/Australia/Victoria diff --git a/libs/pytz/zoneinfo/Australia/West b/libs/common/pytz/zoneinfo/Australia/West similarity index 100% rename from libs/pytz/zoneinfo/Australia/West rename to libs/common/pytz/zoneinfo/Australia/West diff --git a/libs/pytz/zoneinfo/Australia/Yancowinna b/libs/common/pytz/zoneinfo/Australia/Yancowinna similarity index 100% rename from libs/pytz/zoneinfo/Australia/Yancowinna rename to libs/common/pytz/zoneinfo/Australia/Yancowinna diff --git a/libs/pytz/zoneinfo/Brazil/Acre b/libs/common/pytz/zoneinfo/Brazil/Acre similarity index 100% rename from libs/pytz/zoneinfo/Brazil/Acre rename to libs/common/pytz/zoneinfo/Brazil/Acre diff --git a/libs/pytz/zoneinfo/Brazil/DeNoronha b/libs/common/pytz/zoneinfo/Brazil/DeNoronha similarity index 100% rename from libs/pytz/zoneinfo/Brazil/DeNoronha rename to libs/common/pytz/zoneinfo/Brazil/DeNoronha diff --git a/libs/pytz/zoneinfo/Brazil/East b/libs/common/pytz/zoneinfo/Brazil/East similarity index 100% rename from libs/pytz/zoneinfo/Brazil/East rename to libs/common/pytz/zoneinfo/Brazil/East diff --git a/libs/pytz/zoneinfo/Brazil/West b/libs/common/pytz/zoneinfo/Brazil/West similarity index 100% rename from libs/pytz/zoneinfo/Brazil/West rename to libs/common/pytz/zoneinfo/Brazil/West diff --git a/libs/pytz/zoneinfo/CET b/libs/common/pytz/zoneinfo/CET similarity index 100% rename from libs/pytz/zoneinfo/CET rename to libs/common/pytz/zoneinfo/CET diff --git a/libs/pytz/zoneinfo/CST6CDT b/libs/common/pytz/zoneinfo/CST6CDT similarity index 100% rename from libs/pytz/zoneinfo/CST6CDT rename to libs/common/pytz/zoneinfo/CST6CDT diff --git a/libs/pytz/zoneinfo/Canada/Atlantic b/libs/common/pytz/zoneinfo/Canada/Atlantic similarity index 100% rename from libs/pytz/zoneinfo/Canada/Atlantic rename to libs/common/pytz/zoneinfo/Canada/Atlantic diff --git a/libs/pytz/zoneinfo/Canada/Central b/libs/common/pytz/zoneinfo/Canada/Central similarity index 100% rename from libs/pytz/zoneinfo/Canada/Central rename to libs/common/pytz/zoneinfo/Canada/Central diff --git a/libs/pytz/zoneinfo/Canada/Eastern b/libs/common/pytz/zoneinfo/Canada/Eastern similarity index 100% rename from libs/pytz/zoneinfo/Canada/Eastern rename to libs/common/pytz/zoneinfo/Canada/Eastern diff --git a/libs/pytz/zoneinfo/Canada/Mountain b/libs/common/pytz/zoneinfo/Canada/Mountain similarity index 100% rename from libs/pytz/zoneinfo/Canada/Mountain rename to libs/common/pytz/zoneinfo/Canada/Mountain diff --git a/libs/pytz/zoneinfo/Canada/Newfoundland b/libs/common/pytz/zoneinfo/Canada/Newfoundland similarity index 100% rename from libs/pytz/zoneinfo/Canada/Newfoundland rename to libs/common/pytz/zoneinfo/Canada/Newfoundland diff --git a/libs/pytz/zoneinfo/Canada/Pacific b/libs/common/pytz/zoneinfo/Canada/Pacific similarity index 100% rename from libs/pytz/zoneinfo/Canada/Pacific rename to libs/common/pytz/zoneinfo/Canada/Pacific diff --git a/libs/pytz/zoneinfo/Canada/Saskatchewan b/libs/common/pytz/zoneinfo/Canada/Saskatchewan similarity index 100% rename from libs/pytz/zoneinfo/Canada/Saskatchewan rename to libs/common/pytz/zoneinfo/Canada/Saskatchewan diff --git a/libs/pytz/zoneinfo/Canada/Yukon b/libs/common/pytz/zoneinfo/Canada/Yukon similarity index 100% rename from libs/pytz/zoneinfo/Canada/Yukon rename to libs/common/pytz/zoneinfo/Canada/Yukon diff --git a/libs/pytz/zoneinfo/Chile/Continental b/libs/common/pytz/zoneinfo/Chile/Continental similarity index 100% rename from libs/pytz/zoneinfo/Chile/Continental rename to libs/common/pytz/zoneinfo/Chile/Continental diff --git a/libs/pytz/zoneinfo/Chile/EasterIsland b/libs/common/pytz/zoneinfo/Chile/EasterIsland similarity index 100% rename from libs/pytz/zoneinfo/Chile/EasterIsland rename to libs/common/pytz/zoneinfo/Chile/EasterIsland diff --git a/libs/pytz/zoneinfo/Cuba b/libs/common/pytz/zoneinfo/Cuba similarity index 100% rename from libs/pytz/zoneinfo/Cuba rename to libs/common/pytz/zoneinfo/Cuba diff --git a/libs/pytz/zoneinfo/EET b/libs/common/pytz/zoneinfo/EET similarity index 100% rename from libs/pytz/zoneinfo/EET rename to libs/common/pytz/zoneinfo/EET diff --git a/libs/pytz/zoneinfo/EST b/libs/common/pytz/zoneinfo/EST similarity index 100% rename from libs/pytz/zoneinfo/EST rename to libs/common/pytz/zoneinfo/EST diff --git a/libs/pytz/zoneinfo/EST5EDT b/libs/common/pytz/zoneinfo/EST5EDT similarity index 100% rename from libs/pytz/zoneinfo/EST5EDT rename to libs/common/pytz/zoneinfo/EST5EDT diff --git a/libs/pytz/zoneinfo/Egypt b/libs/common/pytz/zoneinfo/Egypt similarity index 100% rename from libs/pytz/zoneinfo/Egypt rename to libs/common/pytz/zoneinfo/Egypt diff --git a/libs/pytz/zoneinfo/Eire b/libs/common/pytz/zoneinfo/Eire similarity index 100% rename from libs/pytz/zoneinfo/Eire rename to libs/common/pytz/zoneinfo/Eire diff --git a/libs/pytz/zoneinfo/Etc/GMT b/libs/common/pytz/zoneinfo/Etc/GMT similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT rename to libs/common/pytz/zoneinfo/Etc/GMT diff --git a/libs/pytz/zoneinfo/Etc/GMT+0 b/libs/common/pytz/zoneinfo/Etc/GMT+0 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+0 rename to libs/common/pytz/zoneinfo/Etc/GMT+0 diff --git a/libs/pytz/zoneinfo/Etc/GMT+1 b/libs/common/pytz/zoneinfo/Etc/GMT+1 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+1 rename to libs/common/pytz/zoneinfo/Etc/GMT+1 diff --git a/libs/pytz/zoneinfo/Etc/GMT+10 b/libs/common/pytz/zoneinfo/Etc/GMT+10 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+10 rename to libs/common/pytz/zoneinfo/Etc/GMT+10 diff --git a/libs/pytz/zoneinfo/Etc/GMT+11 b/libs/common/pytz/zoneinfo/Etc/GMT+11 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+11 rename to libs/common/pytz/zoneinfo/Etc/GMT+11 diff --git a/libs/pytz/zoneinfo/Etc/GMT+12 b/libs/common/pytz/zoneinfo/Etc/GMT+12 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+12 rename to libs/common/pytz/zoneinfo/Etc/GMT+12 diff --git a/libs/pytz/zoneinfo/Etc/GMT+2 b/libs/common/pytz/zoneinfo/Etc/GMT+2 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+2 rename to libs/common/pytz/zoneinfo/Etc/GMT+2 diff --git a/libs/pytz/zoneinfo/Etc/GMT+3 b/libs/common/pytz/zoneinfo/Etc/GMT+3 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+3 rename to libs/common/pytz/zoneinfo/Etc/GMT+3 diff --git a/libs/pytz/zoneinfo/Etc/GMT+4 b/libs/common/pytz/zoneinfo/Etc/GMT+4 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+4 rename to libs/common/pytz/zoneinfo/Etc/GMT+4 diff --git a/libs/pytz/zoneinfo/Etc/GMT+5 b/libs/common/pytz/zoneinfo/Etc/GMT+5 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+5 rename to libs/common/pytz/zoneinfo/Etc/GMT+5 diff --git a/libs/pytz/zoneinfo/Etc/GMT+6 b/libs/common/pytz/zoneinfo/Etc/GMT+6 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+6 rename to libs/common/pytz/zoneinfo/Etc/GMT+6 diff --git a/libs/pytz/zoneinfo/Etc/GMT+7 b/libs/common/pytz/zoneinfo/Etc/GMT+7 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+7 rename to libs/common/pytz/zoneinfo/Etc/GMT+7 diff --git a/libs/pytz/zoneinfo/Etc/GMT+8 b/libs/common/pytz/zoneinfo/Etc/GMT+8 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+8 rename to libs/common/pytz/zoneinfo/Etc/GMT+8 diff --git a/libs/pytz/zoneinfo/Etc/GMT+9 b/libs/common/pytz/zoneinfo/Etc/GMT+9 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT+9 rename to libs/common/pytz/zoneinfo/Etc/GMT+9 diff --git a/libs/pytz/zoneinfo/Etc/GMT-0 b/libs/common/pytz/zoneinfo/Etc/GMT-0 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-0 rename to libs/common/pytz/zoneinfo/Etc/GMT-0 diff --git a/libs/pytz/zoneinfo/Etc/GMT-1 b/libs/common/pytz/zoneinfo/Etc/GMT-1 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-1 rename to libs/common/pytz/zoneinfo/Etc/GMT-1 diff --git a/libs/pytz/zoneinfo/Etc/GMT-10 b/libs/common/pytz/zoneinfo/Etc/GMT-10 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-10 rename to libs/common/pytz/zoneinfo/Etc/GMT-10 diff --git a/libs/pytz/zoneinfo/Etc/GMT-11 b/libs/common/pytz/zoneinfo/Etc/GMT-11 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-11 rename to libs/common/pytz/zoneinfo/Etc/GMT-11 diff --git a/libs/pytz/zoneinfo/Etc/GMT-12 b/libs/common/pytz/zoneinfo/Etc/GMT-12 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-12 rename to libs/common/pytz/zoneinfo/Etc/GMT-12 diff --git a/libs/pytz/zoneinfo/Etc/GMT-13 b/libs/common/pytz/zoneinfo/Etc/GMT-13 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-13 rename to libs/common/pytz/zoneinfo/Etc/GMT-13 diff --git a/libs/pytz/zoneinfo/Etc/GMT-14 b/libs/common/pytz/zoneinfo/Etc/GMT-14 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-14 rename to libs/common/pytz/zoneinfo/Etc/GMT-14 diff --git a/libs/pytz/zoneinfo/Etc/GMT-2 b/libs/common/pytz/zoneinfo/Etc/GMT-2 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-2 rename to libs/common/pytz/zoneinfo/Etc/GMT-2 diff --git a/libs/pytz/zoneinfo/Etc/GMT-3 b/libs/common/pytz/zoneinfo/Etc/GMT-3 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-3 rename to libs/common/pytz/zoneinfo/Etc/GMT-3 diff --git a/libs/pytz/zoneinfo/Etc/GMT-4 b/libs/common/pytz/zoneinfo/Etc/GMT-4 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-4 rename to libs/common/pytz/zoneinfo/Etc/GMT-4 diff --git a/libs/pytz/zoneinfo/Etc/GMT-5 b/libs/common/pytz/zoneinfo/Etc/GMT-5 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-5 rename to libs/common/pytz/zoneinfo/Etc/GMT-5 diff --git a/libs/pytz/zoneinfo/Etc/GMT-6 b/libs/common/pytz/zoneinfo/Etc/GMT-6 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-6 rename to libs/common/pytz/zoneinfo/Etc/GMT-6 diff --git a/libs/pytz/zoneinfo/Etc/GMT-7 b/libs/common/pytz/zoneinfo/Etc/GMT-7 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-7 rename to libs/common/pytz/zoneinfo/Etc/GMT-7 diff --git a/libs/pytz/zoneinfo/Etc/GMT-8 b/libs/common/pytz/zoneinfo/Etc/GMT-8 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-8 rename to libs/common/pytz/zoneinfo/Etc/GMT-8 diff --git a/libs/pytz/zoneinfo/Etc/GMT-9 b/libs/common/pytz/zoneinfo/Etc/GMT-9 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT-9 rename to libs/common/pytz/zoneinfo/Etc/GMT-9 diff --git a/libs/pytz/zoneinfo/Etc/GMT0 b/libs/common/pytz/zoneinfo/Etc/GMT0 similarity index 100% rename from libs/pytz/zoneinfo/Etc/GMT0 rename to libs/common/pytz/zoneinfo/Etc/GMT0 diff --git a/libs/pytz/zoneinfo/Etc/Greenwich b/libs/common/pytz/zoneinfo/Etc/Greenwich similarity index 100% rename from libs/pytz/zoneinfo/Etc/Greenwich rename to libs/common/pytz/zoneinfo/Etc/Greenwich diff --git a/libs/pytz/zoneinfo/Etc/UCT b/libs/common/pytz/zoneinfo/Etc/UCT similarity index 100% rename from libs/pytz/zoneinfo/Etc/UCT rename to libs/common/pytz/zoneinfo/Etc/UCT diff --git a/libs/pytz/zoneinfo/Etc/UTC b/libs/common/pytz/zoneinfo/Etc/UTC similarity index 100% rename from libs/pytz/zoneinfo/Etc/UTC rename to libs/common/pytz/zoneinfo/Etc/UTC diff --git a/libs/pytz/zoneinfo/Etc/Universal b/libs/common/pytz/zoneinfo/Etc/Universal similarity index 100% rename from libs/pytz/zoneinfo/Etc/Universal rename to libs/common/pytz/zoneinfo/Etc/Universal diff --git a/libs/pytz/zoneinfo/Etc/Zulu b/libs/common/pytz/zoneinfo/Etc/Zulu similarity index 100% rename from libs/pytz/zoneinfo/Etc/Zulu rename to libs/common/pytz/zoneinfo/Etc/Zulu diff --git a/libs/pytz/zoneinfo/Europe/Amsterdam b/libs/common/pytz/zoneinfo/Europe/Amsterdam similarity index 100% rename from libs/pytz/zoneinfo/Europe/Amsterdam rename to libs/common/pytz/zoneinfo/Europe/Amsterdam diff --git a/libs/pytz/zoneinfo/Europe/Andorra b/libs/common/pytz/zoneinfo/Europe/Andorra similarity index 100% rename from libs/pytz/zoneinfo/Europe/Andorra rename to libs/common/pytz/zoneinfo/Europe/Andorra diff --git a/libs/pytz/zoneinfo/Europe/Astrakhan b/libs/common/pytz/zoneinfo/Europe/Astrakhan similarity index 100% rename from libs/pytz/zoneinfo/Europe/Astrakhan rename to libs/common/pytz/zoneinfo/Europe/Astrakhan diff --git a/libs/pytz/zoneinfo/Europe/Athens b/libs/common/pytz/zoneinfo/Europe/Athens similarity index 100% rename from libs/pytz/zoneinfo/Europe/Athens rename to libs/common/pytz/zoneinfo/Europe/Athens diff --git a/libs/pytz/zoneinfo/Europe/Belfast b/libs/common/pytz/zoneinfo/Europe/Belfast similarity index 100% rename from libs/pytz/zoneinfo/Europe/Belfast rename to libs/common/pytz/zoneinfo/Europe/Belfast diff --git a/libs/pytz/zoneinfo/Europe/Belgrade b/libs/common/pytz/zoneinfo/Europe/Belgrade similarity index 100% rename from libs/pytz/zoneinfo/Europe/Belgrade rename to libs/common/pytz/zoneinfo/Europe/Belgrade diff --git a/libs/pytz/zoneinfo/Europe/Berlin b/libs/common/pytz/zoneinfo/Europe/Berlin similarity index 100% rename from libs/pytz/zoneinfo/Europe/Berlin rename to libs/common/pytz/zoneinfo/Europe/Berlin diff --git a/libs/pytz/zoneinfo/Europe/Bratislava b/libs/common/pytz/zoneinfo/Europe/Bratislava similarity index 100% rename from libs/pytz/zoneinfo/Europe/Bratislava rename to libs/common/pytz/zoneinfo/Europe/Bratislava diff --git a/libs/pytz/zoneinfo/Europe/Brussels b/libs/common/pytz/zoneinfo/Europe/Brussels similarity index 100% rename from libs/pytz/zoneinfo/Europe/Brussels rename to libs/common/pytz/zoneinfo/Europe/Brussels diff --git a/libs/pytz/zoneinfo/Europe/Bucharest b/libs/common/pytz/zoneinfo/Europe/Bucharest similarity index 100% rename from libs/pytz/zoneinfo/Europe/Bucharest rename to libs/common/pytz/zoneinfo/Europe/Bucharest diff --git a/libs/pytz/zoneinfo/Europe/Budapest b/libs/common/pytz/zoneinfo/Europe/Budapest similarity index 100% rename from libs/pytz/zoneinfo/Europe/Budapest rename to libs/common/pytz/zoneinfo/Europe/Budapest diff --git a/libs/pytz/zoneinfo/Europe/Busingen b/libs/common/pytz/zoneinfo/Europe/Busingen similarity index 100% rename from libs/pytz/zoneinfo/Europe/Busingen rename to libs/common/pytz/zoneinfo/Europe/Busingen diff --git a/libs/pytz/zoneinfo/Europe/Chisinau b/libs/common/pytz/zoneinfo/Europe/Chisinau similarity index 100% rename from libs/pytz/zoneinfo/Europe/Chisinau rename to libs/common/pytz/zoneinfo/Europe/Chisinau diff --git a/libs/pytz/zoneinfo/Europe/Copenhagen b/libs/common/pytz/zoneinfo/Europe/Copenhagen similarity index 100% rename from libs/pytz/zoneinfo/Europe/Copenhagen rename to libs/common/pytz/zoneinfo/Europe/Copenhagen diff --git a/libs/pytz/zoneinfo/Europe/Dublin b/libs/common/pytz/zoneinfo/Europe/Dublin similarity index 100% rename from libs/pytz/zoneinfo/Europe/Dublin rename to libs/common/pytz/zoneinfo/Europe/Dublin diff --git a/libs/pytz/zoneinfo/Europe/Gibraltar b/libs/common/pytz/zoneinfo/Europe/Gibraltar similarity index 100% rename from libs/pytz/zoneinfo/Europe/Gibraltar rename to libs/common/pytz/zoneinfo/Europe/Gibraltar diff --git a/libs/pytz/zoneinfo/Europe/Guernsey b/libs/common/pytz/zoneinfo/Europe/Guernsey similarity index 100% rename from libs/pytz/zoneinfo/Europe/Guernsey rename to libs/common/pytz/zoneinfo/Europe/Guernsey diff --git a/libs/pytz/zoneinfo/Europe/Helsinki b/libs/common/pytz/zoneinfo/Europe/Helsinki similarity index 100% rename from libs/pytz/zoneinfo/Europe/Helsinki rename to libs/common/pytz/zoneinfo/Europe/Helsinki diff --git a/libs/pytz/zoneinfo/Europe/Isle_of_Man b/libs/common/pytz/zoneinfo/Europe/Isle_of_Man similarity index 100% rename from libs/pytz/zoneinfo/Europe/Isle_of_Man rename to libs/common/pytz/zoneinfo/Europe/Isle_of_Man diff --git a/libs/pytz/zoneinfo/Europe/Istanbul b/libs/common/pytz/zoneinfo/Europe/Istanbul similarity index 100% rename from libs/pytz/zoneinfo/Europe/Istanbul rename to libs/common/pytz/zoneinfo/Europe/Istanbul diff --git a/libs/pytz/zoneinfo/Europe/Jersey b/libs/common/pytz/zoneinfo/Europe/Jersey similarity index 100% rename from libs/pytz/zoneinfo/Europe/Jersey rename to libs/common/pytz/zoneinfo/Europe/Jersey diff --git a/libs/pytz/zoneinfo/Europe/Kaliningrad b/libs/common/pytz/zoneinfo/Europe/Kaliningrad similarity index 100% rename from libs/pytz/zoneinfo/Europe/Kaliningrad rename to libs/common/pytz/zoneinfo/Europe/Kaliningrad diff --git a/libs/pytz/zoneinfo/Europe/Kiev b/libs/common/pytz/zoneinfo/Europe/Kiev similarity index 100% rename from libs/pytz/zoneinfo/Europe/Kiev rename to libs/common/pytz/zoneinfo/Europe/Kiev diff --git a/libs/pytz/zoneinfo/Europe/Kirov b/libs/common/pytz/zoneinfo/Europe/Kirov similarity index 100% rename from libs/pytz/zoneinfo/Europe/Kirov rename to libs/common/pytz/zoneinfo/Europe/Kirov diff --git a/libs/pytz/zoneinfo/Europe/Lisbon b/libs/common/pytz/zoneinfo/Europe/Lisbon similarity index 100% rename from libs/pytz/zoneinfo/Europe/Lisbon rename to libs/common/pytz/zoneinfo/Europe/Lisbon diff --git a/libs/pytz/zoneinfo/Europe/Ljubljana b/libs/common/pytz/zoneinfo/Europe/Ljubljana similarity index 100% rename from libs/pytz/zoneinfo/Europe/Ljubljana rename to libs/common/pytz/zoneinfo/Europe/Ljubljana diff --git a/libs/pytz/zoneinfo/Europe/London b/libs/common/pytz/zoneinfo/Europe/London similarity index 100% rename from libs/pytz/zoneinfo/Europe/London rename to libs/common/pytz/zoneinfo/Europe/London diff --git a/libs/pytz/zoneinfo/Europe/Luxembourg b/libs/common/pytz/zoneinfo/Europe/Luxembourg similarity index 100% rename from libs/pytz/zoneinfo/Europe/Luxembourg rename to libs/common/pytz/zoneinfo/Europe/Luxembourg diff --git a/libs/pytz/zoneinfo/Europe/Madrid b/libs/common/pytz/zoneinfo/Europe/Madrid similarity index 100% rename from libs/pytz/zoneinfo/Europe/Madrid rename to libs/common/pytz/zoneinfo/Europe/Madrid diff --git a/libs/pytz/zoneinfo/Europe/Malta b/libs/common/pytz/zoneinfo/Europe/Malta similarity index 100% rename from libs/pytz/zoneinfo/Europe/Malta rename to libs/common/pytz/zoneinfo/Europe/Malta diff --git a/libs/pytz/zoneinfo/Europe/Mariehamn b/libs/common/pytz/zoneinfo/Europe/Mariehamn similarity index 100% rename from libs/pytz/zoneinfo/Europe/Mariehamn rename to libs/common/pytz/zoneinfo/Europe/Mariehamn diff --git a/libs/pytz/zoneinfo/Europe/Minsk b/libs/common/pytz/zoneinfo/Europe/Minsk similarity index 100% rename from libs/pytz/zoneinfo/Europe/Minsk rename to libs/common/pytz/zoneinfo/Europe/Minsk diff --git a/libs/pytz/zoneinfo/Europe/Monaco b/libs/common/pytz/zoneinfo/Europe/Monaco similarity index 100% rename from libs/pytz/zoneinfo/Europe/Monaco rename to libs/common/pytz/zoneinfo/Europe/Monaco diff --git a/libs/pytz/zoneinfo/Europe/Moscow b/libs/common/pytz/zoneinfo/Europe/Moscow similarity index 100% rename from libs/pytz/zoneinfo/Europe/Moscow rename to libs/common/pytz/zoneinfo/Europe/Moscow diff --git a/libs/pytz/zoneinfo/Europe/Nicosia b/libs/common/pytz/zoneinfo/Europe/Nicosia similarity index 100% rename from libs/pytz/zoneinfo/Europe/Nicosia rename to libs/common/pytz/zoneinfo/Europe/Nicosia diff --git a/libs/pytz/zoneinfo/Europe/Oslo b/libs/common/pytz/zoneinfo/Europe/Oslo similarity index 100% rename from libs/pytz/zoneinfo/Europe/Oslo rename to libs/common/pytz/zoneinfo/Europe/Oslo diff --git a/libs/pytz/zoneinfo/Europe/Paris b/libs/common/pytz/zoneinfo/Europe/Paris similarity index 100% rename from libs/pytz/zoneinfo/Europe/Paris rename to libs/common/pytz/zoneinfo/Europe/Paris diff --git a/libs/pytz/zoneinfo/Europe/Podgorica b/libs/common/pytz/zoneinfo/Europe/Podgorica similarity index 100% rename from libs/pytz/zoneinfo/Europe/Podgorica rename to libs/common/pytz/zoneinfo/Europe/Podgorica diff --git a/libs/pytz/zoneinfo/Europe/Prague b/libs/common/pytz/zoneinfo/Europe/Prague similarity index 100% rename from libs/pytz/zoneinfo/Europe/Prague rename to libs/common/pytz/zoneinfo/Europe/Prague diff --git a/libs/pytz/zoneinfo/Europe/Riga b/libs/common/pytz/zoneinfo/Europe/Riga similarity index 100% rename from libs/pytz/zoneinfo/Europe/Riga rename to libs/common/pytz/zoneinfo/Europe/Riga diff --git a/libs/pytz/zoneinfo/Europe/Rome b/libs/common/pytz/zoneinfo/Europe/Rome similarity index 100% rename from libs/pytz/zoneinfo/Europe/Rome rename to libs/common/pytz/zoneinfo/Europe/Rome diff --git a/libs/pytz/zoneinfo/Europe/Samara b/libs/common/pytz/zoneinfo/Europe/Samara similarity index 100% rename from libs/pytz/zoneinfo/Europe/Samara rename to libs/common/pytz/zoneinfo/Europe/Samara diff --git a/libs/pytz/zoneinfo/Europe/San_Marino b/libs/common/pytz/zoneinfo/Europe/San_Marino similarity index 100% rename from libs/pytz/zoneinfo/Europe/San_Marino rename to libs/common/pytz/zoneinfo/Europe/San_Marino diff --git a/libs/pytz/zoneinfo/Europe/Sarajevo b/libs/common/pytz/zoneinfo/Europe/Sarajevo similarity index 100% rename from libs/pytz/zoneinfo/Europe/Sarajevo rename to libs/common/pytz/zoneinfo/Europe/Sarajevo diff --git a/libs/pytz/zoneinfo/Europe/Saratov b/libs/common/pytz/zoneinfo/Europe/Saratov similarity index 100% rename from libs/pytz/zoneinfo/Europe/Saratov rename to libs/common/pytz/zoneinfo/Europe/Saratov diff --git a/libs/pytz/zoneinfo/Europe/Simferopol b/libs/common/pytz/zoneinfo/Europe/Simferopol similarity index 100% rename from libs/pytz/zoneinfo/Europe/Simferopol rename to libs/common/pytz/zoneinfo/Europe/Simferopol diff --git a/libs/pytz/zoneinfo/Europe/Skopje b/libs/common/pytz/zoneinfo/Europe/Skopje similarity index 100% rename from libs/pytz/zoneinfo/Europe/Skopje rename to libs/common/pytz/zoneinfo/Europe/Skopje diff --git a/libs/pytz/zoneinfo/Europe/Sofia b/libs/common/pytz/zoneinfo/Europe/Sofia similarity index 100% rename from libs/pytz/zoneinfo/Europe/Sofia rename to libs/common/pytz/zoneinfo/Europe/Sofia diff --git a/libs/pytz/zoneinfo/Europe/Stockholm b/libs/common/pytz/zoneinfo/Europe/Stockholm similarity index 100% rename from libs/pytz/zoneinfo/Europe/Stockholm rename to libs/common/pytz/zoneinfo/Europe/Stockholm diff --git a/libs/pytz/zoneinfo/Europe/Tallinn b/libs/common/pytz/zoneinfo/Europe/Tallinn similarity index 100% rename from libs/pytz/zoneinfo/Europe/Tallinn rename to libs/common/pytz/zoneinfo/Europe/Tallinn diff --git a/libs/pytz/zoneinfo/Europe/Tirane b/libs/common/pytz/zoneinfo/Europe/Tirane similarity index 100% rename from libs/pytz/zoneinfo/Europe/Tirane rename to libs/common/pytz/zoneinfo/Europe/Tirane diff --git a/libs/pytz/zoneinfo/Europe/Tiraspol b/libs/common/pytz/zoneinfo/Europe/Tiraspol similarity index 100% rename from libs/pytz/zoneinfo/Europe/Tiraspol rename to libs/common/pytz/zoneinfo/Europe/Tiraspol diff --git a/libs/pytz/zoneinfo/Europe/Ulyanovsk b/libs/common/pytz/zoneinfo/Europe/Ulyanovsk similarity index 100% rename from libs/pytz/zoneinfo/Europe/Ulyanovsk rename to libs/common/pytz/zoneinfo/Europe/Ulyanovsk diff --git a/libs/pytz/zoneinfo/Europe/Uzhgorod b/libs/common/pytz/zoneinfo/Europe/Uzhgorod similarity index 100% rename from libs/pytz/zoneinfo/Europe/Uzhgorod rename to libs/common/pytz/zoneinfo/Europe/Uzhgorod diff --git a/libs/pytz/zoneinfo/Europe/Vaduz b/libs/common/pytz/zoneinfo/Europe/Vaduz similarity index 100% rename from libs/pytz/zoneinfo/Europe/Vaduz rename to libs/common/pytz/zoneinfo/Europe/Vaduz diff --git a/libs/pytz/zoneinfo/Europe/Vatican b/libs/common/pytz/zoneinfo/Europe/Vatican similarity index 100% rename from libs/pytz/zoneinfo/Europe/Vatican rename to libs/common/pytz/zoneinfo/Europe/Vatican diff --git a/libs/pytz/zoneinfo/Europe/Vienna b/libs/common/pytz/zoneinfo/Europe/Vienna similarity index 100% rename from libs/pytz/zoneinfo/Europe/Vienna rename to libs/common/pytz/zoneinfo/Europe/Vienna diff --git a/libs/pytz/zoneinfo/Europe/Vilnius b/libs/common/pytz/zoneinfo/Europe/Vilnius similarity index 100% rename from libs/pytz/zoneinfo/Europe/Vilnius rename to libs/common/pytz/zoneinfo/Europe/Vilnius diff --git a/libs/pytz/zoneinfo/Europe/Volgograd b/libs/common/pytz/zoneinfo/Europe/Volgograd similarity index 100% rename from libs/pytz/zoneinfo/Europe/Volgograd rename to libs/common/pytz/zoneinfo/Europe/Volgograd diff --git a/libs/pytz/zoneinfo/Europe/Warsaw b/libs/common/pytz/zoneinfo/Europe/Warsaw similarity index 100% rename from libs/pytz/zoneinfo/Europe/Warsaw rename to libs/common/pytz/zoneinfo/Europe/Warsaw diff --git a/libs/pytz/zoneinfo/Europe/Zagreb b/libs/common/pytz/zoneinfo/Europe/Zagreb similarity index 100% rename from libs/pytz/zoneinfo/Europe/Zagreb rename to libs/common/pytz/zoneinfo/Europe/Zagreb diff --git a/libs/pytz/zoneinfo/Europe/Zaporozhye b/libs/common/pytz/zoneinfo/Europe/Zaporozhye similarity index 100% rename from libs/pytz/zoneinfo/Europe/Zaporozhye rename to libs/common/pytz/zoneinfo/Europe/Zaporozhye diff --git a/libs/pytz/zoneinfo/Europe/Zurich b/libs/common/pytz/zoneinfo/Europe/Zurich similarity index 100% rename from libs/pytz/zoneinfo/Europe/Zurich rename to libs/common/pytz/zoneinfo/Europe/Zurich diff --git a/libs/pytz/zoneinfo/Factory b/libs/common/pytz/zoneinfo/Factory similarity index 100% rename from libs/pytz/zoneinfo/Factory rename to libs/common/pytz/zoneinfo/Factory diff --git a/libs/pytz/zoneinfo/GB b/libs/common/pytz/zoneinfo/GB similarity index 100% rename from libs/pytz/zoneinfo/GB rename to libs/common/pytz/zoneinfo/GB diff --git a/libs/pytz/zoneinfo/GB-Eire b/libs/common/pytz/zoneinfo/GB-Eire similarity index 100% rename from libs/pytz/zoneinfo/GB-Eire rename to libs/common/pytz/zoneinfo/GB-Eire diff --git a/libs/pytz/zoneinfo/GMT b/libs/common/pytz/zoneinfo/GMT similarity index 100% rename from libs/pytz/zoneinfo/GMT rename to libs/common/pytz/zoneinfo/GMT diff --git a/libs/pytz/zoneinfo/GMT+0 b/libs/common/pytz/zoneinfo/GMT+0 similarity index 100% rename from libs/pytz/zoneinfo/GMT+0 rename to libs/common/pytz/zoneinfo/GMT+0 diff --git a/libs/pytz/zoneinfo/GMT-0 b/libs/common/pytz/zoneinfo/GMT-0 similarity index 100% rename from libs/pytz/zoneinfo/GMT-0 rename to libs/common/pytz/zoneinfo/GMT-0 diff --git a/libs/pytz/zoneinfo/GMT0 b/libs/common/pytz/zoneinfo/GMT0 similarity index 100% rename from libs/pytz/zoneinfo/GMT0 rename to libs/common/pytz/zoneinfo/GMT0 diff --git a/libs/pytz/zoneinfo/Greenwich b/libs/common/pytz/zoneinfo/Greenwich similarity index 100% rename from libs/pytz/zoneinfo/Greenwich rename to libs/common/pytz/zoneinfo/Greenwich diff --git a/libs/pytz/zoneinfo/HST b/libs/common/pytz/zoneinfo/HST similarity index 100% rename from libs/pytz/zoneinfo/HST rename to libs/common/pytz/zoneinfo/HST diff --git a/libs/pytz/zoneinfo/Hongkong b/libs/common/pytz/zoneinfo/Hongkong similarity index 100% rename from libs/pytz/zoneinfo/Hongkong rename to libs/common/pytz/zoneinfo/Hongkong diff --git a/libs/pytz/zoneinfo/Iceland b/libs/common/pytz/zoneinfo/Iceland similarity index 100% rename from libs/pytz/zoneinfo/Iceland rename to libs/common/pytz/zoneinfo/Iceland diff --git a/libs/pytz/zoneinfo/Indian/Antananarivo b/libs/common/pytz/zoneinfo/Indian/Antananarivo similarity index 100% rename from libs/pytz/zoneinfo/Indian/Antananarivo rename to libs/common/pytz/zoneinfo/Indian/Antananarivo diff --git a/libs/pytz/zoneinfo/Indian/Chagos b/libs/common/pytz/zoneinfo/Indian/Chagos similarity index 100% rename from libs/pytz/zoneinfo/Indian/Chagos rename to libs/common/pytz/zoneinfo/Indian/Chagos diff --git a/libs/pytz/zoneinfo/Indian/Christmas b/libs/common/pytz/zoneinfo/Indian/Christmas similarity index 100% rename from libs/pytz/zoneinfo/Indian/Christmas rename to libs/common/pytz/zoneinfo/Indian/Christmas diff --git a/libs/pytz/zoneinfo/Indian/Cocos b/libs/common/pytz/zoneinfo/Indian/Cocos similarity index 100% rename from libs/pytz/zoneinfo/Indian/Cocos rename to libs/common/pytz/zoneinfo/Indian/Cocos diff --git a/libs/pytz/zoneinfo/Indian/Comoro b/libs/common/pytz/zoneinfo/Indian/Comoro similarity index 100% rename from libs/pytz/zoneinfo/Indian/Comoro rename to libs/common/pytz/zoneinfo/Indian/Comoro diff --git a/libs/pytz/zoneinfo/Indian/Kerguelen b/libs/common/pytz/zoneinfo/Indian/Kerguelen similarity index 100% rename from libs/pytz/zoneinfo/Indian/Kerguelen rename to libs/common/pytz/zoneinfo/Indian/Kerguelen diff --git a/libs/pytz/zoneinfo/Indian/Mahe b/libs/common/pytz/zoneinfo/Indian/Mahe similarity index 100% rename from libs/pytz/zoneinfo/Indian/Mahe rename to libs/common/pytz/zoneinfo/Indian/Mahe diff --git a/libs/pytz/zoneinfo/Indian/Maldives b/libs/common/pytz/zoneinfo/Indian/Maldives similarity index 100% rename from libs/pytz/zoneinfo/Indian/Maldives rename to libs/common/pytz/zoneinfo/Indian/Maldives diff --git a/libs/pytz/zoneinfo/Indian/Mauritius b/libs/common/pytz/zoneinfo/Indian/Mauritius similarity index 100% rename from libs/pytz/zoneinfo/Indian/Mauritius rename to libs/common/pytz/zoneinfo/Indian/Mauritius diff --git a/libs/pytz/zoneinfo/Indian/Mayotte b/libs/common/pytz/zoneinfo/Indian/Mayotte similarity index 100% rename from libs/pytz/zoneinfo/Indian/Mayotte rename to libs/common/pytz/zoneinfo/Indian/Mayotte diff --git a/libs/pytz/zoneinfo/Indian/Reunion b/libs/common/pytz/zoneinfo/Indian/Reunion similarity index 100% rename from libs/pytz/zoneinfo/Indian/Reunion rename to libs/common/pytz/zoneinfo/Indian/Reunion diff --git a/libs/pytz/zoneinfo/Iran b/libs/common/pytz/zoneinfo/Iran similarity index 100% rename from libs/pytz/zoneinfo/Iran rename to libs/common/pytz/zoneinfo/Iran diff --git a/libs/pytz/zoneinfo/Israel b/libs/common/pytz/zoneinfo/Israel similarity index 100% rename from libs/pytz/zoneinfo/Israel rename to libs/common/pytz/zoneinfo/Israel diff --git a/libs/pytz/zoneinfo/Jamaica b/libs/common/pytz/zoneinfo/Jamaica similarity index 100% rename from libs/pytz/zoneinfo/Jamaica rename to libs/common/pytz/zoneinfo/Jamaica diff --git a/libs/pytz/zoneinfo/Japan b/libs/common/pytz/zoneinfo/Japan similarity index 100% rename from libs/pytz/zoneinfo/Japan rename to libs/common/pytz/zoneinfo/Japan diff --git a/libs/pytz/zoneinfo/Kwajalein b/libs/common/pytz/zoneinfo/Kwajalein similarity index 100% rename from libs/pytz/zoneinfo/Kwajalein rename to libs/common/pytz/zoneinfo/Kwajalein diff --git a/libs/pytz/zoneinfo/Libya b/libs/common/pytz/zoneinfo/Libya similarity index 100% rename from libs/pytz/zoneinfo/Libya rename to libs/common/pytz/zoneinfo/Libya diff --git a/libs/pytz/zoneinfo/MET b/libs/common/pytz/zoneinfo/MET similarity index 100% rename from libs/pytz/zoneinfo/MET rename to libs/common/pytz/zoneinfo/MET diff --git a/libs/pytz/zoneinfo/MST b/libs/common/pytz/zoneinfo/MST similarity index 100% rename from libs/pytz/zoneinfo/MST rename to libs/common/pytz/zoneinfo/MST diff --git a/libs/pytz/zoneinfo/MST7MDT b/libs/common/pytz/zoneinfo/MST7MDT similarity index 100% rename from libs/pytz/zoneinfo/MST7MDT rename to libs/common/pytz/zoneinfo/MST7MDT diff --git a/libs/pytz/zoneinfo/Mexico/BajaNorte b/libs/common/pytz/zoneinfo/Mexico/BajaNorte similarity index 100% rename from libs/pytz/zoneinfo/Mexico/BajaNorte rename to libs/common/pytz/zoneinfo/Mexico/BajaNorte diff --git a/libs/pytz/zoneinfo/Mexico/BajaSur b/libs/common/pytz/zoneinfo/Mexico/BajaSur similarity index 100% rename from libs/pytz/zoneinfo/Mexico/BajaSur rename to libs/common/pytz/zoneinfo/Mexico/BajaSur diff --git a/libs/pytz/zoneinfo/Mexico/General b/libs/common/pytz/zoneinfo/Mexico/General similarity index 100% rename from libs/pytz/zoneinfo/Mexico/General rename to libs/common/pytz/zoneinfo/Mexico/General diff --git a/libs/pytz/zoneinfo/NZ b/libs/common/pytz/zoneinfo/NZ similarity index 100% rename from libs/pytz/zoneinfo/NZ rename to libs/common/pytz/zoneinfo/NZ diff --git a/libs/pytz/zoneinfo/NZ-CHAT b/libs/common/pytz/zoneinfo/NZ-CHAT similarity index 100% rename from libs/pytz/zoneinfo/NZ-CHAT rename to libs/common/pytz/zoneinfo/NZ-CHAT diff --git a/libs/pytz/zoneinfo/Navajo b/libs/common/pytz/zoneinfo/Navajo similarity index 100% rename from libs/pytz/zoneinfo/Navajo rename to libs/common/pytz/zoneinfo/Navajo diff --git a/libs/pytz/zoneinfo/PRC b/libs/common/pytz/zoneinfo/PRC similarity index 100% rename from libs/pytz/zoneinfo/PRC rename to libs/common/pytz/zoneinfo/PRC diff --git a/libs/pytz/zoneinfo/PST8PDT b/libs/common/pytz/zoneinfo/PST8PDT similarity index 100% rename from libs/pytz/zoneinfo/PST8PDT rename to libs/common/pytz/zoneinfo/PST8PDT diff --git a/libs/pytz/zoneinfo/Pacific/Apia b/libs/common/pytz/zoneinfo/Pacific/Apia similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Apia rename to libs/common/pytz/zoneinfo/Pacific/Apia diff --git a/libs/pytz/zoneinfo/Pacific/Auckland b/libs/common/pytz/zoneinfo/Pacific/Auckland similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Auckland rename to libs/common/pytz/zoneinfo/Pacific/Auckland diff --git a/libs/pytz/zoneinfo/Pacific/Bougainville b/libs/common/pytz/zoneinfo/Pacific/Bougainville similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Bougainville rename to libs/common/pytz/zoneinfo/Pacific/Bougainville diff --git a/libs/pytz/zoneinfo/Pacific/Chatham b/libs/common/pytz/zoneinfo/Pacific/Chatham similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Chatham rename to libs/common/pytz/zoneinfo/Pacific/Chatham diff --git a/libs/pytz/zoneinfo/Pacific/Chuuk b/libs/common/pytz/zoneinfo/Pacific/Chuuk similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Chuuk rename to libs/common/pytz/zoneinfo/Pacific/Chuuk diff --git a/libs/pytz/zoneinfo/Pacific/Easter b/libs/common/pytz/zoneinfo/Pacific/Easter similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Easter rename to libs/common/pytz/zoneinfo/Pacific/Easter diff --git a/libs/pytz/zoneinfo/Pacific/Efate b/libs/common/pytz/zoneinfo/Pacific/Efate similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Efate rename to libs/common/pytz/zoneinfo/Pacific/Efate diff --git a/libs/pytz/zoneinfo/Pacific/Enderbury b/libs/common/pytz/zoneinfo/Pacific/Enderbury similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Enderbury rename to libs/common/pytz/zoneinfo/Pacific/Enderbury diff --git a/libs/pytz/zoneinfo/Pacific/Fakaofo b/libs/common/pytz/zoneinfo/Pacific/Fakaofo similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Fakaofo rename to libs/common/pytz/zoneinfo/Pacific/Fakaofo diff --git a/libs/pytz/zoneinfo/Pacific/Fiji b/libs/common/pytz/zoneinfo/Pacific/Fiji similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Fiji rename to libs/common/pytz/zoneinfo/Pacific/Fiji diff --git a/libs/pytz/zoneinfo/Pacific/Funafuti b/libs/common/pytz/zoneinfo/Pacific/Funafuti similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Funafuti rename to libs/common/pytz/zoneinfo/Pacific/Funafuti diff --git a/libs/pytz/zoneinfo/Pacific/Galapagos b/libs/common/pytz/zoneinfo/Pacific/Galapagos similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Galapagos rename to libs/common/pytz/zoneinfo/Pacific/Galapagos diff --git a/libs/pytz/zoneinfo/Pacific/Gambier b/libs/common/pytz/zoneinfo/Pacific/Gambier similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Gambier rename to libs/common/pytz/zoneinfo/Pacific/Gambier diff --git a/libs/pytz/zoneinfo/Pacific/Guadalcanal b/libs/common/pytz/zoneinfo/Pacific/Guadalcanal similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Guadalcanal rename to libs/common/pytz/zoneinfo/Pacific/Guadalcanal diff --git a/libs/pytz/zoneinfo/Pacific/Guam b/libs/common/pytz/zoneinfo/Pacific/Guam similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Guam rename to libs/common/pytz/zoneinfo/Pacific/Guam diff --git a/libs/pytz/zoneinfo/Pacific/Honolulu b/libs/common/pytz/zoneinfo/Pacific/Honolulu similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Honolulu rename to libs/common/pytz/zoneinfo/Pacific/Honolulu diff --git a/libs/pytz/zoneinfo/Pacific/Johnston b/libs/common/pytz/zoneinfo/Pacific/Johnston similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Johnston rename to libs/common/pytz/zoneinfo/Pacific/Johnston diff --git a/libs/pytz/zoneinfo/Pacific/Kiritimati b/libs/common/pytz/zoneinfo/Pacific/Kiritimati similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Kiritimati rename to libs/common/pytz/zoneinfo/Pacific/Kiritimati diff --git a/libs/pytz/zoneinfo/Pacific/Kosrae b/libs/common/pytz/zoneinfo/Pacific/Kosrae similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Kosrae rename to libs/common/pytz/zoneinfo/Pacific/Kosrae diff --git a/libs/pytz/zoneinfo/Pacific/Kwajalein b/libs/common/pytz/zoneinfo/Pacific/Kwajalein similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Kwajalein rename to libs/common/pytz/zoneinfo/Pacific/Kwajalein diff --git a/libs/pytz/zoneinfo/Pacific/Majuro b/libs/common/pytz/zoneinfo/Pacific/Majuro similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Majuro rename to libs/common/pytz/zoneinfo/Pacific/Majuro diff --git a/libs/pytz/zoneinfo/Pacific/Marquesas b/libs/common/pytz/zoneinfo/Pacific/Marquesas similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Marquesas rename to libs/common/pytz/zoneinfo/Pacific/Marquesas diff --git a/libs/pytz/zoneinfo/Pacific/Midway b/libs/common/pytz/zoneinfo/Pacific/Midway similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Midway rename to libs/common/pytz/zoneinfo/Pacific/Midway diff --git a/libs/pytz/zoneinfo/Pacific/Nauru b/libs/common/pytz/zoneinfo/Pacific/Nauru similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Nauru rename to libs/common/pytz/zoneinfo/Pacific/Nauru diff --git a/libs/pytz/zoneinfo/Pacific/Niue b/libs/common/pytz/zoneinfo/Pacific/Niue similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Niue rename to libs/common/pytz/zoneinfo/Pacific/Niue diff --git a/libs/pytz/zoneinfo/Pacific/Norfolk b/libs/common/pytz/zoneinfo/Pacific/Norfolk similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Norfolk rename to libs/common/pytz/zoneinfo/Pacific/Norfolk diff --git a/libs/pytz/zoneinfo/Pacific/Noumea b/libs/common/pytz/zoneinfo/Pacific/Noumea similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Noumea rename to libs/common/pytz/zoneinfo/Pacific/Noumea diff --git a/libs/pytz/zoneinfo/Pacific/Pago_Pago b/libs/common/pytz/zoneinfo/Pacific/Pago_Pago similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Pago_Pago rename to libs/common/pytz/zoneinfo/Pacific/Pago_Pago diff --git a/libs/pytz/zoneinfo/Pacific/Palau b/libs/common/pytz/zoneinfo/Pacific/Palau similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Palau rename to libs/common/pytz/zoneinfo/Pacific/Palau diff --git a/libs/pytz/zoneinfo/Pacific/Pitcairn b/libs/common/pytz/zoneinfo/Pacific/Pitcairn similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Pitcairn rename to libs/common/pytz/zoneinfo/Pacific/Pitcairn diff --git a/libs/pytz/zoneinfo/Pacific/Pohnpei b/libs/common/pytz/zoneinfo/Pacific/Pohnpei similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Pohnpei rename to libs/common/pytz/zoneinfo/Pacific/Pohnpei diff --git a/libs/pytz/zoneinfo/Pacific/Ponape b/libs/common/pytz/zoneinfo/Pacific/Ponape similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Ponape rename to libs/common/pytz/zoneinfo/Pacific/Ponape diff --git a/libs/pytz/zoneinfo/Pacific/Port_Moresby b/libs/common/pytz/zoneinfo/Pacific/Port_Moresby similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Port_Moresby rename to libs/common/pytz/zoneinfo/Pacific/Port_Moresby diff --git a/libs/pytz/zoneinfo/Pacific/Rarotonga b/libs/common/pytz/zoneinfo/Pacific/Rarotonga similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Rarotonga rename to libs/common/pytz/zoneinfo/Pacific/Rarotonga diff --git a/libs/pytz/zoneinfo/Pacific/Saipan b/libs/common/pytz/zoneinfo/Pacific/Saipan similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Saipan rename to libs/common/pytz/zoneinfo/Pacific/Saipan diff --git a/libs/pytz/zoneinfo/Pacific/Samoa b/libs/common/pytz/zoneinfo/Pacific/Samoa similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Samoa rename to libs/common/pytz/zoneinfo/Pacific/Samoa diff --git a/libs/pytz/zoneinfo/Pacific/Tahiti b/libs/common/pytz/zoneinfo/Pacific/Tahiti similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Tahiti rename to libs/common/pytz/zoneinfo/Pacific/Tahiti diff --git a/libs/pytz/zoneinfo/Pacific/Tarawa b/libs/common/pytz/zoneinfo/Pacific/Tarawa similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Tarawa rename to libs/common/pytz/zoneinfo/Pacific/Tarawa diff --git a/libs/pytz/zoneinfo/Pacific/Tongatapu b/libs/common/pytz/zoneinfo/Pacific/Tongatapu similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Tongatapu rename to libs/common/pytz/zoneinfo/Pacific/Tongatapu diff --git a/libs/pytz/zoneinfo/Pacific/Truk b/libs/common/pytz/zoneinfo/Pacific/Truk similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Truk rename to libs/common/pytz/zoneinfo/Pacific/Truk diff --git a/libs/pytz/zoneinfo/Pacific/Wake b/libs/common/pytz/zoneinfo/Pacific/Wake similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Wake rename to libs/common/pytz/zoneinfo/Pacific/Wake diff --git a/libs/pytz/zoneinfo/Pacific/Wallis b/libs/common/pytz/zoneinfo/Pacific/Wallis similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Wallis rename to libs/common/pytz/zoneinfo/Pacific/Wallis diff --git a/libs/pytz/zoneinfo/Pacific/Yap b/libs/common/pytz/zoneinfo/Pacific/Yap similarity index 100% rename from libs/pytz/zoneinfo/Pacific/Yap rename to libs/common/pytz/zoneinfo/Pacific/Yap diff --git a/libs/pytz/zoneinfo/Poland b/libs/common/pytz/zoneinfo/Poland similarity index 100% rename from libs/pytz/zoneinfo/Poland rename to libs/common/pytz/zoneinfo/Poland diff --git a/libs/pytz/zoneinfo/Portugal b/libs/common/pytz/zoneinfo/Portugal similarity index 100% rename from libs/pytz/zoneinfo/Portugal rename to libs/common/pytz/zoneinfo/Portugal diff --git a/libs/pytz/zoneinfo/ROC b/libs/common/pytz/zoneinfo/ROC similarity index 100% rename from libs/pytz/zoneinfo/ROC rename to libs/common/pytz/zoneinfo/ROC diff --git a/libs/pytz/zoneinfo/ROK b/libs/common/pytz/zoneinfo/ROK similarity index 100% rename from libs/pytz/zoneinfo/ROK rename to libs/common/pytz/zoneinfo/ROK diff --git a/libs/pytz/zoneinfo/Singapore b/libs/common/pytz/zoneinfo/Singapore similarity index 100% rename from libs/pytz/zoneinfo/Singapore rename to libs/common/pytz/zoneinfo/Singapore diff --git a/libs/pytz/zoneinfo/Turkey b/libs/common/pytz/zoneinfo/Turkey similarity index 100% rename from libs/pytz/zoneinfo/Turkey rename to libs/common/pytz/zoneinfo/Turkey diff --git a/libs/pytz/zoneinfo/UCT b/libs/common/pytz/zoneinfo/UCT similarity index 100% rename from libs/pytz/zoneinfo/UCT rename to libs/common/pytz/zoneinfo/UCT diff --git a/libs/pytz/zoneinfo/US/Alaska b/libs/common/pytz/zoneinfo/US/Alaska similarity index 100% rename from libs/pytz/zoneinfo/US/Alaska rename to libs/common/pytz/zoneinfo/US/Alaska diff --git a/libs/pytz/zoneinfo/US/Aleutian b/libs/common/pytz/zoneinfo/US/Aleutian similarity index 100% rename from libs/pytz/zoneinfo/US/Aleutian rename to libs/common/pytz/zoneinfo/US/Aleutian diff --git a/libs/pytz/zoneinfo/US/Arizona b/libs/common/pytz/zoneinfo/US/Arizona similarity index 100% rename from libs/pytz/zoneinfo/US/Arizona rename to libs/common/pytz/zoneinfo/US/Arizona diff --git a/libs/pytz/zoneinfo/US/Central b/libs/common/pytz/zoneinfo/US/Central similarity index 100% rename from libs/pytz/zoneinfo/US/Central rename to libs/common/pytz/zoneinfo/US/Central diff --git a/libs/pytz/zoneinfo/US/East-Indiana b/libs/common/pytz/zoneinfo/US/East-Indiana similarity index 100% rename from libs/pytz/zoneinfo/US/East-Indiana rename to libs/common/pytz/zoneinfo/US/East-Indiana diff --git a/libs/pytz/zoneinfo/US/Eastern b/libs/common/pytz/zoneinfo/US/Eastern similarity index 100% rename from libs/pytz/zoneinfo/US/Eastern rename to libs/common/pytz/zoneinfo/US/Eastern diff --git a/libs/pytz/zoneinfo/US/Hawaii b/libs/common/pytz/zoneinfo/US/Hawaii similarity index 100% rename from libs/pytz/zoneinfo/US/Hawaii rename to libs/common/pytz/zoneinfo/US/Hawaii diff --git a/libs/pytz/zoneinfo/US/Indiana-Starke b/libs/common/pytz/zoneinfo/US/Indiana-Starke similarity index 100% rename from libs/pytz/zoneinfo/US/Indiana-Starke rename to libs/common/pytz/zoneinfo/US/Indiana-Starke diff --git a/libs/pytz/zoneinfo/US/Michigan b/libs/common/pytz/zoneinfo/US/Michigan similarity index 100% rename from libs/pytz/zoneinfo/US/Michigan rename to libs/common/pytz/zoneinfo/US/Michigan diff --git a/libs/pytz/zoneinfo/US/Mountain b/libs/common/pytz/zoneinfo/US/Mountain similarity index 100% rename from libs/pytz/zoneinfo/US/Mountain rename to libs/common/pytz/zoneinfo/US/Mountain diff --git a/libs/pytz/zoneinfo/US/Pacific b/libs/common/pytz/zoneinfo/US/Pacific similarity index 100% rename from libs/pytz/zoneinfo/US/Pacific rename to libs/common/pytz/zoneinfo/US/Pacific diff --git a/libs/pytz/zoneinfo/US/Samoa b/libs/common/pytz/zoneinfo/US/Samoa similarity index 100% rename from libs/pytz/zoneinfo/US/Samoa rename to libs/common/pytz/zoneinfo/US/Samoa diff --git a/libs/pytz/zoneinfo/UTC b/libs/common/pytz/zoneinfo/UTC similarity index 100% rename from libs/pytz/zoneinfo/UTC rename to libs/common/pytz/zoneinfo/UTC diff --git a/libs/pytz/zoneinfo/Universal b/libs/common/pytz/zoneinfo/Universal similarity index 100% rename from libs/pytz/zoneinfo/Universal rename to libs/common/pytz/zoneinfo/Universal diff --git a/libs/pytz/zoneinfo/W-SU b/libs/common/pytz/zoneinfo/W-SU similarity index 100% rename from libs/pytz/zoneinfo/W-SU rename to libs/common/pytz/zoneinfo/W-SU diff --git a/libs/pytz/zoneinfo/WET b/libs/common/pytz/zoneinfo/WET similarity index 100% rename from libs/pytz/zoneinfo/WET rename to libs/common/pytz/zoneinfo/WET diff --git a/libs/pytz/zoneinfo/Zulu b/libs/common/pytz/zoneinfo/Zulu similarity index 100% rename from libs/pytz/zoneinfo/Zulu rename to libs/common/pytz/zoneinfo/Zulu diff --git a/libs/pytz/zoneinfo/iso3166.tab b/libs/common/pytz/zoneinfo/iso3166.tab similarity index 100% rename from libs/pytz/zoneinfo/iso3166.tab rename to libs/common/pytz/zoneinfo/iso3166.tab diff --git a/libs/pytz/zoneinfo/leapseconds b/libs/common/pytz/zoneinfo/leapseconds similarity index 100% rename from libs/pytz/zoneinfo/leapseconds rename to libs/common/pytz/zoneinfo/leapseconds diff --git a/libs/pytz/zoneinfo/posixrules b/libs/common/pytz/zoneinfo/posixrules similarity index 100% rename from libs/pytz/zoneinfo/posixrules rename to libs/common/pytz/zoneinfo/posixrules diff --git a/libs/pytz/zoneinfo/tzdata.zi b/libs/common/pytz/zoneinfo/tzdata.zi similarity index 100% rename from libs/pytz/zoneinfo/tzdata.zi rename to libs/common/pytz/zoneinfo/tzdata.zi diff --git a/libs/pytz/zoneinfo/zone.tab b/libs/common/pytz/zoneinfo/zone.tab similarity index 100% rename from libs/pytz/zoneinfo/zone.tab rename to libs/common/pytz/zoneinfo/zone.tab diff --git a/libs/pytz/zoneinfo/zone1970.tab b/libs/common/pytz/zoneinfo/zone1970.tab similarity index 100% rename from libs/pytz/zoneinfo/zone1970.tab rename to libs/common/pytz/zoneinfo/zone1970.tab diff --git a/libs/qbittorrent/__init__.py b/libs/common/qbittorrent/__init__.py similarity index 100% rename from libs/qbittorrent/__init__.py rename to libs/common/qbittorrent/__init__.py diff --git a/libs/qbittorrent/client.py b/libs/common/qbittorrent/client.py similarity index 100% rename from libs/qbittorrent/client.py rename to libs/common/qbittorrent/client.py diff --git a/libs/rarfile.py b/libs/common/rarfile.py similarity index 100% rename from libs/rarfile.py rename to libs/common/rarfile.py diff --git a/libs/rebulk/__init__.py b/libs/common/rebulk/__init__.py similarity index 100% rename from libs/rebulk/__init__.py rename to libs/common/rebulk/__init__.py diff --git a/libs/rebulk/__version__.py b/libs/common/rebulk/__version__.py similarity index 100% rename from libs/rebulk/__version__.py rename to libs/common/rebulk/__version__.py diff --git a/libs/rebulk/chain.py b/libs/common/rebulk/chain.py similarity index 100% rename from libs/rebulk/chain.py rename to libs/common/rebulk/chain.py diff --git a/libs/rebulk/debug.py b/libs/common/rebulk/debug.py similarity index 100% rename from libs/rebulk/debug.py rename to libs/common/rebulk/debug.py diff --git a/libs/rebulk/formatters.py b/libs/common/rebulk/formatters.py similarity index 100% rename from libs/rebulk/formatters.py rename to libs/common/rebulk/formatters.py diff --git a/libs/rebulk/introspector.py b/libs/common/rebulk/introspector.py similarity index 100% rename from libs/rebulk/introspector.py rename to libs/common/rebulk/introspector.py diff --git a/libs/rebulk/loose.py b/libs/common/rebulk/loose.py similarity index 100% rename from libs/rebulk/loose.py rename to libs/common/rebulk/loose.py diff --git a/libs/rebulk/match.py b/libs/common/rebulk/match.py similarity index 100% rename from libs/rebulk/match.py rename to libs/common/rebulk/match.py diff --git a/libs/rebulk/pattern.py b/libs/common/rebulk/pattern.py similarity index 100% rename from libs/rebulk/pattern.py rename to libs/common/rebulk/pattern.py diff --git a/libs/rebulk/processors.py b/libs/common/rebulk/processors.py similarity index 100% rename from libs/rebulk/processors.py rename to libs/common/rebulk/processors.py diff --git a/libs/rebulk/rebulk.py b/libs/common/rebulk/rebulk.py similarity index 100% rename from libs/rebulk/rebulk.py rename to libs/common/rebulk/rebulk.py diff --git a/libs/rebulk/remodule.py b/libs/common/rebulk/remodule.py similarity index 100% rename from libs/rebulk/remodule.py rename to libs/common/rebulk/remodule.py diff --git a/libs/rebulk/rules.py b/libs/common/rebulk/rules.py similarity index 100% rename from libs/rebulk/rules.py rename to libs/common/rebulk/rules.py diff --git a/libs/rebulk/test/__init__.py b/libs/common/rebulk/test/__init__.py similarity index 100% rename from libs/rebulk/test/__init__.py rename to libs/common/rebulk/test/__init__.py diff --git a/libs/rebulk/test/default_rules_module.py b/libs/common/rebulk/test/default_rules_module.py similarity index 100% rename from libs/rebulk/test/default_rules_module.py rename to libs/common/rebulk/test/default_rules_module.py diff --git a/libs/rebulk/test/rebulk_rules_module.py b/libs/common/rebulk/test/rebulk_rules_module.py similarity index 100% rename from libs/rebulk/test/rebulk_rules_module.py rename to libs/common/rebulk/test/rebulk_rules_module.py diff --git a/libs/rebulk/test/rules_module.py b/libs/common/rebulk/test/rules_module.py similarity index 100% rename from libs/rebulk/test/rules_module.py rename to libs/common/rebulk/test/rules_module.py diff --git a/libs/rebulk/test/test_chain.py b/libs/common/rebulk/test/test_chain.py similarity index 100% rename from libs/rebulk/test/test_chain.py rename to libs/common/rebulk/test/test_chain.py diff --git a/libs/rebulk/test/test_debug.py b/libs/common/rebulk/test/test_debug.py similarity index 100% rename from libs/rebulk/test/test_debug.py rename to libs/common/rebulk/test/test_debug.py diff --git a/libs/rebulk/test/test_introspector.py b/libs/common/rebulk/test/test_introspector.py similarity index 100% rename from libs/rebulk/test/test_introspector.py rename to libs/common/rebulk/test/test_introspector.py diff --git a/libs/rebulk/test/test_loose.py b/libs/common/rebulk/test/test_loose.py similarity index 100% rename from libs/rebulk/test/test_loose.py rename to libs/common/rebulk/test/test_loose.py diff --git a/libs/rebulk/test/test_match.py b/libs/common/rebulk/test/test_match.py similarity index 100% rename from libs/rebulk/test/test_match.py rename to libs/common/rebulk/test/test_match.py diff --git a/libs/rebulk/test/test_pattern.py b/libs/common/rebulk/test/test_pattern.py similarity index 100% rename from libs/rebulk/test/test_pattern.py rename to libs/common/rebulk/test/test_pattern.py diff --git a/libs/rebulk/test/test_processors.py b/libs/common/rebulk/test/test_processors.py similarity index 100% rename from libs/rebulk/test/test_processors.py rename to libs/common/rebulk/test/test_processors.py diff --git a/libs/rebulk/test/test_rebulk.py b/libs/common/rebulk/test/test_rebulk.py similarity index 100% rename from libs/rebulk/test/test_rebulk.py rename to libs/common/rebulk/test/test_rebulk.py diff --git a/libs/rebulk/test/test_rules.py b/libs/common/rebulk/test/test_rules.py similarity index 100% rename from libs/rebulk/test/test_rules.py rename to libs/common/rebulk/test/test_rules.py diff --git a/libs/rebulk/test/test_toposort.py b/libs/common/rebulk/test/test_toposort.py similarity index 100% rename from libs/rebulk/test/test_toposort.py rename to libs/common/rebulk/test/test_toposort.py diff --git a/libs/rebulk/test/test_validators.py b/libs/common/rebulk/test/test_validators.py similarity index 100% rename from libs/rebulk/test/test_validators.py rename to libs/common/rebulk/test/test_validators.py diff --git a/libs/rebulk/toposort.py b/libs/common/rebulk/toposort.py similarity index 100% rename from libs/rebulk/toposort.py rename to libs/common/rebulk/toposort.py diff --git a/libs/rebulk/utils.py b/libs/common/rebulk/utils.py similarity index 100% rename from libs/rebulk/utils.py rename to libs/common/rebulk/utils.py diff --git a/libs/rebulk/validators.py b/libs/common/rebulk/validators.py similarity index 100% rename from libs/rebulk/validators.py rename to libs/common/rebulk/validators.py diff --git a/libs/rencode/__init__.py b/libs/common/rencode/__init__.py similarity index 100% rename from libs/rencode/__init__.py rename to libs/common/rencode/__init__.py diff --git a/libs/rencode/rencode_orig.py b/libs/common/rencode/rencode_orig.py similarity index 100% rename from libs/rencode/rencode_orig.py rename to libs/common/rencode/rencode_orig.py diff --git a/libs/requests/__init__.py b/libs/common/requests/__init__.py similarity index 100% rename from libs/requests/__init__.py rename to libs/common/requests/__init__.py diff --git a/libs/requests/__version__.py b/libs/common/requests/__version__.py similarity index 100% rename from libs/requests/__version__.py rename to libs/common/requests/__version__.py diff --git a/libs/requests/_internal_utils.py b/libs/common/requests/_internal_utils.py similarity index 100% rename from libs/requests/_internal_utils.py rename to libs/common/requests/_internal_utils.py diff --git a/libs/requests/adapters.py b/libs/common/requests/adapters.py similarity index 100% rename from libs/requests/adapters.py rename to libs/common/requests/adapters.py diff --git a/libs/requests/api.py b/libs/common/requests/api.py similarity index 100% rename from libs/requests/api.py rename to libs/common/requests/api.py diff --git a/libs/requests/auth.py b/libs/common/requests/auth.py similarity index 100% rename from libs/requests/auth.py rename to libs/common/requests/auth.py diff --git a/libs/requests/certs.py b/libs/common/requests/certs.py similarity index 100% rename from libs/requests/certs.py rename to libs/common/requests/certs.py diff --git a/libs/requests/compat.py b/libs/common/requests/compat.py similarity index 100% rename from libs/requests/compat.py rename to libs/common/requests/compat.py diff --git a/libs/requests/cookies.py b/libs/common/requests/cookies.py similarity index 100% rename from libs/requests/cookies.py rename to libs/common/requests/cookies.py diff --git a/libs/requests/exceptions.py b/libs/common/requests/exceptions.py similarity index 100% rename from libs/requests/exceptions.py rename to libs/common/requests/exceptions.py diff --git a/libs/requests/help.py b/libs/common/requests/help.py similarity index 100% rename from libs/requests/help.py rename to libs/common/requests/help.py diff --git a/libs/requests/hooks.py b/libs/common/requests/hooks.py similarity index 100% rename from libs/requests/hooks.py rename to libs/common/requests/hooks.py diff --git a/libs/requests/models.py b/libs/common/requests/models.py similarity index 100% rename from libs/requests/models.py rename to libs/common/requests/models.py diff --git a/libs/requests/packages.py b/libs/common/requests/packages.py similarity index 100% rename from libs/requests/packages.py rename to libs/common/requests/packages.py diff --git a/libs/requests/sessions.py b/libs/common/requests/sessions.py similarity index 100% rename from libs/requests/sessions.py rename to libs/common/requests/sessions.py diff --git a/libs/requests/status_codes.py b/libs/common/requests/status_codes.py similarity index 100% rename from libs/requests/status_codes.py rename to libs/common/requests/status_codes.py diff --git a/libs/requests/structures.py b/libs/common/requests/structures.py similarity index 100% rename from libs/requests/structures.py rename to libs/common/requests/structures.py diff --git a/libs/requests/utils.py b/libs/common/requests/utils.py similarity index 100% rename from libs/requests/utils.py rename to libs/common/requests/utils.py diff --git a/libs/setuptools/__init__.py b/libs/common/setuptools/__init__.py similarity index 100% rename from libs/setuptools/__init__.py rename to libs/common/setuptools/__init__.py diff --git a/libs/setuptools/_deprecation_warning.py b/libs/common/setuptools/_deprecation_warning.py similarity index 100% rename from libs/setuptools/_deprecation_warning.py rename to libs/common/setuptools/_deprecation_warning.py diff --git a/libs/jaraco/classes/__init__.py b/libs/common/setuptools/_vendor/__init__.py similarity index 100% rename from libs/jaraco/classes/__init__.py rename to libs/common/setuptools/_vendor/__init__.py diff --git a/libs/setuptools/_vendor/packaging/__about__.py b/libs/common/setuptools/_vendor/packaging/__about__.py similarity index 100% rename from libs/setuptools/_vendor/packaging/__about__.py rename to libs/common/setuptools/_vendor/packaging/__about__.py diff --git a/libs/setuptools/_vendor/packaging/__init__.py b/libs/common/setuptools/_vendor/packaging/__init__.py similarity index 100% rename from libs/setuptools/_vendor/packaging/__init__.py rename to libs/common/setuptools/_vendor/packaging/__init__.py diff --git a/libs/setuptools/_vendor/packaging/_compat.py b/libs/common/setuptools/_vendor/packaging/_compat.py similarity index 100% rename from libs/setuptools/_vendor/packaging/_compat.py rename to libs/common/setuptools/_vendor/packaging/_compat.py diff --git a/libs/setuptools/_vendor/packaging/_structures.py b/libs/common/setuptools/_vendor/packaging/_structures.py similarity index 100% rename from libs/setuptools/_vendor/packaging/_structures.py rename to libs/common/setuptools/_vendor/packaging/_structures.py diff --git a/libs/setuptools/_vendor/packaging/markers.py b/libs/common/setuptools/_vendor/packaging/markers.py similarity index 100% rename from libs/setuptools/_vendor/packaging/markers.py rename to libs/common/setuptools/_vendor/packaging/markers.py diff --git a/libs/setuptools/_vendor/packaging/requirements.py b/libs/common/setuptools/_vendor/packaging/requirements.py similarity index 100% rename from libs/setuptools/_vendor/packaging/requirements.py rename to libs/common/setuptools/_vendor/packaging/requirements.py diff --git a/libs/setuptools/_vendor/packaging/specifiers.py b/libs/common/setuptools/_vendor/packaging/specifiers.py similarity index 100% rename from libs/setuptools/_vendor/packaging/specifiers.py rename to libs/common/setuptools/_vendor/packaging/specifiers.py diff --git a/libs/setuptools/_vendor/packaging/utils.py b/libs/common/setuptools/_vendor/packaging/utils.py similarity index 100% rename from libs/setuptools/_vendor/packaging/utils.py rename to libs/common/setuptools/_vendor/packaging/utils.py diff --git a/libs/setuptools/_vendor/packaging/version.py b/libs/common/setuptools/_vendor/packaging/version.py similarity index 100% rename from libs/setuptools/_vendor/packaging/version.py rename to libs/common/setuptools/_vendor/packaging/version.py diff --git a/libs/setuptools/_vendor/pyparsing.py b/libs/common/setuptools/_vendor/pyparsing.py similarity index 100% rename from libs/setuptools/_vendor/pyparsing.py rename to libs/common/setuptools/_vendor/pyparsing.py diff --git a/libs/setuptools/_vendor/six.py b/libs/common/setuptools/_vendor/six.py similarity index 100% rename from libs/setuptools/_vendor/six.py rename to libs/common/setuptools/_vendor/six.py diff --git a/libs/setuptools/archive_util.py b/libs/common/setuptools/archive_util.py similarity index 100% rename from libs/setuptools/archive_util.py rename to libs/common/setuptools/archive_util.py diff --git a/libs/setuptools/build_meta.py b/libs/common/setuptools/build_meta.py similarity index 100% rename from libs/setuptools/build_meta.py rename to libs/common/setuptools/build_meta.py diff --git a/libs/setuptools/cli-32.exe b/libs/common/setuptools/cli-32.exe similarity index 100% rename from libs/setuptools/cli-32.exe rename to libs/common/setuptools/cli-32.exe diff --git a/libs/setuptools/cli-64.exe b/libs/common/setuptools/cli-64.exe similarity index 100% rename from libs/setuptools/cli-64.exe rename to libs/common/setuptools/cli-64.exe diff --git a/libs/setuptools/cli.exe b/libs/common/setuptools/cli.exe similarity index 100% rename from libs/setuptools/cli.exe rename to libs/common/setuptools/cli.exe diff --git a/libs/setuptools/command/__init__.py b/libs/common/setuptools/command/__init__.py similarity index 100% rename from libs/setuptools/command/__init__.py rename to libs/common/setuptools/command/__init__.py diff --git a/libs/setuptools/command/alias.py b/libs/common/setuptools/command/alias.py similarity index 100% rename from libs/setuptools/command/alias.py rename to libs/common/setuptools/command/alias.py diff --git a/libs/setuptools/command/bdist_egg.py b/libs/common/setuptools/command/bdist_egg.py similarity index 100% rename from libs/setuptools/command/bdist_egg.py rename to libs/common/setuptools/command/bdist_egg.py diff --git a/libs/setuptools/command/bdist_rpm.py b/libs/common/setuptools/command/bdist_rpm.py similarity index 100% rename from libs/setuptools/command/bdist_rpm.py rename to libs/common/setuptools/command/bdist_rpm.py diff --git a/libs/setuptools/command/bdist_wininst.py b/libs/common/setuptools/command/bdist_wininst.py similarity index 100% rename from libs/setuptools/command/bdist_wininst.py rename to libs/common/setuptools/command/bdist_wininst.py diff --git a/libs/setuptools/command/build_clib.py b/libs/common/setuptools/command/build_clib.py similarity index 100% rename from libs/setuptools/command/build_clib.py rename to libs/common/setuptools/command/build_clib.py diff --git a/libs/setuptools/command/build_ext.py b/libs/common/setuptools/command/build_ext.py similarity index 100% rename from libs/setuptools/command/build_ext.py rename to libs/common/setuptools/command/build_ext.py diff --git a/libs/setuptools/command/build_py.py b/libs/common/setuptools/command/build_py.py similarity index 100% rename from libs/setuptools/command/build_py.py rename to libs/common/setuptools/command/build_py.py diff --git a/libs/setuptools/command/develop.py b/libs/common/setuptools/command/develop.py similarity index 100% rename from libs/setuptools/command/develop.py rename to libs/common/setuptools/command/develop.py diff --git a/libs/setuptools/command/dist_info.py b/libs/common/setuptools/command/dist_info.py similarity index 100% rename from libs/setuptools/command/dist_info.py rename to libs/common/setuptools/command/dist_info.py diff --git a/libs/setuptools/command/easy_install.py b/libs/common/setuptools/command/easy_install.py similarity index 100% rename from libs/setuptools/command/easy_install.py rename to libs/common/setuptools/command/easy_install.py diff --git a/libs/setuptools/command/egg_info.py b/libs/common/setuptools/command/egg_info.py similarity index 100% rename from libs/setuptools/command/egg_info.py rename to libs/common/setuptools/command/egg_info.py diff --git a/libs/setuptools/command/install.py b/libs/common/setuptools/command/install.py similarity index 100% rename from libs/setuptools/command/install.py rename to libs/common/setuptools/command/install.py diff --git a/libs/setuptools/command/install_egg_info.py b/libs/common/setuptools/command/install_egg_info.py similarity index 100% rename from libs/setuptools/command/install_egg_info.py rename to libs/common/setuptools/command/install_egg_info.py diff --git a/libs/setuptools/command/install_lib.py b/libs/common/setuptools/command/install_lib.py similarity index 100% rename from libs/setuptools/command/install_lib.py rename to libs/common/setuptools/command/install_lib.py diff --git a/libs/setuptools/command/install_scripts.py b/libs/common/setuptools/command/install_scripts.py similarity index 100% rename from libs/setuptools/command/install_scripts.py rename to libs/common/setuptools/command/install_scripts.py diff --git a/libs/setuptools/command/launcher manifest.xml b/libs/common/setuptools/command/launcher manifest.xml similarity index 100% rename from libs/setuptools/command/launcher manifest.xml rename to libs/common/setuptools/command/launcher manifest.xml diff --git a/libs/setuptools/command/py36compat.py b/libs/common/setuptools/command/py36compat.py similarity index 100% rename from libs/setuptools/command/py36compat.py rename to libs/common/setuptools/command/py36compat.py diff --git a/libs/setuptools/command/register.py b/libs/common/setuptools/command/register.py similarity index 100% rename from libs/setuptools/command/register.py rename to libs/common/setuptools/command/register.py diff --git a/libs/setuptools/command/rotate.py b/libs/common/setuptools/command/rotate.py similarity index 100% rename from libs/setuptools/command/rotate.py rename to libs/common/setuptools/command/rotate.py diff --git a/libs/setuptools/command/saveopts.py b/libs/common/setuptools/command/saveopts.py similarity index 100% rename from libs/setuptools/command/saveopts.py rename to libs/common/setuptools/command/saveopts.py diff --git a/libs/setuptools/command/sdist.py b/libs/common/setuptools/command/sdist.py similarity index 100% rename from libs/setuptools/command/sdist.py rename to libs/common/setuptools/command/sdist.py diff --git a/libs/setuptools/command/setopt.py b/libs/common/setuptools/command/setopt.py similarity index 100% rename from libs/setuptools/command/setopt.py rename to libs/common/setuptools/command/setopt.py diff --git a/libs/setuptools/command/test.py b/libs/common/setuptools/command/test.py similarity index 100% rename from libs/setuptools/command/test.py rename to libs/common/setuptools/command/test.py diff --git a/libs/setuptools/command/upload.py b/libs/common/setuptools/command/upload.py similarity index 100% rename from libs/setuptools/command/upload.py rename to libs/common/setuptools/command/upload.py diff --git a/libs/setuptools/command/upload_docs.py b/libs/common/setuptools/command/upload_docs.py similarity index 100% rename from libs/setuptools/command/upload_docs.py rename to libs/common/setuptools/command/upload_docs.py diff --git a/libs/setuptools/config.py b/libs/common/setuptools/config.py similarity index 100% rename from libs/setuptools/config.py rename to libs/common/setuptools/config.py diff --git a/libs/setuptools/dep_util.py b/libs/common/setuptools/dep_util.py similarity index 100% rename from libs/setuptools/dep_util.py rename to libs/common/setuptools/dep_util.py diff --git a/libs/setuptools/depends.py b/libs/common/setuptools/depends.py similarity index 100% rename from libs/setuptools/depends.py rename to libs/common/setuptools/depends.py diff --git a/libs/setuptools/dist.py b/libs/common/setuptools/dist.py similarity index 100% rename from libs/setuptools/dist.py rename to libs/common/setuptools/dist.py diff --git a/libs/setuptools/extension.py b/libs/common/setuptools/extension.py similarity index 100% rename from libs/setuptools/extension.py rename to libs/common/setuptools/extension.py diff --git a/libs/setuptools/extern/__init__.py b/libs/common/setuptools/extern/__init__.py similarity index 100% rename from libs/setuptools/extern/__init__.py rename to libs/common/setuptools/extern/__init__.py diff --git a/libs/setuptools/glibc.py b/libs/common/setuptools/glibc.py similarity index 100% rename from libs/setuptools/glibc.py rename to libs/common/setuptools/glibc.py diff --git a/libs/setuptools/glob.py b/libs/common/setuptools/glob.py similarity index 100% rename from libs/setuptools/glob.py rename to libs/common/setuptools/glob.py diff --git a/libs/setuptools/gui-32.exe b/libs/common/setuptools/gui-32.exe similarity index 100% rename from libs/setuptools/gui-32.exe rename to libs/common/setuptools/gui-32.exe diff --git a/libs/setuptools/gui-64.exe b/libs/common/setuptools/gui-64.exe similarity index 100% rename from libs/setuptools/gui-64.exe rename to libs/common/setuptools/gui-64.exe diff --git a/libs/setuptools/gui.exe b/libs/common/setuptools/gui.exe similarity index 100% rename from libs/setuptools/gui.exe rename to libs/common/setuptools/gui.exe diff --git a/libs/setuptools/launch.py b/libs/common/setuptools/launch.py similarity index 100% rename from libs/setuptools/launch.py rename to libs/common/setuptools/launch.py diff --git a/libs/setuptools/lib2to3_ex.py b/libs/common/setuptools/lib2to3_ex.py similarity index 100% rename from libs/setuptools/lib2to3_ex.py rename to libs/common/setuptools/lib2to3_ex.py diff --git a/libs/setuptools/monkey.py b/libs/common/setuptools/monkey.py similarity index 100% rename from libs/setuptools/monkey.py rename to libs/common/setuptools/monkey.py diff --git a/libs/setuptools/msvc.py b/libs/common/setuptools/msvc.py similarity index 100% rename from libs/setuptools/msvc.py rename to libs/common/setuptools/msvc.py diff --git a/libs/setuptools/namespaces.py b/libs/common/setuptools/namespaces.py similarity index 100% rename from libs/setuptools/namespaces.py rename to libs/common/setuptools/namespaces.py diff --git a/libs/setuptools/package_index.py b/libs/common/setuptools/package_index.py similarity index 100% rename from libs/setuptools/package_index.py rename to libs/common/setuptools/package_index.py diff --git a/libs/setuptools/pep425tags.py b/libs/common/setuptools/pep425tags.py similarity index 100% rename from libs/setuptools/pep425tags.py rename to libs/common/setuptools/pep425tags.py diff --git a/libs/setuptools/py27compat.py b/libs/common/setuptools/py27compat.py similarity index 100% rename from libs/setuptools/py27compat.py rename to libs/common/setuptools/py27compat.py diff --git a/libs/setuptools/py31compat.py b/libs/common/setuptools/py31compat.py similarity index 100% rename from libs/setuptools/py31compat.py rename to libs/common/setuptools/py31compat.py diff --git a/libs/setuptools/py33compat.py b/libs/common/setuptools/py33compat.py similarity index 100% rename from libs/setuptools/py33compat.py rename to libs/common/setuptools/py33compat.py diff --git a/libs/setuptools/py36compat.py b/libs/common/setuptools/py36compat.py similarity index 100% rename from libs/setuptools/py36compat.py rename to libs/common/setuptools/py36compat.py diff --git a/libs/setuptools/sandbox.py b/libs/common/setuptools/sandbox.py similarity index 100% rename from libs/setuptools/sandbox.py rename to libs/common/setuptools/sandbox.py diff --git a/libs/setuptools/script (dev).tmpl b/libs/common/setuptools/script (dev).tmpl similarity index 100% rename from libs/setuptools/script (dev).tmpl rename to libs/common/setuptools/script (dev).tmpl diff --git a/libs/setuptools/script.tmpl b/libs/common/setuptools/script.tmpl similarity index 100% rename from libs/setuptools/script.tmpl rename to libs/common/setuptools/script.tmpl diff --git a/libs/setuptools/site-patch.py b/libs/common/setuptools/site-patch.py similarity index 100% rename from libs/setuptools/site-patch.py rename to libs/common/setuptools/site-patch.py diff --git a/libs/setuptools/ssl_support.py b/libs/common/setuptools/ssl_support.py similarity index 100% rename from libs/setuptools/ssl_support.py rename to libs/common/setuptools/ssl_support.py diff --git a/libs/setuptools/unicode_utils.py b/libs/common/setuptools/unicode_utils.py similarity index 100% rename from libs/setuptools/unicode_utils.py rename to libs/common/setuptools/unicode_utils.py diff --git a/libs/setuptools/version.py b/libs/common/setuptools/version.py similarity index 100% rename from libs/setuptools/version.py rename to libs/common/setuptools/version.py diff --git a/libs/setuptools/wheel.py b/libs/common/setuptools/wheel.py similarity index 100% rename from libs/setuptools/wheel.py rename to libs/common/setuptools/wheel.py diff --git a/libs/setuptools/windows_support.py b/libs/common/setuptools/windows_support.py similarity index 100% rename from libs/setuptools/windows_support.py rename to libs/common/setuptools/windows_support.py diff --git a/libs/six.py b/libs/common/six.py similarity index 100% rename from libs/six.py rename to libs/common/six.py diff --git a/libs/stevedore/__init__.py b/libs/common/stevedore/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/__init__.py rename to libs/common/stevedore/__init__.py diff --git a/libs/stevedore/dispatch.py b/libs/common/stevedore/dispatch.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/dispatch.py rename to libs/common/stevedore/dispatch.py diff --git a/libs/stevedore/driver.py b/libs/common/stevedore/driver.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/driver.py rename to libs/common/stevedore/driver.py diff --git a/libs/stevedore/enabled.py b/libs/common/stevedore/enabled.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/enabled.py rename to libs/common/stevedore/enabled.py diff --git a/libs/jaraco/structures/__init__.py b/libs/common/stevedore/example/__init__.py similarity index 100% rename from libs/jaraco/structures/__init__.py rename to libs/common/stevedore/example/__init__.py diff --git a/libs/stevedore/example/base.py b/libs/common/stevedore/example/base.py similarity index 100% rename from libs/stevedore/example/base.py rename to libs/common/stevedore/example/base.py diff --git a/libs/stevedore/example/load_as_driver.py b/libs/common/stevedore/example/load_as_driver.py similarity index 100% rename from libs/stevedore/example/load_as_driver.py rename to libs/common/stevedore/example/load_as_driver.py diff --git a/libs/stevedore/example/load_as_extension.py b/libs/common/stevedore/example/load_as_extension.py similarity index 100% rename from libs/stevedore/example/load_as_extension.py rename to libs/common/stevedore/example/load_as_extension.py diff --git a/libs/stevedore/example/setup.py b/libs/common/stevedore/example/setup.py similarity index 100% rename from libs/stevedore/example/setup.py rename to libs/common/stevedore/example/setup.py diff --git a/libs/stevedore/example/simple.py b/libs/common/stevedore/example/simple.py similarity index 100% rename from libs/stevedore/example/simple.py rename to libs/common/stevedore/example/simple.py diff --git a/libs/jaraco/ui/__init__.py b/libs/common/stevedore/example2/__init__.py similarity index 100% rename from libs/jaraco/ui/__init__.py rename to libs/common/stevedore/example2/__init__.py diff --git a/libs/stevedore/example2/fields.py b/libs/common/stevedore/example2/fields.py similarity index 100% rename from libs/stevedore/example2/fields.py rename to libs/common/stevedore/example2/fields.py diff --git a/libs/stevedore/example2/setup.py b/libs/common/stevedore/example2/setup.py similarity index 100% rename from libs/stevedore/example2/setup.py rename to libs/common/stevedore/example2/setup.py diff --git a/libs/stevedore/exception.py b/libs/common/stevedore/exception.py similarity index 100% rename from libs/stevedore/exception.py rename to libs/common/stevedore/exception.py diff --git a/libs/stevedore/extension.py b/libs/common/stevedore/extension.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/extension.py rename to libs/common/stevedore/extension.py diff --git a/libs/stevedore/hook.py b/libs/common/stevedore/hook.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/hook.py rename to libs/common/stevedore/hook.py diff --git a/libs/stevedore/named.py b/libs/common/stevedore/named.py old mode 100755 new mode 100644 similarity index 100% rename from libs/stevedore/named.py rename to libs/common/stevedore/named.py diff --git a/libs/stevedore/sphinxext.py b/libs/common/stevedore/sphinxext.py similarity index 100% rename from libs/stevedore/sphinxext.py rename to libs/common/stevedore/sphinxext.py diff --git a/libs/jaraco/windows/api/__init__.py b/libs/common/stevedore/tests/__init__.py similarity index 100% rename from libs/jaraco/windows/api/__init__.py rename to libs/common/stevedore/tests/__init__.py diff --git a/libs/stevedore/tests/extension_unimportable.py b/libs/common/stevedore/tests/extension_unimportable.py similarity index 100% rename from libs/stevedore/tests/extension_unimportable.py rename to libs/common/stevedore/tests/extension_unimportable.py diff --git a/libs/stevedore/tests/manager.py b/libs/common/stevedore/tests/manager.py similarity index 100% rename from libs/stevedore/tests/manager.py rename to libs/common/stevedore/tests/manager.py diff --git a/libs/stevedore/tests/test_callback.py b/libs/common/stevedore/tests/test_callback.py similarity index 100% rename from libs/stevedore/tests/test_callback.py rename to libs/common/stevedore/tests/test_callback.py diff --git a/libs/stevedore/tests/test_dispatch.py b/libs/common/stevedore/tests/test_dispatch.py similarity index 100% rename from libs/stevedore/tests/test_dispatch.py rename to libs/common/stevedore/tests/test_dispatch.py diff --git a/libs/stevedore/tests/test_driver.py b/libs/common/stevedore/tests/test_driver.py similarity index 100% rename from libs/stevedore/tests/test_driver.py rename to libs/common/stevedore/tests/test_driver.py diff --git a/libs/stevedore/tests/test_enabled.py b/libs/common/stevedore/tests/test_enabled.py similarity index 100% rename from libs/stevedore/tests/test_enabled.py rename to libs/common/stevedore/tests/test_enabled.py diff --git a/libs/stevedore/tests/test_example_fields.py b/libs/common/stevedore/tests/test_example_fields.py similarity index 100% rename from libs/stevedore/tests/test_example_fields.py rename to libs/common/stevedore/tests/test_example_fields.py diff --git a/libs/stevedore/tests/test_example_simple.py b/libs/common/stevedore/tests/test_example_simple.py similarity index 100% rename from libs/stevedore/tests/test_example_simple.py rename to libs/common/stevedore/tests/test_example_simple.py diff --git a/libs/stevedore/tests/test_extension.py b/libs/common/stevedore/tests/test_extension.py similarity index 100% rename from libs/stevedore/tests/test_extension.py rename to libs/common/stevedore/tests/test_extension.py diff --git a/libs/stevedore/tests/test_hook.py b/libs/common/stevedore/tests/test_hook.py similarity index 100% rename from libs/stevedore/tests/test_hook.py rename to libs/common/stevedore/tests/test_hook.py diff --git a/libs/stevedore/tests/test_named.py b/libs/common/stevedore/tests/test_named.py similarity index 100% rename from libs/stevedore/tests/test_named.py rename to libs/common/stevedore/tests/test_named.py diff --git a/libs/stevedore/tests/test_sphinxext.py b/libs/common/stevedore/tests/test_sphinxext.py similarity index 100% rename from libs/stevedore/tests/test_sphinxext.py rename to libs/common/stevedore/tests/test_sphinxext.py diff --git a/libs/stevedore/tests/test_test_manager.py b/libs/common/stevedore/tests/test_test_manager.py similarity index 100% rename from libs/stevedore/tests/test_test_manager.py rename to libs/common/stevedore/tests/test_test_manager.py diff --git a/libs/stevedore/tests/utils.py b/libs/common/stevedore/tests/utils.py similarity index 100% rename from libs/stevedore/tests/utils.py rename to libs/common/stevedore/tests/utils.py diff --git a/libs/subliminal/__init__.py b/libs/common/subliminal/__init__.py similarity index 100% rename from libs/subliminal/__init__.py rename to libs/common/subliminal/__init__.py diff --git a/libs/subliminal/cache.py b/libs/common/subliminal/cache.py similarity index 100% rename from libs/subliminal/cache.py rename to libs/common/subliminal/cache.py diff --git a/libs/subliminal/cli.py b/libs/common/subliminal/cli.py similarity index 100% rename from libs/subliminal/cli.py rename to libs/common/subliminal/cli.py diff --git a/libs/more_itertools/tests/__init__.py b/libs/common/subliminal/converters/__init__.py similarity index 100% rename from libs/more_itertools/tests/__init__.py rename to libs/common/subliminal/converters/__init__.py diff --git a/libs/subliminal/converters/addic7ed.py b/libs/common/subliminal/converters/addic7ed.py similarity index 100% rename from libs/subliminal/converters/addic7ed.py rename to libs/common/subliminal/converters/addic7ed.py diff --git a/libs/subliminal/converters/legendastv.py b/libs/common/subliminal/converters/legendastv.py similarity index 100% rename from libs/subliminal/converters/legendastv.py rename to libs/common/subliminal/converters/legendastv.py diff --git a/libs/subliminal/converters/shooter.py b/libs/common/subliminal/converters/shooter.py similarity index 100% rename from libs/subliminal/converters/shooter.py rename to libs/common/subliminal/converters/shooter.py diff --git a/libs/subliminal/converters/thesubdb.py b/libs/common/subliminal/converters/thesubdb.py similarity index 100% rename from libs/subliminal/converters/thesubdb.py rename to libs/common/subliminal/converters/thesubdb.py diff --git a/libs/subliminal/converters/tvsubtitles.py b/libs/common/subliminal/converters/tvsubtitles.py similarity index 100% rename from libs/subliminal/converters/tvsubtitles.py rename to libs/common/subliminal/converters/tvsubtitles.py diff --git a/libs/subliminal/core.py b/libs/common/subliminal/core.py similarity index 100% rename from libs/subliminal/core.py rename to libs/common/subliminal/core.py diff --git a/libs/subliminal/exceptions.py b/libs/common/subliminal/exceptions.py similarity index 100% rename from libs/subliminal/exceptions.py rename to libs/common/subliminal/exceptions.py diff --git a/libs/subliminal/extensions.py b/libs/common/subliminal/extensions.py similarity index 100% rename from libs/subliminal/extensions.py rename to libs/common/subliminal/extensions.py diff --git a/libs/subliminal/providers/__init__.py b/libs/common/subliminal/providers/__init__.py similarity index 100% rename from libs/subliminal/providers/__init__.py rename to libs/common/subliminal/providers/__init__.py diff --git a/libs/subliminal/providers/addic7ed.py b/libs/common/subliminal/providers/addic7ed.py similarity index 100% rename from libs/subliminal/providers/addic7ed.py rename to libs/common/subliminal/providers/addic7ed.py diff --git a/libs/subliminal/providers/legendastv.py b/libs/common/subliminal/providers/legendastv.py similarity index 100% rename from libs/subliminal/providers/legendastv.py rename to libs/common/subliminal/providers/legendastv.py diff --git a/libs/subliminal/providers/napiprojekt.py b/libs/common/subliminal/providers/napiprojekt.py similarity index 100% rename from libs/subliminal/providers/napiprojekt.py rename to libs/common/subliminal/providers/napiprojekt.py diff --git a/libs/subliminal/providers/opensubtitles.py b/libs/common/subliminal/providers/opensubtitles.py similarity index 100% rename from libs/subliminal/providers/opensubtitles.py rename to libs/common/subliminal/providers/opensubtitles.py diff --git a/libs/subliminal/providers/podnapisi.py b/libs/common/subliminal/providers/podnapisi.py similarity index 100% rename from libs/subliminal/providers/podnapisi.py rename to libs/common/subliminal/providers/podnapisi.py diff --git a/libs/subliminal/providers/shooter.py b/libs/common/subliminal/providers/shooter.py similarity index 100% rename from libs/subliminal/providers/shooter.py rename to libs/common/subliminal/providers/shooter.py diff --git a/libs/subliminal/providers/subscenter.py b/libs/common/subliminal/providers/subscenter.py similarity index 100% rename from libs/subliminal/providers/subscenter.py rename to libs/common/subliminal/providers/subscenter.py diff --git a/libs/subliminal/providers/thesubdb.py b/libs/common/subliminal/providers/thesubdb.py similarity index 100% rename from libs/subliminal/providers/thesubdb.py rename to libs/common/subliminal/providers/thesubdb.py diff --git a/libs/subliminal/providers/tvsubtitles.py b/libs/common/subliminal/providers/tvsubtitles.py similarity index 100% rename from libs/subliminal/providers/tvsubtitles.py rename to libs/common/subliminal/providers/tvsubtitles.py diff --git a/libs/subliminal/refiners/__init__.py b/libs/common/subliminal/refiners/__init__.py similarity index 100% rename from libs/subliminal/refiners/__init__.py rename to libs/common/subliminal/refiners/__init__.py diff --git a/libs/subliminal/refiners/metadata.py b/libs/common/subliminal/refiners/metadata.py similarity index 100% rename from libs/subliminal/refiners/metadata.py rename to libs/common/subliminal/refiners/metadata.py diff --git a/libs/subliminal/refiners/omdb.py b/libs/common/subliminal/refiners/omdb.py similarity index 100% rename from libs/subliminal/refiners/omdb.py rename to libs/common/subliminal/refiners/omdb.py diff --git a/libs/subliminal/refiners/tvdb.py b/libs/common/subliminal/refiners/tvdb.py similarity index 100% rename from libs/subliminal/refiners/tvdb.py rename to libs/common/subliminal/refiners/tvdb.py diff --git a/libs/subliminal/score.py b/libs/common/subliminal/score.py old mode 100755 new mode 100644 similarity index 100% rename from libs/subliminal/score.py rename to libs/common/subliminal/score.py diff --git a/libs/subliminal/subtitle.py b/libs/common/subliminal/subtitle.py similarity index 100% rename from libs/subliminal/subtitle.py rename to libs/common/subliminal/subtitle.py diff --git a/libs/subliminal/subtitles/__init__.py b/libs/common/subliminal/subtitles/__init__.py similarity index 100% rename from libs/subliminal/subtitles/__init__.py rename to libs/common/subliminal/subtitles/__init__.py diff --git a/libs/subliminal/subtitles/subrip.py b/libs/common/subliminal/subtitles/subrip.py similarity index 100% rename from libs/subliminal/subtitles/subrip.py rename to libs/common/subliminal/subtitles/subrip.py diff --git a/libs/subliminal/utils.py b/libs/common/subliminal/utils.py similarity index 100% rename from libs/subliminal/utils.py rename to libs/common/subliminal/utils.py diff --git a/libs/subliminal/video.py b/libs/common/subliminal/video.py similarity index 100% rename from libs/subliminal/video.py rename to libs/common/subliminal/video.py diff --git a/libs/transmissionrpc/__init__.py b/libs/common/transmissionrpc/__init__.py similarity index 100% rename from libs/transmissionrpc/__init__.py rename to libs/common/transmissionrpc/__init__.py diff --git a/libs/transmissionrpc/client.py b/libs/common/transmissionrpc/client.py similarity index 100% rename from libs/transmissionrpc/client.py rename to libs/common/transmissionrpc/client.py diff --git a/libs/transmissionrpc/constants.py b/libs/common/transmissionrpc/constants.py similarity index 100% rename from libs/transmissionrpc/constants.py rename to libs/common/transmissionrpc/constants.py diff --git a/libs/transmissionrpc/error.py b/libs/common/transmissionrpc/error.py similarity index 100% rename from libs/transmissionrpc/error.py rename to libs/common/transmissionrpc/error.py diff --git a/libs/transmissionrpc/httphandler.py b/libs/common/transmissionrpc/httphandler.py similarity index 100% rename from libs/transmissionrpc/httphandler.py rename to libs/common/transmissionrpc/httphandler.py diff --git a/libs/transmissionrpc/session.py b/libs/common/transmissionrpc/session.py similarity index 100% rename from libs/transmissionrpc/session.py rename to libs/common/transmissionrpc/session.py diff --git a/libs/transmissionrpc/torrent.py b/libs/common/transmissionrpc/torrent.py similarity index 100% rename from libs/transmissionrpc/torrent.py rename to libs/common/transmissionrpc/torrent.py diff --git a/libs/transmissionrpc/utils.py b/libs/common/transmissionrpc/utils.py similarity index 100% rename from libs/transmissionrpc/utils.py rename to libs/common/transmissionrpc/utils.py diff --git a/libs/unidecode/__init__.py b/libs/common/unidecode/__init__.py similarity index 100% rename from libs/unidecode/__init__.py rename to libs/common/unidecode/__init__.py diff --git a/libs/unidecode/util.py b/libs/common/unidecode/util.py similarity index 100% rename from libs/unidecode/util.py rename to libs/common/unidecode/util.py diff --git a/libs/unidecode/x000.py b/libs/common/unidecode/x000.py similarity index 100% rename from libs/unidecode/x000.py rename to libs/common/unidecode/x000.py diff --git a/libs/unidecode/x001.py b/libs/common/unidecode/x001.py similarity index 100% rename from libs/unidecode/x001.py rename to libs/common/unidecode/x001.py diff --git a/libs/unidecode/x002.py b/libs/common/unidecode/x002.py similarity index 100% rename from libs/unidecode/x002.py rename to libs/common/unidecode/x002.py diff --git a/libs/unidecode/x003.py b/libs/common/unidecode/x003.py similarity index 100% rename from libs/unidecode/x003.py rename to libs/common/unidecode/x003.py diff --git a/libs/unidecode/x004.py b/libs/common/unidecode/x004.py similarity index 100% rename from libs/unidecode/x004.py rename to libs/common/unidecode/x004.py diff --git a/libs/unidecode/x005.py b/libs/common/unidecode/x005.py similarity index 100% rename from libs/unidecode/x005.py rename to libs/common/unidecode/x005.py diff --git a/libs/unidecode/x006.py b/libs/common/unidecode/x006.py similarity index 100% rename from libs/unidecode/x006.py rename to libs/common/unidecode/x006.py diff --git a/libs/unidecode/x007.py b/libs/common/unidecode/x007.py similarity index 100% rename from libs/unidecode/x007.py rename to libs/common/unidecode/x007.py diff --git a/libs/unidecode/x009.py b/libs/common/unidecode/x009.py similarity index 100% rename from libs/unidecode/x009.py rename to libs/common/unidecode/x009.py diff --git a/libs/unidecode/x00a.py b/libs/common/unidecode/x00a.py similarity index 100% rename from libs/unidecode/x00a.py rename to libs/common/unidecode/x00a.py diff --git a/libs/unidecode/x00b.py b/libs/common/unidecode/x00b.py similarity index 100% rename from libs/unidecode/x00b.py rename to libs/common/unidecode/x00b.py diff --git a/libs/unidecode/x00c.py b/libs/common/unidecode/x00c.py similarity index 100% rename from libs/unidecode/x00c.py rename to libs/common/unidecode/x00c.py diff --git a/libs/unidecode/x00d.py b/libs/common/unidecode/x00d.py similarity index 100% rename from libs/unidecode/x00d.py rename to libs/common/unidecode/x00d.py diff --git a/libs/unidecode/x00e.py b/libs/common/unidecode/x00e.py similarity index 100% rename from libs/unidecode/x00e.py rename to libs/common/unidecode/x00e.py diff --git a/libs/unidecode/x00f.py b/libs/common/unidecode/x00f.py similarity index 100% rename from libs/unidecode/x00f.py rename to libs/common/unidecode/x00f.py diff --git a/libs/unidecode/x010.py b/libs/common/unidecode/x010.py similarity index 100% rename from libs/unidecode/x010.py rename to libs/common/unidecode/x010.py diff --git a/libs/unidecode/x011.py b/libs/common/unidecode/x011.py similarity index 100% rename from libs/unidecode/x011.py rename to libs/common/unidecode/x011.py diff --git a/libs/unidecode/x012.py b/libs/common/unidecode/x012.py similarity index 100% rename from libs/unidecode/x012.py rename to libs/common/unidecode/x012.py diff --git a/libs/unidecode/x013.py b/libs/common/unidecode/x013.py similarity index 100% rename from libs/unidecode/x013.py rename to libs/common/unidecode/x013.py diff --git a/libs/unidecode/x014.py b/libs/common/unidecode/x014.py similarity index 100% rename from libs/unidecode/x014.py rename to libs/common/unidecode/x014.py diff --git a/libs/unidecode/x015.py b/libs/common/unidecode/x015.py similarity index 100% rename from libs/unidecode/x015.py rename to libs/common/unidecode/x015.py diff --git a/libs/unidecode/x016.py b/libs/common/unidecode/x016.py similarity index 100% rename from libs/unidecode/x016.py rename to libs/common/unidecode/x016.py diff --git a/libs/unidecode/x017.py b/libs/common/unidecode/x017.py similarity index 100% rename from libs/unidecode/x017.py rename to libs/common/unidecode/x017.py diff --git a/libs/unidecode/x018.py b/libs/common/unidecode/x018.py similarity index 100% rename from libs/unidecode/x018.py rename to libs/common/unidecode/x018.py diff --git a/libs/unidecode/x01d.py b/libs/common/unidecode/x01d.py similarity index 100% rename from libs/unidecode/x01d.py rename to libs/common/unidecode/x01d.py diff --git a/libs/unidecode/x01e.py b/libs/common/unidecode/x01e.py similarity index 100% rename from libs/unidecode/x01e.py rename to libs/common/unidecode/x01e.py diff --git a/libs/unidecode/x01f.py b/libs/common/unidecode/x01f.py similarity index 100% rename from libs/unidecode/x01f.py rename to libs/common/unidecode/x01f.py diff --git a/libs/unidecode/x020.py b/libs/common/unidecode/x020.py similarity index 100% rename from libs/unidecode/x020.py rename to libs/common/unidecode/x020.py diff --git a/libs/unidecode/x021.py b/libs/common/unidecode/x021.py similarity index 100% rename from libs/unidecode/x021.py rename to libs/common/unidecode/x021.py diff --git a/libs/unidecode/x022.py b/libs/common/unidecode/x022.py similarity index 100% rename from libs/unidecode/x022.py rename to libs/common/unidecode/x022.py diff --git a/libs/unidecode/x023.py b/libs/common/unidecode/x023.py similarity index 100% rename from libs/unidecode/x023.py rename to libs/common/unidecode/x023.py diff --git a/libs/unidecode/x024.py b/libs/common/unidecode/x024.py similarity index 100% rename from libs/unidecode/x024.py rename to libs/common/unidecode/x024.py diff --git a/libs/unidecode/x025.py b/libs/common/unidecode/x025.py similarity index 100% rename from libs/unidecode/x025.py rename to libs/common/unidecode/x025.py diff --git a/libs/unidecode/x026.py b/libs/common/unidecode/x026.py similarity index 100% rename from libs/unidecode/x026.py rename to libs/common/unidecode/x026.py diff --git a/libs/unidecode/x027.py b/libs/common/unidecode/x027.py similarity index 100% rename from libs/unidecode/x027.py rename to libs/common/unidecode/x027.py diff --git a/libs/unidecode/x028.py b/libs/common/unidecode/x028.py similarity index 100% rename from libs/unidecode/x028.py rename to libs/common/unidecode/x028.py diff --git a/libs/unidecode/x029.py b/libs/common/unidecode/x029.py similarity index 100% rename from libs/unidecode/x029.py rename to libs/common/unidecode/x029.py diff --git a/libs/unidecode/x02a.py b/libs/common/unidecode/x02a.py similarity index 100% rename from libs/unidecode/x02a.py rename to libs/common/unidecode/x02a.py diff --git a/libs/unidecode/x02c.py b/libs/common/unidecode/x02c.py similarity index 100% rename from libs/unidecode/x02c.py rename to libs/common/unidecode/x02c.py diff --git a/libs/unidecode/x02e.py b/libs/common/unidecode/x02e.py similarity index 100% rename from libs/unidecode/x02e.py rename to libs/common/unidecode/x02e.py diff --git a/libs/unidecode/x02f.py b/libs/common/unidecode/x02f.py similarity index 100% rename from libs/unidecode/x02f.py rename to libs/common/unidecode/x02f.py diff --git a/libs/unidecode/x030.py b/libs/common/unidecode/x030.py similarity index 100% rename from libs/unidecode/x030.py rename to libs/common/unidecode/x030.py diff --git a/libs/unidecode/x031.py b/libs/common/unidecode/x031.py similarity index 100% rename from libs/unidecode/x031.py rename to libs/common/unidecode/x031.py diff --git a/libs/unidecode/x032.py b/libs/common/unidecode/x032.py similarity index 100% rename from libs/unidecode/x032.py rename to libs/common/unidecode/x032.py diff --git a/libs/unidecode/x033.py b/libs/common/unidecode/x033.py similarity index 100% rename from libs/unidecode/x033.py rename to libs/common/unidecode/x033.py diff --git a/libs/unidecode/x04d.py b/libs/common/unidecode/x04d.py similarity index 100% rename from libs/unidecode/x04d.py rename to libs/common/unidecode/x04d.py diff --git a/libs/unidecode/x04e.py b/libs/common/unidecode/x04e.py similarity index 100% rename from libs/unidecode/x04e.py rename to libs/common/unidecode/x04e.py diff --git a/libs/unidecode/x04f.py b/libs/common/unidecode/x04f.py similarity index 100% rename from libs/unidecode/x04f.py rename to libs/common/unidecode/x04f.py diff --git a/libs/unidecode/x050.py b/libs/common/unidecode/x050.py similarity index 100% rename from libs/unidecode/x050.py rename to libs/common/unidecode/x050.py diff --git a/libs/unidecode/x051.py b/libs/common/unidecode/x051.py similarity index 100% rename from libs/unidecode/x051.py rename to libs/common/unidecode/x051.py diff --git a/libs/unidecode/x052.py b/libs/common/unidecode/x052.py similarity index 100% rename from libs/unidecode/x052.py rename to libs/common/unidecode/x052.py diff --git a/libs/unidecode/x053.py b/libs/common/unidecode/x053.py similarity index 100% rename from libs/unidecode/x053.py rename to libs/common/unidecode/x053.py diff --git a/libs/unidecode/x054.py b/libs/common/unidecode/x054.py similarity index 100% rename from libs/unidecode/x054.py rename to libs/common/unidecode/x054.py diff --git a/libs/unidecode/x055.py b/libs/common/unidecode/x055.py similarity index 100% rename from libs/unidecode/x055.py rename to libs/common/unidecode/x055.py diff --git a/libs/unidecode/x056.py b/libs/common/unidecode/x056.py similarity index 100% rename from libs/unidecode/x056.py rename to libs/common/unidecode/x056.py diff --git a/libs/unidecode/x057.py b/libs/common/unidecode/x057.py similarity index 100% rename from libs/unidecode/x057.py rename to libs/common/unidecode/x057.py diff --git a/libs/unidecode/x058.py b/libs/common/unidecode/x058.py similarity index 100% rename from libs/unidecode/x058.py rename to libs/common/unidecode/x058.py diff --git a/libs/unidecode/x059.py b/libs/common/unidecode/x059.py similarity index 100% rename from libs/unidecode/x059.py rename to libs/common/unidecode/x059.py diff --git a/libs/unidecode/x05a.py b/libs/common/unidecode/x05a.py similarity index 100% rename from libs/unidecode/x05a.py rename to libs/common/unidecode/x05a.py diff --git a/libs/unidecode/x05b.py b/libs/common/unidecode/x05b.py similarity index 100% rename from libs/unidecode/x05b.py rename to libs/common/unidecode/x05b.py diff --git a/libs/unidecode/x05c.py b/libs/common/unidecode/x05c.py similarity index 100% rename from libs/unidecode/x05c.py rename to libs/common/unidecode/x05c.py diff --git a/libs/unidecode/x05d.py b/libs/common/unidecode/x05d.py similarity index 100% rename from libs/unidecode/x05d.py rename to libs/common/unidecode/x05d.py diff --git a/libs/unidecode/x05e.py b/libs/common/unidecode/x05e.py similarity index 100% rename from libs/unidecode/x05e.py rename to libs/common/unidecode/x05e.py diff --git a/libs/unidecode/x05f.py b/libs/common/unidecode/x05f.py similarity index 100% rename from libs/unidecode/x05f.py rename to libs/common/unidecode/x05f.py diff --git a/libs/unidecode/x060.py b/libs/common/unidecode/x060.py similarity index 100% rename from libs/unidecode/x060.py rename to libs/common/unidecode/x060.py diff --git a/libs/unidecode/x061.py b/libs/common/unidecode/x061.py similarity index 100% rename from libs/unidecode/x061.py rename to libs/common/unidecode/x061.py diff --git a/libs/unidecode/x062.py b/libs/common/unidecode/x062.py similarity index 100% rename from libs/unidecode/x062.py rename to libs/common/unidecode/x062.py diff --git a/libs/unidecode/x063.py b/libs/common/unidecode/x063.py similarity index 100% rename from libs/unidecode/x063.py rename to libs/common/unidecode/x063.py diff --git a/libs/unidecode/x064.py b/libs/common/unidecode/x064.py similarity index 100% rename from libs/unidecode/x064.py rename to libs/common/unidecode/x064.py diff --git a/libs/unidecode/x065.py b/libs/common/unidecode/x065.py similarity index 100% rename from libs/unidecode/x065.py rename to libs/common/unidecode/x065.py diff --git a/libs/unidecode/x066.py b/libs/common/unidecode/x066.py similarity index 100% rename from libs/unidecode/x066.py rename to libs/common/unidecode/x066.py diff --git a/libs/unidecode/x067.py b/libs/common/unidecode/x067.py similarity index 100% rename from libs/unidecode/x067.py rename to libs/common/unidecode/x067.py diff --git a/libs/unidecode/x068.py b/libs/common/unidecode/x068.py similarity index 100% rename from libs/unidecode/x068.py rename to libs/common/unidecode/x068.py diff --git a/libs/unidecode/x069.py b/libs/common/unidecode/x069.py similarity index 100% rename from libs/unidecode/x069.py rename to libs/common/unidecode/x069.py diff --git a/libs/unidecode/x06a.py b/libs/common/unidecode/x06a.py similarity index 100% rename from libs/unidecode/x06a.py rename to libs/common/unidecode/x06a.py diff --git a/libs/unidecode/x06b.py b/libs/common/unidecode/x06b.py similarity index 100% rename from libs/unidecode/x06b.py rename to libs/common/unidecode/x06b.py diff --git a/libs/unidecode/x06c.py b/libs/common/unidecode/x06c.py similarity index 100% rename from libs/unidecode/x06c.py rename to libs/common/unidecode/x06c.py diff --git a/libs/unidecode/x06d.py b/libs/common/unidecode/x06d.py similarity index 100% rename from libs/unidecode/x06d.py rename to libs/common/unidecode/x06d.py diff --git a/libs/unidecode/x06e.py b/libs/common/unidecode/x06e.py similarity index 100% rename from libs/unidecode/x06e.py rename to libs/common/unidecode/x06e.py diff --git a/libs/unidecode/x06f.py b/libs/common/unidecode/x06f.py similarity index 100% rename from libs/unidecode/x06f.py rename to libs/common/unidecode/x06f.py diff --git a/libs/unidecode/x070.py b/libs/common/unidecode/x070.py similarity index 100% rename from libs/unidecode/x070.py rename to libs/common/unidecode/x070.py diff --git a/libs/unidecode/x071.py b/libs/common/unidecode/x071.py similarity index 100% rename from libs/unidecode/x071.py rename to libs/common/unidecode/x071.py diff --git a/libs/unidecode/x072.py b/libs/common/unidecode/x072.py similarity index 100% rename from libs/unidecode/x072.py rename to libs/common/unidecode/x072.py diff --git a/libs/unidecode/x073.py b/libs/common/unidecode/x073.py similarity index 100% rename from libs/unidecode/x073.py rename to libs/common/unidecode/x073.py diff --git a/libs/unidecode/x074.py b/libs/common/unidecode/x074.py similarity index 100% rename from libs/unidecode/x074.py rename to libs/common/unidecode/x074.py diff --git a/libs/unidecode/x075.py b/libs/common/unidecode/x075.py similarity index 100% rename from libs/unidecode/x075.py rename to libs/common/unidecode/x075.py diff --git a/libs/unidecode/x076.py b/libs/common/unidecode/x076.py similarity index 100% rename from libs/unidecode/x076.py rename to libs/common/unidecode/x076.py diff --git a/libs/unidecode/x077.py b/libs/common/unidecode/x077.py similarity index 100% rename from libs/unidecode/x077.py rename to libs/common/unidecode/x077.py diff --git a/libs/unidecode/x078.py b/libs/common/unidecode/x078.py similarity index 100% rename from libs/unidecode/x078.py rename to libs/common/unidecode/x078.py diff --git a/libs/unidecode/x079.py b/libs/common/unidecode/x079.py similarity index 100% rename from libs/unidecode/x079.py rename to libs/common/unidecode/x079.py diff --git a/libs/unidecode/x07a.py b/libs/common/unidecode/x07a.py similarity index 100% rename from libs/unidecode/x07a.py rename to libs/common/unidecode/x07a.py diff --git a/libs/unidecode/x07b.py b/libs/common/unidecode/x07b.py similarity index 100% rename from libs/unidecode/x07b.py rename to libs/common/unidecode/x07b.py diff --git a/libs/unidecode/x07c.py b/libs/common/unidecode/x07c.py similarity index 100% rename from libs/unidecode/x07c.py rename to libs/common/unidecode/x07c.py diff --git a/libs/unidecode/x07d.py b/libs/common/unidecode/x07d.py similarity index 100% rename from libs/unidecode/x07d.py rename to libs/common/unidecode/x07d.py diff --git a/libs/unidecode/x07e.py b/libs/common/unidecode/x07e.py similarity index 100% rename from libs/unidecode/x07e.py rename to libs/common/unidecode/x07e.py diff --git a/libs/unidecode/x07f.py b/libs/common/unidecode/x07f.py similarity index 100% rename from libs/unidecode/x07f.py rename to libs/common/unidecode/x07f.py diff --git a/libs/unidecode/x080.py b/libs/common/unidecode/x080.py similarity index 100% rename from libs/unidecode/x080.py rename to libs/common/unidecode/x080.py diff --git a/libs/unidecode/x081.py b/libs/common/unidecode/x081.py similarity index 100% rename from libs/unidecode/x081.py rename to libs/common/unidecode/x081.py diff --git a/libs/unidecode/x082.py b/libs/common/unidecode/x082.py similarity index 100% rename from libs/unidecode/x082.py rename to libs/common/unidecode/x082.py diff --git a/libs/unidecode/x083.py b/libs/common/unidecode/x083.py similarity index 100% rename from libs/unidecode/x083.py rename to libs/common/unidecode/x083.py diff --git a/libs/unidecode/x084.py b/libs/common/unidecode/x084.py similarity index 100% rename from libs/unidecode/x084.py rename to libs/common/unidecode/x084.py diff --git a/libs/unidecode/x085.py b/libs/common/unidecode/x085.py similarity index 100% rename from libs/unidecode/x085.py rename to libs/common/unidecode/x085.py diff --git a/libs/unidecode/x086.py b/libs/common/unidecode/x086.py similarity index 100% rename from libs/unidecode/x086.py rename to libs/common/unidecode/x086.py diff --git a/libs/unidecode/x087.py b/libs/common/unidecode/x087.py similarity index 100% rename from libs/unidecode/x087.py rename to libs/common/unidecode/x087.py diff --git a/libs/unidecode/x088.py b/libs/common/unidecode/x088.py similarity index 100% rename from libs/unidecode/x088.py rename to libs/common/unidecode/x088.py diff --git a/libs/unidecode/x089.py b/libs/common/unidecode/x089.py similarity index 100% rename from libs/unidecode/x089.py rename to libs/common/unidecode/x089.py diff --git a/libs/unidecode/x08a.py b/libs/common/unidecode/x08a.py similarity index 100% rename from libs/unidecode/x08a.py rename to libs/common/unidecode/x08a.py diff --git a/libs/unidecode/x08b.py b/libs/common/unidecode/x08b.py similarity index 100% rename from libs/unidecode/x08b.py rename to libs/common/unidecode/x08b.py diff --git a/libs/unidecode/x08c.py b/libs/common/unidecode/x08c.py similarity index 100% rename from libs/unidecode/x08c.py rename to libs/common/unidecode/x08c.py diff --git a/libs/unidecode/x08d.py b/libs/common/unidecode/x08d.py similarity index 100% rename from libs/unidecode/x08d.py rename to libs/common/unidecode/x08d.py diff --git a/libs/unidecode/x08e.py b/libs/common/unidecode/x08e.py similarity index 100% rename from libs/unidecode/x08e.py rename to libs/common/unidecode/x08e.py diff --git a/libs/unidecode/x08f.py b/libs/common/unidecode/x08f.py similarity index 100% rename from libs/unidecode/x08f.py rename to libs/common/unidecode/x08f.py diff --git a/libs/unidecode/x090.py b/libs/common/unidecode/x090.py similarity index 100% rename from libs/unidecode/x090.py rename to libs/common/unidecode/x090.py diff --git a/libs/unidecode/x091.py b/libs/common/unidecode/x091.py similarity index 100% rename from libs/unidecode/x091.py rename to libs/common/unidecode/x091.py diff --git a/libs/unidecode/x092.py b/libs/common/unidecode/x092.py similarity index 100% rename from libs/unidecode/x092.py rename to libs/common/unidecode/x092.py diff --git a/libs/unidecode/x093.py b/libs/common/unidecode/x093.py similarity index 100% rename from libs/unidecode/x093.py rename to libs/common/unidecode/x093.py diff --git a/libs/unidecode/x094.py b/libs/common/unidecode/x094.py similarity index 100% rename from libs/unidecode/x094.py rename to libs/common/unidecode/x094.py diff --git a/libs/unidecode/x095.py b/libs/common/unidecode/x095.py similarity index 100% rename from libs/unidecode/x095.py rename to libs/common/unidecode/x095.py diff --git a/libs/unidecode/x096.py b/libs/common/unidecode/x096.py similarity index 100% rename from libs/unidecode/x096.py rename to libs/common/unidecode/x096.py diff --git a/libs/unidecode/x097.py b/libs/common/unidecode/x097.py similarity index 100% rename from libs/unidecode/x097.py rename to libs/common/unidecode/x097.py diff --git a/libs/unidecode/x098.py b/libs/common/unidecode/x098.py similarity index 100% rename from libs/unidecode/x098.py rename to libs/common/unidecode/x098.py diff --git a/libs/unidecode/x099.py b/libs/common/unidecode/x099.py similarity index 100% rename from libs/unidecode/x099.py rename to libs/common/unidecode/x099.py diff --git a/libs/unidecode/x09a.py b/libs/common/unidecode/x09a.py similarity index 100% rename from libs/unidecode/x09a.py rename to libs/common/unidecode/x09a.py diff --git a/libs/unidecode/x09b.py b/libs/common/unidecode/x09b.py similarity index 100% rename from libs/unidecode/x09b.py rename to libs/common/unidecode/x09b.py diff --git a/libs/unidecode/x09c.py b/libs/common/unidecode/x09c.py similarity index 100% rename from libs/unidecode/x09c.py rename to libs/common/unidecode/x09c.py diff --git a/libs/unidecode/x09d.py b/libs/common/unidecode/x09d.py similarity index 100% rename from libs/unidecode/x09d.py rename to libs/common/unidecode/x09d.py diff --git a/libs/unidecode/x09e.py b/libs/common/unidecode/x09e.py similarity index 100% rename from libs/unidecode/x09e.py rename to libs/common/unidecode/x09e.py diff --git a/libs/unidecode/x09f.py b/libs/common/unidecode/x09f.py similarity index 100% rename from libs/unidecode/x09f.py rename to libs/common/unidecode/x09f.py diff --git a/libs/unidecode/x0a0.py b/libs/common/unidecode/x0a0.py similarity index 100% rename from libs/unidecode/x0a0.py rename to libs/common/unidecode/x0a0.py diff --git a/libs/unidecode/x0a1.py b/libs/common/unidecode/x0a1.py similarity index 100% rename from libs/unidecode/x0a1.py rename to libs/common/unidecode/x0a1.py diff --git a/libs/unidecode/x0a2.py b/libs/common/unidecode/x0a2.py similarity index 100% rename from libs/unidecode/x0a2.py rename to libs/common/unidecode/x0a2.py diff --git a/libs/unidecode/x0a3.py b/libs/common/unidecode/x0a3.py similarity index 100% rename from libs/unidecode/x0a3.py rename to libs/common/unidecode/x0a3.py diff --git a/libs/unidecode/x0a4.py b/libs/common/unidecode/x0a4.py similarity index 100% rename from libs/unidecode/x0a4.py rename to libs/common/unidecode/x0a4.py diff --git a/libs/unidecode/x0ac.py b/libs/common/unidecode/x0ac.py similarity index 100% rename from libs/unidecode/x0ac.py rename to libs/common/unidecode/x0ac.py diff --git a/libs/unidecode/x0ad.py b/libs/common/unidecode/x0ad.py similarity index 100% rename from libs/unidecode/x0ad.py rename to libs/common/unidecode/x0ad.py diff --git a/libs/unidecode/x0ae.py b/libs/common/unidecode/x0ae.py similarity index 100% rename from libs/unidecode/x0ae.py rename to libs/common/unidecode/x0ae.py diff --git a/libs/unidecode/x0af.py b/libs/common/unidecode/x0af.py similarity index 100% rename from libs/unidecode/x0af.py rename to libs/common/unidecode/x0af.py diff --git a/libs/unidecode/x0b0.py b/libs/common/unidecode/x0b0.py similarity index 100% rename from libs/unidecode/x0b0.py rename to libs/common/unidecode/x0b0.py diff --git a/libs/unidecode/x0b1.py b/libs/common/unidecode/x0b1.py similarity index 100% rename from libs/unidecode/x0b1.py rename to libs/common/unidecode/x0b1.py diff --git a/libs/unidecode/x0b2.py b/libs/common/unidecode/x0b2.py similarity index 100% rename from libs/unidecode/x0b2.py rename to libs/common/unidecode/x0b2.py diff --git a/libs/unidecode/x0b3.py b/libs/common/unidecode/x0b3.py similarity index 100% rename from libs/unidecode/x0b3.py rename to libs/common/unidecode/x0b3.py diff --git a/libs/unidecode/x0b4.py b/libs/common/unidecode/x0b4.py similarity index 100% rename from libs/unidecode/x0b4.py rename to libs/common/unidecode/x0b4.py diff --git a/libs/unidecode/x0b5.py b/libs/common/unidecode/x0b5.py similarity index 100% rename from libs/unidecode/x0b5.py rename to libs/common/unidecode/x0b5.py diff --git a/libs/unidecode/x0b6.py b/libs/common/unidecode/x0b6.py similarity index 100% rename from libs/unidecode/x0b6.py rename to libs/common/unidecode/x0b6.py diff --git a/libs/unidecode/x0b7.py b/libs/common/unidecode/x0b7.py similarity index 100% rename from libs/unidecode/x0b7.py rename to libs/common/unidecode/x0b7.py diff --git a/libs/unidecode/x0b8.py b/libs/common/unidecode/x0b8.py similarity index 100% rename from libs/unidecode/x0b8.py rename to libs/common/unidecode/x0b8.py diff --git a/libs/unidecode/x0b9.py b/libs/common/unidecode/x0b9.py similarity index 100% rename from libs/unidecode/x0b9.py rename to libs/common/unidecode/x0b9.py diff --git a/libs/unidecode/x0ba.py b/libs/common/unidecode/x0ba.py similarity index 100% rename from libs/unidecode/x0ba.py rename to libs/common/unidecode/x0ba.py diff --git a/libs/unidecode/x0bb.py b/libs/common/unidecode/x0bb.py similarity index 100% rename from libs/unidecode/x0bb.py rename to libs/common/unidecode/x0bb.py diff --git a/libs/unidecode/x0bc.py b/libs/common/unidecode/x0bc.py similarity index 100% rename from libs/unidecode/x0bc.py rename to libs/common/unidecode/x0bc.py diff --git a/libs/unidecode/x0bd.py b/libs/common/unidecode/x0bd.py similarity index 100% rename from libs/unidecode/x0bd.py rename to libs/common/unidecode/x0bd.py diff --git a/libs/unidecode/x0be.py b/libs/common/unidecode/x0be.py similarity index 100% rename from libs/unidecode/x0be.py rename to libs/common/unidecode/x0be.py diff --git a/libs/unidecode/x0bf.py b/libs/common/unidecode/x0bf.py similarity index 100% rename from libs/unidecode/x0bf.py rename to libs/common/unidecode/x0bf.py diff --git a/libs/unidecode/x0c0.py b/libs/common/unidecode/x0c0.py similarity index 100% rename from libs/unidecode/x0c0.py rename to libs/common/unidecode/x0c0.py diff --git a/libs/unidecode/x0c1.py b/libs/common/unidecode/x0c1.py similarity index 100% rename from libs/unidecode/x0c1.py rename to libs/common/unidecode/x0c1.py diff --git a/libs/unidecode/x0c2.py b/libs/common/unidecode/x0c2.py similarity index 100% rename from libs/unidecode/x0c2.py rename to libs/common/unidecode/x0c2.py diff --git a/libs/unidecode/x0c3.py b/libs/common/unidecode/x0c3.py similarity index 100% rename from libs/unidecode/x0c3.py rename to libs/common/unidecode/x0c3.py diff --git a/libs/unidecode/x0c4.py b/libs/common/unidecode/x0c4.py similarity index 100% rename from libs/unidecode/x0c4.py rename to libs/common/unidecode/x0c4.py diff --git a/libs/unidecode/x0c5.py b/libs/common/unidecode/x0c5.py similarity index 100% rename from libs/unidecode/x0c5.py rename to libs/common/unidecode/x0c5.py diff --git a/libs/unidecode/x0c6.py b/libs/common/unidecode/x0c6.py similarity index 100% rename from libs/unidecode/x0c6.py rename to libs/common/unidecode/x0c6.py diff --git a/libs/unidecode/x0c7.py b/libs/common/unidecode/x0c7.py similarity index 100% rename from libs/unidecode/x0c7.py rename to libs/common/unidecode/x0c7.py diff --git a/libs/unidecode/x0c8.py b/libs/common/unidecode/x0c8.py similarity index 100% rename from libs/unidecode/x0c8.py rename to libs/common/unidecode/x0c8.py diff --git a/libs/unidecode/x0c9.py b/libs/common/unidecode/x0c9.py similarity index 100% rename from libs/unidecode/x0c9.py rename to libs/common/unidecode/x0c9.py diff --git a/libs/unidecode/x0ca.py b/libs/common/unidecode/x0ca.py similarity index 100% rename from libs/unidecode/x0ca.py rename to libs/common/unidecode/x0ca.py diff --git a/libs/unidecode/x0cb.py b/libs/common/unidecode/x0cb.py similarity index 100% rename from libs/unidecode/x0cb.py rename to libs/common/unidecode/x0cb.py diff --git a/libs/unidecode/x0cc.py b/libs/common/unidecode/x0cc.py similarity index 100% rename from libs/unidecode/x0cc.py rename to libs/common/unidecode/x0cc.py diff --git a/libs/unidecode/x0cd.py b/libs/common/unidecode/x0cd.py similarity index 100% rename from libs/unidecode/x0cd.py rename to libs/common/unidecode/x0cd.py diff --git a/libs/unidecode/x0ce.py b/libs/common/unidecode/x0ce.py similarity index 100% rename from libs/unidecode/x0ce.py rename to libs/common/unidecode/x0ce.py diff --git a/libs/unidecode/x0cf.py b/libs/common/unidecode/x0cf.py similarity index 100% rename from libs/unidecode/x0cf.py rename to libs/common/unidecode/x0cf.py diff --git a/libs/unidecode/x0d0.py b/libs/common/unidecode/x0d0.py similarity index 100% rename from libs/unidecode/x0d0.py rename to libs/common/unidecode/x0d0.py diff --git a/libs/unidecode/x0d1.py b/libs/common/unidecode/x0d1.py similarity index 100% rename from libs/unidecode/x0d1.py rename to libs/common/unidecode/x0d1.py diff --git a/libs/unidecode/x0d2.py b/libs/common/unidecode/x0d2.py similarity index 100% rename from libs/unidecode/x0d2.py rename to libs/common/unidecode/x0d2.py diff --git a/libs/unidecode/x0d3.py b/libs/common/unidecode/x0d3.py similarity index 100% rename from libs/unidecode/x0d3.py rename to libs/common/unidecode/x0d3.py diff --git a/libs/unidecode/x0d4.py b/libs/common/unidecode/x0d4.py similarity index 100% rename from libs/unidecode/x0d4.py rename to libs/common/unidecode/x0d4.py diff --git a/libs/unidecode/x0d5.py b/libs/common/unidecode/x0d5.py similarity index 100% rename from libs/unidecode/x0d5.py rename to libs/common/unidecode/x0d5.py diff --git a/libs/unidecode/x0d6.py b/libs/common/unidecode/x0d6.py similarity index 100% rename from libs/unidecode/x0d6.py rename to libs/common/unidecode/x0d6.py diff --git a/libs/unidecode/x0d7.py b/libs/common/unidecode/x0d7.py similarity index 100% rename from libs/unidecode/x0d7.py rename to libs/common/unidecode/x0d7.py diff --git a/libs/unidecode/x0f9.py b/libs/common/unidecode/x0f9.py similarity index 100% rename from libs/unidecode/x0f9.py rename to libs/common/unidecode/x0f9.py diff --git a/libs/unidecode/x0fa.py b/libs/common/unidecode/x0fa.py similarity index 100% rename from libs/unidecode/x0fa.py rename to libs/common/unidecode/x0fa.py diff --git a/libs/unidecode/x0fb.py b/libs/common/unidecode/x0fb.py similarity index 100% rename from libs/unidecode/x0fb.py rename to libs/common/unidecode/x0fb.py diff --git a/libs/unidecode/x0fc.py b/libs/common/unidecode/x0fc.py similarity index 100% rename from libs/unidecode/x0fc.py rename to libs/common/unidecode/x0fc.py diff --git a/libs/unidecode/x0fd.py b/libs/common/unidecode/x0fd.py similarity index 100% rename from libs/unidecode/x0fd.py rename to libs/common/unidecode/x0fd.py diff --git a/libs/unidecode/x0fe.py b/libs/common/unidecode/x0fe.py similarity index 100% rename from libs/unidecode/x0fe.py rename to libs/common/unidecode/x0fe.py diff --git a/libs/unidecode/x0ff.py b/libs/common/unidecode/x0ff.py similarity index 100% rename from libs/unidecode/x0ff.py rename to libs/common/unidecode/x0ff.py diff --git a/libs/unidecode/x1d4.py b/libs/common/unidecode/x1d4.py similarity index 100% rename from libs/unidecode/x1d4.py rename to libs/common/unidecode/x1d4.py diff --git a/libs/unidecode/x1d5.py b/libs/common/unidecode/x1d5.py similarity index 100% rename from libs/unidecode/x1d5.py rename to libs/common/unidecode/x1d5.py diff --git a/libs/unidecode/x1d6.py b/libs/common/unidecode/x1d6.py similarity index 100% rename from libs/unidecode/x1d6.py rename to libs/common/unidecode/x1d6.py diff --git a/libs/unidecode/x1d7.py b/libs/common/unidecode/x1d7.py similarity index 100% rename from libs/unidecode/x1d7.py rename to libs/common/unidecode/x1d7.py diff --git a/libs/unidecode/x1f1.py b/libs/common/unidecode/x1f1.py similarity index 100% rename from libs/unidecode/x1f1.py rename to libs/common/unidecode/x1f1.py diff --git a/libs/urllib3/__init__.py b/libs/common/urllib3/__init__.py similarity index 100% rename from libs/urllib3/__init__.py rename to libs/common/urllib3/__init__.py diff --git a/libs/urllib3/_collections.py b/libs/common/urllib3/_collections.py similarity index 100% rename from libs/urllib3/_collections.py rename to libs/common/urllib3/_collections.py diff --git a/libs/urllib3/connection.py b/libs/common/urllib3/connection.py similarity index 100% rename from libs/urllib3/connection.py rename to libs/common/urllib3/connection.py diff --git a/libs/urllib3/connectionpool.py b/libs/common/urllib3/connectionpool.py similarity index 100% rename from libs/urllib3/connectionpool.py rename to libs/common/urllib3/connectionpool.py diff --git a/libs/pbr/__init__.py b/libs/common/urllib3/contrib/__init__.py similarity index 100% rename from libs/pbr/__init__.py rename to libs/common/urllib3/contrib/__init__.py diff --git a/libs/urllib3/contrib/_appengine_environ.py b/libs/common/urllib3/contrib/_appengine_environ.py similarity index 100% rename from libs/urllib3/contrib/_appengine_environ.py rename to libs/common/urllib3/contrib/_appengine_environ.py diff --git a/libs/pbr/cmd/__init__.py b/libs/common/urllib3/contrib/_securetransport/__init__.py similarity index 100% rename from libs/pbr/cmd/__init__.py rename to libs/common/urllib3/contrib/_securetransport/__init__.py diff --git a/libs/urllib3/contrib/_securetransport/bindings.py b/libs/common/urllib3/contrib/_securetransport/bindings.py similarity index 100% rename from libs/urllib3/contrib/_securetransport/bindings.py rename to libs/common/urllib3/contrib/_securetransport/bindings.py diff --git a/libs/urllib3/contrib/_securetransport/low_level.py b/libs/common/urllib3/contrib/_securetransport/low_level.py similarity index 100% rename from libs/urllib3/contrib/_securetransport/low_level.py rename to libs/common/urllib3/contrib/_securetransport/low_level.py diff --git a/libs/urllib3/contrib/appengine.py b/libs/common/urllib3/contrib/appengine.py similarity index 100% rename from libs/urllib3/contrib/appengine.py rename to libs/common/urllib3/contrib/appengine.py diff --git a/libs/urllib3/contrib/ntlmpool.py b/libs/common/urllib3/contrib/ntlmpool.py similarity index 100% rename from libs/urllib3/contrib/ntlmpool.py rename to libs/common/urllib3/contrib/ntlmpool.py diff --git a/libs/urllib3/contrib/pyopenssl.py b/libs/common/urllib3/contrib/pyopenssl.py similarity index 100% rename from libs/urllib3/contrib/pyopenssl.py rename to libs/common/urllib3/contrib/pyopenssl.py diff --git a/libs/urllib3/contrib/securetransport.py b/libs/common/urllib3/contrib/securetransport.py similarity index 100% rename from libs/urllib3/contrib/securetransport.py rename to libs/common/urllib3/contrib/securetransport.py diff --git a/libs/urllib3/contrib/socks.py b/libs/common/urllib3/contrib/socks.py similarity index 100% rename from libs/urllib3/contrib/socks.py rename to libs/common/urllib3/contrib/socks.py diff --git a/libs/urllib3/exceptions.py b/libs/common/urllib3/exceptions.py similarity index 100% rename from libs/urllib3/exceptions.py rename to libs/common/urllib3/exceptions.py diff --git a/libs/urllib3/fields.py b/libs/common/urllib3/fields.py similarity index 100% rename from libs/urllib3/fields.py rename to libs/common/urllib3/fields.py diff --git a/libs/urllib3/filepost.py b/libs/common/urllib3/filepost.py similarity index 100% rename from libs/urllib3/filepost.py rename to libs/common/urllib3/filepost.py diff --git a/libs/urllib3/packages/__init__.py b/libs/common/urllib3/packages/__init__.py similarity index 100% rename from libs/urllib3/packages/__init__.py rename to libs/common/urllib3/packages/__init__.py diff --git a/libs/pkg_resources/_vendor/__init__.py b/libs/common/urllib3/packages/backports/__init__.py similarity index 100% rename from libs/pkg_resources/_vendor/__init__.py rename to libs/common/urllib3/packages/backports/__init__.py diff --git a/libs/urllib3/packages/backports/makefile.py b/libs/common/urllib3/packages/backports/makefile.py similarity index 100% rename from libs/urllib3/packages/backports/makefile.py rename to libs/common/urllib3/packages/backports/makefile.py diff --git a/libs/urllib3/packages/six.py b/libs/common/urllib3/packages/six.py similarity index 100% rename from libs/urllib3/packages/six.py rename to libs/common/urllib3/packages/six.py diff --git a/libs/urllib3/packages/ssl_match_hostname/__init__.py b/libs/common/urllib3/packages/ssl_match_hostname/__init__.py similarity index 100% rename from libs/urllib3/packages/ssl_match_hostname/__init__.py rename to libs/common/urllib3/packages/ssl_match_hostname/__init__.py diff --git a/libs/urllib3/packages/ssl_match_hostname/_implementation.py b/libs/common/urllib3/packages/ssl_match_hostname/_implementation.py similarity index 100% rename from libs/urllib3/packages/ssl_match_hostname/_implementation.py rename to libs/common/urllib3/packages/ssl_match_hostname/_implementation.py diff --git a/libs/urllib3/poolmanager.py b/libs/common/urllib3/poolmanager.py similarity index 100% rename from libs/urllib3/poolmanager.py rename to libs/common/urllib3/poolmanager.py diff --git a/libs/urllib3/request.py b/libs/common/urllib3/request.py similarity index 100% rename from libs/urllib3/request.py rename to libs/common/urllib3/request.py diff --git a/libs/urllib3/response.py b/libs/common/urllib3/response.py similarity index 100% rename from libs/urllib3/response.py rename to libs/common/urllib3/response.py diff --git a/libs/urllib3/util/__init__.py b/libs/common/urllib3/util/__init__.py similarity index 100% rename from libs/urllib3/util/__init__.py rename to libs/common/urllib3/util/__init__.py diff --git a/libs/urllib3/util/connection.py b/libs/common/urllib3/util/connection.py similarity index 100% rename from libs/urllib3/util/connection.py rename to libs/common/urllib3/util/connection.py diff --git a/libs/urllib3/util/queue.py b/libs/common/urllib3/util/queue.py similarity index 100% rename from libs/urllib3/util/queue.py rename to libs/common/urllib3/util/queue.py diff --git a/libs/urllib3/util/request.py b/libs/common/urllib3/util/request.py similarity index 100% rename from libs/urllib3/util/request.py rename to libs/common/urllib3/util/request.py diff --git a/libs/urllib3/util/response.py b/libs/common/urllib3/util/response.py similarity index 100% rename from libs/urllib3/util/response.py rename to libs/common/urllib3/util/response.py diff --git a/libs/urllib3/util/retry.py b/libs/common/urllib3/util/retry.py similarity index 100% rename from libs/urllib3/util/retry.py rename to libs/common/urllib3/util/retry.py diff --git a/libs/urllib3/util/ssl_.py b/libs/common/urllib3/util/ssl_.py similarity index 100% rename from libs/urllib3/util/ssl_.py rename to libs/common/urllib3/util/ssl_.py diff --git a/libs/urllib3/util/timeout.py b/libs/common/urllib3/util/timeout.py similarity index 100% rename from libs/urllib3/util/timeout.py rename to libs/common/urllib3/util/timeout.py diff --git a/libs/urllib3/util/url.py b/libs/common/urllib3/util/url.py similarity index 100% rename from libs/urllib3/util/url.py rename to libs/common/urllib3/util/url.py diff --git a/libs/urllib3/util/wait.py b/libs/common/urllib3/util/wait.py similarity index 100% rename from libs/urllib3/util/wait.py rename to libs/common/urllib3/util/wait.py diff --git a/libs/validate.py b/libs/common/validate.py similarity index 100% rename from libs/validate.py rename to libs/common/validate.py diff --git a/libs/xdg/BaseDirectory.py b/libs/common/xdg/BaseDirectory.py similarity index 100% rename from libs/xdg/BaseDirectory.py rename to libs/common/xdg/BaseDirectory.py diff --git a/libs/xdg/Config.py b/libs/common/xdg/Config.py similarity index 100% rename from libs/xdg/Config.py rename to libs/common/xdg/Config.py diff --git a/libs/xdg/DesktopEntry.py b/libs/common/xdg/DesktopEntry.py similarity index 100% rename from libs/xdg/DesktopEntry.py rename to libs/common/xdg/DesktopEntry.py diff --git a/libs/xdg/Exceptions.py b/libs/common/xdg/Exceptions.py similarity index 100% rename from libs/xdg/Exceptions.py rename to libs/common/xdg/Exceptions.py diff --git a/libs/xdg/IconTheme.py b/libs/common/xdg/IconTheme.py similarity index 100% rename from libs/xdg/IconTheme.py rename to libs/common/xdg/IconTheme.py diff --git a/libs/xdg/IniFile.py b/libs/common/xdg/IniFile.py similarity index 100% rename from libs/xdg/IniFile.py rename to libs/common/xdg/IniFile.py diff --git a/libs/xdg/Locale.py b/libs/common/xdg/Locale.py similarity index 100% rename from libs/xdg/Locale.py rename to libs/common/xdg/Locale.py diff --git a/libs/xdg/Menu.py b/libs/common/xdg/Menu.py similarity index 100% rename from libs/xdg/Menu.py rename to libs/common/xdg/Menu.py diff --git a/libs/xdg/MenuEditor.py b/libs/common/xdg/MenuEditor.py similarity index 100% rename from libs/xdg/MenuEditor.py rename to libs/common/xdg/MenuEditor.py diff --git a/libs/xdg/Mime.py b/libs/common/xdg/Mime.py similarity index 100% rename from libs/xdg/Mime.py rename to libs/common/xdg/Mime.py diff --git a/libs/xdg/RecentFiles.py b/libs/common/xdg/RecentFiles.py similarity index 100% rename from libs/xdg/RecentFiles.py rename to libs/common/xdg/RecentFiles.py diff --git a/libs/xdg/__init__.py b/libs/common/xdg/__init__.py similarity index 100% rename from libs/xdg/__init__.py rename to libs/common/xdg/__init__.py diff --git a/libs/xdg/util.py b/libs/common/xdg/util.py similarity index 100% rename from libs/xdg/util.py rename to libs/common/xdg/util.py diff --git a/libs/yaml/__init__.py b/libs/common/yaml/__init__.py similarity index 100% rename from libs/yaml/__init__.py rename to libs/common/yaml/__init__.py diff --git a/libs/yaml/composer.py b/libs/common/yaml/composer.py similarity index 100% rename from libs/yaml/composer.py rename to libs/common/yaml/composer.py diff --git a/libs/yaml/constructor.py b/libs/common/yaml/constructor.py similarity index 100% rename from libs/yaml/constructor.py rename to libs/common/yaml/constructor.py diff --git a/libs/yaml/cyaml.py b/libs/common/yaml/cyaml.py similarity index 100% rename from libs/yaml/cyaml.py rename to libs/common/yaml/cyaml.py diff --git a/libs/yaml/dumper.py b/libs/common/yaml/dumper.py similarity index 100% rename from libs/yaml/dumper.py rename to libs/common/yaml/dumper.py diff --git a/libs/yaml/emitter.py b/libs/common/yaml/emitter.py similarity index 100% rename from libs/yaml/emitter.py rename to libs/common/yaml/emitter.py diff --git a/libs/yaml/error.py b/libs/common/yaml/error.py similarity index 100% rename from libs/yaml/error.py rename to libs/common/yaml/error.py diff --git a/libs/yaml/events.py b/libs/common/yaml/events.py similarity index 100% rename from libs/yaml/events.py rename to libs/common/yaml/events.py diff --git a/libs/yaml/loader.py b/libs/common/yaml/loader.py similarity index 100% rename from libs/yaml/loader.py rename to libs/common/yaml/loader.py diff --git a/libs/yaml/nodes.py b/libs/common/yaml/nodes.py similarity index 100% rename from libs/yaml/nodes.py rename to libs/common/yaml/nodes.py diff --git a/libs/yaml/parser.py b/libs/common/yaml/parser.py similarity index 100% rename from libs/yaml/parser.py rename to libs/common/yaml/parser.py diff --git a/libs/yaml/reader.py b/libs/common/yaml/reader.py similarity index 100% rename from libs/yaml/reader.py rename to libs/common/yaml/reader.py diff --git a/libs/yaml/representer.py b/libs/common/yaml/representer.py similarity index 100% rename from libs/yaml/representer.py rename to libs/common/yaml/representer.py diff --git a/libs/yaml/resolver.py b/libs/common/yaml/resolver.py similarity index 100% rename from libs/yaml/resolver.py rename to libs/common/yaml/resolver.py diff --git a/libs/yaml/scanner.py b/libs/common/yaml/scanner.py similarity index 100% rename from libs/yaml/scanner.py rename to libs/common/yaml/scanner.py diff --git a/libs/yaml/serializer.py b/libs/common/yaml/serializer.py similarity index 100% rename from libs/yaml/serializer.py rename to libs/common/yaml/serializer.py diff --git a/libs/yaml/tokens.py b/libs/common/yaml/tokens.py similarity index 100% rename from libs/yaml/tokens.py rename to libs/common/yaml/tokens.py diff --git a/libs/synchronousdeluge/__init__.py b/libs/custom/synchronousdeluge/__init__.py similarity index 100% rename from libs/synchronousdeluge/__init__.py rename to libs/custom/synchronousdeluge/__init__.py diff --git a/libs/synchronousdeluge/client.py b/libs/custom/synchronousdeluge/client.py similarity index 100% rename from libs/synchronousdeluge/client.py rename to libs/custom/synchronousdeluge/client.py diff --git a/libs/synchronousdeluge/exceptions.py b/libs/custom/synchronousdeluge/exceptions.py similarity index 100% rename from libs/synchronousdeluge/exceptions.py rename to libs/custom/synchronousdeluge/exceptions.py diff --git a/libs/synchronousdeluge/protocol.py b/libs/custom/synchronousdeluge/protocol.py similarity index 100% rename from libs/synchronousdeluge/protocol.py rename to libs/custom/synchronousdeluge/protocol.py diff --git a/libs/synchronousdeluge/transfer.py b/libs/custom/synchronousdeluge/transfer.py similarity index 100% rename from libs/synchronousdeluge/transfer.py rename to libs/custom/synchronousdeluge/transfer.py diff --git a/libs/utorrent/__init__.py b/libs/custom/utorrent/__init__.py similarity index 100% rename from libs/utorrent/__init__.py rename to libs/custom/utorrent/__init__.py diff --git a/libs/utorrent/client.py b/libs/custom/utorrent/client.py similarity index 100% rename from libs/utorrent/client.py rename to libs/custom/utorrent/client.py diff --git a/libs/utorrent/upload.py b/libs/custom/utorrent/upload.py similarity index 100% rename from libs/utorrent/upload.py rename to libs/custom/utorrent/upload.py diff --git a/libs/backports/__init__.py b/libs/py2/backports/__init__.py similarity index 100% rename from libs/backports/__init__.py rename to libs/py2/backports/__init__.py diff --git a/libs/backports/functools_lru_cache.py b/libs/py2/backports/functools_lru_cache.py similarity index 100% rename from libs/backports/functools_lru_cache.py rename to libs/py2/backports/functools_lru_cache.py diff --git a/libs/concurrent/__init__.py b/libs/py2/concurrent/__init__.py similarity index 100% rename from libs/concurrent/__init__.py rename to libs/py2/concurrent/__init__.py diff --git a/libs/concurrent/futures/__init__.py b/libs/py2/concurrent/futures/__init__.py similarity index 100% rename from libs/concurrent/futures/__init__.py rename to libs/py2/concurrent/futures/__init__.py diff --git a/libs/concurrent/futures/_base.py b/libs/py2/concurrent/futures/_base.py similarity index 100% rename from libs/concurrent/futures/_base.py rename to libs/py2/concurrent/futures/_base.py diff --git a/libs/concurrent/futures/process.py b/libs/py2/concurrent/futures/process.py similarity index 100% rename from libs/concurrent/futures/process.py rename to libs/py2/concurrent/futures/process.py diff --git a/libs/concurrent/futures/thread.py b/libs/py2/concurrent/futures/thread.py similarity index 100% rename from libs/concurrent/futures/thread.py rename to libs/py2/concurrent/futures/thread.py diff --git a/libs/enum/LICENSE b/libs/py2/enum/LICENSE similarity index 100% rename from libs/enum/LICENSE rename to libs/py2/enum/LICENSE diff --git a/libs/enum/README b/libs/py2/enum/README similarity index 100% rename from libs/enum/README rename to libs/py2/enum/README diff --git a/libs/enum/__init__.py b/libs/py2/enum/__init__.py similarity index 100% rename from libs/enum/__init__.py rename to libs/py2/enum/__init__.py diff --git a/requirements.txt b/libs/requirements-common.txt similarity index 80% rename from requirements.txt rename to libs/requirements-common.txt index 3fbffd4b..3eff9cbe 100644 --- a/requirements.txt +++ b/libs/requirements-common.txt @@ -11,6 +11,3 @@ setuptools six subliminal transmissionrpc - -# synchronousdeluge -# utorrent diff --git a/libs/requirements-custom.txt b/libs/requirements-custom.txt new file mode 100644 index 00000000..2ffbb20a --- /dev/null +++ b/libs/requirements-custom.txt @@ -0,0 +1,2 @@ +synchronousdeluge +utorrent diff --git a/requirements-py2.txt b/libs/requirements-py2.txt similarity index 100% rename from requirements-py2.txt rename to libs/requirements-py2.txt diff --git a/requirements-windows.txt b/libs/requirements-win.txt similarity index 53% rename from requirements-windows.txt rename to libs/requirements-win.txt index 4311efc1..e225500e 100644 --- a/requirements-windows.txt +++ b/libs/requirements-win.txt @@ -1,3 +1,2 @@ --r requirements.txt jaraco-windows pywin32 diff --git a/libs/requirements.txt b/libs/requirements.txt new file mode 100644 index 00000000..1d0ef559 --- /dev/null +++ b/libs/requirements.txt @@ -0,0 +1,3 @@ +-r requirements-common.txt +-r requirements-py2.txt ; python_version < '3' +-r requirements-win.txt ; sys.platform == 'win32' diff --git a/libs/util.py b/libs/util.py new file mode 100644 index 00000000..3b597d69 --- /dev/null +++ b/libs/util.py @@ -0,0 +1,60 @@ + +import subprocess +import sys +import os + +__all__ = [ + 'module_root', + 'add_path', +] + + +def module_root(module=__file__): + try: + path = module.__file__ + except AttributeError: + path = module + directory = os.path.dirname(path) + parent = os.path.join(directory, os.pardir) + absolute = os.path.abspath(parent) + normalized = os.path.normpath(absolute) + return normalized + + +def add_path(path, index=0): + sys.path.insert(index, path) + try: + sys.path.index(path) + except ValueError: + return + else: + return path + + +def install_requirements( + requirements, + upgrade=True, + path=None, + file=False, + executable=sys.executable, +): + + args = [ + executable, + '-m', + 'pip', + 'install', + ] + + if file: + args.append('-r') + args.append(requirements) + + if upgrade: + args.append('--upgrade') + + if path is not None: + args.append('--target') + args.append(path) + + subprocess.call(args) diff --git a/libs/PyWin32.chm b/libs/win/PyWin32.chm similarity index 100% rename from libs/PyWin32.chm rename to libs/win/PyWin32.chm diff --git a/libs/adodbapi/__init__.py b/libs/win/adodbapi/__init__.py similarity index 100% rename from libs/adodbapi/__init__.py rename to libs/win/adodbapi/__init__.py diff --git a/libs/adodbapi/ado_consts.py b/libs/win/adodbapi/ado_consts.py similarity index 100% rename from libs/adodbapi/ado_consts.py rename to libs/win/adodbapi/ado_consts.py diff --git a/libs/adodbapi/adodbapi.py b/libs/win/adodbapi/adodbapi.py similarity index 100% rename from libs/adodbapi/adodbapi.py rename to libs/win/adodbapi/adodbapi.py diff --git a/libs/adodbapi/examples/db_print.py b/libs/win/adodbapi/examples/db_print.py similarity index 100% rename from libs/adodbapi/examples/db_print.py rename to libs/win/adodbapi/examples/db_print.py diff --git a/libs/adodbapi/examples/db_table_names.py b/libs/win/adodbapi/examples/db_table_names.py similarity index 100% rename from libs/adodbapi/examples/db_table_names.py rename to libs/win/adodbapi/examples/db_table_names.py diff --git a/libs/adodbapi/examples/xls_read.py b/libs/win/adodbapi/examples/xls_read.py similarity index 100% rename from libs/adodbapi/examples/xls_read.py rename to libs/win/adodbapi/examples/xls_read.py diff --git a/libs/adodbapi/examples/xls_write.py b/libs/win/adodbapi/examples/xls_write.py similarity index 100% rename from libs/adodbapi/examples/xls_write.py rename to libs/win/adodbapi/examples/xls_write.py diff --git a/libs/adodbapi/is64bit.py b/libs/win/adodbapi/is64bit.py similarity index 100% rename from libs/adodbapi/is64bit.py rename to libs/win/adodbapi/is64bit.py diff --git a/libs/adodbapi/license.txt b/libs/win/adodbapi/license.txt similarity index 100% rename from libs/adodbapi/license.txt rename to libs/win/adodbapi/license.txt diff --git a/libs/adodbapi/readme.txt b/libs/win/adodbapi/readme.txt similarity index 100% rename from libs/adodbapi/readme.txt rename to libs/win/adodbapi/readme.txt diff --git a/libs/adodbapi/schema_table.py b/libs/win/adodbapi/schema_table.py similarity index 100% rename from libs/adodbapi/schema_table.py rename to libs/win/adodbapi/schema_table.py diff --git a/libs/adodbapi/test/adodbapitest.py b/libs/win/adodbapi/test/adodbapitest.py similarity index 100% rename from libs/adodbapi/test/adodbapitest.py rename to libs/win/adodbapi/test/adodbapitest.py diff --git a/libs/adodbapi/test/adodbapitestconfig.py b/libs/win/adodbapi/test/adodbapitestconfig.py similarity index 100% rename from libs/adodbapi/test/adodbapitestconfig.py rename to libs/win/adodbapi/test/adodbapitestconfig.py diff --git a/libs/adodbapi/test/dbapi20.py b/libs/win/adodbapi/test/dbapi20.py similarity index 100% rename from libs/adodbapi/test/dbapi20.py rename to libs/win/adodbapi/test/dbapi20.py diff --git a/libs/adodbapi/test/is64bit.py b/libs/win/adodbapi/test/is64bit.py similarity index 100% rename from libs/adodbapi/test/is64bit.py rename to libs/win/adodbapi/test/is64bit.py diff --git a/libs/adodbapi/test/setuptestframework.py b/libs/win/adodbapi/test/setuptestframework.py similarity index 100% rename from libs/adodbapi/test/setuptestframework.py rename to libs/win/adodbapi/test/setuptestframework.py diff --git a/libs/adodbapi/test/test_adodbapi_dbapi20.py b/libs/win/adodbapi/test/test_adodbapi_dbapi20.py similarity index 100% rename from libs/adodbapi/test/test_adodbapi_dbapi20.py rename to libs/win/adodbapi/test/test_adodbapi_dbapi20.py diff --git a/libs/adodbapi/test/tryconnection2.py b/libs/win/adodbapi/test/tryconnection2.py similarity index 100% rename from libs/adodbapi/test/tryconnection2.py rename to libs/win/adodbapi/test/tryconnection2.py diff --git a/libs/adodbapi/test/tryconnection3.py b/libs/win/adodbapi/test/tryconnection3.py similarity index 100% rename from libs/adodbapi/test/tryconnection3.py rename to libs/win/adodbapi/test/tryconnection3.py diff --git a/libs/bin/enver.exe b/libs/win/bin/enver.exe similarity index 99% rename from libs/bin/enver.exe rename to libs/win/bin/enver.exe index 19390fed..43cdc2f5 100644 Binary files a/libs/bin/enver.exe and b/libs/win/bin/enver.exe differ diff --git a/libs/bin/find-symlinks.exe b/libs/win/bin/find-symlinks.exe similarity index 99% rename from libs/bin/find-symlinks.exe rename to libs/win/bin/find-symlinks.exe index cf6d37a8..39e01ca1 100644 Binary files a/libs/bin/find-symlinks.exe and b/libs/win/bin/find-symlinks.exe differ diff --git a/libs/bin/gclip.exe b/libs/win/bin/gclip.exe similarity index 99% rename from libs/bin/gclip.exe rename to libs/win/bin/gclip.exe index e3b9a0a6..ee8ae479 100644 Binary files a/libs/bin/gclip.exe and b/libs/win/bin/gclip.exe differ diff --git a/libs/bin/mklink.exe b/libs/win/bin/mklink.exe similarity index 99% rename from libs/bin/mklink.exe rename to libs/win/bin/mklink.exe index f467f718..1fb60e5a 100644 Binary files a/libs/bin/mklink.exe and b/libs/win/bin/mklink.exe differ diff --git a/libs/bin/pclip.exe b/libs/win/bin/pclip.exe similarity index 99% rename from libs/bin/pclip.exe rename to libs/win/bin/pclip.exe index fc8c364b..92c07c06 100644 Binary files a/libs/bin/pclip.exe and b/libs/win/bin/pclip.exe differ diff --git a/libs/bin/pywin32_postinstall.py b/libs/win/bin/pywin32_postinstall.py similarity index 100% rename from libs/bin/pywin32_postinstall.py rename to libs/win/bin/pywin32_postinstall.py diff --git a/libs/bin/pywin32_testall.py b/libs/win/bin/pywin32_testall.py similarity index 100% rename from libs/bin/pywin32_testall.py rename to libs/win/bin/pywin32_testall.py diff --git a/libs/bin/xmouse.exe b/libs/win/bin/xmouse.exe similarity index 99% rename from libs/bin/xmouse.exe rename to libs/win/bin/xmouse.exe index b9d66505..9f7e8a9b 100644 Binary files a/libs/bin/xmouse.exe and b/libs/win/bin/xmouse.exe differ diff --git a/libs/importlib_metadata/__init__.py b/libs/win/importlib_metadata/__init__.py similarity index 100% rename from libs/importlib_metadata/__init__.py rename to libs/win/importlib_metadata/__init__.py diff --git a/libs/importlib_metadata/_hooks.py b/libs/win/importlib_metadata/_hooks.py similarity index 100% rename from libs/importlib_metadata/_hooks.py rename to libs/win/importlib_metadata/_hooks.py diff --git a/libs/importlib_metadata/api.py b/libs/win/importlib_metadata/api.py similarity index 100% rename from libs/importlib_metadata/api.py rename to libs/win/importlib_metadata/api.py diff --git a/libs/pythonwin/pywin/Demos/ocx/__init__.py b/libs/win/importlib_metadata/docs/__init__.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/__init__.py rename to libs/win/importlib_metadata/docs/__init__.py diff --git a/libs/importlib_metadata/docs/changelog.rst b/libs/win/importlib_metadata/docs/changelog.rst similarity index 100% rename from libs/importlib_metadata/docs/changelog.rst rename to libs/win/importlib_metadata/docs/changelog.rst diff --git a/libs/importlib_metadata/docs/conf.py b/libs/win/importlib_metadata/docs/conf.py similarity index 100% rename from libs/importlib_metadata/docs/conf.py rename to libs/win/importlib_metadata/docs/conf.py diff --git a/libs/importlib_metadata/docs/index.rst b/libs/win/importlib_metadata/docs/index.rst similarity index 100% rename from libs/importlib_metadata/docs/index.rst rename to libs/win/importlib_metadata/docs/index.rst diff --git a/libs/importlib_metadata/docs/using.rst b/libs/win/importlib_metadata/docs/using.rst similarity index 100% rename from libs/importlib_metadata/docs/using.rst rename to libs/win/importlib_metadata/docs/using.rst diff --git a/libs/pythonwin/pywin/dialogs/__init__.py b/libs/win/importlib_metadata/tests/__init__.py similarity index 100% rename from libs/pythonwin/pywin/dialogs/__init__.py rename to libs/win/importlib_metadata/tests/__init__.py diff --git a/libs/pythonwin/pywin/docking/__init__.py b/libs/win/importlib_metadata/tests/data/__init__.py similarity index 100% rename from libs/pythonwin/pywin/docking/__init__.py rename to libs/win/importlib_metadata/tests/data/__init__.py diff --git a/libs/importlib_metadata/tests/test_api.py b/libs/win/importlib_metadata/tests/test_api.py similarity index 100% rename from libs/importlib_metadata/tests/test_api.py rename to libs/win/importlib_metadata/tests/test_api.py diff --git a/libs/importlib_metadata/tests/test_main.py b/libs/win/importlib_metadata/tests/test_main.py similarity index 100% rename from libs/importlib_metadata/tests/test_main.py rename to libs/win/importlib_metadata/tests/test_main.py diff --git a/libs/importlib_metadata/tests/test_zip.py b/libs/win/importlib_metadata/tests/test_zip.py similarity index 100% rename from libs/importlib_metadata/tests/test_zip.py rename to libs/win/importlib_metadata/tests/test_zip.py diff --git a/libs/importlib_metadata/version.txt b/libs/win/importlib_metadata/version.txt similarity index 100% rename from libs/importlib_metadata/version.txt rename to libs/win/importlib_metadata/version.txt diff --git a/libs/isapi/PyISAPI_loader.dll b/libs/win/isapi/PyISAPI_loader.dll similarity index 100% rename from libs/isapi/PyISAPI_loader.dll rename to libs/win/isapi/PyISAPI_loader.dll diff --git a/libs/isapi/README.txt b/libs/win/isapi/README.txt similarity index 100% rename from libs/isapi/README.txt rename to libs/win/isapi/README.txt diff --git a/libs/isapi/__init__.py b/libs/win/isapi/__init__.py similarity index 100% rename from libs/isapi/__init__.py rename to libs/win/isapi/__init__.py diff --git a/libs/isapi/doc/isapi.html b/libs/win/isapi/doc/isapi.html similarity index 100% rename from libs/isapi/doc/isapi.html rename to libs/win/isapi/doc/isapi.html diff --git a/libs/isapi/install.py b/libs/win/isapi/install.py similarity index 100% rename from libs/isapi/install.py rename to libs/win/isapi/install.py diff --git a/libs/isapi/isapicon.py b/libs/win/isapi/isapicon.py similarity index 100% rename from libs/isapi/isapicon.py rename to libs/win/isapi/isapicon.py diff --git a/libs/isapi/samples/README.txt b/libs/win/isapi/samples/README.txt similarity index 100% rename from libs/isapi/samples/README.txt rename to libs/win/isapi/samples/README.txt diff --git a/libs/isapi/samples/advanced.py b/libs/win/isapi/samples/advanced.py similarity index 100% rename from libs/isapi/samples/advanced.py rename to libs/win/isapi/samples/advanced.py diff --git a/libs/isapi/samples/redirector.py b/libs/win/isapi/samples/redirector.py similarity index 100% rename from libs/isapi/samples/redirector.py rename to libs/win/isapi/samples/redirector.py diff --git a/libs/isapi/samples/redirector_asynch.py b/libs/win/isapi/samples/redirector_asynch.py similarity index 100% rename from libs/isapi/samples/redirector_asynch.py rename to libs/win/isapi/samples/redirector_asynch.py diff --git a/libs/isapi/samples/redirector_with_filter.py b/libs/win/isapi/samples/redirector_with_filter.py similarity index 100% rename from libs/isapi/samples/redirector_with_filter.py rename to libs/win/isapi/samples/redirector_with_filter.py diff --git a/libs/isapi/samples/test.py b/libs/win/isapi/samples/test.py similarity index 100% rename from libs/isapi/samples/test.py rename to libs/win/isapi/samples/test.py diff --git a/libs/isapi/simple.py b/libs/win/isapi/simple.py similarity index 100% rename from libs/isapi/simple.py rename to libs/win/isapi/simple.py diff --git a/libs/isapi/test/README.txt b/libs/win/isapi/test/README.txt similarity index 100% rename from libs/isapi/test/README.txt rename to libs/win/isapi/test/README.txt diff --git a/libs/isapi/test/extension_simple.py b/libs/win/isapi/test/extension_simple.py similarity index 100% rename from libs/isapi/test/extension_simple.py rename to libs/win/isapi/test/extension_simple.py diff --git a/libs/isapi/threaded_extension.py b/libs/win/isapi/threaded_extension.py similarity index 100% rename from libs/isapi/threaded_extension.py rename to libs/win/isapi/threaded_extension.py diff --git a/libs/jaraco.classes-1.5-py3.6-nspkg.pth b/libs/win/jaraco.classes-1.5-py3.6-nspkg.pth similarity index 100% rename from libs/jaraco.classes-1.5-py3.6-nspkg.pth rename to libs/win/jaraco.classes-1.5-py3.6-nspkg.pth diff --git a/libs/jaraco.collections-1.6.0-py3.7-nspkg.pth b/libs/win/jaraco.collections-1.6.0-py3.7-nspkg.pth similarity index 100% rename from libs/jaraco.collections-1.6.0-py3.7-nspkg.pth rename to libs/win/jaraco.collections-1.6.0-py3.7-nspkg.pth diff --git a/libs/jaraco.functools-1.20-py3.6-nspkg.pth b/libs/win/jaraco.functools-1.20-py3.6-nspkg.pth similarity index 100% rename from libs/jaraco.functools-1.20-py3.6-nspkg.pth rename to libs/win/jaraco.functools-1.20-py3.6-nspkg.pth diff --git a/libs/jaraco.structures-1.1.2-py3.6-nspkg.pth b/libs/win/jaraco.structures-1.1.2-py3.6-nspkg.pth similarity index 100% rename from libs/jaraco.structures-1.1.2-py3.6-nspkg.pth rename to libs/win/jaraco.structures-1.1.2-py3.6-nspkg.pth diff --git a/libs/jaraco.text-1.10.1-py3.6-nspkg.pth b/libs/win/jaraco.text-1.10.1-py3.6-nspkg.pth similarity index 100% rename from libs/jaraco.text-1.10.1-py3.6-nspkg.pth rename to libs/win/jaraco.text-1.10.1-py3.6-nspkg.pth diff --git a/libs/jaraco.ui-1.6-py3.6-nspkg.pth b/libs/win/jaraco.ui-1.6-py3.6-nspkg.pth similarity index 100% rename from libs/jaraco.ui-1.6-py3.6-nspkg.pth rename to libs/win/jaraco.ui-1.6-py3.6-nspkg.pth diff --git a/libs/jaraco.windows-3.9.2-py3.7-nspkg.pth b/libs/win/jaraco.windows-3.9.2-py3.7-nspkg.pth similarity index 100% rename from libs/jaraco.windows-3.9.2-py3.7-nspkg.pth rename to libs/win/jaraco.windows-3.9.2-py3.7-nspkg.pth diff --git a/libs/pythonwin/pywin/framework/__init__.py b/libs/win/jaraco/classes/__init__.py similarity index 100% rename from libs/pythonwin/pywin/framework/__init__.py rename to libs/win/jaraco/classes/__init__.py diff --git a/libs/jaraco/classes/ancestry.py b/libs/win/jaraco/classes/ancestry.py similarity index 100% rename from libs/jaraco/classes/ancestry.py rename to libs/win/jaraco/classes/ancestry.py diff --git a/libs/jaraco/classes/meta.py b/libs/win/jaraco/classes/meta.py similarity index 100% rename from libs/jaraco/classes/meta.py rename to libs/win/jaraco/classes/meta.py diff --git a/libs/jaraco/classes/properties.py b/libs/win/jaraco/classes/properties.py similarity index 100% rename from libs/jaraco/classes/properties.py rename to libs/win/jaraco/classes/properties.py diff --git a/libs/jaraco/collections.py b/libs/win/jaraco/collections.py similarity index 100% rename from libs/jaraco/collections.py rename to libs/win/jaraco/collections.py diff --git a/libs/jaraco/functools.py b/libs/win/jaraco/functools.py similarity index 100% rename from libs/jaraco/functools.py rename to libs/win/jaraco/functools.py diff --git a/libs/pythonwin/pywin/framework/editor/color/__init__.py b/libs/win/jaraco/structures/__init__.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/color/__init__.py rename to libs/win/jaraco/structures/__init__.py diff --git a/libs/jaraco/structures/binary.py b/libs/win/jaraco/structures/binary.py similarity index 100% rename from libs/jaraco/structures/binary.py rename to libs/win/jaraco/structures/binary.py diff --git a/libs/jaraco/text.py b/libs/win/jaraco/text.py similarity index 100% rename from libs/jaraco/text.py rename to libs/win/jaraco/text.py diff --git a/libs/pythonwin/pywin/mfc/__init__.py b/libs/win/jaraco/ui/__init__.py similarity index 100% rename from libs/pythonwin/pywin/mfc/__init__.py rename to libs/win/jaraco/ui/__init__.py diff --git a/libs/jaraco/ui/cmdline.py b/libs/win/jaraco/ui/cmdline.py similarity index 100% rename from libs/jaraco/ui/cmdline.py rename to libs/win/jaraco/ui/cmdline.py diff --git a/libs/jaraco/ui/editor.py b/libs/win/jaraco/ui/editor.py similarity index 100% rename from libs/jaraco/ui/editor.py rename to libs/win/jaraco/ui/editor.py diff --git a/libs/jaraco/ui/input.py b/libs/win/jaraco/ui/input.py similarity index 100% rename from libs/jaraco/ui/input.py rename to libs/win/jaraco/ui/input.py diff --git a/libs/jaraco/ui/menu.py b/libs/win/jaraco/ui/menu.py similarity index 100% rename from libs/jaraco/ui/menu.py rename to libs/win/jaraco/ui/menu.py diff --git a/libs/jaraco/ui/progress.py b/libs/win/jaraco/ui/progress.py similarity index 100% rename from libs/jaraco/ui/progress.py rename to libs/win/jaraco/ui/progress.py diff --git a/libs/jaraco/windows/__init__.py b/libs/win/jaraco/windows/__init__.py similarity index 100% rename from libs/jaraco/windows/__init__.py rename to libs/win/jaraco/windows/__init__.py diff --git a/libs/setuptools/_vendor/__init__.py b/libs/win/jaraco/windows/api/__init__.py similarity index 100% rename from libs/setuptools/_vendor/__init__.py rename to libs/win/jaraco/windows/api/__init__.py diff --git a/libs/jaraco/windows/api/clipboard.py b/libs/win/jaraco/windows/api/clipboard.py similarity index 100% rename from libs/jaraco/windows/api/clipboard.py rename to libs/win/jaraco/windows/api/clipboard.py diff --git a/libs/jaraco/windows/api/credential.py b/libs/win/jaraco/windows/api/credential.py similarity index 100% rename from libs/jaraco/windows/api/credential.py rename to libs/win/jaraco/windows/api/credential.py diff --git a/libs/jaraco/windows/api/environ.py b/libs/win/jaraco/windows/api/environ.py similarity index 100% rename from libs/jaraco/windows/api/environ.py rename to libs/win/jaraco/windows/api/environ.py diff --git a/libs/jaraco/windows/api/errors.py b/libs/win/jaraco/windows/api/errors.py similarity index 100% rename from libs/jaraco/windows/api/errors.py rename to libs/win/jaraco/windows/api/errors.py diff --git a/libs/jaraco/windows/api/event.py b/libs/win/jaraco/windows/api/event.py similarity index 100% rename from libs/jaraco/windows/api/event.py rename to libs/win/jaraco/windows/api/event.py diff --git a/libs/jaraco/windows/api/filesystem.py b/libs/win/jaraco/windows/api/filesystem.py similarity index 100% rename from libs/jaraco/windows/api/filesystem.py rename to libs/win/jaraco/windows/api/filesystem.py diff --git a/libs/jaraco/windows/api/inet.py b/libs/win/jaraco/windows/api/inet.py similarity index 100% rename from libs/jaraco/windows/api/inet.py rename to libs/win/jaraco/windows/api/inet.py diff --git a/libs/jaraco/windows/api/library.py b/libs/win/jaraco/windows/api/library.py similarity index 100% rename from libs/jaraco/windows/api/library.py rename to libs/win/jaraco/windows/api/library.py diff --git a/libs/jaraco/windows/api/memory.py b/libs/win/jaraco/windows/api/memory.py similarity index 100% rename from libs/jaraco/windows/api/memory.py rename to libs/win/jaraco/windows/api/memory.py diff --git a/libs/jaraco/windows/api/message.py b/libs/win/jaraco/windows/api/message.py similarity index 100% rename from libs/jaraco/windows/api/message.py rename to libs/win/jaraco/windows/api/message.py diff --git a/libs/jaraco/windows/api/net.py b/libs/win/jaraco/windows/api/net.py similarity index 100% rename from libs/jaraco/windows/api/net.py rename to libs/win/jaraco/windows/api/net.py diff --git a/libs/jaraco/windows/api/power.py b/libs/win/jaraco/windows/api/power.py similarity index 100% rename from libs/jaraco/windows/api/power.py rename to libs/win/jaraco/windows/api/power.py diff --git a/libs/jaraco/windows/api/privilege.py b/libs/win/jaraco/windows/api/privilege.py similarity index 100% rename from libs/jaraco/windows/api/privilege.py rename to libs/win/jaraco/windows/api/privilege.py diff --git a/libs/jaraco/windows/api/process.py b/libs/win/jaraco/windows/api/process.py similarity index 100% rename from libs/jaraco/windows/api/process.py rename to libs/win/jaraco/windows/api/process.py diff --git a/libs/jaraco/windows/api/security.py b/libs/win/jaraco/windows/api/security.py similarity index 100% rename from libs/jaraco/windows/api/security.py rename to libs/win/jaraco/windows/api/security.py diff --git a/libs/jaraco/windows/api/shell.py b/libs/win/jaraco/windows/api/shell.py similarity index 100% rename from libs/jaraco/windows/api/shell.py rename to libs/win/jaraco/windows/api/shell.py diff --git a/libs/jaraco/windows/api/system.py b/libs/win/jaraco/windows/api/system.py similarity index 100% rename from libs/jaraco/windows/api/system.py rename to libs/win/jaraco/windows/api/system.py diff --git a/libs/jaraco/windows/api/user.py b/libs/win/jaraco/windows/api/user.py similarity index 100% rename from libs/jaraco/windows/api/user.py rename to libs/win/jaraco/windows/api/user.py diff --git a/libs/jaraco/windows/clipboard.py b/libs/win/jaraco/windows/clipboard.py similarity index 100% rename from libs/jaraco/windows/clipboard.py rename to libs/win/jaraco/windows/clipboard.py diff --git a/libs/jaraco/windows/cred.py b/libs/win/jaraco/windows/cred.py similarity index 100% rename from libs/jaraco/windows/cred.py rename to libs/win/jaraco/windows/cred.py diff --git a/libs/jaraco/windows/dpapi.py b/libs/win/jaraco/windows/dpapi.py similarity index 100% rename from libs/jaraco/windows/dpapi.py rename to libs/win/jaraco/windows/dpapi.py diff --git a/libs/jaraco/windows/environ.py b/libs/win/jaraco/windows/environ.py similarity index 100% rename from libs/jaraco/windows/environ.py rename to libs/win/jaraco/windows/environ.py diff --git a/libs/jaraco/windows/error.py b/libs/win/jaraco/windows/error.py similarity index 100% rename from libs/jaraco/windows/error.py rename to libs/win/jaraco/windows/error.py diff --git a/libs/jaraco/windows/eventlog.py b/libs/win/jaraco/windows/eventlog.py similarity index 100% rename from libs/jaraco/windows/eventlog.py rename to libs/win/jaraco/windows/eventlog.py diff --git a/libs/jaraco/windows/filesystem/__init__.py b/libs/win/jaraco/windows/filesystem/__init__.py similarity index 100% rename from libs/jaraco/windows/filesystem/__init__.py rename to libs/win/jaraco/windows/filesystem/__init__.py diff --git a/libs/jaraco/windows/filesystem/backports.py b/libs/win/jaraco/windows/filesystem/backports.py similarity index 100% rename from libs/jaraco/windows/filesystem/backports.py rename to libs/win/jaraco/windows/filesystem/backports.py diff --git a/libs/jaraco/windows/filesystem/change.py b/libs/win/jaraco/windows/filesystem/change.py similarity index 100% rename from libs/jaraco/windows/filesystem/change.py rename to libs/win/jaraco/windows/filesystem/change.py diff --git a/libs/jaraco/windows/inet.py b/libs/win/jaraco/windows/inet.py similarity index 100% rename from libs/jaraco/windows/inet.py rename to libs/win/jaraco/windows/inet.py diff --git a/libs/jaraco/windows/lib.py b/libs/win/jaraco/windows/lib.py similarity index 100% rename from libs/jaraco/windows/lib.py rename to libs/win/jaraco/windows/lib.py diff --git a/libs/jaraco/windows/memory.py b/libs/win/jaraco/windows/memory.py similarity index 100% rename from libs/jaraco/windows/memory.py rename to libs/win/jaraco/windows/memory.py diff --git a/libs/jaraco/windows/mmap.py b/libs/win/jaraco/windows/mmap.py similarity index 100% rename from libs/jaraco/windows/mmap.py rename to libs/win/jaraco/windows/mmap.py diff --git a/libs/jaraco/windows/msie.py b/libs/win/jaraco/windows/msie.py similarity index 100% rename from libs/jaraco/windows/msie.py rename to libs/win/jaraco/windows/msie.py diff --git a/libs/jaraco/windows/net.py b/libs/win/jaraco/windows/net.py similarity index 100% rename from libs/jaraco/windows/net.py rename to libs/win/jaraco/windows/net.py diff --git a/libs/jaraco/windows/power.py b/libs/win/jaraco/windows/power.py similarity index 100% rename from libs/jaraco/windows/power.py rename to libs/win/jaraco/windows/power.py diff --git a/libs/jaraco/windows/privilege.py b/libs/win/jaraco/windows/privilege.py similarity index 100% rename from libs/jaraco/windows/privilege.py rename to libs/win/jaraco/windows/privilege.py diff --git a/libs/jaraco/windows/registry.py b/libs/win/jaraco/windows/registry.py similarity index 100% rename from libs/jaraco/windows/registry.py rename to libs/win/jaraco/windows/registry.py diff --git a/libs/jaraco/windows/reparse.py b/libs/win/jaraco/windows/reparse.py similarity index 100% rename from libs/jaraco/windows/reparse.py rename to libs/win/jaraco/windows/reparse.py diff --git a/libs/jaraco/windows/security.py b/libs/win/jaraco/windows/security.py similarity index 100% rename from libs/jaraco/windows/security.py rename to libs/win/jaraco/windows/security.py diff --git a/libs/jaraco/windows/services.py b/libs/win/jaraco/windows/services.py similarity index 100% rename from libs/jaraco/windows/services.py rename to libs/win/jaraco/windows/services.py diff --git a/libs/jaraco/windows/shell.py b/libs/win/jaraco/windows/shell.py similarity index 100% rename from libs/jaraco/windows/shell.py rename to libs/win/jaraco/windows/shell.py diff --git a/libs/jaraco/windows/timers.py b/libs/win/jaraco/windows/timers.py similarity index 100% rename from libs/jaraco/windows/timers.py rename to libs/win/jaraco/windows/timers.py diff --git a/libs/jaraco/windows/timezone.py b/libs/win/jaraco/windows/timezone.py similarity index 100% rename from libs/jaraco/windows/timezone.py rename to libs/win/jaraco/windows/timezone.py diff --git a/libs/jaraco/windows/ui.py b/libs/win/jaraco/windows/ui.py similarity index 100% rename from libs/jaraco/windows/ui.py rename to libs/win/jaraco/windows/ui.py diff --git a/libs/jaraco/windows/user.py b/libs/win/jaraco/windows/user.py similarity index 100% rename from libs/jaraco/windows/user.py rename to libs/win/jaraco/windows/user.py diff --git a/libs/jaraco/windows/util.py b/libs/win/jaraco/windows/util.py similarity index 100% rename from libs/jaraco/windows/util.py rename to libs/win/jaraco/windows/util.py diff --git a/libs/jaraco/windows/vpn.py b/libs/win/jaraco/windows/vpn.py similarity index 100% rename from libs/jaraco/windows/vpn.py rename to libs/win/jaraco/windows/vpn.py diff --git a/libs/jaraco/windows/xmouse.py b/libs/win/jaraco/windows/xmouse.py similarity index 100% rename from libs/jaraco/windows/xmouse.py rename to libs/win/jaraco/windows/xmouse.py diff --git a/libs/more_itertools/__init__.py b/libs/win/more_itertools/__init__.py similarity index 100% rename from libs/more_itertools/__init__.py rename to libs/win/more_itertools/__init__.py diff --git a/libs/more_itertools/more.py b/libs/win/more_itertools/more.py similarity index 100% rename from libs/more_itertools/more.py rename to libs/win/more_itertools/more.py diff --git a/libs/more_itertools/recipes.py b/libs/win/more_itertools/recipes.py similarity index 100% rename from libs/more_itertools/recipes.py rename to libs/win/more_itertools/recipes.py diff --git a/libs/stevedore/example/__init__.py b/libs/win/more_itertools/tests/__init__.py similarity index 100% rename from libs/stevedore/example/__init__.py rename to libs/win/more_itertools/tests/__init__.py diff --git a/libs/more_itertools/tests/test_more.py b/libs/win/more_itertools/tests/test_more.py similarity index 100% rename from libs/more_itertools/tests/test_more.py rename to libs/win/more_itertools/tests/test_more.py diff --git a/libs/more_itertools/tests/test_recipes.py b/libs/win/more_itertools/tests/test_recipes.py similarity index 100% rename from libs/more_itertools/tests/test_recipes.py rename to libs/win/more_itertools/tests/test_recipes.py diff --git a/libs/path.py b/libs/win/path.py similarity index 100% rename from libs/path.py rename to libs/win/path.py diff --git a/libs/pythoncom.py b/libs/win/pythoncom.py similarity index 100% rename from libs/pythoncom.py rename to libs/win/pythoncom.py diff --git a/libs/pythonwin/Pythonwin.exe b/libs/win/pythonwin/Pythonwin.exe similarity index 100% rename from libs/pythonwin/Pythonwin.exe rename to libs/win/pythonwin/Pythonwin.exe diff --git a/libs/pythonwin/dde.pyd b/libs/win/pythonwin/dde.pyd similarity index 100% rename from libs/pythonwin/dde.pyd rename to libs/win/pythonwin/dde.pyd diff --git a/libs/pythonwin/license.txt b/libs/win/pythonwin/license.txt similarity index 100% rename from libs/pythonwin/license.txt rename to libs/win/pythonwin/license.txt diff --git a/libs/pythonwin/mfc140u.dll b/libs/win/pythonwin/mfc140u.dll similarity index 100% rename from libs/pythonwin/mfc140u.dll rename to libs/win/pythonwin/mfc140u.dll diff --git a/libs/pythonwin/mfcm140u.dll b/libs/win/pythonwin/mfcm140u.dll similarity index 100% rename from libs/pythonwin/mfcm140u.dll rename to libs/win/pythonwin/mfcm140u.dll diff --git a/libs/pythonwin/pywin/Demos/app/basictimerapp.py b/libs/win/pythonwin/pywin/Demos/app/basictimerapp.py similarity index 100% rename from libs/pythonwin/pywin/Demos/app/basictimerapp.py rename to libs/win/pythonwin/pywin/Demos/app/basictimerapp.py diff --git a/libs/pythonwin/pywin/Demos/app/customprint.py b/libs/win/pythonwin/pywin/Demos/app/customprint.py similarity index 100% rename from libs/pythonwin/pywin/Demos/app/customprint.py rename to libs/win/pythonwin/pywin/Demos/app/customprint.py diff --git a/libs/pythonwin/pywin/Demos/app/demoutils.py b/libs/win/pythonwin/pywin/Demos/app/demoutils.py similarity index 100% rename from libs/pythonwin/pywin/Demos/app/demoutils.py rename to libs/win/pythonwin/pywin/Demos/app/demoutils.py diff --git a/libs/pythonwin/pywin/Demos/app/dlgappdemo.py b/libs/win/pythonwin/pywin/Demos/app/dlgappdemo.py similarity index 100% rename from libs/pythonwin/pywin/Demos/app/dlgappdemo.py rename to libs/win/pythonwin/pywin/Demos/app/dlgappdemo.py diff --git a/libs/pythonwin/pywin/Demos/app/dojobapp.py b/libs/win/pythonwin/pywin/Demos/app/dojobapp.py similarity index 100% rename from libs/pythonwin/pywin/Demos/app/dojobapp.py rename to libs/win/pythonwin/pywin/Demos/app/dojobapp.py diff --git a/libs/pythonwin/pywin/Demos/app/helloapp.py b/libs/win/pythonwin/pywin/Demos/app/helloapp.py similarity index 100% rename from libs/pythonwin/pywin/Demos/app/helloapp.py rename to libs/win/pythonwin/pywin/Demos/app/helloapp.py diff --git a/libs/pythonwin/pywin/Demos/cmdserver.py b/libs/win/pythonwin/pywin/Demos/cmdserver.py similarity index 100% rename from libs/pythonwin/pywin/Demos/cmdserver.py rename to libs/win/pythonwin/pywin/Demos/cmdserver.py diff --git a/libs/pythonwin/pywin/Demos/createwin.py b/libs/win/pythonwin/pywin/Demos/createwin.py similarity index 100% rename from libs/pythonwin/pywin/Demos/createwin.py rename to libs/win/pythonwin/pywin/Demos/createwin.py diff --git a/libs/pythonwin/pywin/Demos/demoutils.py b/libs/win/pythonwin/pywin/Demos/demoutils.py similarity index 100% rename from libs/pythonwin/pywin/Demos/demoutils.py rename to libs/win/pythonwin/pywin/Demos/demoutils.py diff --git a/libs/pythonwin/pywin/Demos/dibdemo.py b/libs/win/pythonwin/pywin/Demos/dibdemo.py similarity index 100% rename from libs/pythonwin/pywin/Demos/dibdemo.py rename to libs/win/pythonwin/pywin/Demos/dibdemo.py diff --git a/libs/pythonwin/pywin/Demos/dlgtest.py b/libs/win/pythonwin/pywin/Demos/dlgtest.py similarity index 100% rename from libs/pythonwin/pywin/Demos/dlgtest.py rename to libs/win/pythonwin/pywin/Demos/dlgtest.py diff --git a/libs/pythonwin/pywin/Demos/dyndlg.py b/libs/win/pythonwin/pywin/Demos/dyndlg.py similarity index 100% rename from libs/pythonwin/pywin/Demos/dyndlg.py rename to libs/win/pythonwin/pywin/Demos/dyndlg.py diff --git a/libs/pythonwin/pywin/Demos/fontdemo.py b/libs/win/pythonwin/pywin/Demos/fontdemo.py similarity index 100% rename from libs/pythonwin/pywin/Demos/fontdemo.py rename to libs/win/pythonwin/pywin/Demos/fontdemo.py diff --git a/libs/pythonwin/pywin/Demos/guidemo.py b/libs/win/pythonwin/pywin/Demos/guidemo.py similarity index 100% rename from libs/pythonwin/pywin/Demos/guidemo.py rename to libs/win/pythonwin/pywin/Demos/guidemo.py diff --git a/libs/pythonwin/pywin/Demos/hiertest.py b/libs/win/pythonwin/pywin/Demos/hiertest.py similarity index 100% rename from libs/pythonwin/pywin/Demos/hiertest.py rename to libs/win/pythonwin/pywin/Demos/hiertest.py diff --git a/libs/pythonwin/pywin/Demos/menutest.py b/libs/win/pythonwin/pywin/Demos/menutest.py similarity index 100% rename from libs/pythonwin/pywin/Demos/menutest.py rename to libs/win/pythonwin/pywin/Demos/menutest.py diff --git a/libs/pythonwin/pywin/Demos/objdoc.py b/libs/win/pythonwin/pywin/Demos/objdoc.py similarity index 100% rename from libs/pythonwin/pywin/Demos/objdoc.py rename to libs/win/pythonwin/pywin/Demos/objdoc.py diff --git a/libs/stevedore/example2/__init__.py b/libs/win/pythonwin/pywin/Demos/ocx/__init__.py similarity index 100% rename from libs/stevedore/example2/__init__.py rename to libs/win/pythonwin/pywin/Demos/ocx/__init__.py diff --git a/libs/pythonwin/pywin/Demos/ocx/demoutils.py b/libs/win/pythonwin/pywin/Demos/ocx/demoutils.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/demoutils.py rename to libs/win/pythonwin/pywin/Demos/ocx/demoutils.py diff --git a/libs/pythonwin/pywin/Demos/ocx/flash.py b/libs/win/pythonwin/pywin/Demos/ocx/flash.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/flash.py rename to libs/win/pythonwin/pywin/Demos/ocx/flash.py diff --git a/libs/pythonwin/pywin/Demos/ocx/msoffice.py b/libs/win/pythonwin/pywin/Demos/ocx/msoffice.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/msoffice.py rename to libs/win/pythonwin/pywin/Demos/ocx/msoffice.py diff --git a/libs/pythonwin/pywin/Demos/ocx/ocxserialtest.py b/libs/win/pythonwin/pywin/Demos/ocx/ocxserialtest.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/ocxserialtest.py rename to libs/win/pythonwin/pywin/Demos/ocx/ocxserialtest.py diff --git a/libs/pythonwin/pywin/Demos/ocx/ocxtest.py b/libs/win/pythonwin/pywin/Demos/ocx/ocxtest.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/ocxtest.py rename to libs/win/pythonwin/pywin/Demos/ocx/ocxtest.py diff --git a/libs/pythonwin/pywin/Demos/ocx/webbrowser.py b/libs/win/pythonwin/pywin/Demos/ocx/webbrowser.py similarity index 100% rename from libs/pythonwin/pywin/Demos/ocx/webbrowser.py rename to libs/win/pythonwin/pywin/Demos/ocx/webbrowser.py diff --git a/libs/pythonwin/pywin/Demos/openGLDemo.py b/libs/win/pythonwin/pywin/Demos/openGLDemo.py similarity index 100% rename from libs/pythonwin/pywin/Demos/openGLDemo.py rename to libs/win/pythonwin/pywin/Demos/openGLDemo.py diff --git a/libs/pythonwin/pywin/Demos/progressbar.py b/libs/win/pythonwin/pywin/Demos/progressbar.py similarity index 100% rename from libs/pythonwin/pywin/Demos/progressbar.py rename to libs/win/pythonwin/pywin/Demos/progressbar.py diff --git a/libs/pythonwin/pywin/Demos/sliderdemo.py b/libs/win/pythonwin/pywin/Demos/sliderdemo.py similarity index 100% rename from libs/pythonwin/pywin/Demos/sliderdemo.py rename to libs/win/pythonwin/pywin/Demos/sliderdemo.py diff --git a/libs/pythonwin/pywin/Demos/splittst.py b/libs/win/pythonwin/pywin/Demos/splittst.py similarity index 100% rename from libs/pythonwin/pywin/Demos/splittst.py rename to libs/win/pythonwin/pywin/Demos/splittst.py diff --git a/libs/pythonwin/pywin/Demos/threadedgui.py b/libs/win/pythonwin/pywin/Demos/threadedgui.py similarity index 100% rename from libs/pythonwin/pywin/Demos/threadedgui.py rename to libs/win/pythonwin/pywin/Demos/threadedgui.py diff --git a/libs/pythonwin/pywin/Demos/toolbar.py b/libs/win/pythonwin/pywin/Demos/toolbar.py similarity index 100% rename from libs/pythonwin/pywin/Demos/toolbar.py rename to libs/win/pythonwin/pywin/Demos/toolbar.py diff --git a/libs/pythonwin/pywin/__init__.py b/libs/win/pythonwin/pywin/__init__.py similarity index 100% rename from libs/pythonwin/pywin/__init__.py rename to libs/win/pythonwin/pywin/__init__.py diff --git a/libs/pythonwin/pywin/debugger/__init__.py b/libs/win/pythonwin/pywin/debugger/__init__.py similarity index 100% rename from libs/pythonwin/pywin/debugger/__init__.py rename to libs/win/pythonwin/pywin/debugger/__init__.py diff --git a/libs/pythonwin/pywin/debugger/configui.py b/libs/win/pythonwin/pywin/debugger/configui.py similarity index 100% rename from libs/pythonwin/pywin/debugger/configui.py rename to libs/win/pythonwin/pywin/debugger/configui.py diff --git a/libs/pythonwin/pywin/debugger/dbgcon.py b/libs/win/pythonwin/pywin/debugger/dbgcon.py similarity index 100% rename from libs/pythonwin/pywin/debugger/dbgcon.py rename to libs/win/pythonwin/pywin/debugger/dbgcon.py diff --git a/libs/pythonwin/pywin/debugger/dbgpyapp.py b/libs/win/pythonwin/pywin/debugger/dbgpyapp.py similarity index 100% rename from libs/pythonwin/pywin/debugger/dbgpyapp.py rename to libs/win/pythonwin/pywin/debugger/dbgpyapp.py diff --git a/libs/pythonwin/pywin/debugger/debugger.py b/libs/win/pythonwin/pywin/debugger/debugger.py similarity index 100% rename from libs/pythonwin/pywin/debugger/debugger.py rename to libs/win/pythonwin/pywin/debugger/debugger.py diff --git a/libs/pythonwin/pywin/debugger/fail.py b/libs/win/pythonwin/pywin/debugger/fail.py similarity index 100% rename from libs/pythonwin/pywin/debugger/fail.py rename to libs/win/pythonwin/pywin/debugger/fail.py diff --git a/libs/stevedore/tests/__init__.py b/libs/win/pythonwin/pywin/dialogs/__init__.py similarity index 100% rename from libs/stevedore/tests/__init__.py rename to libs/win/pythonwin/pywin/dialogs/__init__.py diff --git a/libs/pythonwin/pywin/dialogs/ideoptions.py b/libs/win/pythonwin/pywin/dialogs/ideoptions.py similarity index 100% rename from libs/pythonwin/pywin/dialogs/ideoptions.py rename to libs/win/pythonwin/pywin/dialogs/ideoptions.py diff --git a/libs/pythonwin/pywin/dialogs/list.py b/libs/win/pythonwin/pywin/dialogs/list.py similarity index 100% rename from libs/pythonwin/pywin/dialogs/list.py rename to libs/win/pythonwin/pywin/dialogs/list.py diff --git a/libs/pythonwin/pywin/dialogs/login.py b/libs/win/pythonwin/pywin/dialogs/login.py similarity index 100% rename from libs/pythonwin/pywin/dialogs/login.py rename to libs/win/pythonwin/pywin/dialogs/login.py diff --git a/libs/pythonwin/pywin/dialogs/status.py b/libs/win/pythonwin/pywin/dialogs/status.py similarity index 100% rename from libs/pythonwin/pywin/dialogs/status.py rename to libs/win/pythonwin/pywin/dialogs/status.py diff --git a/libs/pythonwin/pywin/docking/DockingBar.py b/libs/win/pythonwin/pywin/docking/DockingBar.py similarity index 100% rename from libs/pythonwin/pywin/docking/DockingBar.py rename to libs/win/pythonwin/pywin/docking/DockingBar.py diff --git a/libs/subliminal/converters/__init__.py b/libs/win/pythonwin/pywin/docking/__init__.py similarity index 100% rename from libs/subliminal/converters/__init__.py rename to libs/win/pythonwin/pywin/docking/__init__.py diff --git a/libs/urllib3/contrib/__init__.py b/libs/win/pythonwin/pywin/framework/__init__.py similarity index 100% rename from libs/urllib3/contrib/__init__.py rename to libs/win/pythonwin/pywin/framework/__init__.py diff --git a/libs/pythonwin/pywin/framework/app.py b/libs/win/pythonwin/pywin/framework/app.py similarity index 100% rename from libs/pythonwin/pywin/framework/app.py rename to libs/win/pythonwin/pywin/framework/app.py diff --git a/libs/pythonwin/pywin/framework/bitmap.py b/libs/win/pythonwin/pywin/framework/bitmap.py similarity index 100% rename from libs/pythonwin/pywin/framework/bitmap.py rename to libs/win/pythonwin/pywin/framework/bitmap.py diff --git a/libs/pythonwin/pywin/framework/cmdline.py b/libs/win/pythonwin/pywin/framework/cmdline.py similarity index 100% rename from libs/pythonwin/pywin/framework/cmdline.py rename to libs/win/pythonwin/pywin/framework/cmdline.py diff --git a/libs/pythonwin/pywin/framework/dbgcommands.py b/libs/win/pythonwin/pywin/framework/dbgcommands.py similarity index 100% rename from libs/pythonwin/pywin/framework/dbgcommands.py rename to libs/win/pythonwin/pywin/framework/dbgcommands.py diff --git a/libs/pythonwin/pywin/framework/dlgappcore.py b/libs/win/pythonwin/pywin/framework/dlgappcore.py similarity index 100% rename from libs/pythonwin/pywin/framework/dlgappcore.py rename to libs/win/pythonwin/pywin/framework/dlgappcore.py diff --git a/libs/pythonwin/pywin/framework/editor/ModuleBrowser.py b/libs/win/pythonwin/pywin/framework/editor/ModuleBrowser.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/ModuleBrowser.py rename to libs/win/pythonwin/pywin/framework/editor/ModuleBrowser.py diff --git a/libs/pythonwin/pywin/framework/editor/__init__.py b/libs/win/pythonwin/pywin/framework/editor/__init__.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/__init__.py rename to libs/win/pythonwin/pywin/framework/editor/__init__.py diff --git a/libs/urllib3/contrib/_securetransport/__init__.py b/libs/win/pythonwin/pywin/framework/editor/color/__init__.py similarity index 100% rename from libs/urllib3/contrib/_securetransport/__init__.py rename to libs/win/pythonwin/pywin/framework/editor/color/__init__.py diff --git a/libs/pythonwin/pywin/framework/editor/color/coloreditor.py b/libs/win/pythonwin/pywin/framework/editor/color/coloreditor.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/color/coloreditor.py rename to libs/win/pythonwin/pywin/framework/editor/color/coloreditor.py diff --git a/libs/pythonwin/pywin/framework/editor/configui.py b/libs/win/pythonwin/pywin/framework/editor/configui.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/configui.py rename to libs/win/pythonwin/pywin/framework/editor/configui.py diff --git a/libs/pythonwin/pywin/framework/editor/document.py b/libs/win/pythonwin/pywin/framework/editor/document.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/document.py rename to libs/win/pythonwin/pywin/framework/editor/document.py diff --git a/libs/pythonwin/pywin/framework/editor/editor.py b/libs/win/pythonwin/pywin/framework/editor/editor.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/editor.py rename to libs/win/pythonwin/pywin/framework/editor/editor.py diff --git a/libs/pythonwin/pywin/framework/editor/frame.py b/libs/win/pythonwin/pywin/framework/editor/frame.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/frame.py rename to libs/win/pythonwin/pywin/framework/editor/frame.py diff --git a/libs/pythonwin/pywin/framework/editor/template.py b/libs/win/pythonwin/pywin/framework/editor/template.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/template.py rename to libs/win/pythonwin/pywin/framework/editor/template.py diff --git a/libs/pythonwin/pywin/framework/editor/vss.py b/libs/win/pythonwin/pywin/framework/editor/vss.py similarity index 100% rename from libs/pythonwin/pywin/framework/editor/vss.py rename to libs/win/pythonwin/pywin/framework/editor/vss.py diff --git a/libs/pythonwin/pywin/framework/help.py b/libs/win/pythonwin/pywin/framework/help.py similarity index 100% rename from libs/pythonwin/pywin/framework/help.py rename to libs/win/pythonwin/pywin/framework/help.py diff --git a/libs/pythonwin/pywin/framework/interact.py b/libs/win/pythonwin/pywin/framework/interact.py similarity index 100% rename from libs/pythonwin/pywin/framework/interact.py rename to libs/win/pythonwin/pywin/framework/interact.py diff --git a/libs/pythonwin/pywin/framework/intpyapp.py b/libs/win/pythonwin/pywin/framework/intpyapp.py similarity index 100% rename from libs/pythonwin/pywin/framework/intpyapp.py rename to libs/win/pythonwin/pywin/framework/intpyapp.py diff --git a/libs/pythonwin/pywin/framework/intpydde.py b/libs/win/pythonwin/pywin/framework/intpydde.py similarity index 100% rename from libs/pythonwin/pywin/framework/intpydde.py rename to libs/win/pythonwin/pywin/framework/intpydde.py diff --git a/libs/pythonwin/pywin/framework/mdi_pychecker.py b/libs/win/pythonwin/pywin/framework/mdi_pychecker.py similarity index 100% rename from libs/pythonwin/pywin/framework/mdi_pychecker.py rename to libs/win/pythonwin/pywin/framework/mdi_pychecker.py diff --git a/libs/pythonwin/pywin/framework/scriptutils.py b/libs/win/pythonwin/pywin/framework/scriptutils.py similarity index 100% rename from libs/pythonwin/pywin/framework/scriptutils.py rename to libs/win/pythonwin/pywin/framework/scriptutils.py diff --git a/libs/pythonwin/pywin/framework/sgrepmdi.py b/libs/win/pythonwin/pywin/framework/sgrepmdi.py similarity index 100% rename from libs/pythonwin/pywin/framework/sgrepmdi.py rename to libs/win/pythonwin/pywin/framework/sgrepmdi.py diff --git a/libs/pythonwin/pywin/framework/startup.py b/libs/win/pythonwin/pywin/framework/startup.py similarity index 100% rename from libs/pythonwin/pywin/framework/startup.py rename to libs/win/pythonwin/pywin/framework/startup.py diff --git a/libs/pythonwin/pywin/framework/stdin.py b/libs/win/pythonwin/pywin/framework/stdin.py similarity index 100% rename from libs/pythonwin/pywin/framework/stdin.py rename to libs/win/pythonwin/pywin/framework/stdin.py diff --git a/libs/pythonwin/pywin/framework/toolmenu.py b/libs/win/pythonwin/pywin/framework/toolmenu.py similarity index 100% rename from libs/pythonwin/pywin/framework/toolmenu.py rename to libs/win/pythonwin/pywin/framework/toolmenu.py diff --git a/libs/pythonwin/pywin/framework/window.py b/libs/win/pythonwin/pywin/framework/window.py similarity index 100% rename from libs/pythonwin/pywin/framework/window.py rename to libs/win/pythonwin/pywin/framework/window.py diff --git a/libs/pythonwin/pywin/framework/winout.py b/libs/win/pythonwin/pywin/framework/winout.py similarity index 100% rename from libs/pythonwin/pywin/framework/winout.py rename to libs/win/pythonwin/pywin/framework/winout.py diff --git a/libs/pythonwin/pywin/idle/AutoExpand.py b/libs/win/pythonwin/pywin/idle/AutoExpand.py similarity index 100% rename from libs/pythonwin/pywin/idle/AutoExpand.py rename to libs/win/pythonwin/pywin/idle/AutoExpand.py diff --git a/libs/pythonwin/pywin/idle/AutoIndent.py b/libs/win/pythonwin/pywin/idle/AutoIndent.py similarity index 100% rename from libs/pythonwin/pywin/idle/AutoIndent.py rename to libs/win/pythonwin/pywin/idle/AutoIndent.py diff --git a/libs/pythonwin/pywin/idle/CallTips.py b/libs/win/pythonwin/pywin/idle/CallTips.py similarity index 100% rename from libs/pythonwin/pywin/idle/CallTips.py rename to libs/win/pythonwin/pywin/idle/CallTips.py diff --git a/libs/pythonwin/pywin/idle/FormatParagraph.py b/libs/win/pythonwin/pywin/idle/FormatParagraph.py similarity index 100% rename from libs/pythonwin/pywin/idle/FormatParagraph.py rename to libs/win/pythonwin/pywin/idle/FormatParagraph.py diff --git a/libs/pythonwin/pywin/idle/IdleHistory.py b/libs/win/pythonwin/pywin/idle/IdleHistory.py similarity index 100% rename from libs/pythonwin/pywin/idle/IdleHistory.py rename to libs/win/pythonwin/pywin/idle/IdleHistory.py diff --git a/libs/pythonwin/pywin/idle/PyParse.py b/libs/win/pythonwin/pywin/idle/PyParse.py similarity index 100% rename from libs/pythonwin/pywin/idle/PyParse.py rename to libs/win/pythonwin/pywin/idle/PyParse.py diff --git a/libs/pythonwin/pywin/idle/__init__.py b/libs/win/pythonwin/pywin/idle/__init__.py similarity index 100% rename from libs/pythonwin/pywin/idle/__init__.py rename to libs/win/pythonwin/pywin/idle/__init__.py diff --git a/libs/urllib3/packages/backports/__init__.py b/libs/win/pythonwin/pywin/mfc/__init__.py similarity index 100% rename from libs/urllib3/packages/backports/__init__.py rename to libs/win/pythonwin/pywin/mfc/__init__.py diff --git a/libs/pythonwin/pywin/mfc/activex.py b/libs/win/pythonwin/pywin/mfc/activex.py similarity index 100% rename from libs/pythonwin/pywin/mfc/activex.py rename to libs/win/pythonwin/pywin/mfc/activex.py diff --git a/libs/pythonwin/pywin/mfc/afxres.py b/libs/win/pythonwin/pywin/mfc/afxres.py similarity index 100% rename from libs/pythonwin/pywin/mfc/afxres.py rename to libs/win/pythonwin/pywin/mfc/afxres.py diff --git a/libs/pythonwin/pywin/mfc/dialog.py b/libs/win/pythonwin/pywin/mfc/dialog.py similarity index 100% rename from libs/pythonwin/pywin/mfc/dialog.py rename to libs/win/pythonwin/pywin/mfc/dialog.py diff --git a/libs/pythonwin/pywin/mfc/docview.py b/libs/win/pythonwin/pywin/mfc/docview.py similarity index 100% rename from libs/pythonwin/pywin/mfc/docview.py rename to libs/win/pythonwin/pywin/mfc/docview.py diff --git a/libs/pythonwin/pywin/mfc/object.py b/libs/win/pythonwin/pywin/mfc/object.py similarity index 100% rename from libs/pythonwin/pywin/mfc/object.py rename to libs/win/pythonwin/pywin/mfc/object.py diff --git a/libs/pythonwin/pywin/mfc/thread.py b/libs/win/pythonwin/pywin/mfc/thread.py similarity index 100% rename from libs/pythonwin/pywin/mfc/thread.py rename to libs/win/pythonwin/pywin/mfc/thread.py diff --git a/libs/pythonwin/pywin/mfc/window.py b/libs/win/pythonwin/pywin/mfc/window.py similarity index 100% rename from libs/pythonwin/pywin/mfc/window.py rename to libs/win/pythonwin/pywin/mfc/window.py diff --git a/libs/pythonwin/pywin/scintilla/IDLEenvironment.py b/libs/win/pythonwin/pywin/scintilla/IDLEenvironment.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/IDLEenvironment.py rename to libs/win/pythonwin/pywin/scintilla/IDLEenvironment.py diff --git a/libs/pythonwin/pywin/scintilla/__init__.py b/libs/win/pythonwin/pywin/scintilla/__init__.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/__init__.py rename to libs/win/pythonwin/pywin/scintilla/__init__.py diff --git a/libs/pythonwin/pywin/scintilla/bindings.py b/libs/win/pythonwin/pywin/scintilla/bindings.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/bindings.py rename to libs/win/pythonwin/pywin/scintilla/bindings.py diff --git a/libs/pythonwin/pywin/scintilla/config.py b/libs/win/pythonwin/pywin/scintilla/config.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/config.py rename to libs/win/pythonwin/pywin/scintilla/config.py diff --git a/libs/pythonwin/pywin/scintilla/configui.py b/libs/win/pythonwin/pywin/scintilla/configui.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/configui.py rename to libs/win/pythonwin/pywin/scintilla/configui.py diff --git a/libs/pythonwin/pywin/scintilla/control.py b/libs/win/pythonwin/pywin/scintilla/control.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/control.py rename to libs/win/pythonwin/pywin/scintilla/control.py diff --git a/libs/pythonwin/pywin/scintilla/document.py b/libs/win/pythonwin/pywin/scintilla/document.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/document.py rename to libs/win/pythonwin/pywin/scintilla/document.py diff --git a/libs/pythonwin/pywin/scintilla/find.py b/libs/win/pythonwin/pywin/scintilla/find.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/find.py rename to libs/win/pythonwin/pywin/scintilla/find.py diff --git a/libs/pythonwin/pywin/scintilla/formatter.py b/libs/win/pythonwin/pywin/scintilla/formatter.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/formatter.py rename to libs/win/pythonwin/pywin/scintilla/formatter.py diff --git a/libs/pythonwin/pywin/scintilla/keycodes.py b/libs/win/pythonwin/pywin/scintilla/keycodes.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/keycodes.py rename to libs/win/pythonwin/pywin/scintilla/keycodes.py diff --git a/libs/pythonwin/pywin/scintilla/scintillacon.py b/libs/win/pythonwin/pywin/scintilla/scintillacon.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/scintillacon.py rename to libs/win/pythonwin/pywin/scintilla/scintillacon.py diff --git a/libs/pythonwin/pywin/scintilla/view.py b/libs/win/pythonwin/pywin/scintilla/view.py similarity index 100% rename from libs/pythonwin/pywin/scintilla/view.py rename to libs/win/pythonwin/pywin/scintilla/view.py diff --git a/libs/pythonwin/pywin/tools/TraceCollector.py b/libs/win/pythonwin/pywin/tools/TraceCollector.py similarity index 100% rename from libs/pythonwin/pywin/tools/TraceCollector.py rename to libs/win/pythonwin/pywin/tools/TraceCollector.py diff --git a/libs/pythonwin/pywin/tools/__init__.py b/libs/win/pythonwin/pywin/tools/__init__.py similarity index 100% rename from libs/pythonwin/pywin/tools/__init__.py rename to libs/win/pythonwin/pywin/tools/__init__.py diff --git a/libs/pythonwin/pywin/tools/browseProjects.py b/libs/win/pythonwin/pywin/tools/browseProjects.py similarity index 100% rename from libs/pythonwin/pywin/tools/browseProjects.py rename to libs/win/pythonwin/pywin/tools/browseProjects.py diff --git a/libs/pythonwin/pywin/tools/browser.py b/libs/win/pythonwin/pywin/tools/browser.py similarity index 100% rename from libs/pythonwin/pywin/tools/browser.py rename to libs/win/pythonwin/pywin/tools/browser.py diff --git a/libs/pythonwin/pywin/tools/hierlist.py b/libs/win/pythonwin/pywin/tools/hierlist.py similarity index 100% rename from libs/pythonwin/pywin/tools/hierlist.py rename to libs/win/pythonwin/pywin/tools/hierlist.py diff --git a/libs/pythonwin/pywin/tools/regedit.py b/libs/win/pythonwin/pywin/tools/regedit.py similarity index 100% rename from libs/pythonwin/pywin/tools/regedit.py rename to libs/win/pythonwin/pywin/tools/regedit.py diff --git a/libs/pythonwin/pywin/tools/regpy.py b/libs/win/pythonwin/pywin/tools/regpy.py similarity index 100% rename from libs/pythonwin/pywin/tools/regpy.py rename to libs/win/pythonwin/pywin/tools/regpy.py diff --git a/libs/pythonwin/scintilla.dll b/libs/win/pythonwin/scintilla.dll similarity index 100% rename from libs/pythonwin/scintilla.dll rename to libs/win/pythonwin/scintilla.dll diff --git a/libs/pythonwin/win32ui.pyd b/libs/win/pythonwin/win32ui.pyd similarity index 100% rename from libs/pythonwin/win32ui.pyd rename to libs/win/pythonwin/win32ui.pyd diff --git a/libs/pythonwin/win32uiole.pyd b/libs/win/pythonwin/win32uiole.pyd similarity index 100% rename from libs/pythonwin/win32uiole.pyd rename to libs/win/pythonwin/win32uiole.pyd diff --git a/libs/pywin32.pth b/libs/win/pywin32.pth similarity index 100% rename from libs/pywin32.pth rename to libs/win/pywin32.pth diff --git a/libs/pywin32.version.txt b/libs/win/pywin32.version.txt similarity index 100% rename from libs/pywin32.version.txt rename to libs/win/pywin32.version.txt diff --git a/libs/pywin32_system32/pythoncom37.dll b/libs/win/pywin32_system32/pythoncom37.dll similarity index 100% rename from libs/pywin32_system32/pythoncom37.dll rename to libs/win/pywin32_system32/pythoncom37.dll diff --git a/libs/pywin32_system32/pywintypes37.dll b/libs/win/pywin32_system32/pywintypes37.dll similarity index 100% rename from libs/pywin32_system32/pywintypes37.dll rename to libs/win/pywin32_system32/pywintypes37.dll diff --git a/libs/win/six.py b/libs/win/six.py new file mode 100644 index 00000000..89b2188f --- /dev/null +++ b/libs/win/six.py @@ -0,0 +1,952 @@ +# Copyright (c) 2010-2018 Benjamin Peterson +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +"""Utilities for writing code that runs on Python 2 and 3""" + +from __future__ import absolute_import + +import functools +import itertools +import operator +import sys +import types + +__author__ = "Benjamin Peterson " +__version__ = "1.12.0" + + +# Useful for very coarse version differentiation. +PY2 = sys.version_info[0] == 2 +PY3 = sys.version_info[0] == 3 +PY34 = sys.version_info[0:2] >= (3, 4) + +if PY3: + string_types = str, + integer_types = int, + class_types = type, + text_type = str + binary_type = bytes + + MAXSIZE = sys.maxsize +else: + string_types = basestring, + integer_types = (int, long) + class_types = (type, types.ClassType) + text_type = unicode + binary_type = str + + if sys.platform.startswith("java"): + # Jython always uses 32 bits. + MAXSIZE = int((1 << 31) - 1) + else: + # It's possible to have sizeof(long) != sizeof(Py_ssize_t). + class X(object): + + def __len__(self): + return 1 << 31 + try: + len(X()) + except OverflowError: + # 32-bit + MAXSIZE = int((1 << 31) - 1) + else: + # 64-bit + MAXSIZE = int((1 << 63) - 1) + del X + + +def _add_doc(func, doc): + """Add documentation to a function.""" + func.__doc__ = doc + + +def _import_module(name): + """Import module, returning the module after the last dot.""" + __import__(name) + return sys.modules[name] + + +class _LazyDescr(object): + + def __init__(self, name): + self.name = name + + def __get__(self, obj, tp): + result = self._resolve() + setattr(obj, self.name, result) # Invokes __set__. + try: + # This is a bit ugly, but it avoids running this again by + # removing this descriptor. + delattr(obj.__class__, self.name) + except AttributeError: + pass + return result + + +class MovedModule(_LazyDescr): + + def __init__(self, name, old, new=None): + super(MovedModule, self).__init__(name) + if PY3: + if new is None: + new = name + self.mod = new + else: + self.mod = old + + def _resolve(self): + return _import_module(self.mod) + + def __getattr__(self, attr): + _module = self._resolve() + value = getattr(_module, attr) + setattr(self, attr, value) + return value + + +class _LazyModule(types.ModuleType): + + def __init__(self, name): + super(_LazyModule, self).__init__(name) + self.__doc__ = self.__class__.__doc__ + + def __dir__(self): + attrs = ["__doc__", "__name__"] + attrs += [attr.name for attr in self._moved_attributes] + return attrs + + # Subclasses should override this + _moved_attributes = [] + + +class MovedAttribute(_LazyDescr): + + def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None): + super(MovedAttribute, self).__init__(name) + if PY3: + if new_mod is None: + new_mod = name + self.mod = new_mod + if new_attr is None: + if old_attr is None: + new_attr = name + else: + new_attr = old_attr + self.attr = new_attr + else: + self.mod = old_mod + if old_attr is None: + old_attr = name + self.attr = old_attr + + def _resolve(self): + module = _import_module(self.mod) + return getattr(module, self.attr) + + +class _SixMetaPathImporter(object): + + """ + A meta path importer to import six.moves and its submodules. + + This class implements a PEP302 finder and loader. It should be compatible + with Python 2.5 and all existing versions of Python3 + """ + + def __init__(self, six_module_name): + self.name = six_module_name + self.known_modules = {} + + def _add_module(self, mod, *fullnames): + for fullname in fullnames: + self.known_modules[self.name + "." + fullname] = mod + + def _get_module(self, fullname): + return self.known_modules[self.name + "." + fullname] + + def find_module(self, fullname, path=None): + if fullname in self.known_modules: + return self + return None + + def __get_module(self, fullname): + try: + return self.known_modules[fullname] + except KeyError: + raise ImportError("This loader does not know module " + fullname) + + def load_module(self, fullname): + try: + # in case of a reload + return sys.modules[fullname] + except KeyError: + pass + mod = self.__get_module(fullname) + if isinstance(mod, MovedModule): + mod = mod._resolve() + else: + mod.__loader__ = self + sys.modules[fullname] = mod + return mod + + def is_package(self, fullname): + """ + Return true, if the named module is a package. + + We need this method to get correct spec objects with + Python 3.4 (see PEP451) + """ + return hasattr(self.__get_module(fullname), "__path__") + + def get_code(self, fullname): + """Return None + + Required, if is_package is implemented""" + self.__get_module(fullname) # eventually raises ImportError + return None + get_source = get_code # same as get_code + +_importer = _SixMetaPathImporter(__name__) + + +class _MovedItems(_LazyModule): + + """Lazy loading of moved objects""" + __path__ = [] # mark as package + + +_moved_attributes = [ + MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"), + MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"), + MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"), + MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"), + MovedAttribute("intern", "__builtin__", "sys"), + MovedAttribute("map", "itertools", "builtins", "imap", "map"), + MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), + MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), + MovedAttribute("getoutput", "commands", "subprocess"), + MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), + MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), + MovedAttribute("reduce", "__builtin__", "functools"), + MovedAttribute("shlex_quote", "pipes", "shlex", "quote"), + MovedAttribute("StringIO", "StringIO", "io"), + MovedAttribute("UserDict", "UserDict", "collections"), + MovedAttribute("UserList", "UserList", "collections"), + MovedAttribute("UserString", "UserString", "collections"), + MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"), + MovedAttribute("zip", "itertools", "builtins", "izip", "zip"), + MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"), + MovedModule("builtins", "__builtin__"), + MovedModule("configparser", "ConfigParser"), + MovedModule("copyreg", "copy_reg"), + MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), + MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"), + MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), + MovedModule("http_cookies", "Cookie", "http.cookies"), + MovedModule("html_entities", "htmlentitydefs", "html.entities"), + MovedModule("html_parser", "HTMLParser", "html.parser"), + MovedModule("http_client", "httplib", "http.client"), + MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), + MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"), + MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"), + MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"), + MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"), + MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), + MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), + MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), + MovedModule("cPickle", "cPickle", "pickle"), + MovedModule("queue", "Queue"), + MovedModule("reprlib", "repr"), + MovedModule("socketserver", "SocketServer"), + MovedModule("_thread", "thread", "_thread"), + MovedModule("tkinter", "Tkinter"), + MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"), + MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"), + MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), + MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), + MovedModule("tkinter_tix", "Tix", "tkinter.tix"), + MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"), + MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), + MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), + MovedModule("tkinter_colorchooser", "tkColorChooser", + "tkinter.colorchooser"), + MovedModule("tkinter_commondialog", "tkCommonDialog", + "tkinter.commondialog"), + MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"), + MovedModule("tkinter_font", "tkFont", "tkinter.font"), + MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), + MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", + "tkinter.simpledialog"), + MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"), + MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"), + MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"), + MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), + MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"), + MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"), +] +# Add windows specific modules. +if sys.platform == "win32": + _moved_attributes += [ + MovedModule("winreg", "_winreg"), + ] + +for attr in _moved_attributes: + setattr(_MovedItems, attr.name, attr) + if isinstance(attr, MovedModule): + _importer._add_module(attr, "moves." + attr.name) +del attr + +_MovedItems._moved_attributes = _moved_attributes + +moves = _MovedItems(__name__ + ".moves") +_importer._add_module(moves, "moves") + + +class Module_six_moves_urllib_parse(_LazyModule): + + """Lazy loading of moved objects in six.moves.urllib_parse""" + + +_urllib_parse_moved_attributes = [ + MovedAttribute("ParseResult", "urlparse", "urllib.parse"), + MovedAttribute("SplitResult", "urlparse", "urllib.parse"), + MovedAttribute("parse_qs", "urlparse", "urllib.parse"), + MovedAttribute("parse_qsl", "urlparse", "urllib.parse"), + MovedAttribute("urldefrag", "urlparse", "urllib.parse"), + MovedAttribute("urljoin", "urlparse", "urllib.parse"), + MovedAttribute("urlparse", "urlparse", "urllib.parse"), + MovedAttribute("urlsplit", "urlparse", "urllib.parse"), + MovedAttribute("urlunparse", "urlparse", "urllib.parse"), + MovedAttribute("urlunsplit", "urlparse", "urllib.parse"), + MovedAttribute("quote", "urllib", "urllib.parse"), + MovedAttribute("quote_plus", "urllib", "urllib.parse"), + MovedAttribute("unquote", "urllib", "urllib.parse"), + MovedAttribute("unquote_plus", "urllib", "urllib.parse"), + MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"), + MovedAttribute("urlencode", "urllib", "urllib.parse"), + MovedAttribute("splitquery", "urllib", "urllib.parse"), + MovedAttribute("splittag", "urllib", "urllib.parse"), + MovedAttribute("splituser", "urllib", "urllib.parse"), + MovedAttribute("splitvalue", "urllib", "urllib.parse"), + MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), + MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), + MovedAttribute("uses_params", "urlparse", "urllib.parse"), + MovedAttribute("uses_query", "urlparse", "urllib.parse"), + MovedAttribute("uses_relative", "urlparse", "urllib.parse"), +] +for attr in _urllib_parse_moved_attributes: + setattr(Module_six_moves_urllib_parse, attr.name, attr) +del attr + +Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes + +_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"), + "moves.urllib_parse", "moves.urllib.parse") + + +class Module_six_moves_urllib_error(_LazyModule): + + """Lazy loading of moved objects in six.moves.urllib_error""" + + +_urllib_error_moved_attributes = [ + MovedAttribute("URLError", "urllib2", "urllib.error"), + MovedAttribute("HTTPError", "urllib2", "urllib.error"), + MovedAttribute("ContentTooShortError", "urllib", "urllib.error"), +] +for attr in _urllib_error_moved_attributes: + setattr(Module_six_moves_urllib_error, attr.name, attr) +del attr + +Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes + +_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"), + "moves.urllib_error", "moves.urllib.error") + + +class Module_six_moves_urllib_request(_LazyModule): + + """Lazy loading of moved objects in six.moves.urllib_request""" + + +_urllib_request_moved_attributes = [ + MovedAttribute("urlopen", "urllib2", "urllib.request"), + MovedAttribute("install_opener", "urllib2", "urllib.request"), + MovedAttribute("build_opener", "urllib2", "urllib.request"), + MovedAttribute("pathname2url", "urllib", "urllib.request"), + MovedAttribute("url2pathname", "urllib", "urllib.request"), + MovedAttribute("getproxies", "urllib", "urllib.request"), + MovedAttribute("Request", "urllib2", "urllib.request"), + MovedAttribute("OpenerDirector", "urllib2", "urllib.request"), + MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"), + MovedAttribute("ProxyHandler", "urllib2", "urllib.request"), + MovedAttribute("BaseHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"), + MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"), + MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"), + MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"), + MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"), + MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"), + MovedAttribute("FileHandler", "urllib2", "urllib.request"), + MovedAttribute("FTPHandler", "urllib2", "urllib.request"), + MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"), + MovedAttribute("UnknownHandler", "urllib2", "urllib.request"), + MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"), + MovedAttribute("urlretrieve", "urllib", "urllib.request"), + MovedAttribute("urlcleanup", "urllib", "urllib.request"), + MovedAttribute("URLopener", "urllib", "urllib.request"), + MovedAttribute("FancyURLopener", "urllib", "urllib.request"), + MovedAttribute("proxy_bypass", "urllib", "urllib.request"), + MovedAttribute("parse_http_list", "urllib2", "urllib.request"), + MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), +] +for attr in _urllib_request_moved_attributes: + setattr(Module_six_moves_urllib_request, attr.name, attr) +del attr + +Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes + +_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"), + "moves.urllib_request", "moves.urllib.request") + + +class Module_six_moves_urllib_response(_LazyModule): + + """Lazy loading of moved objects in six.moves.urllib_response""" + + +_urllib_response_moved_attributes = [ + MovedAttribute("addbase", "urllib", "urllib.response"), + MovedAttribute("addclosehook", "urllib", "urllib.response"), + MovedAttribute("addinfo", "urllib", "urllib.response"), + MovedAttribute("addinfourl", "urllib", "urllib.response"), +] +for attr in _urllib_response_moved_attributes: + setattr(Module_six_moves_urllib_response, attr.name, attr) +del attr + +Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes + +_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"), + "moves.urllib_response", "moves.urllib.response") + + +class Module_six_moves_urllib_robotparser(_LazyModule): + + """Lazy loading of moved objects in six.moves.urllib_robotparser""" + + +_urllib_robotparser_moved_attributes = [ + MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"), +] +for attr in _urllib_robotparser_moved_attributes: + setattr(Module_six_moves_urllib_robotparser, attr.name, attr) +del attr + +Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes + +_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"), + "moves.urllib_robotparser", "moves.urllib.robotparser") + + +class Module_six_moves_urllib(types.ModuleType): + + """Create a six.moves.urllib namespace that resembles the Python 3 namespace""" + __path__ = [] # mark as package + parse = _importer._get_module("moves.urllib_parse") + error = _importer._get_module("moves.urllib_error") + request = _importer._get_module("moves.urllib_request") + response = _importer._get_module("moves.urllib_response") + robotparser = _importer._get_module("moves.urllib_robotparser") + + def __dir__(self): + return ['parse', 'error', 'request', 'response', 'robotparser'] + +_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"), + "moves.urllib") + + +def add_move(move): + """Add an item to six.moves.""" + setattr(_MovedItems, move.name, move) + + +def remove_move(name): + """Remove item from six.moves.""" + try: + delattr(_MovedItems, name) + except AttributeError: + try: + del moves.__dict__[name] + except KeyError: + raise AttributeError("no such move, %r" % (name,)) + + +if PY3: + _meth_func = "__func__" + _meth_self = "__self__" + + _func_closure = "__closure__" + _func_code = "__code__" + _func_defaults = "__defaults__" + _func_globals = "__globals__" +else: + _meth_func = "im_func" + _meth_self = "im_self" + + _func_closure = "func_closure" + _func_code = "func_code" + _func_defaults = "func_defaults" + _func_globals = "func_globals" + + +try: + advance_iterator = next +except NameError: + def advance_iterator(it): + return it.next() +next = advance_iterator + + +try: + callable = callable +except NameError: + def callable(obj): + return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) + + +if PY3: + def get_unbound_function(unbound): + return unbound + + create_bound_method = types.MethodType + + def create_unbound_method(func, cls): + return func + + Iterator = object +else: + def get_unbound_function(unbound): + return unbound.im_func + + def create_bound_method(func, obj): + return types.MethodType(func, obj, obj.__class__) + + def create_unbound_method(func, cls): + return types.MethodType(func, None, cls) + + class Iterator(object): + + def next(self): + return type(self).__next__(self) + + callable = callable +_add_doc(get_unbound_function, + """Get the function out of a possibly unbound function""") + + +get_method_function = operator.attrgetter(_meth_func) +get_method_self = operator.attrgetter(_meth_self) +get_function_closure = operator.attrgetter(_func_closure) +get_function_code = operator.attrgetter(_func_code) +get_function_defaults = operator.attrgetter(_func_defaults) +get_function_globals = operator.attrgetter(_func_globals) + + +if PY3: + def iterkeys(d, **kw): + return iter(d.keys(**kw)) + + def itervalues(d, **kw): + return iter(d.values(**kw)) + + def iteritems(d, **kw): + return iter(d.items(**kw)) + + def iterlists(d, **kw): + return iter(d.lists(**kw)) + + viewkeys = operator.methodcaller("keys") + + viewvalues = operator.methodcaller("values") + + viewitems = operator.methodcaller("items") +else: + def iterkeys(d, **kw): + return d.iterkeys(**kw) + + def itervalues(d, **kw): + return d.itervalues(**kw) + + def iteritems(d, **kw): + return d.iteritems(**kw) + + def iterlists(d, **kw): + return d.iterlists(**kw) + + viewkeys = operator.methodcaller("viewkeys") + + viewvalues = operator.methodcaller("viewvalues") + + viewitems = operator.methodcaller("viewitems") + +_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.") +_add_doc(itervalues, "Return an iterator over the values of a dictionary.") +_add_doc(iteritems, + "Return an iterator over the (key, value) pairs of a dictionary.") +_add_doc(iterlists, + "Return an iterator over the (key, [values]) pairs of a dictionary.") + + +if PY3: + def b(s): + return s.encode("latin-1") + + def u(s): + return s + unichr = chr + import struct + int2byte = struct.Struct(">B").pack + del struct + byte2int = operator.itemgetter(0) + indexbytes = operator.getitem + iterbytes = iter + import io + StringIO = io.StringIO + BytesIO = io.BytesIO + _assertCountEqual = "assertCountEqual" + if sys.version_info[1] <= 1: + _assertRaisesRegex = "assertRaisesRegexp" + _assertRegex = "assertRegexpMatches" + else: + _assertRaisesRegex = "assertRaisesRegex" + _assertRegex = "assertRegex" +else: + def b(s): + return s + # Workaround for standalone backslash + + def u(s): + return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape") + unichr = unichr + int2byte = chr + + def byte2int(bs): + return ord(bs[0]) + + def indexbytes(buf, i): + return ord(buf[i]) + iterbytes = functools.partial(itertools.imap, ord) + import StringIO + StringIO = BytesIO = StringIO.StringIO + _assertCountEqual = "assertItemsEqual" + _assertRaisesRegex = "assertRaisesRegexp" + _assertRegex = "assertRegexpMatches" +_add_doc(b, """Byte literal""") +_add_doc(u, """Text literal""") + + +def assertCountEqual(self, *args, **kwargs): + return getattr(self, _assertCountEqual)(*args, **kwargs) + + +def assertRaisesRegex(self, *args, **kwargs): + return getattr(self, _assertRaisesRegex)(*args, **kwargs) + + +def assertRegex(self, *args, **kwargs): + return getattr(self, _assertRegex)(*args, **kwargs) + + +if PY3: + exec_ = getattr(moves.builtins, "exec") + + def reraise(tp, value, tb=None): + try: + if value is None: + value = tp() + if value.__traceback__ is not tb: + raise value.with_traceback(tb) + raise value + finally: + value = None + tb = None + +else: + def exec_(_code_, _globs_=None, _locs_=None): + """Execute code in a namespace.""" + if _globs_ is None: + frame = sys._getframe(1) + _globs_ = frame.f_globals + if _locs_ is None: + _locs_ = frame.f_locals + del frame + elif _locs_ is None: + _locs_ = _globs_ + exec("""exec _code_ in _globs_, _locs_""") + + exec_("""def reraise(tp, value, tb=None): + try: + raise tp, value, tb + finally: + tb = None +""") + + +if sys.version_info[:2] == (3, 2): + exec_("""def raise_from(value, from_value): + try: + if from_value is None: + raise value + raise value from from_value + finally: + value = None +""") +elif sys.version_info[:2] > (3, 2): + exec_("""def raise_from(value, from_value): + try: + raise value from from_value + finally: + value = None +""") +else: + def raise_from(value, from_value): + raise value + + +print_ = getattr(moves.builtins, "print", None) +if print_ is None: + def print_(*args, **kwargs): + """The new-style print function for Python 2.4 and 2.5.""" + fp = kwargs.pop("file", sys.stdout) + if fp is None: + return + + def write(data): + if not isinstance(data, basestring): + data = str(data) + # If the file has an encoding, encode unicode with it. + if (isinstance(fp, file) and + isinstance(data, unicode) and + fp.encoding is not None): + errors = getattr(fp, "errors", None) + if errors is None: + errors = "strict" + data = data.encode(fp.encoding, errors) + fp.write(data) + want_unicode = False + sep = kwargs.pop("sep", None) + if sep is not None: + if isinstance(sep, unicode): + want_unicode = True + elif not isinstance(sep, str): + raise TypeError("sep must be None or a string") + end = kwargs.pop("end", None) + if end is not None: + if isinstance(end, unicode): + want_unicode = True + elif not isinstance(end, str): + raise TypeError("end must be None or a string") + if kwargs: + raise TypeError("invalid keyword arguments to print()") + if not want_unicode: + for arg in args: + if isinstance(arg, unicode): + want_unicode = True + break + if want_unicode: + newline = unicode("\n") + space = unicode(" ") + else: + newline = "\n" + space = " " + if sep is None: + sep = space + if end is None: + end = newline + for i, arg in enumerate(args): + if i: + write(sep) + write(arg) + write(end) +if sys.version_info[:2] < (3, 3): + _print = print_ + + def print_(*args, **kwargs): + fp = kwargs.get("file", sys.stdout) + flush = kwargs.pop("flush", False) + _print(*args, **kwargs) + if flush and fp is not None: + fp.flush() + +_add_doc(reraise, """Reraise an exception.""") + +if sys.version_info[0:2] < (3, 4): + def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS, + updated=functools.WRAPPER_UPDATES): + def wrapper(f): + f = functools.wraps(wrapped, assigned, updated)(f) + f.__wrapped__ = wrapped + return f + return wrapper +else: + wraps = functools.wraps + + +def with_metaclass(meta, *bases): + """Create a base class with a metaclass.""" + # This requires a bit of explanation: the basic idea is to make a dummy + # metaclass for one level of class instantiation that replaces itself with + # the actual metaclass. + class metaclass(type): + + def __new__(cls, name, this_bases, d): + return meta(name, bases, d) + + @classmethod + def __prepare__(cls, name, this_bases): + return meta.__prepare__(name, bases) + return type.__new__(metaclass, 'temporary_class', (), {}) + + +def add_metaclass(metaclass): + """Class decorator for creating a class with a metaclass.""" + def wrapper(cls): + orig_vars = cls.__dict__.copy() + slots = orig_vars.get('__slots__') + if slots is not None: + if isinstance(slots, str): + slots = [slots] + for slots_var in slots: + orig_vars.pop(slots_var) + orig_vars.pop('__dict__', None) + orig_vars.pop('__weakref__', None) + if hasattr(cls, '__qualname__'): + orig_vars['__qualname__'] = cls.__qualname__ + return metaclass(cls.__name__, cls.__bases__, orig_vars) + return wrapper + + +def ensure_binary(s, encoding='utf-8', errors='strict'): + """Coerce **s** to six.binary_type. + + For Python 2: + - `unicode` -> encoded to `str` + - `str` -> `str` + + For Python 3: + - `str` -> encoded to `bytes` + - `bytes` -> `bytes` + """ + if isinstance(s, text_type): + return s.encode(encoding, errors) + elif isinstance(s, binary_type): + return s + else: + raise TypeError("not expecting type '%s'" % type(s)) + + +def ensure_str(s, encoding='utf-8', errors='strict'): + """Coerce *s* to `str`. + + For Python 2: + - `unicode` -> encoded to `str` + - `str` -> `str` + + For Python 3: + - `str` -> `str` + - `bytes` -> decoded to `str` + """ + if not isinstance(s, (text_type, binary_type)): + raise TypeError("not expecting type '%s'" % type(s)) + if PY2 and isinstance(s, text_type): + s = s.encode(encoding, errors) + elif PY3 and isinstance(s, binary_type): + s = s.decode(encoding, errors) + return s + + +def ensure_text(s, encoding='utf-8', errors='strict'): + """Coerce *s* to six.text_type. + + For Python 2: + - `unicode` -> `unicode` + - `str` -> `unicode` + + For Python 3: + - `str` -> `str` + - `bytes` -> decoded to `str` + """ + if isinstance(s, binary_type): + return s.decode(encoding, errors) + elif isinstance(s, text_type): + return s + else: + raise TypeError("not expecting type '%s'" % type(s)) + + + +def python_2_unicode_compatible(klass): + """ + A decorator that defines __unicode__ and __str__ methods under Python 2. + Under Python 3 it does nothing. + + To support Python 2 and 3 with a single code base, define a __str__ method + returning text and apply this decorator to the class. + """ + if PY2: + if '__str__' not in klass.__dict__: + raise ValueError("@python_2_unicode_compatible cannot be applied " + "to %s because it doesn't define __str__()." % + klass.__name__) + klass.__unicode__ = klass.__str__ + klass.__str__ = lambda self: self.__unicode__().encode('utf-8') + return klass + + +# Complete the moves implementation. +# This code is at the end of this module to speed up module loading. +# Turn this module into a package. +__path__ = [] # required for PEP 302 and PEP 451 +__package__ = __name__ # see PEP 366 @ReservedAssignment +if globals().get("__spec__") is not None: + __spec__.submodule_search_locations = [] # PEP 451 @UndefinedVariable +# Remove other six meta path importers, since they cause problems. This can +# happen if six is removed from sys.modules and then reloaded. (Setuptools does +# this for some reason.) +if sys.meta_path: + for i, importer in enumerate(sys.meta_path): + # Here's some real nastiness: Another "instance" of the six module might + # be floating around. Therefore, we can't use isinstance() to check for + # the six meta path importer, since the other six instance will have + # inserted an importer with different class. + if (type(importer).__name__ == "_SixMetaPathImporter" and + importer.name == __name__): + del sys.meta_path[i] + break + del i, importer +# Finally, add the importer to the meta path import hook. +sys.meta_path.append(_importer) diff --git a/libs/test_path.py b/libs/win/test_path.py similarity index 100% rename from libs/test_path.py rename to libs/win/test_path.py diff --git a/libs/win32/Demos/BackupRead_BackupWrite.py b/libs/win/win32/Demos/BackupRead_BackupWrite.py similarity index 100% rename from libs/win32/Demos/BackupRead_BackupWrite.py rename to libs/win/win32/Demos/BackupRead_BackupWrite.py diff --git a/libs/win32/Demos/BackupSeek_streamheaders.py b/libs/win/win32/Demos/BackupSeek_streamheaders.py similarity index 100% rename from libs/win32/Demos/BackupSeek_streamheaders.py rename to libs/win/win32/Demos/BackupSeek_streamheaders.py diff --git a/libs/win32/Demos/CopyFileEx.py b/libs/win/win32/Demos/CopyFileEx.py similarity index 100% rename from libs/win32/Demos/CopyFileEx.py rename to libs/win/win32/Demos/CopyFileEx.py diff --git a/libs/win32/Demos/CreateFileTransacted_MiniVersion.py b/libs/win/win32/Demos/CreateFileTransacted_MiniVersion.py similarity index 100% rename from libs/win32/Demos/CreateFileTransacted_MiniVersion.py rename to libs/win/win32/Demos/CreateFileTransacted_MiniVersion.py diff --git a/libs/win32/Demos/EvtSubscribe_pull.py b/libs/win/win32/Demos/EvtSubscribe_pull.py similarity index 100% rename from libs/win32/Demos/EvtSubscribe_pull.py rename to libs/win/win32/Demos/EvtSubscribe_pull.py diff --git a/libs/win32/Demos/EvtSubscribe_push.py b/libs/win/win32/Demos/EvtSubscribe_push.py similarity index 100% rename from libs/win32/Demos/EvtSubscribe_push.py rename to libs/win/win32/Demos/EvtSubscribe_push.py diff --git a/libs/win32/Demos/FileSecurityTest.py b/libs/win/win32/Demos/FileSecurityTest.py similarity index 100% rename from libs/win32/Demos/FileSecurityTest.py rename to libs/win/win32/Demos/FileSecurityTest.py diff --git a/libs/win32/Demos/GetSaveFileName.py b/libs/win/win32/Demos/GetSaveFileName.py similarity index 100% rename from libs/win32/Demos/GetSaveFileName.py rename to libs/win/win32/Demos/GetSaveFileName.py diff --git a/libs/win32/Demos/NetValidatePasswordPolicy.py b/libs/win/win32/Demos/NetValidatePasswordPolicy.py similarity index 100% rename from libs/win32/Demos/NetValidatePasswordPolicy.py rename to libs/win/win32/Demos/NetValidatePasswordPolicy.py diff --git a/libs/win32/Demos/OpenEncryptedFileRaw.py b/libs/win/win32/Demos/OpenEncryptedFileRaw.py similarity index 100% rename from libs/win32/Demos/OpenEncryptedFileRaw.py rename to libs/win/win32/Demos/OpenEncryptedFileRaw.py diff --git a/libs/win32/Demos/RegCreateKeyTransacted.py b/libs/win/win32/Demos/RegCreateKeyTransacted.py similarity index 100% rename from libs/win32/Demos/RegCreateKeyTransacted.py rename to libs/win/win32/Demos/RegCreateKeyTransacted.py diff --git a/libs/win32/Demos/RegRestoreKey.py b/libs/win/win32/Demos/RegRestoreKey.py similarity index 100% rename from libs/win32/Demos/RegRestoreKey.py rename to libs/win/win32/Demos/RegRestoreKey.py diff --git a/libs/win32/Demos/SystemParametersInfo.py b/libs/win/win32/Demos/SystemParametersInfo.py similarity index 100% rename from libs/win32/Demos/SystemParametersInfo.py rename to libs/win/win32/Demos/SystemParametersInfo.py diff --git a/libs/win32/Demos/c_extension/setup.py b/libs/win/win32/Demos/c_extension/setup.py similarity index 100% rename from libs/win32/Demos/c_extension/setup.py rename to libs/win/win32/Demos/c_extension/setup.py diff --git a/libs/win32/Demos/cerapi.py b/libs/win/win32/Demos/cerapi.py similarity index 100% rename from libs/win32/Demos/cerapi.py rename to libs/win/win32/Demos/cerapi.py diff --git a/libs/win32/Demos/dde/ddeclient.py b/libs/win/win32/Demos/dde/ddeclient.py similarity index 100% rename from libs/win32/Demos/dde/ddeclient.py rename to libs/win/win32/Demos/dde/ddeclient.py diff --git a/libs/win32/Demos/dde/ddeserver.py b/libs/win/win32/Demos/dde/ddeserver.py similarity index 100% rename from libs/win32/Demos/dde/ddeserver.py rename to libs/win/win32/Demos/dde/ddeserver.py diff --git a/libs/win32/Demos/desktopmanager.py b/libs/win/win32/Demos/desktopmanager.py similarity index 100% rename from libs/win32/Demos/desktopmanager.py rename to libs/win/win32/Demos/desktopmanager.py diff --git a/libs/win32/Demos/eventLogDemo.py b/libs/win/win32/Demos/eventLogDemo.py similarity index 100% rename from libs/win32/Demos/eventLogDemo.py rename to libs/win/win32/Demos/eventLogDemo.py diff --git a/libs/win32/Demos/getfilever.py b/libs/win/win32/Demos/getfilever.py similarity index 100% rename from libs/win32/Demos/getfilever.py rename to libs/win/win32/Demos/getfilever.py diff --git a/libs/win32/Demos/images/frowny.bmp b/libs/win/win32/Demos/images/frowny.bmp similarity index 100% rename from libs/win32/Demos/images/frowny.bmp rename to libs/win/win32/Demos/images/frowny.bmp diff --git a/libs/win32/Demos/images/smiley.bmp b/libs/win/win32/Demos/images/smiley.bmp similarity index 100% rename from libs/win32/Demos/images/smiley.bmp rename to libs/win/win32/Demos/images/smiley.bmp diff --git a/libs/win32/Demos/mmapfile_demo.py b/libs/win/win32/Demos/mmapfile_demo.py similarity index 100% rename from libs/win32/Demos/mmapfile_demo.py rename to libs/win/win32/Demos/mmapfile_demo.py diff --git a/libs/win32/Demos/pipes/cat.py b/libs/win/win32/Demos/pipes/cat.py similarity index 100% rename from libs/win32/Demos/pipes/cat.py rename to libs/win/win32/Demos/pipes/cat.py diff --git a/libs/win32/Demos/pipes/runproc.py b/libs/win/win32/Demos/pipes/runproc.py similarity index 100% rename from libs/win32/Demos/pipes/runproc.py rename to libs/win/win32/Demos/pipes/runproc.py diff --git a/libs/win32/Demos/print_desktop.py b/libs/win/win32/Demos/print_desktop.py similarity index 100% rename from libs/win32/Demos/print_desktop.py rename to libs/win/win32/Demos/print_desktop.py diff --git a/libs/win32/Demos/rastest.py b/libs/win/win32/Demos/rastest.py similarity index 100% rename from libs/win32/Demos/rastest.py rename to libs/win/win32/Demos/rastest.py diff --git a/libs/win32/Demos/security/GetTokenInformation.py b/libs/win/win32/Demos/security/GetTokenInformation.py similarity index 100% rename from libs/win32/Demos/security/GetTokenInformation.py rename to libs/win/win32/Demos/security/GetTokenInformation.py diff --git a/libs/win32/Demos/security/account_rights.py b/libs/win/win32/Demos/security/account_rights.py similarity index 100% rename from libs/win32/Demos/security/account_rights.py rename to libs/win/win32/Demos/security/account_rights.py diff --git a/libs/win32/Demos/security/explicit_entries.py b/libs/win/win32/Demos/security/explicit_entries.py similarity index 100% rename from libs/win32/Demos/security/explicit_entries.py rename to libs/win/win32/Demos/security/explicit_entries.py diff --git a/libs/win32/Demos/security/get_policy_info.py b/libs/win/win32/Demos/security/get_policy_info.py similarity index 100% rename from libs/win32/Demos/security/get_policy_info.py rename to libs/win/win32/Demos/security/get_policy_info.py diff --git a/libs/win32/Demos/security/list_rights.py b/libs/win/win32/Demos/security/list_rights.py similarity index 100% rename from libs/win32/Demos/security/list_rights.py rename to libs/win/win32/Demos/security/list_rights.py diff --git a/libs/win32/Demos/security/localized_names.py b/libs/win/win32/Demos/security/localized_names.py similarity index 100% rename from libs/win32/Demos/security/localized_names.py rename to libs/win/win32/Demos/security/localized_names.py diff --git a/libs/win32/Demos/security/lsaregevent.py b/libs/win/win32/Demos/security/lsaregevent.py similarity index 100% rename from libs/win32/Demos/security/lsaregevent.py rename to libs/win/win32/Demos/security/lsaregevent.py diff --git a/libs/win32/Demos/security/lsastore.py b/libs/win/win32/Demos/security/lsastore.py similarity index 100% rename from libs/win32/Demos/security/lsastore.py rename to libs/win/win32/Demos/security/lsastore.py diff --git a/libs/win32/Demos/security/query_information.py b/libs/win/win32/Demos/security/query_information.py similarity index 100% rename from libs/win32/Demos/security/query_information.py rename to libs/win/win32/Demos/security/query_information.py diff --git a/libs/win32/Demos/security/regsave_sa.py b/libs/win/win32/Demos/security/regsave_sa.py similarity index 100% rename from libs/win32/Demos/security/regsave_sa.py rename to libs/win/win32/Demos/security/regsave_sa.py diff --git a/libs/win32/Demos/security/regsecurity.py b/libs/win/win32/Demos/security/regsecurity.py similarity index 100% rename from libs/win32/Demos/security/regsecurity.py rename to libs/win/win32/Demos/security/regsecurity.py diff --git a/libs/win32/Demos/security/sa_inherit.py b/libs/win/win32/Demos/security/sa_inherit.py similarity index 100% rename from libs/win32/Demos/security/sa_inherit.py rename to libs/win/win32/Demos/security/sa_inherit.py diff --git a/libs/win32/Demos/security/security_enums.py b/libs/win/win32/Demos/security/security_enums.py similarity index 100% rename from libs/win32/Demos/security/security_enums.py rename to libs/win/win32/Demos/security/security_enums.py diff --git a/libs/win32/Demos/security/set_file_audit.py b/libs/win/win32/Demos/security/set_file_audit.py similarity index 100% rename from libs/win32/Demos/security/set_file_audit.py rename to libs/win/win32/Demos/security/set_file_audit.py diff --git a/libs/win32/Demos/security/set_file_owner.py b/libs/win/win32/Demos/security/set_file_owner.py similarity index 100% rename from libs/win32/Demos/security/set_file_owner.py rename to libs/win/win32/Demos/security/set_file_owner.py diff --git a/libs/win32/Demos/security/set_policy_info.py b/libs/win/win32/Demos/security/set_policy_info.py similarity index 100% rename from libs/win32/Demos/security/set_policy_info.py rename to libs/win/win32/Demos/security/set_policy_info.py diff --git a/libs/win32/Demos/security/setkernelobjectsecurity.py b/libs/win/win32/Demos/security/setkernelobjectsecurity.py similarity index 100% rename from libs/win32/Demos/security/setkernelobjectsecurity.py rename to libs/win/win32/Demos/security/setkernelobjectsecurity.py diff --git a/libs/win32/Demos/security/setnamedsecurityinfo.py b/libs/win/win32/Demos/security/setnamedsecurityinfo.py similarity index 100% rename from libs/win32/Demos/security/setnamedsecurityinfo.py rename to libs/win/win32/Demos/security/setnamedsecurityinfo.py diff --git a/libs/win32/Demos/security/setsecurityinfo.py b/libs/win/win32/Demos/security/setsecurityinfo.py similarity index 100% rename from libs/win32/Demos/security/setsecurityinfo.py rename to libs/win/win32/Demos/security/setsecurityinfo.py diff --git a/libs/win32/Demos/security/setuserobjectsecurity.py b/libs/win/win32/Demos/security/setuserobjectsecurity.py similarity index 100% rename from libs/win32/Demos/security/setuserobjectsecurity.py rename to libs/win/win32/Demos/security/setuserobjectsecurity.py diff --git a/libs/win32/Demos/security/sspi/fetch_url.py b/libs/win/win32/Demos/security/sspi/fetch_url.py similarity index 100% rename from libs/win32/Demos/security/sspi/fetch_url.py rename to libs/win/win32/Demos/security/sspi/fetch_url.py diff --git a/libs/win32/Demos/security/sspi/simple_auth.py b/libs/win/win32/Demos/security/sspi/simple_auth.py similarity index 100% rename from libs/win32/Demos/security/sspi/simple_auth.py rename to libs/win/win32/Demos/security/sspi/simple_auth.py diff --git a/libs/win32/Demos/security/sspi/socket_server.py b/libs/win/win32/Demos/security/sspi/socket_server.py similarity index 100% rename from libs/win32/Demos/security/sspi/socket_server.py rename to libs/win/win32/Demos/security/sspi/socket_server.py diff --git a/libs/win32/Demos/security/sspi/validate_password.py b/libs/win/win32/Demos/security/sspi/validate_password.py similarity index 100% rename from libs/win32/Demos/security/sspi/validate_password.py rename to libs/win/win32/Demos/security/sspi/validate_password.py diff --git a/libs/win32/Demos/service/nativePipeTestService.py b/libs/win/win32/Demos/service/nativePipeTestService.py similarity index 100% rename from libs/win32/Demos/service/nativePipeTestService.py rename to libs/win/win32/Demos/service/nativePipeTestService.py diff --git a/libs/win32/Demos/service/pipeTestService.py b/libs/win/win32/Demos/service/pipeTestService.py similarity index 100% rename from libs/win32/Demos/service/pipeTestService.py rename to libs/win/win32/Demos/service/pipeTestService.py diff --git a/libs/win32/Demos/service/pipeTestServiceClient.py b/libs/win/win32/Demos/service/pipeTestServiceClient.py similarity index 100% rename from libs/win32/Demos/service/pipeTestServiceClient.py rename to libs/win/win32/Demos/service/pipeTestServiceClient.py diff --git a/libs/win32/Demos/service/serviceEvents.py b/libs/win/win32/Demos/service/serviceEvents.py similarity index 100% rename from libs/win32/Demos/service/serviceEvents.py rename to libs/win/win32/Demos/service/serviceEvents.py diff --git a/libs/win32/Demos/timer_demo.py b/libs/win/win32/Demos/timer_demo.py similarity index 100% rename from libs/win32/Demos/timer_demo.py rename to libs/win/win32/Demos/timer_demo.py diff --git a/libs/win32/Demos/win32clipboardDemo.py b/libs/win/win32/Demos/win32clipboardDemo.py similarity index 100% rename from libs/win32/Demos/win32clipboardDemo.py rename to libs/win/win32/Demos/win32clipboardDemo.py diff --git a/libs/win32/Demos/win32clipboard_bitmapdemo.py b/libs/win/win32/Demos/win32clipboard_bitmapdemo.py similarity index 100% rename from libs/win32/Demos/win32clipboard_bitmapdemo.py rename to libs/win/win32/Demos/win32clipboard_bitmapdemo.py diff --git a/libs/win32/Demos/win32comport_demo.py b/libs/win/win32/Demos/win32comport_demo.py similarity index 100% rename from libs/win32/Demos/win32comport_demo.py rename to libs/win/win32/Demos/win32comport_demo.py diff --git a/libs/win32/Demos/win32console_demo.py b/libs/win/win32/Demos/win32console_demo.py similarity index 100% rename from libs/win32/Demos/win32console_demo.py rename to libs/win/win32/Demos/win32console_demo.py diff --git a/libs/win32/Demos/win32cred_demo.py b/libs/win/win32/Demos/win32cred_demo.py similarity index 100% rename from libs/win32/Demos/win32cred_demo.py rename to libs/win/win32/Demos/win32cred_demo.py diff --git a/libs/win32/Demos/win32fileDemo.py b/libs/win/win32/Demos/win32fileDemo.py similarity index 100% rename from libs/win32/Demos/win32fileDemo.py rename to libs/win/win32/Demos/win32fileDemo.py diff --git a/libs/win32/Demos/win32gui_demo.py b/libs/win/win32/Demos/win32gui_demo.py similarity index 100% rename from libs/win32/Demos/win32gui_demo.py rename to libs/win/win32/Demos/win32gui_demo.py diff --git a/libs/win32/Demos/win32gui_devicenotify.py b/libs/win/win32/Demos/win32gui_devicenotify.py similarity index 100% rename from libs/win32/Demos/win32gui_devicenotify.py rename to libs/win/win32/Demos/win32gui_devicenotify.py diff --git a/libs/win32/Demos/win32gui_dialog.py b/libs/win/win32/Demos/win32gui_dialog.py similarity index 100% rename from libs/win32/Demos/win32gui_dialog.py rename to libs/win/win32/Demos/win32gui_dialog.py diff --git a/libs/win32/Demos/win32gui_menu.py b/libs/win/win32/Demos/win32gui_menu.py similarity index 100% rename from libs/win32/Demos/win32gui_menu.py rename to libs/win/win32/Demos/win32gui_menu.py diff --git a/libs/win32/Demos/win32gui_taskbar.py b/libs/win/win32/Demos/win32gui_taskbar.py similarity index 100% rename from libs/win32/Demos/win32gui_taskbar.py rename to libs/win/win32/Demos/win32gui_taskbar.py diff --git a/libs/win32/Demos/win32netdemo.py b/libs/win/win32/Demos/win32netdemo.py similarity index 100% rename from libs/win32/Demos/win32netdemo.py rename to libs/win/win32/Demos/win32netdemo.py diff --git a/libs/win32/Demos/win32rcparser_demo.py b/libs/win/win32/Demos/win32rcparser_demo.py similarity index 100% rename from libs/win32/Demos/win32rcparser_demo.py rename to libs/win/win32/Demos/win32rcparser_demo.py diff --git a/libs/win32/Demos/win32servicedemo.py b/libs/win/win32/Demos/win32servicedemo.py similarity index 100% rename from libs/win32/Demos/win32servicedemo.py rename to libs/win/win32/Demos/win32servicedemo.py diff --git a/libs/win32/Demos/win32ts_logoff_disconnected.py b/libs/win/win32/Demos/win32ts_logoff_disconnected.py similarity index 100% rename from libs/win32/Demos/win32ts_logoff_disconnected.py rename to libs/win/win32/Demos/win32ts_logoff_disconnected.py diff --git a/libs/win32/Demos/win32wnet/testwnet.py b/libs/win/win32/Demos/win32wnet/testwnet.py similarity index 100% rename from libs/win32/Demos/win32wnet/testwnet.py rename to libs/win/win32/Demos/win32wnet/testwnet.py diff --git a/libs/win32/Demos/win32wnet/winnetwk.py b/libs/win/win32/Demos/win32wnet/winnetwk.py similarity index 100% rename from libs/win32/Demos/win32wnet/winnetwk.py rename to libs/win/win32/Demos/win32wnet/winnetwk.py diff --git a/libs/win32/Demos/winprocess.py b/libs/win/win32/Demos/winprocess.py similarity index 100% rename from libs/win32/Demos/winprocess.py rename to libs/win/win32/Demos/winprocess.py diff --git a/libs/win32/_win32sysloader.pyd b/libs/win/win32/_win32sysloader.pyd similarity index 100% rename from libs/win32/_win32sysloader.pyd rename to libs/win/win32/_win32sysloader.pyd diff --git a/libs/win32/_winxptheme.pyd b/libs/win/win32/_winxptheme.pyd similarity index 100% rename from libs/win32/_winxptheme.pyd rename to libs/win/win32/_winxptheme.pyd diff --git a/libs/win32/include/PyWinTypes.h b/libs/win/win32/include/PyWinTypes.h similarity index 100% rename from libs/win32/include/PyWinTypes.h rename to libs/win/win32/include/PyWinTypes.h diff --git a/libs/win32/lib/afxres.py b/libs/win/win32/lib/afxres.py similarity index 100% rename from libs/win32/lib/afxres.py rename to libs/win/win32/lib/afxres.py diff --git a/libs/win32/lib/commctrl.py b/libs/win/win32/lib/commctrl.py similarity index 100% rename from libs/win32/lib/commctrl.py rename to libs/win/win32/lib/commctrl.py diff --git a/libs/win32/lib/dbi.py b/libs/win/win32/lib/dbi.py similarity index 100% rename from libs/win32/lib/dbi.py rename to libs/win/win32/lib/dbi.py diff --git a/libs/win32/lib/mmsystem.py b/libs/win/win32/lib/mmsystem.py similarity index 100% rename from libs/win32/lib/mmsystem.py rename to libs/win/win32/lib/mmsystem.py diff --git a/libs/win32/lib/netbios.py b/libs/win/win32/lib/netbios.py similarity index 100% rename from libs/win32/lib/netbios.py rename to libs/win/win32/lib/netbios.py diff --git a/libs/win32/lib/ntsecuritycon.py b/libs/win/win32/lib/ntsecuritycon.py similarity index 100% rename from libs/win32/lib/ntsecuritycon.py rename to libs/win/win32/lib/ntsecuritycon.py diff --git a/libs/win32/lib/pywin32_testutil.py b/libs/win/win32/lib/pywin32_testutil.py similarity index 100% rename from libs/win32/lib/pywin32_testutil.py rename to libs/win/win32/lib/pywin32_testutil.py diff --git a/libs/win32/lib/pywintypes.py b/libs/win/win32/lib/pywintypes.py similarity index 100% rename from libs/win32/lib/pywintypes.py rename to libs/win/win32/lib/pywintypes.py diff --git a/libs/win32/lib/rasutil.py b/libs/win/win32/lib/rasutil.py similarity index 100% rename from libs/win32/lib/rasutil.py rename to libs/win/win32/lib/rasutil.py diff --git a/libs/win32/lib/regcheck.py b/libs/win/win32/lib/regcheck.py similarity index 100% rename from libs/win32/lib/regcheck.py rename to libs/win/win32/lib/regcheck.py diff --git a/libs/win32/lib/regutil.py b/libs/win/win32/lib/regutil.py similarity index 100% rename from libs/win32/lib/regutil.py rename to libs/win/win32/lib/regutil.py diff --git a/libs/win32/lib/sspi.py b/libs/win/win32/lib/sspi.py similarity index 100% rename from libs/win32/lib/sspi.py rename to libs/win/win32/lib/sspi.py diff --git a/libs/win32/lib/sspicon.py b/libs/win/win32/lib/sspicon.py similarity index 100% rename from libs/win32/lib/sspicon.py rename to libs/win/win32/lib/sspicon.py diff --git a/libs/win32/lib/win32con.py b/libs/win/win32/lib/win32con.py similarity index 100% rename from libs/win32/lib/win32con.py rename to libs/win/win32/lib/win32con.py diff --git a/libs/win32/lib/win32cryptcon.py b/libs/win/win32/lib/win32cryptcon.py similarity index 100% rename from libs/win32/lib/win32cryptcon.py rename to libs/win/win32/lib/win32cryptcon.py diff --git a/libs/win32/lib/win32evtlogutil.py b/libs/win/win32/lib/win32evtlogutil.py similarity index 100% rename from libs/win32/lib/win32evtlogutil.py rename to libs/win/win32/lib/win32evtlogutil.py diff --git a/libs/win32/lib/win32gui_struct.py b/libs/win/win32/lib/win32gui_struct.py similarity index 100% rename from libs/win32/lib/win32gui_struct.py rename to libs/win/win32/lib/win32gui_struct.py diff --git a/libs/win32/lib/win32inetcon.py b/libs/win/win32/lib/win32inetcon.py similarity index 100% rename from libs/win32/lib/win32inetcon.py rename to libs/win/win32/lib/win32inetcon.py diff --git a/libs/win32/lib/win32netcon.py b/libs/win/win32/lib/win32netcon.py similarity index 100% rename from libs/win32/lib/win32netcon.py rename to libs/win/win32/lib/win32netcon.py diff --git a/libs/win32/lib/win32pdhquery.py b/libs/win/win32/lib/win32pdhquery.py similarity index 100% rename from libs/win32/lib/win32pdhquery.py rename to libs/win/win32/lib/win32pdhquery.py diff --git a/libs/win32/lib/win32pdhutil.py b/libs/win/win32/lib/win32pdhutil.py similarity index 100% rename from libs/win32/lib/win32pdhutil.py rename to libs/win/win32/lib/win32pdhutil.py diff --git a/libs/win32/lib/win32rcparser.py b/libs/win/win32/lib/win32rcparser.py similarity index 100% rename from libs/win32/lib/win32rcparser.py rename to libs/win/win32/lib/win32rcparser.py diff --git a/libs/win32/lib/win32serviceutil.py b/libs/win/win32/lib/win32serviceutil.py similarity index 100% rename from libs/win32/lib/win32serviceutil.py rename to libs/win/win32/lib/win32serviceutil.py diff --git a/libs/win32/lib/win32timezone.py b/libs/win/win32/lib/win32timezone.py similarity index 100% rename from libs/win32/lib/win32timezone.py rename to libs/win/win32/lib/win32timezone.py diff --git a/libs/win32/lib/win32traceutil.py b/libs/win/win32/lib/win32traceutil.py similarity index 100% rename from libs/win32/lib/win32traceutil.py rename to libs/win/win32/lib/win32traceutil.py diff --git a/libs/win32/lib/win32verstamp.py b/libs/win/win32/lib/win32verstamp.py similarity index 100% rename from libs/win32/lib/win32verstamp.py rename to libs/win/win32/lib/win32verstamp.py diff --git a/libs/win32/lib/winerror.py b/libs/win/win32/lib/winerror.py similarity index 100% rename from libs/win32/lib/winerror.py rename to libs/win/win32/lib/winerror.py diff --git a/libs/win32/lib/winioctlcon.py b/libs/win/win32/lib/winioctlcon.py similarity index 100% rename from libs/win32/lib/winioctlcon.py rename to libs/win/win32/lib/winioctlcon.py diff --git a/libs/win32/lib/winnt.py b/libs/win/win32/lib/winnt.py similarity index 100% rename from libs/win32/lib/winnt.py rename to libs/win/win32/lib/winnt.py diff --git a/libs/win32/lib/winperf.py b/libs/win/win32/lib/winperf.py similarity index 100% rename from libs/win32/lib/winperf.py rename to libs/win/win32/lib/winperf.py diff --git a/libs/win32/lib/winxptheme.py b/libs/win/win32/lib/winxptheme.py similarity index 100% rename from libs/win32/lib/winxptheme.py rename to libs/win/win32/lib/winxptheme.py diff --git a/libs/win32/libs/pywintypes.lib b/libs/win/win32/libs/pywintypes.lib similarity index 100% rename from libs/win32/libs/pywintypes.lib rename to libs/win/win32/libs/pywintypes.lib diff --git a/libs/win32/license.txt b/libs/win/win32/license.txt similarity index 100% rename from libs/win32/license.txt rename to libs/win/win32/license.txt diff --git a/libs/win32/mmapfile.pyd b/libs/win/win32/mmapfile.pyd similarity index 100% rename from libs/win32/mmapfile.pyd rename to libs/win/win32/mmapfile.pyd diff --git a/libs/win32/odbc.pyd b/libs/win/win32/odbc.pyd similarity index 100% rename from libs/win32/odbc.pyd rename to libs/win/win32/odbc.pyd diff --git a/libs/win32/perfmon.pyd b/libs/win/win32/perfmon.pyd similarity index 100% rename from libs/win32/perfmon.pyd rename to libs/win/win32/perfmon.pyd diff --git a/libs/win32/perfmondata.dll b/libs/win/win32/perfmondata.dll similarity index 100% rename from libs/win32/perfmondata.dll rename to libs/win/win32/perfmondata.dll diff --git a/libs/win32/pythonservice.exe b/libs/win/win32/pythonservice.exe similarity index 100% rename from libs/win32/pythonservice.exe rename to libs/win/win32/pythonservice.exe diff --git a/libs/win32/scripts/ControlService.py b/libs/win/win32/scripts/ControlService.py similarity index 100% rename from libs/win32/scripts/ControlService.py rename to libs/win/win32/scripts/ControlService.py diff --git a/libs/win32/scripts/VersionStamp/BrandProject.py b/libs/win/win32/scripts/VersionStamp/BrandProject.py similarity index 100% rename from libs/win32/scripts/VersionStamp/BrandProject.py rename to libs/win/win32/scripts/VersionStamp/BrandProject.py diff --git a/libs/win32/scripts/VersionStamp/bulkstamp.py b/libs/win/win32/scripts/VersionStamp/bulkstamp.py similarity index 100% rename from libs/win32/scripts/VersionStamp/bulkstamp.py rename to libs/win/win32/scripts/VersionStamp/bulkstamp.py diff --git a/libs/win32/scripts/VersionStamp/vssutil.py b/libs/win/win32/scripts/VersionStamp/vssutil.py similarity index 100% rename from libs/win32/scripts/VersionStamp/vssutil.py rename to libs/win/win32/scripts/VersionStamp/vssutil.py diff --git a/libs/win32/scripts/backupEventLog.py b/libs/win/win32/scripts/backupEventLog.py similarity index 100% rename from libs/win32/scripts/backupEventLog.py rename to libs/win/win32/scripts/backupEventLog.py diff --git a/libs/win32/scripts/ce/pysynch.py b/libs/win/win32/scripts/ce/pysynch.py similarity index 100% rename from libs/win32/scripts/ce/pysynch.py rename to libs/win/win32/scripts/ce/pysynch.py diff --git a/libs/win32/scripts/killProcName.py b/libs/win/win32/scripts/killProcName.py similarity index 100% rename from libs/win32/scripts/killProcName.py rename to libs/win/win32/scripts/killProcName.py diff --git a/libs/win32/scripts/rasutil.py b/libs/win/win32/scripts/rasutil.py similarity index 100% rename from libs/win32/scripts/rasutil.py rename to libs/win/win32/scripts/rasutil.py diff --git a/libs/win32/scripts/regsetup.py b/libs/win/win32/scripts/regsetup.py similarity index 100% rename from libs/win32/scripts/regsetup.py rename to libs/win/win32/scripts/regsetup.py diff --git a/libs/win32/scripts/setup_d.py b/libs/win/win32/scripts/setup_d.py similarity index 100% rename from libs/win32/scripts/setup_d.py rename to libs/win/win32/scripts/setup_d.py diff --git a/libs/win32/servicemanager.pyd b/libs/win/win32/servicemanager.pyd similarity index 100% rename from libs/win32/servicemanager.pyd rename to libs/win/win32/servicemanager.pyd diff --git a/libs/win32/test/handles.py b/libs/win/win32/test/handles.py similarity index 100% rename from libs/win32/test/handles.py rename to libs/win/win32/test/handles.py diff --git a/libs/win32/test/test_clipboard.py b/libs/win/win32/test/test_clipboard.py similarity index 100% rename from libs/win32/test/test_clipboard.py rename to libs/win/win32/test/test_clipboard.py diff --git a/libs/win32/test/test_exceptions.py b/libs/win/win32/test/test_exceptions.py similarity index 100% rename from libs/win32/test/test_exceptions.py rename to libs/win/win32/test/test_exceptions.py diff --git a/libs/win32/test/test_odbc.py b/libs/win/win32/test/test_odbc.py similarity index 100% rename from libs/win32/test/test_odbc.py rename to libs/win/win32/test/test_odbc.py diff --git a/libs/win32/test/test_pywintypes.py b/libs/win/win32/test/test_pywintypes.py similarity index 100% rename from libs/win32/test/test_pywintypes.py rename to libs/win/win32/test/test_pywintypes.py diff --git a/libs/win32/test/test_security.py b/libs/win/win32/test/test_security.py similarity index 100% rename from libs/win32/test/test_security.py rename to libs/win/win32/test/test_security.py diff --git a/libs/win32/test/test_sspi.py b/libs/win/win32/test/test_sspi.py similarity index 100% rename from libs/win32/test/test_sspi.py rename to libs/win/win32/test/test_sspi.py diff --git a/libs/win32/test/test_win32api.py b/libs/win/win32/test/test_win32api.py similarity index 100% rename from libs/win32/test/test_win32api.py rename to libs/win/win32/test/test_win32api.py diff --git a/libs/win32/test/test_win32crypt.py b/libs/win/win32/test/test_win32crypt.py similarity index 100% rename from libs/win32/test/test_win32crypt.py rename to libs/win/win32/test/test_win32crypt.py diff --git a/libs/win32/test/test_win32event.py b/libs/win/win32/test/test_win32event.py similarity index 100% rename from libs/win32/test/test_win32event.py rename to libs/win/win32/test/test_win32event.py diff --git a/libs/win32/test/test_win32file.py b/libs/win/win32/test/test_win32file.py similarity index 100% rename from libs/win32/test/test_win32file.py rename to libs/win/win32/test/test_win32file.py diff --git a/libs/win32/test/test_win32gui.py b/libs/win/win32/test/test_win32gui.py similarity index 100% rename from libs/win32/test/test_win32gui.py rename to libs/win/win32/test/test_win32gui.py diff --git a/libs/win32/test/test_win32guistruct.py b/libs/win/win32/test/test_win32guistruct.py similarity index 100% rename from libs/win32/test/test_win32guistruct.py rename to libs/win/win32/test/test_win32guistruct.py diff --git a/libs/win32/test/test_win32inet.py b/libs/win/win32/test/test_win32inet.py similarity index 100% rename from libs/win32/test/test_win32inet.py rename to libs/win/win32/test/test_win32inet.py diff --git a/libs/win32/test/test_win32net.py b/libs/win/win32/test/test_win32net.py similarity index 100% rename from libs/win32/test/test_win32net.py rename to libs/win/win32/test/test_win32net.py diff --git a/libs/win32/test/test_win32pipe.py b/libs/win/win32/test/test_win32pipe.py similarity index 100% rename from libs/win32/test/test_win32pipe.py rename to libs/win/win32/test/test_win32pipe.py diff --git a/libs/win32/test/test_win32rcparser.py b/libs/win/win32/test/test_win32rcparser.py similarity index 100% rename from libs/win32/test/test_win32rcparser.py rename to libs/win/win32/test/test_win32rcparser.py diff --git a/libs/win32/test/test_win32timezone.py b/libs/win/win32/test/test_win32timezone.py similarity index 100% rename from libs/win32/test/test_win32timezone.py rename to libs/win/win32/test/test_win32timezone.py diff --git a/libs/win32/test/test_win32trace.py b/libs/win/win32/test/test_win32trace.py similarity index 100% rename from libs/win32/test/test_win32trace.py rename to libs/win/win32/test/test_win32trace.py diff --git a/libs/win32/test/test_win32wnet.py b/libs/win/win32/test/test_win32wnet.py similarity index 100% rename from libs/win32/test/test_win32wnet.py rename to libs/win/win32/test/test_win32wnet.py diff --git a/libs/win32/test/testall.py b/libs/win/win32/test/testall.py similarity index 100% rename from libs/win32/test/testall.py rename to libs/win/win32/test/testall.py diff --git a/libs/win32/test/win32rcparser/python.bmp b/libs/win/win32/test/win32rcparser/python.bmp similarity index 100% rename from libs/win32/test/win32rcparser/python.bmp rename to libs/win/win32/test/win32rcparser/python.bmp diff --git a/libs/win32/test/win32rcparser/python.ico b/libs/win/win32/test/win32rcparser/python.ico similarity index 100% rename from libs/win32/test/win32rcparser/python.ico rename to libs/win/win32/test/win32rcparser/python.ico diff --git a/libs/win32/test/win32rcparser/test.h b/libs/win/win32/test/win32rcparser/test.h similarity index 100% rename from libs/win32/test/win32rcparser/test.h rename to libs/win/win32/test/win32rcparser/test.h diff --git a/libs/win32/test/win32rcparser/test.rc b/libs/win/win32/test/win32rcparser/test.rc similarity index 100% rename from libs/win32/test/win32rcparser/test.rc rename to libs/win/win32/test/win32rcparser/test.rc diff --git a/libs/win32/timer.pyd b/libs/win/win32/timer.pyd similarity index 100% rename from libs/win32/timer.pyd rename to libs/win/win32/timer.pyd diff --git a/libs/win32/win2kras.pyd b/libs/win/win32/win2kras.pyd similarity index 100% rename from libs/win32/win2kras.pyd rename to libs/win/win32/win2kras.pyd diff --git a/libs/win32/win32api.pyd b/libs/win/win32/win32api.pyd similarity index 100% rename from libs/win32/win32api.pyd rename to libs/win/win32/win32api.pyd diff --git a/libs/win32/win32clipboard.pyd b/libs/win/win32/win32clipboard.pyd similarity index 100% rename from libs/win32/win32clipboard.pyd rename to libs/win/win32/win32clipboard.pyd diff --git a/libs/win32/win32console.pyd b/libs/win/win32/win32console.pyd similarity index 100% rename from libs/win32/win32console.pyd rename to libs/win/win32/win32console.pyd diff --git a/libs/win32/win32cred.pyd b/libs/win/win32/win32cred.pyd similarity index 100% rename from libs/win32/win32cred.pyd rename to libs/win/win32/win32cred.pyd diff --git a/libs/win32/win32crypt.pyd b/libs/win/win32/win32crypt.pyd similarity index 100% rename from libs/win32/win32crypt.pyd rename to libs/win/win32/win32crypt.pyd diff --git a/libs/win32/win32event.pyd b/libs/win/win32/win32event.pyd similarity index 100% rename from libs/win32/win32event.pyd rename to libs/win/win32/win32event.pyd diff --git a/libs/win32/win32evtlog.pyd b/libs/win/win32/win32evtlog.pyd similarity index 100% rename from libs/win32/win32evtlog.pyd rename to libs/win/win32/win32evtlog.pyd diff --git a/libs/win32/win32file.pyd b/libs/win/win32/win32file.pyd similarity index 100% rename from libs/win32/win32file.pyd rename to libs/win/win32/win32file.pyd diff --git a/libs/win32/win32gui.pyd b/libs/win/win32/win32gui.pyd similarity index 100% rename from libs/win32/win32gui.pyd rename to libs/win/win32/win32gui.pyd diff --git a/libs/win32/win32help.pyd b/libs/win/win32/win32help.pyd similarity index 100% rename from libs/win32/win32help.pyd rename to libs/win/win32/win32help.pyd diff --git a/libs/win32/win32inet.pyd b/libs/win/win32/win32inet.pyd similarity index 100% rename from libs/win32/win32inet.pyd rename to libs/win/win32/win32inet.pyd diff --git a/libs/win32/win32job.pyd b/libs/win/win32/win32job.pyd similarity index 100% rename from libs/win32/win32job.pyd rename to libs/win/win32/win32job.pyd diff --git a/libs/win32/win32lz.pyd b/libs/win/win32/win32lz.pyd similarity index 100% rename from libs/win32/win32lz.pyd rename to libs/win/win32/win32lz.pyd diff --git a/libs/win32/win32net.pyd b/libs/win/win32/win32net.pyd similarity index 100% rename from libs/win32/win32net.pyd rename to libs/win/win32/win32net.pyd diff --git a/libs/win32/win32pdh.pyd b/libs/win/win32/win32pdh.pyd similarity index 100% rename from libs/win32/win32pdh.pyd rename to libs/win/win32/win32pdh.pyd diff --git a/libs/win32/win32pipe.pyd b/libs/win/win32/win32pipe.pyd similarity index 100% rename from libs/win32/win32pipe.pyd rename to libs/win/win32/win32pipe.pyd diff --git a/libs/win32/win32print.pyd b/libs/win/win32/win32print.pyd similarity index 100% rename from libs/win32/win32print.pyd rename to libs/win/win32/win32print.pyd diff --git a/libs/win32/win32process.pyd b/libs/win/win32/win32process.pyd similarity index 100% rename from libs/win32/win32process.pyd rename to libs/win/win32/win32process.pyd diff --git a/libs/win32/win32profile.pyd b/libs/win/win32/win32profile.pyd similarity index 100% rename from libs/win32/win32profile.pyd rename to libs/win/win32/win32profile.pyd diff --git a/libs/win32/win32ras.pyd b/libs/win/win32/win32ras.pyd similarity index 100% rename from libs/win32/win32ras.pyd rename to libs/win/win32/win32ras.pyd diff --git a/libs/win32/win32security.pyd b/libs/win/win32/win32security.pyd similarity index 100% rename from libs/win32/win32security.pyd rename to libs/win/win32/win32security.pyd diff --git a/libs/win32/win32service.pyd b/libs/win/win32/win32service.pyd similarity index 100% rename from libs/win32/win32service.pyd rename to libs/win/win32/win32service.pyd diff --git a/libs/win32/win32trace.pyd b/libs/win/win32/win32trace.pyd similarity index 100% rename from libs/win32/win32trace.pyd rename to libs/win/win32/win32trace.pyd diff --git a/libs/win32/win32transaction.pyd b/libs/win/win32/win32transaction.pyd similarity index 100% rename from libs/win32/win32transaction.pyd rename to libs/win/win32/win32transaction.pyd diff --git a/libs/win32/win32ts.pyd b/libs/win/win32/win32ts.pyd similarity index 100% rename from libs/win32/win32ts.pyd rename to libs/win/win32/win32ts.pyd diff --git a/libs/win32/win32wnet.pyd b/libs/win/win32/win32wnet.pyd similarity index 100% rename from libs/win32/win32wnet.pyd rename to libs/win/win32/win32wnet.pyd diff --git a/libs/win32/winxpgui.pyd b/libs/win/win32/winxpgui.pyd similarity index 100% rename from libs/win32/winxpgui.pyd rename to libs/win/win32/winxpgui.pyd diff --git a/libs/win32com/HTML/GeneratedSupport.html b/libs/win/win32com/HTML/GeneratedSupport.html similarity index 100% rename from libs/win32com/HTML/GeneratedSupport.html rename to libs/win/win32com/HTML/GeneratedSupport.html diff --git a/libs/win32com/HTML/PythonCOM.html b/libs/win/win32com/HTML/PythonCOM.html similarity index 100% rename from libs/win32com/HTML/PythonCOM.html rename to libs/win/win32com/HTML/PythonCOM.html diff --git a/libs/win32com/HTML/QuickStartClientCom.html b/libs/win/win32com/HTML/QuickStartClientCom.html similarity index 100% rename from libs/win32com/HTML/QuickStartClientCom.html rename to libs/win/win32com/HTML/QuickStartClientCom.html diff --git a/libs/win32com/HTML/QuickStartServerCom.html b/libs/win/win32com/HTML/QuickStartServerCom.html similarity index 100% rename from libs/win32com/HTML/QuickStartServerCom.html rename to libs/win/win32com/HTML/QuickStartServerCom.html diff --git a/libs/win32com/HTML/docindex.html b/libs/win/win32com/HTML/docindex.html similarity index 100% rename from libs/win32com/HTML/docindex.html rename to libs/win/win32com/HTML/docindex.html diff --git a/libs/win32com/HTML/image/BTN_HomePage.gif b/libs/win/win32com/HTML/image/BTN_HomePage.gif similarity index 100% rename from libs/win32com/HTML/image/BTN_HomePage.gif rename to libs/win/win32com/HTML/image/BTN_HomePage.gif diff --git a/libs/win32com/HTML/image/BTN_ManualTop.gif b/libs/win/win32com/HTML/image/BTN_ManualTop.gif similarity index 100% rename from libs/win32com/HTML/image/BTN_ManualTop.gif rename to libs/win/win32com/HTML/image/BTN_ManualTop.gif diff --git a/libs/win32com/HTML/image/BTN_NextPage.gif b/libs/win/win32com/HTML/image/BTN_NextPage.gif similarity index 100% rename from libs/win32com/HTML/image/BTN_NextPage.gif rename to libs/win/win32com/HTML/image/BTN_NextPage.gif diff --git a/libs/win32com/HTML/image/BTN_PrevPage.gif b/libs/win/win32com/HTML/image/BTN_PrevPage.gif similarity index 100% rename from libs/win32com/HTML/image/BTN_PrevPage.gif rename to libs/win/win32com/HTML/image/BTN_PrevPage.gif diff --git a/libs/win32com/HTML/image/blank.gif b/libs/win/win32com/HTML/image/blank.gif similarity index 100% rename from libs/win32com/HTML/image/blank.gif rename to libs/win/win32com/HTML/image/blank.gif diff --git a/libs/win32com/HTML/image/pycom_blowing.gif b/libs/win/win32com/HTML/image/pycom_blowing.gif similarity index 100% rename from libs/win32com/HTML/image/pycom_blowing.gif rename to libs/win/win32com/HTML/image/pycom_blowing.gif diff --git a/libs/win32com/HTML/image/pythoncom.gif b/libs/win/win32com/HTML/image/pythoncom.gif similarity index 100% rename from libs/win32com/HTML/image/pythoncom.gif rename to libs/win/win32com/HTML/image/pythoncom.gif diff --git a/libs/win32com/HTML/image/www_icon.gif b/libs/win/win32com/HTML/image/www_icon.gif similarity index 100% rename from libs/win32com/HTML/image/www_icon.gif rename to libs/win/win32com/HTML/image/www_icon.gif diff --git a/libs/win32com/HTML/index.html b/libs/win/win32com/HTML/index.html similarity index 100% rename from libs/win32com/HTML/index.html rename to libs/win/win32com/HTML/index.html diff --git a/libs/win32com/HTML/misc.html b/libs/win/win32com/HTML/misc.html similarity index 100% rename from libs/win32com/HTML/misc.html rename to libs/win/win32com/HTML/misc.html diff --git a/libs/win32com/HTML/package.html b/libs/win/win32com/HTML/package.html similarity index 100% rename from libs/win32com/HTML/package.html rename to libs/win/win32com/HTML/package.html diff --git a/libs/win32com/HTML/variant.html b/libs/win/win32com/HTML/variant.html similarity index 100% rename from libs/win32com/HTML/variant.html rename to libs/win/win32com/HTML/variant.html diff --git a/libs/win32com/License.txt b/libs/win/win32com/License.txt similarity index 100% rename from libs/win32com/License.txt rename to libs/win/win32com/License.txt diff --git a/libs/win32com/__init__.py b/libs/win/win32com/__init__.py similarity index 100% rename from libs/win32com/__init__.py rename to libs/win/win32com/__init__.py diff --git a/libs/win32com/client/CLSIDToClass.py b/libs/win/win32com/client/CLSIDToClass.py similarity index 100% rename from libs/win32com/client/CLSIDToClass.py rename to libs/win/win32com/client/CLSIDToClass.py diff --git a/libs/win32com/client/__init__.py b/libs/win/win32com/client/__init__.py similarity index 100% rename from libs/win32com/client/__init__.py rename to libs/win/win32com/client/__init__.py diff --git a/libs/win32com/client/build.py b/libs/win/win32com/client/build.py similarity index 100% rename from libs/win32com/client/build.py rename to libs/win/win32com/client/build.py diff --git a/libs/win32com/client/combrowse.py b/libs/win/win32com/client/combrowse.py similarity index 100% rename from libs/win32com/client/combrowse.py rename to libs/win/win32com/client/combrowse.py diff --git a/libs/win32com/client/connect.py b/libs/win/win32com/client/connect.py similarity index 100% rename from libs/win32com/client/connect.py rename to libs/win/win32com/client/connect.py diff --git a/libs/win32com/client/dynamic.py b/libs/win/win32com/client/dynamic.py similarity index 100% rename from libs/win32com/client/dynamic.py rename to libs/win/win32com/client/dynamic.py diff --git a/libs/win32com/client/gencache.py b/libs/win/win32com/client/gencache.py similarity index 100% rename from libs/win32com/client/gencache.py rename to libs/win/win32com/client/gencache.py diff --git a/libs/win32com/client/genpy.py b/libs/win/win32com/client/genpy.py similarity index 100% rename from libs/win32com/client/genpy.py rename to libs/win/win32com/client/genpy.py diff --git a/libs/win32com/client/makepy.py b/libs/win/win32com/client/makepy.py similarity index 100% rename from libs/win32com/client/makepy.py rename to libs/win/win32com/client/makepy.py diff --git a/libs/win32com/client/selecttlb.py b/libs/win/win32com/client/selecttlb.py similarity index 100% rename from libs/win32com/client/selecttlb.py rename to libs/win/win32com/client/selecttlb.py diff --git a/libs/win32com/client/tlbrowse.py b/libs/win/win32com/client/tlbrowse.py similarity index 100% rename from libs/win32com/client/tlbrowse.py rename to libs/win/win32com/client/tlbrowse.py diff --git a/libs/win32com/client/util.py b/libs/win/win32com/client/util.py similarity index 100% rename from libs/win32com/client/util.py rename to libs/win/win32com/client/util.py diff --git a/libs/win32com/demos/__init__.py b/libs/win/win32com/demos/__init__.py similarity index 100% rename from libs/win32com/demos/__init__.py rename to libs/win/win32com/demos/__init__.py diff --git a/libs/win32com/demos/connect.py b/libs/win/win32com/demos/connect.py similarity index 100% rename from libs/win32com/demos/connect.py rename to libs/win/win32com/demos/connect.py diff --git a/libs/win32com/demos/dump_clipboard.py b/libs/win/win32com/demos/dump_clipboard.py similarity index 100% rename from libs/win32com/demos/dump_clipboard.py rename to libs/win/win32com/demos/dump_clipboard.py diff --git a/libs/win32com/demos/eventsApartmentThreaded.py b/libs/win/win32com/demos/eventsApartmentThreaded.py similarity index 100% rename from libs/win32com/demos/eventsApartmentThreaded.py rename to libs/win/win32com/demos/eventsApartmentThreaded.py diff --git a/libs/win32com/demos/eventsFreeThreaded.py b/libs/win/win32com/demos/eventsFreeThreaded.py similarity index 100% rename from libs/win32com/demos/eventsFreeThreaded.py rename to libs/win/win32com/demos/eventsFreeThreaded.py diff --git a/libs/win32com/demos/excelAddin.py b/libs/win/win32com/demos/excelAddin.py similarity index 100% rename from libs/win32com/demos/excelAddin.py rename to libs/win/win32com/demos/excelAddin.py diff --git a/libs/win32com/demos/excelRTDServer.py b/libs/win/win32com/demos/excelRTDServer.py similarity index 100% rename from libs/win32com/demos/excelRTDServer.py rename to libs/win/win32com/demos/excelRTDServer.py diff --git a/libs/win32com/demos/iebutton.py b/libs/win/win32com/demos/iebutton.py similarity index 100% rename from libs/win32com/demos/iebutton.py rename to libs/win/win32com/demos/iebutton.py diff --git a/libs/win32com/demos/ietoolbar.py b/libs/win/win32com/demos/ietoolbar.py similarity index 100% rename from libs/win32com/demos/ietoolbar.py rename to libs/win/win32com/demos/ietoolbar.py diff --git a/libs/win32com/demos/outlookAddin.py b/libs/win/win32com/demos/outlookAddin.py similarity index 100% rename from libs/win32com/demos/outlookAddin.py rename to libs/win/win32com/demos/outlookAddin.py diff --git a/libs/win32com/demos/trybag.py b/libs/win/win32com/demos/trybag.py similarity index 100% rename from libs/win32com/demos/trybag.py rename to libs/win/win32com/demos/trybag.py diff --git a/libs/win32com/include/PythonCOM.h b/libs/win/win32com/include/PythonCOM.h similarity index 100% rename from libs/win32com/include/PythonCOM.h rename to libs/win/win32com/include/PythonCOM.h diff --git a/libs/win32com/include/PythonCOMRegister.h b/libs/win/win32com/include/PythonCOMRegister.h similarity index 100% rename from libs/win32com/include/PythonCOMRegister.h rename to libs/win/win32com/include/PythonCOMRegister.h diff --git a/libs/win32com/include/PythonCOMServer.h b/libs/win/win32com/include/PythonCOMServer.h similarity index 100% rename from libs/win32com/include/PythonCOMServer.h rename to libs/win/win32com/include/PythonCOMServer.h diff --git a/libs/win32com/libs/axscript.lib b/libs/win/win32com/libs/axscript.lib similarity index 100% rename from libs/win32com/libs/axscript.lib rename to libs/win/win32com/libs/axscript.lib diff --git a/libs/win32com/libs/pythoncom.lib b/libs/win/win32com/libs/pythoncom.lib similarity index 100% rename from libs/win32com/libs/pythoncom.lib rename to libs/win/win32com/libs/pythoncom.lib diff --git a/libs/win32com/makegw/__init__.py b/libs/win/win32com/makegw/__init__.py similarity index 100% rename from libs/win32com/makegw/__init__.py rename to libs/win/win32com/makegw/__init__.py diff --git a/libs/win32com/makegw/makegw.py b/libs/win/win32com/makegw/makegw.py similarity index 100% rename from libs/win32com/makegw/makegw.py rename to libs/win/win32com/makegw/makegw.py diff --git a/libs/win32com/makegw/makegwenum.py b/libs/win/win32com/makegw/makegwenum.py similarity index 100% rename from libs/win32com/makegw/makegwenum.py rename to libs/win/win32com/makegw/makegwenum.py diff --git a/libs/win32com/makegw/makegwparse.py b/libs/win/win32com/makegw/makegwparse.py similarity index 100% rename from libs/win32com/makegw/makegwparse.py rename to libs/win/win32com/makegw/makegwparse.py diff --git a/libs/win32com/olectl.py b/libs/win/win32com/olectl.py similarity index 100% rename from libs/win32com/olectl.py rename to libs/win/win32com/olectl.py diff --git a/libs/win32com/readme.htm b/libs/win/win32com/readme.htm similarity index 100% rename from libs/win32com/readme.htm rename to libs/win/win32com/readme.htm diff --git a/libs/win32com/server/__init__.py b/libs/win/win32com/server/__init__.py similarity index 100% rename from libs/win32com/server/__init__.py rename to libs/win/win32com/server/__init__.py diff --git a/libs/win32com/server/connect.py b/libs/win/win32com/server/connect.py similarity index 100% rename from libs/win32com/server/connect.py rename to libs/win/win32com/server/connect.py diff --git a/libs/win32com/server/dispatcher.py b/libs/win/win32com/server/dispatcher.py similarity index 100% rename from libs/win32com/server/dispatcher.py rename to libs/win/win32com/server/dispatcher.py diff --git a/libs/win32com/server/exception.py b/libs/win/win32com/server/exception.py similarity index 100% rename from libs/win32com/server/exception.py rename to libs/win/win32com/server/exception.py diff --git a/libs/win32com/server/factory.py b/libs/win/win32com/server/factory.py similarity index 100% rename from libs/win32com/server/factory.py rename to libs/win/win32com/server/factory.py diff --git a/libs/win32com/server/localserver.py b/libs/win/win32com/server/localserver.py similarity index 100% rename from libs/win32com/server/localserver.py rename to libs/win/win32com/server/localserver.py diff --git a/libs/win32com/server/policy.py b/libs/win/win32com/server/policy.py similarity index 100% rename from libs/win32com/server/policy.py rename to libs/win/win32com/server/policy.py diff --git a/libs/win32com/server/register.py b/libs/win/win32com/server/register.py similarity index 100% rename from libs/win32com/server/register.py rename to libs/win/win32com/server/register.py diff --git a/libs/win32com/server/util.py b/libs/win/win32com/server/util.py similarity index 100% rename from libs/win32com/server/util.py rename to libs/win/win32com/server/util.py diff --git a/libs/win32com/servers/PythonTools.py b/libs/win/win32com/servers/PythonTools.py similarity index 100% rename from libs/win32com/servers/PythonTools.py rename to libs/win/win32com/servers/PythonTools.py diff --git a/libs/win32com/servers/__init__.py b/libs/win/win32com/servers/__init__.py similarity index 100% rename from libs/win32com/servers/__init__.py rename to libs/win/win32com/servers/__init__.py diff --git a/libs/win32com/servers/dictionary.py b/libs/win/win32com/servers/dictionary.py similarity index 100% rename from libs/win32com/servers/dictionary.py rename to libs/win/win32com/servers/dictionary.py diff --git a/libs/win32com/servers/interp.py b/libs/win/win32com/servers/interp.py similarity index 100% rename from libs/win32com/servers/interp.py rename to libs/win/win32com/servers/interp.py diff --git a/libs/win32com/servers/perfmon.py b/libs/win/win32com/servers/perfmon.py similarity index 100% rename from libs/win32com/servers/perfmon.py rename to libs/win/win32com/servers/perfmon.py diff --git a/libs/win32com/servers/test_pycomtest.py b/libs/win/win32com/servers/test_pycomtest.py similarity index 100% rename from libs/win32com/servers/test_pycomtest.py rename to libs/win/win32com/servers/test_pycomtest.py diff --git a/libs/win32com/storagecon.py b/libs/win/win32com/storagecon.py similarity index 100% rename from libs/win32com/storagecon.py rename to libs/win/win32com/storagecon.py diff --git a/libs/win32com/test/GenTestScripts.py b/libs/win/win32com/test/GenTestScripts.py similarity index 100% rename from libs/win32com/test/GenTestScripts.py rename to libs/win/win32com/test/GenTestScripts.py diff --git a/libs/win32com/test/Testpys.sct b/libs/win/win32com/test/Testpys.sct similarity index 100% rename from libs/win32com/test/Testpys.sct rename to libs/win/win32com/test/Testpys.sct diff --git a/libs/win32com/test/__init__.py b/libs/win/win32com/test/__init__.py similarity index 100% rename from libs/win32com/test/__init__.py rename to libs/win/win32com/test/__init__.py diff --git a/libs/win32com/test/daodump.py b/libs/win/win32com/test/daodump.py similarity index 100% rename from libs/win32com/test/daodump.py rename to libs/win/win32com/test/daodump.py diff --git a/libs/win32com/test/errorSemantics.py b/libs/win/win32com/test/errorSemantics.py similarity index 100% rename from libs/win32com/test/errorSemantics.py rename to libs/win/win32com/test/errorSemantics.py diff --git a/libs/win32com/test/pippo.idl b/libs/win/win32com/test/pippo.idl similarity index 100% rename from libs/win32com/test/pippo.idl rename to libs/win/win32com/test/pippo.idl diff --git a/libs/win32com/test/pippo_server.py b/libs/win/win32com/test/pippo_server.py similarity index 100% rename from libs/win32com/test/pippo_server.py rename to libs/win/win32com/test/pippo_server.py diff --git a/libs/win32com/test/policySemantics.py b/libs/win/win32com/test/policySemantics.py similarity index 100% rename from libs/win32com/test/policySemantics.py rename to libs/win/win32com/test/policySemantics.py diff --git a/libs/win32com/test/readme.txt b/libs/win/win32com/test/readme.txt similarity index 100% rename from libs/win32com/test/readme.txt rename to libs/win/win32com/test/readme.txt diff --git a/libs/win32com/test/testADOEvents.py b/libs/win/win32com/test/testADOEvents.py similarity index 100% rename from libs/win32com/test/testADOEvents.py rename to libs/win/win32com/test/testADOEvents.py diff --git a/libs/win32com/test/testAXScript.py b/libs/win/win32com/test/testAXScript.py similarity index 100% rename from libs/win32com/test/testAXScript.py rename to libs/win/win32com/test/testAXScript.py diff --git a/libs/win32com/test/testAccess.py b/libs/win/win32com/test/testAccess.py similarity index 100% rename from libs/win32com/test/testAccess.py rename to libs/win/win32com/test/testAccess.py diff --git a/libs/win32com/test/testArrays.py b/libs/win/win32com/test/testArrays.py similarity index 100% rename from libs/win32com/test/testArrays.py rename to libs/win/win32com/test/testArrays.py diff --git a/libs/win32com/test/testClipboard.py b/libs/win/win32com/test/testClipboard.py similarity index 100% rename from libs/win32com/test/testClipboard.py rename to libs/win/win32com/test/testClipboard.py diff --git a/libs/win32com/test/testCollections.py b/libs/win/win32com/test/testCollections.py similarity index 100% rename from libs/win32com/test/testCollections.py rename to libs/win/win32com/test/testCollections.py diff --git a/libs/win32com/test/testDCOM.py b/libs/win/win32com/test/testDCOM.py similarity index 100% rename from libs/win32com/test/testDCOM.py rename to libs/win/win32com/test/testDCOM.py diff --git a/libs/win32com/test/testDictionary.py b/libs/win/win32com/test/testDictionary.py similarity index 100% rename from libs/win32com/test/testDictionary.py rename to libs/win/win32com/test/testDictionary.py diff --git a/libs/win32com/test/testDictionary.vbs b/libs/win/win32com/test/testDictionary.vbs similarity index 100% rename from libs/win32com/test/testDictionary.vbs rename to libs/win/win32com/test/testDictionary.vbs diff --git a/libs/win32com/test/testDynamic.py b/libs/win/win32com/test/testDynamic.py similarity index 100% rename from libs/win32com/test/testDynamic.py rename to libs/win/win32com/test/testDynamic.py diff --git a/libs/win32com/test/testExchange.py b/libs/win/win32com/test/testExchange.py similarity index 100% rename from libs/win32com/test/testExchange.py rename to libs/win/win32com/test/testExchange.py diff --git a/libs/win32com/test/testExplorer.py b/libs/win/win32com/test/testExplorer.py similarity index 100% rename from libs/win32com/test/testExplorer.py rename to libs/win/win32com/test/testExplorer.py diff --git a/libs/win32com/test/testGIT.py b/libs/win/win32com/test/testGIT.py similarity index 100% rename from libs/win32com/test/testGIT.py rename to libs/win/win32com/test/testGIT.py diff --git a/libs/win32com/test/testGatewayAddresses.py b/libs/win/win32com/test/testGatewayAddresses.py similarity index 100% rename from libs/win32com/test/testGatewayAddresses.py rename to libs/win/win32com/test/testGatewayAddresses.py diff --git a/libs/win32com/test/testInterp.vbs b/libs/win/win32com/test/testInterp.vbs similarity index 100% rename from libs/win32com/test/testInterp.vbs rename to libs/win/win32com/test/testInterp.vbs diff --git a/libs/win32com/test/testIterators.py b/libs/win/win32com/test/testIterators.py similarity index 100% rename from libs/win32com/test/testIterators.py rename to libs/win/win32com/test/testIterators.py diff --git a/libs/win32com/test/testMSOffice.py b/libs/win/win32com/test/testMSOffice.py similarity index 100% rename from libs/win32com/test/testMSOffice.py rename to libs/win/win32com/test/testMSOffice.py diff --git a/libs/win32com/test/testMSOfficeEvents.py b/libs/win/win32com/test/testMSOfficeEvents.py similarity index 100% rename from libs/win32com/test/testMSOfficeEvents.py rename to libs/win/win32com/test/testMSOfficeEvents.py diff --git a/libs/win32com/test/testMarshal.py b/libs/win/win32com/test/testMarshal.py similarity index 100% rename from libs/win32com/test/testMarshal.py rename to libs/win/win32com/test/testMarshal.py diff --git a/libs/win32com/test/testNetscape.py b/libs/win/win32com/test/testNetscape.py similarity index 100% rename from libs/win32com/test/testNetscape.py rename to libs/win/win32com/test/testNetscape.py diff --git a/libs/win32com/test/testPersist.py b/libs/win/win32com/test/testPersist.py similarity index 100% rename from libs/win32com/test/testPersist.py rename to libs/win/win32com/test/testPersist.py diff --git a/libs/win32com/test/testPippo.py b/libs/win/win32com/test/testPippo.py similarity index 100% rename from libs/win32com/test/testPippo.py rename to libs/win/win32com/test/testPippo.py diff --git a/libs/win32com/test/testPyComTest.py b/libs/win/win32com/test/testPyComTest.py similarity index 100% rename from libs/win32com/test/testPyComTest.py rename to libs/win/win32com/test/testPyComTest.py diff --git a/libs/win32com/test/testPyScriptlet.js b/libs/win/win32com/test/testPyScriptlet.js similarity index 100% rename from libs/win32com/test/testPyScriptlet.js rename to libs/win/win32com/test/testPyScriptlet.js diff --git a/libs/win32com/test/testROT.py b/libs/win/win32com/test/testROT.py similarity index 100% rename from libs/win32com/test/testROT.py rename to libs/win/win32com/test/testROT.py diff --git a/libs/win32com/test/testServers.py b/libs/win/win32com/test/testServers.py similarity index 100% rename from libs/win32com/test/testServers.py rename to libs/win/win32com/test/testServers.py diff --git a/libs/win32com/test/testShell.py b/libs/win/win32com/test/testShell.py similarity index 100% rename from libs/win32com/test/testShell.py rename to libs/win/win32com/test/testShell.py diff --git a/libs/win32com/test/testStorage.py b/libs/win/win32com/test/testStorage.py similarity index 100% rename from libs/win32com/test/testStorage.py rename to libs/win/win32com/test/testStorage.py diff --git a/libs/win32com/test/testStreams.py b/libs/win/win32com/test/testStreams.py similarity index 100% rename from libs/win32com/test/testStreams.py rename to libs/win/win32com/test/testStreams.py diff --git a/libs/win32com/test/testWMI.py b/libs/win/win32com/test/testWMI.py similarity index 100% rename from libs/win32com/test/testWMI.py rename to libs/win/win32com/test/testWMI.py diff --git a/libs/win32com/test/testall.py b/libs/win/win32com/test/testall.py similarity index 100% rename from libs/win32com/test/testall.py rename to libs/win/win32com/test/testall.py diff --git a/libs/win32com/test/testmakepy.py b/libs/win/win32com/test/testmakepy.py similarity index 100% rename from libs/win32com/test/testmakepy.py rename to libs/win/win32com/test/testmakepy.py diff --git a/libs/win32com/test/testvb.py b/libs/win/win32com/test/testvb.py similarity index 100% rename from libs/win32com/test/testvb.py rename to libs/win/win32com/test/testvb.py diff --git a/libs/win32com/test/testvbscript_regexp.py b/libs/win/win32com/test/testvbscript_regexp.py similarity index 100% rename from libs/win32com/test/testvbscript_regexp.py rename to libs/win/win32com/test/testvbscript_regexp.py diff --git a/libs/win32com/test/testxslt.js b/libs/win/win32com/test/testxslt.js similarity index 100% rename from libs/win32com/test/testxslt.js rename to libs/win/win32com/test/testxslt.js diff --git a/libs/win32com/test/testxslt.py b/libs/win/win32com/test/testxslt.py similarity index 100% rename from libs/win32com/test/testxslt.py rename to libs/win/win32com/test/testxslt.py diff --git a/libs/win32com/test/testxslt.xsl b/libs/win/win32com/test/testxslt.xsl similarity index 100% rename from libs/win32com/test/testxslt.xsl rename to libs/win/win32com/test/testxslt.xsl diff --git a/libs/win32com/test/util.py b/libs/win/win32com/test/util.py similarity index 100% rename from libs/win32com/test/util.py rename to libs/win/win32com/test/util.py diff --git a/libs/win32com/universal.py b/libs/win/win32com/universal.py similarity index 100% rename from libs/win32com/universal.py rename to libs/win/win32com/universal.py diff --git a/libs/win32com/util.py b/libs/win/win32com/util.py similarity index 100% rename from libs/win32com/util.py rename to libs/win/win32com/util.py diff --git a/libs/win32comext/adsi/__init__.py b/libs/win/win32comext/adsi/__init__.py similarity index 100% rename from libs/win32comext/adsi/__init__.py rename to libs/win/win32comext/adsi/__init__.py diff --git a/libs/win32comext/adsi/adsi.pyd b/libs/win/win32comext/adsi/adsi.pyd similarity index 100% rename from libs/win32comext/adsi/adsi.pyd rename to libs/win/win32comext/adsi/adsi.pyd diff --git a/libs/win32comext/adsi/adsicon.py b/libs/win/win32comext/adsi/adsicon.py similarity index 100% rename from libs/win32comext/adsi/adsicon.py rename to libs/win/win32comext/adsi/adsicon.py diff --git a/libs/win32comext/adsi/demos/objectPicker.py b/libs/win/win32comext/adsi/demos/objectPicker.py similarity index 100% rename from libs/win32comext/adsi/demos/objectPicker.py rename to libs/win/win32comext/adsi/demos/objectPicker.py diff --git a/libs/win32comext/adsi/demos/scp.py b/libs/win/win32comext/adsi/demos/scp.py similarity index 100% rename from libs/win32comext/adsi/demos/scp.py rename to libs/win/win32comext/adsi/demos/scp.py diff --git a/libs/win32comext/adsi/demos/search.py b/libs/win/win32comext/adsi/demos/search.py similarity index 100% rename from libs/win32comext/adsi/demos/search.py rename to libs/win/win32comext/adsi/demos/search.py diff --git a/libs/win32comext/adsi/demos/test.py b/libs/win/win32comext/adsi/demos/test.py similarity index 100% rename from libs/win32comext/adsi/demos/test.py rename to libs/win/win32comext/adsi/demos/test.py diff --git a/libs/win32comext/authorization/__init__.py b/libs/win/win32comext/authorization/__init__.py similarity index 100% rename from libs/win32comext/authorization/__init__.py rename to libs/win/win32comext/authorization/__init__.py diff --git a/libs/win32comext/authorization/authorization.pyd b/libs/win/win32comext/authorization/authorization.pyd similarity index 100% rename from libs/win32comext/authorization/authorization.pyd rename to libs/win/win32comext/authorization/authorization.pyd diff --git a/libs/win32comext/authorization/demos/EditSecurity.py b/libs/win/win32comext/authorization/demos/EditSecurity.py similarity index 100% rename from libs/win32comext/authorization/demos/EditSecurity.py rename to libs/win/win32comext/authorization/demos/EditSecurity.py diff --git a/libs/win32comext/authorization/demos/EditServiceSecurity.py b/libs/win/win32comext/authorization/demos/EditServiceSecurity.py similarity index 100% rename from libs/win32comext/authorization/demos/EditServiceSecurity.py rename to libs/win/win32comext/authorization/demos/EditServiceSecurity.py diff --git a/libs/win32comext/axcontrol/__init__.py b/libs/win/win32comext/axcontrol/__init__.py similarity index 100% rename from libs/win32comext/axcontrol/__init__.py rename to libs/win/win32comext/axcontrol/__init__.py diff --git a/libs/win32comext/axcontrol/axcontrol.pyd b/libs/win/win32comext/axcontrol/axcontrol.pyd similarity index 100% rename from libs/win32comext/axcontrol/axcontrol.pyd rename to libs/win/win32comext/axcontrol/axcontrol.pyd diff --git a/libs/win32comext/axdebug/__init__.py b/libs/win/win32comext/axdebug/__init__.py similarity index 100% rename from libs/win32comext/axdebug/__init__.py rename to libs/win/win32comext/axdebug/__init__.py diff --git a/libs/win32comext/axdebug/adb.py b/libs/win/win32comext/axdebug/adb.py similarity index 100% rename from libs/win32comext/axdebug/adb.py rename to libs/win/win32comext/axdebug/adb.py diff --git a/libs/win32comext/axdebug/axdebug.pyd b/libs/win/win32comext/axdebug/axdebug.pyd similarity index 100% rename from libs/win32comext/axdebug/axdebug.pyd rename to libs/win/win32comext/axdebug/axdebug.pyd diff --git a/libs/win32comext/axdebug/codecontainer.py b/libs/win/win32comext/axdebug/codecontainer.py similarity index 100% rename from libs/win32comext/axdebug/codecontainer.py rename to libs/win/win32comext/axdebug/codecontainer.py diff --git a/libs/win32comext/axdebug/contexts.py b/libs/win/win32comext/axdebug/contexts.py similarity index 100% rename from libs/win32comext/axdebug/contexts.py rename to libs/win/win32comext/axdebug/contexts.py diff --git a/libs/win32comext/axdebug/debugger.py b/libs/win/win32comext/axdebug/debugger.py similarity index 100% rename from libs/win32comext/axdebug/debugger.py rename to libs/win/win32comext/axdebug/debugger.py diff --git a/libs/win32comext/axdebug/documents.py b/libs/win/win32comext/axdebug/documents.py similarity index 100% rename from libs/win32comext/axdebug/documents.py rename to libs/win/win32comext/axdebug/documents.py diff --git a/libs/win32comext/axdebug/dump.py b/libs/win/win32comext/axdebug/dump.py similarity index 100% rename from libs/win32comext/axdebug/dump.py rename to libs/win/win32comext/axdebug/dump.py diff --git a/libs/win32comext/axdebug/expressions.py b/libs/win/win32comext/axdebug/expressions.py similarity index 100% rename from libs/win32comext/axdebug/expressions.py rename to libs/win/win32comext/axdebug/expressions.py diff --git a/libs/win32comext/axdebug/gateways.py b/libs/win/win32comext/axdebug/gateways.py similarity index 100% rename from libs/win32comext/axdebug/gateways.py rename to libs/win/win32comext/axdebug/gateways.py diff --git a/libs/win32comext/axdebug/stackframe.py b/libs/win/win32comext/axdebug/stackframe.py similarity index 100% rename from libs/win32comext/axdebug/stackframe.py rename to libs/win/win32comext/axdebug/stackframe.py diff --git a/libs/win32comext/axdebug/util.py b/libs/win/win32comext/axdebug/util.py similarity index 100% rename from libs/win32comext/axdebug/util.py rename to libs/win/win32comext/axdebug/util.py diff --git a/libs/win32comext/axscript/Demos/client/asp/CreateObject.asp b/libs/win/win32comext/axscript/Demos/client/asp/CreateObject.asp similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/CreateObject.asp rename to libs/win/win32comext/axscript/Demos/client/asp/CreateObject.asp diff --git a/libs/win32comext/axscript/Demos/client/asp/caps.asp b/libs/win/win32comext/axscript/Demos/client/asp/caps.asp similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/caps.asp rename to libs/win/win32comext/axscript/Demos/client/asp/caps.asp diff --git a/libs/win32comext/axscript/Demos/client/asp/interrupt/test.asp b/libs/win/win32comext/axscript/Demos/client/asp/interrupt/test.asp similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/interrupt/test.asp rename to libs/win/win32comext/axscript/Demos/client/asp/interrupt/test.asp diff --git a/libs/win32comext/axscript/Demos/client/asp/interrupt/test.html b/libs/win/win32comext/axscript/Demos/client/asp/interrupt/test.html similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/interrupt/test.html rename to libs/win/win32comext/axscript/Demos/client/asp/interrupt/test.html diff --git a/libs/win32comext/axscript/Demos/client/asp/interrupt/test1.asp b/libs/win/win32comext/axscript/Demos/client/asp/interrupt/test1.asp similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/interrupt/test1.asp rename to libs/win/win32comext/axscript/Demos/client/asp/interrupt/test1.asp diff --git a/libs/win32comext/axscript/Demos/client/asp/interrupt/test1.html b/libs/win/win32comext/axscript/Demos/client/asp/interrupt/test1.html similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/interrupt/test1.html rename to libs/win/win32comext/axscript/Demos/client/asp/interrupt/test1.html diff --git a/libs/win32comext/axscript/Demos/client/asp/tut1.asp b/libs/win/win32comext/axscript/Demos/client/asp/tut1.asp similarity index 100% rename from libs/win32comext/axscript/Demos/client/asp/tut1.asp rename to libs/win/win32comext/axscript/Demos/client/asp/tut1.asp diff --git a/libs/win32comext/axscript/Demos/client/ie/MarqueeText1.htm b/libs/win/win32comext/axscript/Demos/client/ie/MarqueeText1.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/MarqueeText1.htm rename to libs/win/win32comext/axscript/Demos/client/ie/MarqueeText1.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/calc.htm b/libs/win/win32comext/axscript/Demos/client/ie/calc.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/calc.htm rename to libs/win/win32comext/axscript/Demos/client/ie/calc.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/dbgtest.htm b/libs/win/win32comext/axscript/Demos/client/ie/dbgtest.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/dbgtest.htm rename to libs/win/win32comext/axscript/Demos/client/ie/dbgtest.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/demo.htm b/libs/win/win32comext/axscript/Demos/client/ie/demo.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/demo.htm rename to libs/win/win32comext/axscript/Demos/client/ie/demo.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/demo_check.htm b/libs/win/win32comext/axscript/Demos/client/ie/demo_check.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/demo_check.htm rename to libs/win/win32comext/axscript/Demos/client/ie/demo_check.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/demo_intro.htm b/libs/win/win32comext/axscript/Demos/client/ie/demo_intro.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/demo_intro.htm rename to libs/win/win32comext/axscript/Demos/client/ie/demo_intro.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/demo_menu.htm b/libs/win/win32comext/axscript/Demos/client/ie/demo_menu.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/demo_menu.htm rename to libs/win/win32comext/axscript/Demos/client/ie/demo_menu.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/docwrite.htm b/libs/win/win32comext/axscript/Demos/client/ie/docwrite.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/docwrite.htm rename to libs/win/win32comext/axscript/Demos/client/ie/docwrite.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/foo2.htm b/libs/win/win32comext/axscript/Demos/client/ie/foo2.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/foo2.htm rename to libs/win/win32comext/axscript/Demos/client/ie/foo2.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/form.htm b/libs/win/win32comext/axscript/Demos/client/ie/form.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/form.htm rename to libs/win/win32comext/axscript/Demos/client/ie/form.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/marqueeDemo.htm b/libs/win/win32comext/axscript/Demos/client/ie/marqueeDemo.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/marqueeDemo.htm rename to libs/win/win32comext/axscript/Demos/client/ie/marqueeDemo.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/mousetrack.htm b/libs/win/win32comext/axscript/Demos/client/ie/mousetrack.htm similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/mousetrack.htm rename to libs/win/win32comext/axscript/Demos/client/ie/mousetrack.htm diff --git a/libs/win32comext/axscript/Demos/client/ie/pycom_blowing.gif b/libs/win/win32comext/axscript/Demos/client/ie/pycom_blowing.gif similarity index 100% rename from libs/win32comext/axscript/Demos/client/ie/pycom_blowing.gif rename to libs/win/win32comext/axscript/Demos/client/ie/pycom_blowing.gif diff --git a/libs/win32comext/axscript/Demos/client/wsh/blank.pys b/libs/win/win32comext/axscript/Demos/client/wsh/blank.pys similarity index 100% rename from libs/win32comext/axscript/Demos/client/wsh/blank.pys rename to libs/win/win32comext/axscript/Demos/client/wsh/blank.pys diff --git a/libs/win32comext/axscript/Demos/client/wsh/excel.pys b/libs/win/win32comext/axscript/Demos/client/wsh/excel.pys similarity index 100% rename from libs/win32comext/axscript/Demos/client/wsh/excel.pys rename to libs/win/win32comext/axscript/Demos/client/wsh/excel.pys diff --git a/libs/win32comext/axscript/Demos/client/wsh/registry.pys b/libs/win/win32comext/axscript/Demos/client/wsh/registry.pys similarity index 100% rename from libs/win32comext/axscript/Demos/client/wsh/registry.pys rename to libs/win/win32comext/axscript/Demos/client/wsh/registry.pys diff --git a/libs/win32comext/axscript/Demos/client/wsh/test.pys b/libs/win/win32comext/axscript/Demos/client/wsh/test.pys similarity index 100% rename from libs/win32comext/axscript/Demos/client/wsh/test.pys rename to libs/win/win32comext/axscript/Demos/client/wsh/test.pys diff --git a/libs/win32comext/axscript/__init__.py b/libs/win/win32comext/axscript/__init__.py similarity index 100% rename from libs/win32comext/axscript/__init__.py rename to libs/win/win32comext/axscript/__init__.py diff --git a/libs/win32comext/axscript/asputil.py b/libs/win/win32comext/axscript/asputil.py similarity index 100% rename from libs/win32comext/axscript/asputil.py rename to libs/win/win32comext/axscript/asputil.py diff --git a/libs/win32comext/axscript/axscript.pyd b/libs/win/win32comext/axscript/axscript.pyd similarity index 100% rename from libs/win32comext/axscript/axscript.pyd rename to libs/win/win32comext/axscript/axscript.pyd diff --git a/libs/win32comext/axscript/client/__init__.py b/libs/win/win32comext/axscript/client/__init__.py similarity index 100% rename from libs/win32comext/axscript/client/__init__.py rename to libs/win/win32comext/axscript/client/__init__.py diff --git a/libs/win32comext/axscript/client/debug.py b/libs/win/win32comext/axscript/client/debug.py similarity index 100% rename from libs/win32comext/axscript/client/debug.py rename to libs/win/win32comext/axscript/client/debug.py diff --git a/libs/win32comext/axscript/client/error.py b/libs/win/win32comext/axscript/client/error.py similarity index 100% rename from libs/win32comext/axscript/client/error.py rename to libs/win/win32comext/axscript/client/error.py diff --git a/libs/win32comext/axscript/client/framework.py b/libs/win/win32comext/axscript/client/framework.py similarity index 100% rename from libs/win32comext/axscript/client/framework.py rename to libs/win/win32comext/axscript/client/framework.py diff --git a/libs/win32comext/axscript/client/pydumper.py b/libs/win/win32comext/axscript/client/pydumper.py similarity index 100% rename from libs/win32comext/axscript/client/pydumper.py rename to libs/win/win32comext/axscript/client/pydumper.py diff --git a/libs/win32comext/axscript/client/pyscript.py b/libs/win/win32comext/axscript/client/pyscript.py similarity index 100% rename from libs/win32comext/axscript/client/pyscript.py rename to libs/win/win32comext/axscript/client/pyscript.py diff --git a/libs/win32comext/axscript/client/pyscript_rexec.py b/libs/win/win32comext/axscript/client/pyscript_rexec.py similarity index 100% rename from libs/win32comext/axscript/client/pyscript_rexec.py rename to libs/win/win32comext/axscript/client/pyscript_rexec.py diff --git a/libs/win32comext/axscript/client/scriptdispatch.py b/libs/win/win32comext/axscript/client/scriptdispatch.py similarity index 100% rename from libs/win32comext/axscript/client/scriptdispatch.py rename to libs/win/win32comext/axscript/client/scriptdispatch.py diff --git a/libs/win32comext/axscript/server/__init__.py b/libs/win/win32comext/axscript/server/__init__.py similarity index 100% rename from libs/win32comext/axscript/server/__init__.py rename to libs/win/win32comext/axscript/server/__init__.py diff --git a/libs/win32comext/axscript/server/axsite.py b/libs/win/win32comext/axscript/server/axsite.py similarity index 100% rename from libs/win32comext/axscript/server/axsite.py rename to libs/win/win32comext/axscript/server/axsite.py diff --git a/libs/win32comext/axscript/server/error.py b/libs/win/win32comext/axscript/server/error.py similarity index 100% rename from libs/win32comext/axscript/server/error.py rename to libs/win/win32comext/axscript/server/error.py diff --git a/libs/win32comext/axscript/test/debugTest.pys b/libs/win/win32comext/axscript/test/debugTest.pys similarity index 100% rename from libs/win32comext/axscript/test/debugTest.pys rename to libs/win/win32comext/axscript/test/debugTest.pys diff --git a/libs/win32comext/axscript/test/debugTest.vbs b/libs/win/win32comext/axscript/test/debugTest.vbs similarity index 100% rename from libs/win32comext/axscript/test/debugTest.vbs rename to libs/win/win32comext/axscript/test/debugTest.vbs diff --git a/libs/win32comext/axscript/test/leakTest.py b/libs/win/win32comext/axscript/test/leakTest.py similarity index 100% rename from libs/win32comext/axscript/test/leakTest.py rename to libs/win/win32comext/axscript/test/leakTest.py diff --git a/libs/win32comext/axscript/test/test.html b/libs/win/win32comext/axscript/test/test.html similarity index 100% rename from libs/win32comext/axscript/test/test.html rename to libs/win/win32comext/axscript/test/test.html diff --git a/libs/win32comext/axscript/test/testHost.py b/libs/win/win32comext/axscript/test/testHost.py similarity index 100% rename from libs/win32comext/axscript/test/testHost.py rename to libs/win/win32comext/axscript/test/testHost.py diff --git a/libs/win32comext/axscript/test/testHost4Dbg.py b/libs/win/win32comext/axscript/test/testHost4Dbg.py similarity index 100% rename from libs/win32comext/axscript/test/testHost4Dbg.py rename to libs/win/win32comext/axscript/test/testHost4Dbg.py diff --git a/libs/win32comext/bits/__init__.py b/libs/win/win32comext/bits/__init__.py similarity index 100% rename from libs/win32comext/bits/__init__.py rename to libs/win/win32comext/bits/__init__.py diff --git a/libs/win32comext/bits/bits.pyd b/libs/win/win32comext/bits/bits.pyd similarity index 100% rename from libs/win32comext/bits/bits.pyd rename to libs/win/win32comext/bits/bits.pyd diff --git a/libs/win32comext/bits/test/show_all_jobs.py b/libs/win/win32comext/bits/test/show_all_jobs.py similarity index 100% rename from libs/win32comext/bits/test/show_all_jobs.py rename to libs/win/win32comext/bits/test/show_all_jobs.py diff --git a/libs/win32comext/bits/test/test_bits.py b/libs/win/win32comext/bits/test/test_bits.py similarity index 100% rename from libs/win32comext/bits/test/test_bits.py rename to libs/win/win32comext/bits/test/test_bits.py diff --git a/libs/win32comext/directsound/__init__.py b/libs/win/win32comext/directsound/__init__.py similarity index 100% rename from libs/win32comext/directsound/__init__.py rename to libs/win/win32comext/directsound/__init__.py diff --git a/libs/win32comext/directsound/directsound.pyd b/libs/win/win32comext/directsound/directsound.pyd similarity index 100% rename from libs/win32comext/directsound/directsound.pyd rename to libs/win/win32comext/directsound/directsound.pyd diff --git a/libs/win32comext/directsound/test/__init__.py b/libs/win/win32comext/directsound/test/__init__.py similarity index 100% rename from libs/win32comext/directsound/test/__init__.py rename to libs/win/win32comext/directsound/test/__init__.py diff --git a/libs/win32comext/directsound/test/ds_record.py b/libs/win/win32comext/directsound/test/ds_record.py similarity index 100% rename from libs/win32comext/directsound/test/ds_record.py rename to libs/win/win32comext/directsound/test/ds_record.py diff --git a/libs/win32comext/directsound/test/ds_test.py b/libs/win/win32comext/directsound/test/ds_test.py similarity index 100% rename from libs/win32comext/directsound/test/ds_test.py rename to libs/win/win32comext/directsound/test/ds_test.py diff --git a/libs/win32comext/ifilter/__init__.py b/libs/win/win32comext/ifilter/__init__.py similarity index 100% rename from libs/win32comext/ifilter/__init__.py rename to libs/win/win32comext/ifilter/__init__.py diff --git a/libs/win32comext/ifilter/demo/filterDemo.py b/libs/win/win32comext/ifilter/demo/filterDemo.py similarity index 100% rename from libs/win32comext/ifilter/demo/filterDemo.py rename to libs/win/win32comext/ifilter/demo/filterDemo.py diff --git a/libs/win32comext/ifilter/ifilter.pyd b/libs/win/win32comext/ifilter/ifilter.pyd similarity index 100% rename from libs/win32comext/ifilter/ifilter.pyd rename to libs/win/win32comext/ifilter/ifilter.pyd diff --git a/libs/win32comext/ifilter/ifiltercon.py b/libs/win/win32comext/ifilter/ifiltercon.py similarity index 100% rename from libs/win32comext/ifilter/ifiltercon.py rename to libs/win/win32comext/ifilter/ifiltercon.py diff --git a/libs/win32comext/internet/__init__.py b/libs/win/win32comext/internet/__init__.py similarity index 100% rename from libs/win32comext/internet/__init__.py rename to libs/win/win32comext/internet/__init__.py diff --git a/libs/win32comext/internet/inetcon.py b/libs/win/win32comext/internet/inetcon.py similarity index 100% rename from libs/win32comext/internet/inetcon.py rename to libs/win/win32comext/internet/inetcon.py diff --git a/libs/win32comext/internet/internet.pyd b/libs/win/win32comext/internet/internet.pyd similarity index 100% rename from libs/win32comext/internet/internet.pyd rename to libs/win/win32comext/internet/internet.pyd diff --git a/libs/win32comext/mapi/__init__.py b/libs/win/win32comext/mapi/__init__.py similarity index 100% rename from libs/win32comext/mapi/__init__.py rename to libs/win/win32comext/mapi/__init__.py diff --git a/libs/win32comext/mapi/demos/mapisend.py b/libs/win/win32comext/mapi/demos/mapisend.py similarity index 100% rename from libs/win32comext/mapi/demos/mapisend.py rename to libs/win/win32comext/mapi/demos/mapisend.py diff --git a/libs/win32comext/mapi/emsabtags.py b/libs/win/win32comext/mapi/emsabtags.py similarity index 100% rename from libs/win32comext/mapi/emsabtags.py rename to libs/win/win32comext/mapi/emsabtags.py diff --git a/libs/win32comext/mapi/exchange.pyd b/libs/win/win32comext/mapi/exchange.pyd similarity index 100% rename from libs/win32comext/mapi/exchange.pyd rename to libs/win/win32comext/mapi/exchange.pyd diff --git a/libs/win32comext/mapi/mapi.pyd b/libs/win/win32comext/mapi/mapi.pyd similarity index 100% rename from libs/win32comext/mapi/mapi.pyd rename to libs/win/win32comext/mapi/mapi.pyd diff --git a/libs/win32comext/mapi/mapitags.py b/libs/win/win32comext/mapi/mapitags.py similarity index 100% rename from libs/win32comext/mapi/mapitags.py rename to libs/win/win32comext/mapi/mapitags.py diff --git a/libs/win32comext/mapi/mapiutil.py b/libs/win/win32comext/mapi/mapiutil.py similarity index 100% rename from libs/win32comext/mapi/mapiutil.py rename to libs/win/win32comext/mapi/mapiutil.py diff --git a/libs/win32comext/propsys/__init__.py b/libs/win/win32comext/propsys/__init__.py similarity index 100% rename from libs/win32comext/propsys/__init__.py rename to libs/win/win32comext/propsys/__init__.py diff --git a/libs/win32comext/propsys/propsys.pyd b/libs/win/win32comext/propsys/propsys.pyd similarity index 100% rename from libs/win32comext/propsys/propsys.pyd rename to libs/win/win32comext/propsys/propsys.pyd diff --git a/libs/win32comext/propsys/pscon.py b/libs/win/win32comext/propsys/pscon.py similarity index 100% rename from libs/win32comext/propsys/pscon.py rename to libs/win/win32comext/propsys/pscon.py diff --git a/libs/win32comext/propsys/test/testpropsys.py b/libs/win/win32comext/propsys/test/testpropsys.py similarity index 100% rename from libs/win32comext/propsys/test/testpropsys.py rename to libs/win/win32comext/propsys/test/testpropsys.py diff --git a/libs/win32comext/shell/__init__.py b/libs/win/win32comext/shell/__init__.py similarity index 100% rename from libs/win32comext/shell/__init__.py rename to libs/win/win32comext/shell/__init__.py diff --git a/libs/win32comext/shell/demos/IActiveDesktop.py b/libs/win/win32comext/shell/demos/IActiveDesktop.py similarity index 100% rename from libs/win32comext/shell/demos/IActiveDesktop.py rename to libs/win/win32comext/shell/demos/IActiveDesktop.py diff --git a/libs/win32comext/shell/demos/IFileOperationProgressSink.py b/libs/win/win32comext/shell/demos/IFileOperationProgressSink.py similarity index 100% rename from libs/win32comext/shell/demos/IFileOperationProgressSink.py rename to libs/win/win32comext/shell/demos/IFileOperationProgressSink.py diff --git a/libs/win32comext/shell/demos/IShellLinkDataList.py b/libs/win/win32comext/shell/demos/IShellLinkDataList.py similarity index 100% rename from libs/win32comext/shell/demos/IShellLinkDataList.py rename to libs/win/win32comext/shell/demos/IShellLinkDataList.py diff --git a/libs/win32comext/shell/demos/ITransferAdviseSink.py b/libs/win/win32comext/shell/demos/ITransferAdviseSink.py similarity index 100% rename from libs/win32comext/shell/demos/ITransferAdviseSink.py rename to libs/win/win32comext/shell/demos/ITransferAdviseSink.py diff --git a/libs/win32comext/shell/demos/IUniformResourceLocator.py b/libs/win/win32comext/shell/demos/IUniformResourceLocator.py similarity index 100% rename from libs/win32comext/shell/demos/IUniformResourceLocator.py rename to libs/win/win32comext/shell/demos/IUniformResourceLocator.py diff --git a/libs/win32comext/shell/demos/browse_for_folder.py b/libs/win/win32comext/shell/demos/browse_for_folder.py similarity index 100% rename from libs/win32comext/shell/demos/browse_for_folder.py rename to libs/win/win32comext/shell/demos/browse_for_folder.py diff --git a/libs/win32comext/shell/demos/create_link.py b/libs/win/win32comext/shell/demos/create_link.py similarity index 100% rename from libs/win32comext/shell/demos/create_link.py rename to libs/win/win32comext/shell/demos/create_link.py diff --git a/libs/win32comext/shell/demos/dump_link.py b/libs/win/win32comext/shell/demos/dump_link.py similarity index 100% rename from libs/win32comext/shell/demos/dump_link.py rename to libs/win/win32comext/shell/demos/dump_link.py diff --git a/libs/win32comext/shell/demos/explorer_browser.py b/libs/win/win32comext/shell/demos/explorer_browser.py similarity index 100% rename from libs/win32comext/shell/demos/explorer_browser.py rename to libs/win/win32comext/shell/demos/explorer_browser.py diff --git a/libs/win32comext/shell/demos/servers/column_provider.py b/libs/win/win32comext/shell/demos/servers/column_provider.py similarity index 100% rename from libs/win32comext/shell/demos/servers/column_provider.py rename to libs/win/win32comext/shell/demos/servers/column_provider.py diff --git a/libs/win32comext/shell/demos/servers/context_menu.py b/libs/win/win32comext/shell/demos/servers/context_menu.py similarity index 100% rename from libs/win32comext/shell/demos/servers/context_menu.py rename to libs/win/win32comext/shell/demos/servers/context_menu.py diff --git a/libs/win32comext/shell/demos/servers/copy_hook.py b/libs/win/win32comext/shell/demos/servers/copy_hook.py similarity index 100% rename from libs/win32comext/shell/demos/servers/copy_hook.py rename to libs/win/win32comext/shell/demos/servers/copy_hook.py diff --git a/libs/win32comext/shell/demos/servers/empty_volume_cache.py b/libs/win/win32comext/shell/demos/servers/empty_volume_cache.py similarity index 100% rename from libs/win32comext/shell/demos/servers/empty_volume_cache.py rename to libs/win/win32comext/shell/demos/servers/empty_volume_cache.py diff --git a/libs/win32comext/shell/demos/servers/folder_view.py b/libs/win/win32comext/shell/demos/servers/folder_view.py similarity index 100% rename from libs/win32comext/shell/demos/servers/folder_view.py rename to libs/win/win32comext/shell/demos/servers/folder_view.py diff --git a/libs/win32comext/shell/demos/servers/icon_handler.py b/libs/win/win32comext/shell/demos/servers/icon_handler.py similarity index 100% rename from libs/win32comext/shell/demos/servers/icon_handler.py rename to libs/win/win32comext/shell/demos/servers/icon_handler.py diff --git a/libs/win32comext/shell/demos/servers/shell_view.py b/libs/win/win32comext/shell/demos/servers/shell_view.py similarity index 100% rename from libs/win32comext/shell/demos/servers/shell_view.py rename to libs/win/win32comext/shell/demos/servers/shell_view.py diff --git a/libs/win32comext/shell/demos/shellexecuteex.py b/libs/win/win32comext/shell/demos/shellexecuteex.py similarity index 100% rename from libs/win32comext/shell/demos/shellexecuteex.py rename to libs/win/win32comext/shell/demos/shellexecuteex.py diff --git a/libs/win32comext/shell/demos/viewstate.py b/libs/win/win32comext/shell/demos/viewstate.py similarity index 100% rename from libs/win32comext/shell/demos/viewstate.py rename to libs/win/win32comext/shell/demos/viewstate.py diff --git a/libs/win32comext/shell/demos/walk_shell_folders.py b/libs/win/win32comext/shell/demos/walk_shell_folders.py similarity index 100% rename from libs/win32comext/shell/demos/walk_shell_folders.py rename to libs/win/win32comext/shell/demos/walk_shell_folders.py diff --git a/libs/win32comext/shell/shell.pyd b/libs/win/win32comext/shell/shell.pyd similarity index 100% rename from libs/win32comext/shell/shell.pyd rename to libs/win/win32comext/shell/shell.pyd diff --git a/libs/win32comext/shell/shellcon.py b/libs/win/win32comext/shell/shellcon.py similarity index 100% rename from libs/win32comext/shell/shellcon.py rename to libs/win/win32comext/shell/shellcon.py diff --git a/libs/win32comext/shell/test/testSHFileOperation.py b/libs/win/win32comext/shell/test/testSHFileOperation.py similarity index 100% rename from libs/win32comext/shell/test/testSHFileOperation.py rename to libs/win/win32comext/shell/test/testSHFileOperation.py diff --git a/libs/win32comext/shell/test/testShellFolder.py b/libs/win/win32comext/shell/test/testShellFolder.py similarity index 100% rename from libs/win32comext/shell/test/testShellFolder.py rename to libs/win/win32comext/shell/test/testShellFolder.py diff --git a/libs/win32comext/shell/test/testShellItem.py b/libs/win/win32comext/shell/test/testShellItem.py similarity index 100% rename from libs/win32comext/shell/test/testShellItem.py rename to libs/win/win32comext/shell/test/testShellItem.py diff --git a/libs/win32comext/taskscheduler/__init__.py b/libs/win/win32comext/taskscheduler/__init__.py similarity index 100% rename from libs/win32comext/taskscheduler/__init__.py rename to libs/win/win32comext/taskscheduler/__init__.py diff --git a/libs/win32comext/taskscheduler/taskscheduler.pyd b/libs/win/win32comext/taskscheduler/taskscheduler.pyd similarity index 100% rename from libs/win32comext/taskscheduler/taskscheduler.pyd rename to libs/win/win32comext/taskscheduler/taskscheduler.pyd diff --git a/libs/win32comext/taskscheduler/test/test_addtask.py b/libs/win/win32comext/taskscheduler/test/test_addtask.py similarity index 100% rename from libs/win32comext/taskscheduler/test/test_addtask.py rename to libs/win/win32comext/taskscheduler/test/test_addtask.py diff --git a/libs/win32comext/taskscheduler/test/test_addtask_1.py b/libs/win/win32comext/taskscheduler/test/test_addtask_1.py similarity index 100% rename from libs/win32comext/taskscheduler/test/test_addtask_1.py rename to libs/win/win32comext/taskscheduler/test/test_addtask_1.py diff --git a/libs/win32comext/taskscheduler/test/test_addtask_2.py b/libs/win/win32comext/taskscheduler/test/test_addtask_2.py similarity index 100% rename from libs/win32comext/taskscheduler/test/test_addtask_2.py rename to libs/win/win32comext/taskscheduler/test/test_addtask_2.py diff --git a/libs/win32comext/taskscheduler/test/test_localsystem.py b/libs/win/win32comext/taskscheduler/test/test_localsystem.py similarity index 100% rename from libs/win32comext/taskscheduler/test/test_localsystem.py rename to libs/win/win32comext/taskscheduler/test/test_localsystem.py diff --git a/nzbToMedia.py b/nzbToMedia.py index 3a8ce793..a24aaad0 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -636,7 +636,11 @@ from core.autoProcess.autoProcessMusic import autoProcessMusic from core.autoProcess.autoProcessTV import autoProcessTV from core.nzbToMediaUserScript import external_script from core.nzbToMediaUtil import CharReplace, cleanDir, convert_to_ascii, extractFiles, getDirs, get_downloadInfo, get_nzoid, plex_update, update_downloadInfoStatus -from libs.six import text_type + +try: + text_type = unicode +except NameError: + text_type = str # post-processing