diff --git a/packages/wakatime/wakatime/packages/pygments2/__init__.py b/packages/wakatime/wakatime/packages/pygments2/pygments/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/__init__.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/cmdline.py b/packages/wakatime/wakatime/packages/pygments2/pygments/cmdline.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/cmdline.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/cmdline.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/console.py b/packages/wakatime/wakatime/packages/pygments2/pygments/console.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/console.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/console.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/filter.py b/packages/wakatime/wakatime/packages/pygments2/pygments/filter.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/filter.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/filter.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/filters/__init__.py b/packages/wakatime/wakatime/packages/pygments2/pygments/filters/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/filters/__init__.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/filters/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatter.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatter.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatter.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatter.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/__init__.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/__init__.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/_mapping.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/_mapping.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/_mapping.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/_mapping.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/bbcode.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/bbcode.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/bbcode.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/bbcode.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/html.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/html.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/html.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/html.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/img.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/img.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/img.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/img.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/latex.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/latex.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/latex.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/latex.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/other.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/other.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/other.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/other.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/rtf.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/rtf.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/rtf.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/rtf.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/svg.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/svg.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/svg.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/svg.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/terminal.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/terminal.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/terminal.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/terminal.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/formatters/terminal256.py b/packages/wakatime/wakatime/packages/pygments2/pygments/formatters/terminal256.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/formatters/terminal256.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/formatters/terminal256.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexer.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexer.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexer.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexer.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/__init__.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/__init__.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_asybuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_asybuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_asybuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_asybuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_clbuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_clbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_clbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_clbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_lassobuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_lassobuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_lassobuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_lassobuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_luabuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_luabuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_luabuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_luabuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_mapping.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_mapping.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_mapping.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_mapping.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_openedgebuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_openedgebuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_openedgebuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_openedgebuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_phpbuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_phpbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_phpbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_phpbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_postgres_builtins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_postgres_builtins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_postgres_builtins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_postgres_builtins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_robotframeworklexer.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_robotframeworklexer.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_robotframeworklexer.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_robotframeworklexer.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_scilab_builtins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_scilab_builtins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_scilab_builtins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_scilab_builtins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_sourcemodbuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_sourcemodbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_sourcemodbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_sourcemodbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_stan_builtins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_stan_builtins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_stan_builtins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_stan_builtins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/_vimbuiltins.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_vimbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/_vimbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/_vimbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/agile.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/agile.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/agile.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/agile.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/asm.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/asm.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/asm.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/asm.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/compiled.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/compiled.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/compiled.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/compiled.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/dalvik.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/dalvik.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/dalvik.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/dalvik.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/dotnet.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/dotnet.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/dotnet.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/dotnet.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/foxpro.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/foxpro.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/foxpro.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/foxpro.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/functional.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/functional.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/functional.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/functional.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/hdl.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/hdl.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/hdl.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/hdl.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/jvm.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/jvm.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/jvm.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/jvm.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/math.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/math.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/math.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/math.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/other.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/other.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/other.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/other.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/parsers.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/parsers.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/parsers.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/parsers.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/shell.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/shell.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/shell.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/shell.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/special.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/special.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/special.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/special.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/sql.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/sql.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/sql.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/sql.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/templates.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/templates.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/templates.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/templates.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/text.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/text.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/text.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/text.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/lexers/web.py b/packages/wakatime/wakatime/packages/pygments2/pygments/lexers/web.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/lexers/web.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/lexers/web.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/modeline.py b/packages/wakatime/wakatime/packages/pygments2/pygments/modeline.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/modeline.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/modeline.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/plugin.py b/packages/wakatime/wakatime/packages/pygments2/pygments/plugin.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/plugin.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/plugin.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/scanner.py b/packages/wakatime/wakatime/packages/pygments2/pygments/scanner.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/scanner.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/scanner.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/style.py b/packages/wakatime/wakatime/packages/pygments2/pygments/style.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/style.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/style.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/__init__.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/__init__.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/autumn.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/autumn.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/autumn.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/autumn.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/borland.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/borland.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/borland.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/borland.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/bw.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/bw.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/bw.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/bw.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/colorful.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/colorful.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/colorful.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/colorful.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/default.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/default.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/default.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/default.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/emacs.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/emacs.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/emacs.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/emacs.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/friendly.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/friendly.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/friendly.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/friendly.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/fruity.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/fruity.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/fruity.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/fruity.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/manni.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/manni.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/manni.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/manni.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/monokai.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/monokai.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/monokai.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/monokai.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/murphy.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/murphy.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/murphy.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/murphy.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/native.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/native.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/native.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/native.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/pastie.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/pastie.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/pastie.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/pastie.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/perldoc.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/perldoc.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/perldoc.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/perldoc.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/rrt.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/rrt.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/rrt.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/rrt.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/tango.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/tango.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/tango.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/tango.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/trac.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/trac.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/trac.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/trac.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/vim.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/vim.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/vim.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/vim.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/styles/vs.py b/packages/wakatime/wakatime/packages/pygments2/pygments/styles/vs.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/styles/vs.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/styles/vs.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/token.py b/packages/wakatime/wakatime/packages/pygments2/pygments/token.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/token.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/token.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/unistring.py b/packages/wakatime/wakatime/packages/pygments2/pygments/unistring.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/unistring.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/unistring.py
diff --git a/packages/wakatime/wakatime/packages/pygments2/util.py b/packages/wakatime/wakatime/packages/pygments2/pygments/util.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments2/util.py
rename to packages/wakatime/wakatime/packages/pygments2/pygments/util.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/__init__.py b/packages/wakatime/wakatime/packages/pygments3/pygments/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/__init__.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/cmdline.py b/packages/wakatime/wakatime/packages/pygments3/pygments/cmdline.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/cmdline.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/cmdline.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/console.py b/packages/wakatime/wakatime/packages/pygments3/pygments/console.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/console.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/console.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/filter.py b/packages/wakatime/wakatime/packages/pygments3/pygments/filter.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/filter.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/filter.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/filters/__init__.py b/packages/wakatime/wakatime/packages/pygments3/pygments/filters/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/filters/__init__.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/filters/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatter.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatter.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatter.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatter.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/__init__.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/__init__.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/_mapping.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/_mapping.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/_mapping.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/_mapping.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/bbcode.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/bbcode.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/bbcode.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/bbcode.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/html.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/html.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/html.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/html.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/img.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/img.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/img.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/img.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/latex.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/latex.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/latex.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/latex.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/other.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/other.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/other.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/other.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/rtf.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/rtf.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/rtf.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/rtf.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/svg.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/svg.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/svg.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/svg.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/terminal.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/terminal.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/terminal.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/terminal.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/formatters/terminal256.py b/packages/wakatime/wakatime/packages/pygments3/pygments/formatters/terminal256.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/formatters/terminal256.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/formatters/terminal256.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexer.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexer.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexer.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexer.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/__init__.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/__init__.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_asybuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_asybuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_asybuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_asybuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_clbuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_clbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_clbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_clbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_lassobuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_lassobuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_lassobuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_lassobuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_luabuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_luabuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_luabuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_luabuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_mapping.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_mapping.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_mapping.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_mapping.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_openedgebuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_openedgebuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_openedgebuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_openedgebuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_phpbuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_phpbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_phpbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_phpbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_postgres_builtins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_postgres_builtins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_postgres_builtins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_postgres_builtins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_robotframeworklexer.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_robotframeworklexer.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_robotframeworklexer.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_robotframeworklexer.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_scilab_builtins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_scilab_builtins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_scilab_builtins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_scilab_builtins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_sourcemodbuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_sourcemodbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_sourcemodbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_sourcemodbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_stan_builtins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_stan_builtins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_stan_builtins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_stan_builtins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/_vimbuiltins.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_vimbuiltins.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/_vimbuiltins.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/_vimbuiltins.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/agile.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/agile.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/agile.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/agile.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/asm.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/asm.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/asm.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/asm.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/compiled.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/compiled.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/compiled.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/compiled.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/dalvik.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/dalvik.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/dalvik.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/dalvik.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/dotnet.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/dotnet.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/dotnet.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/dotnet.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/foxpro.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/foxpro.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/foxpro.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/foxpro.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/functional.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/functional.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/functional.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/functional.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/hdl.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/hdl.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/hdl.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/hdl.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/jvm.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/jvm.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/jvm.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/jvm.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/math.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/math.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/math.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/math.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/other.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/other.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/other.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/other.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/parsers.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/parsers.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/parsers.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/parsers.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/shell.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/shell.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/shell.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/shell.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/special.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/special.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/special.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/special.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/sql.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/sql.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/sql.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/sql.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/templates.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/templates.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/templates.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/templates.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/text.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/text.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/text.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/text.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/lexers/web.py b/packages/wakatime/wakatime/packages/pygments3/pygments/lexers/web.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/lexers/web.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/lexers/web.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/modeline.py b/packages/wakatime/wakatime/packages/pygments3/pygments/modeline.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/modeline.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/modeline.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/plugin.py b/packages/wakatime/wakatime/packages/pygments3/pygments/plugin.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/plugin.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/plugin.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/scanner.py b/packages/wakatime/wakatime/packages/pygments3/pygments/scanner.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/scanner.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/scanner.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/style.py b/packages/wakatime/wakatime/packages/pygments3/pygments/style.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/style.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/style.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/__init__.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/__init__.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/__init__.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/__init__.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/autumn.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/autumn.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/autumn.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/autumn.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/borland.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/borland.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/borland.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/borland.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/bw.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/bw.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/bw.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/bw.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/colorful.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/colorful.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/colorful.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/colorful.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/default.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/default.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/default.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/default.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/emacs.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/emacs.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/emacs.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/emacs.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/friendly.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/friendly.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/friendly.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/friendly.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/fruity.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/fruity.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/fruity.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/fruity.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/manni.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/manni.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/manni.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/manni.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/monokai.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/monokai.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/monokai.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/monokai.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/murphy.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/murphy.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/murphy.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/murphy.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/native.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/native.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/native.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/native.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/pastie.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/pastie.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/pastie.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/pastie.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/perldoc.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/perldoc.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/perldoc.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/perldoc.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/rrt.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/rrt.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/rrt.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/rrt.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/tango.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/tango.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/tango.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/tango.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/trac.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/trac.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/trac.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/trac.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/vim.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/vim.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/vim.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/vim.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/styles/vs.py b/packages/wakatime/wakatime/packages/pygments3/pygments/styles/vs.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/styles/vs.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/styles/vs.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/token.py b/packages/wakatime/wakatime/packages/pygments3/pygments/token.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/token.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/token.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/unistring.py b/packages/wakatime/wakatime/packages/pygments3/pygments/unistring.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/unistring.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/unistring.py
diff --git a/packages/wakatime/wakatime/packages/pygments3/util.py b/packages/wakatime/wakatime/packages/pygments3/pygments/util.py
similarity index 100%
rename from packages/wakatime/wakatime/packages/pygments3/util.py
rename to packages/wakatime/wakatime/packages/pygments3/pygments/util.py