From cace9359e3acc98a2555734d28234986c1bdfeb9 Mon Sep 17 00:00:00 2001
From: Craig Citro <craigcitro@google.com>
Date: Mon, 6 Dec 2021 18:02:54 -0800
Subject: [PATCH] Revert "Internal change"

This reverts commit 6edd31f9928f4d06fa778f8dca057af59a2fb823.
---
 .../.github => .github}/ISSUE_TEMPLATE/bug_report.md     | 0
 .../.github => .github}/ISSUE_TEMPLATE/config.yml        | 0
 .../ISSUE_TEMPLATE/feature_request.md                    | 0
 .../py/google/colab/pkg_files/.gitignore => .gitignore   | 0
 .../colab/pkg_files/CONTRIBUTING.md => CONTRIBUTING.md   | 0
 google3/third_party/py/google/colab/LICENSE => LICENSE   | 0
 .../py/google/colab/pkg_files/MANIFEST.in => MANIFEST.in | 0
 .../py/google/colab/pkg_files/README.md => README.md     | 0
 .../google/colab/pkg_files/google => google}/__init__.py | 0
 .../third_party/py/google => google}/colab/__init__.py   | 0
 .../py/google => google}/colab/_contents_manager.py      | 0
 .../third_party/py/google => google}/colab/_debugpy.py   | 0
 .../py/google => google}/colab/_debugpy_repr.py          | 0
 .../py/google => google}/colab/_event_manager.py         | 0
 .../py/google => google}/colab/_files_handler.py         | 0
 .../third_party/py/google => google}/colab/_history.py   | 0
 .../py/google => google}/colab/_import_hooks/__init__.py | 0
 .../py/google => google}/colab/_import_hooks/_altair.py  | 0
 .../py/google => google}/colab/_import_hooks/_bokeh.py   | 0
 .../py/google => google}/colab/_import_hooks/_cv2.py     | 0
 .../py/google => google}/colab/_import_magics.py         | 0
 .../third_party/py/google => google}/colab/_inspector.py | 0
 .../py/google => google}/colab/_installation_commands.py | 0
 .../google => google}/colab/_interactive_table_helper.py | 0
 .../colab/_interactive_table_hint_button.py              | 9 ++-------
 .../third_party/py/google => google}/colab/_ipython.py   | 0
 .../third_party/py/google => google}/colab/_kernel.py    | 0
 .../py/google => google}/colab/_login_handler.py         | 0
 .../third_party/py/google => google}/colab/_message.py   | 0
 {google3/third_party/py/google => google}/colab/_pip.py  | 0
 .../third_party/py/google => google}/colab/_reprs.py     | 0
 .../google => google}/colab/_serverextension/__init__.py | 0
 .../colab/_serverextension/_handlers.py                  | 0
 .../colab/_serverextension/_resource_monitor.py          | 0
 .../third_party/py/google => google}/colab/_shell.py     | 0
 .../py/google => google}/colab/_shell_customizations.py  | 0
 .../py/google => google}/colab/_system_commands.py       | 0
 .../py/google => google}/colab/_tensorflow_magics.py     | 0
 .../third_party/py/google => google}/colab/_userdata.py  | 0
 .../py/google => google}/colab/_variable_inspector.py    | 0
 {google3/third_party/py/google => google}/colab/auth.py  | 0
 .../third_party/py/google => google}/colab/data_table.py | 0
 {google3/third_party/py/google => google}/colab/drive.py | 0
 .../third_party/py/google => google}/colab/errors.py     | 0
 {google3/third_party/py/google => google}/colab/files.py | 0
 .../py/google => google}/colab/html/__init__.py          | 0
 .../google => google}/colab/html/_background_server.py   | 0
 .../third_party/py/google => google}/colab/html/_html.py | 0
 .../py/google => google}/colab/html/_provide.py          | 3 ++-
 .../py/google => google}/colab/html/_resources.py        | 0
 .../py/google => google}/colab/html/js/_html.js          | 0
 .../py/google => google}/colab/html/js/_proxy.js         | 0
 .../py/google => google}/colab/output/__init__.py        | 0
 .../py/google => google}/colab/output/_area.py           | 0
 .../third_party/py/google => google}/colab/output/_js.py | 0
 .../py/google => google}/colab/output/_js_builder.py     | 0
 .../py/google => google}/colab/output/_publish.py        | 0
 .../py/google => google}/colab/output/_tags.py           | 0
 .../py/google => google}/colab/output/_util.py           | 0
 .../py/google => google}/colab/output/_widgets.py        | 0
 .../py/google => google}/colab/patches/__init__.py       | 0
 .../py/google => google}/colab/resources/files.js        | 0
 .../py/google => google}/colab/resources/tabbar.css      | 0
 .../google => google}/colab/resources/tabbar_main.min.js | 0
 .../third_party/py/google => google}/colab/snippets.py   | 0
 .../third_party/py/google => google}/colab/syntax.py     | 0
 .../py/google => google}/colab/widgets/__init__.py       | 0
 .../py/google => google}/colab/widgets/_grid.py          | 0
 .../py/google => google}/colab/widgets/_tabbar.py        | 0
 .../py/google => google}/colab/widgets/_widget.py        | 0
 .../notebooks => notebooks}/colab-github-demo.ipynb      | 0
 .../colab/packages => packages}/outputframe/README.md    | 0
 .../packages => packages}/outputframe/lib/index.d.ts     | 0
 .../colab/packages => packages}/outputframe/package.json | 0
 .../py/google/colab/pkg_files/setup.cfg => setup.cfg     | 0
 .../py/google/colab/pkg_files/setup.py => setup.py       | 0
 .../pkg_files/tests => tests}/colabtools_loads_test.py   | 0
 .../tests => tests}/serverextension/test_handlers.py     | 0
 .../google/colab/pkg_files/tests => tests}/simple.ipynb  | 0
 .../pkg_files/tests => tests}/test_altair_import_hook.py | 0
 .../colab/pkg_files/tests => tests}/test_api_surface.py  | 0
 .../pkg_files/tests => tests}/test_cv2_import_hook.py    | 0
 .../colab/pkg_files/tests => tests}/test_data_table.py   | 0
 .../pkg_files/tests => tests}/test_files_handler.py      | 0
 .../tests => tests}/test_installation_commands.py        | 0
 .../tests => tests}/test_jupyter_autocomplete.py         | 0
 .../pkg_files/tests => tests}/test_system_commands.py    | 0
 .../pkg_files/tests => tests}/test_tensorflow_magics.py  | 0
 88 files changed, 4 insertions(+), 8 deletions(-)
 rename {google3/third_party/py/google/colab/pkg_files/.github => .github}/ISSUE_TEMPLATE/bug_report.md (100%)
 rename {google3/third_party/py/google/colab/pkg_files/.github => .github}/ISSUE_TEMPLATE/config.yml (100%)
 rename {google3/third_party/py/google/colab/pkg_files/.github => .github}/ISSUE_TEMPLATE/feature_request.md (100%)
 rename google3/third_party/py/google/colab/pkg_files/.gitignore => .gitignore (100%)
 rename google3/third_party/py/google/colab/pkg_files/CONTRIBUTING.md => CONTRIBUTING.md (100%)
 rename google3/third_party/py/google/colab/LICENSE => LICENSE (100%)
 rename google3/third_party/py/google/colab/pkg_files/MANIFEST.in => MANIFEST.in (100%)
 rename google3/third_party/py/google/colab/pkg_files/README.md => README.md (100%)
 rename {google3/third_party/py/google/colab/pkg_files/google => google}/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/_contents_manager.py (100%)
 rename {google3/third_party/py/google => google}/colab/_debugpy.py (100%)
 rename {google3/third_party/py/google => google}/colab/_debugpy_repr.py (100%)
 rename {google3/third_party/py/google => google}/colab/_event_manager.py (100%)
 rename {google3/third_party/py/google => google}/colab/_files_handler.py (100%)
 rename {google3/third_party/py/google => google}/colab/_history.py (100%)
 rename {google3/third_party/py/google => google}/colab/_import_hooks/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/_import_hooks/_altair.py (100%)
 rename {google3/third_party/py/google => google}/colab/_import_hooks/_bokeh.py (100%)
 rename {google3/third_party/py/google => google}/colab/_import_hooks/_cv2.py (100%)
 rename {google3/third_party/py/google => google}/colab/_import_magics.py (100%)
 rename {google3/third_party/py/google => google}/colab/_inspector.py (100%)
 rename {google3/third_party/py/google => google}/colab/_installation_commands.py (100%)
 rename {google3/third_party/py/google => google}/colab/_interactive_table_helper.py (100%)
 rename {google3/third_party/py/google => google}/colab/_interactive_table_hint_button.py (97%)
 rename {google3/third_party/py/google => google}/colab/_ipython.py (100%)
 rename {google3/third_party/py/google => google}/colab/_kernel.py (100%)
 rename {google3/third_party/py/google => google}/colab/_login_handler.py (100%)
 rename {google3/third_party/py/google => google}/colab/_message.py (100%)
 rename {google3/third_party/py/google => google}/colab/_pip.py (100%)
 rename {google3/third_party/py/google => google}/colab/_reprs.py (100%)
 rename {google3/third_party/py/google => google}/colab/_serverextension/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/_serverextension/_handlers.py (100%)
 rename {google3/third_party/py/google => google}/colab/_serverextension/_resource_monitor.py (100%)
 rename {google3/third_party/py/google => google}/colab/_shell.py (100%)
 rename {google3/third_party/py/google => google}/colab/_shell_customizations.py (100%)
 rename {google3/third_party/py/google => google}/colab/_system_commands.py (100%)
 rename {google3/third_party/py/google => google}/colab/_tensorflow_magics.py (100%)
 rename {google3/third_party/py/google => google}/colab/_userdata.py (100%)
 rename {google3/third_party/py/google => google}/colab/_variable_inspector.py (100%)
 rename {google3/third_party/py/google => google}/colab/auth.py (100%)
 rename {google3/third_party/py/google => google}/colab/data_table.py (100%)
 rename {google3/third_party/py/google => google}/colab/drive.py (100%)
 rename {google3/third_party/py/google => google}/colab/errors.py (100%)
 rename {google3/third_party/py/google => google}/colab/files.py (100%)
 rename {google3/third_party/py/google => google}/colab/html/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/html/_background_server.py (100%)
 rename {google3/third_party/py/google => google}/colab/html/_html.py (100%)
 rename {google3/third_party/py/google => google}/colab/html/_provide.py (99%)
 rename {google3/third_party/py/google => google}/colab/html/_resources.py (100%)
 rename {google3/third_party/py/google => google}/colab/html/js/_html.js (100%)
 rename {google3/third_party/py/google => google}/colab/html/js/_proxy.js (100%)
 rename {google3/third_party/py/google => google}/colab/output/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_area.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_js.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_js_builder.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_publish.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_tags.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_util.py (100%)
 rename {google3/third_party/py/google => google}/colab/output/_widgets.py (100%)
 rename {google3/third_party/py/google => google}/colab/patches/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/resources/files.js (100%)
 rename {google3/third_party/py/google => google}/colab/resources/tabbar.css (100%)
 rename {google3/third_party/py/google => google}/colab/resources/tabbar_main.min.js (100%)
 rename {google3/third_party/py/google => google}/colab/snippets.py (100%)
 rename {google3/third_party/py/google => google}/colab/syntax.py (100%)
 rename {google3/third_party/py/google => google}/colab/widgets/__init__.py (100%)
 rename {google3/third_party/py/google => google}/colab/widgets/_grid.py (100%)
 rename {google3/third_party/py/google => google}/colab/widgets/_tabbar.py (100%)
 rename {google3/third_party/py/google => google}/colab/widgets/_widget.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/notebooks => notebooks}/colab-github-demo.ipynb (100%)
 rename {google3/third_party/py/google/colab/packages => packages}/outputframe/README.md (100%)
 rename {google3/third_party/py/google/colab/packages => packages}/outputframe/lib/index.d.ts (100%)
 rename {google3/third_party/py/google/colab/packages => packages}/outputframe/package.json (100%)
 rename google3/third_party/py/google/colab/pkg_files/setup.cfg => setup.cfg (100%)
 rename google3/third_party/py/google/colab/pkg_files/setup.py => setup.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/colabtools_loads_test.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/serverextension/test_handlers.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/simple.ipynb (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_altair_import_hook.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_api_surface.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_cv2_import_hook.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_data_table.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_files_handler.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_installation_commands.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_jupyter_autocomplete.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_system_commands.py (100%)
 rename {google3/third_party/py/google/colab/pkg_files/tests => tests}/test_tensorflow_magics.py (100%)

diff --git a/google3/third_party/py/google/colab/pkg_files/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/.github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
diff --git a/google3/third_party/py/google/colab/pkg_files/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/.github/ISSUE_TEMPLATE/config.yml
rename to .github/ISSUE_TEMPLATE/config.yml
diff --git a/google3/third_party/py/google/colab/pkg_files/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/.github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/google3/third_party/py/google/colab/pkg_files/.gitignore b/.gitignore
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/.gitignore
rename to .gitignore
diff --git a/google3/third_party/py/google/colab/pkg_files/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/CONTRIBUTING.md
rename to CONTRIBUTING.md
diff --git a/google3/third_party/py/google/colab/LICENSE b/LICENSE
similarity index 100%
rename from google3/third_party/py/google/colab/LICENSE
rename to LICENSE
diff --git a/google3/third_party/py/google/colab/pkg_files/MANIFEST.in b/MANIFEST.in
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/MANIFEST.in
rename to MANIFEST.in
diff --git a/google3/third_party/py/google/colab/pkg_files/README.md b/README.md
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/README.md
rename to README.md
diff --git a/google3/third_party/py/google/colab/pkg_files/google/__init__.py b/google/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/google/__init__.py
rename to google/__init__.py
diff --git a/google3/third_party/py/google/colab/__init__.py b/google/colab/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/__init__.py
rename to google/colab/__init__.py
diff --git a/google3/third_party/py/google/colab/_contents_manager.py b/google/colab/_contents_manager.py
similarity index 100%
rename from google3/third_party/py/google/colab/_contents_manager.py
rename to google/colab/_contents_manager.py
diff --git a/google3/third_party/py/google/colab/_debugpy.py b/google/colab/_debugpy.py
similarity index 100%
rename from google3/third_party/py/google/colab/_debugpy.py
rename to google/colab/_debugpy.py
diff --git a/google3/third_party/py/google/colab/_debugpy_repr.py b/google/colab/_debugpy_repr.py
similarity index 100%
rename from google3/third_party/py/google/colab/_debugpy_repr.py
rename to google/colab/_debugpy_repr.py
diff --git a/google3/third_party/py/google/colab/_event_manager.py b/google/colab/_event_manager.py
similarity index 100%
rename from google3/third_party/py/google/colab/_event_manager.py
rename to google/colab/_event_manager.py
diff --git a/google3/third_party/py/google/colab/_files_handler.py b/google/colab/_files_handler.py
similarity index 100%
rename from google3/third_party/py/google/colab/_files_handler.py
rename to google/colab/_files_handler.py
diff --git a/google3/third_party/py/google/colab/_history.py b/google/colab/_history.py
similarity index 100%
rename from google3/third_party/py/google/colab/_history.py
rename to google/colab/_history.py
diff --git a/google3/third_party/py/google/colab/_import_hooks/__init__.py b/google/colab/_import_hooks/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/_import_hooks/__init__.py
rename to google/colab/_import_hooks/__init__.py
diff --git a/google3/third_party/py/google/colab/_import_hooks/_altair.py b/google/colab/_import_hooks/_altair.py
similarity index 100%
rename from google3/third_party/py/google/colab/_import_hooks/_altair.py
rename to google/colab/_import_hooks/_altair.py
diff --git a/google3/third_party/py/google/colab/_import_hooks/_bokeh.py b/google/colab/_import_hooks/_bokeh.py
similarity index 100%
rename from google3/third_party/py/google/colab/_import_hooks/_bokeh.py
rename to google/colab/_import_hooks/_bokeh.py
diff --git a/google3/third_party/py/google/colab/_import_hooks/_cv2.py b/google/colab/_import_hooks/_cv2.py
similarity index 100%
rename from google3/third_party/py/google/colab/_import_hooks/_cv2.py
rename to google/colab/_import_hooks/_cv2.py
diff --git a/google3/third_party/py/google/colab/_import_magics.py b/google/colab/_import_magics.py
similarity index 100%
rename from google3/third_party/py/google/colab/_import_magics.py
rename to google/colab/_import_magics.py
diff --git a/google3/third_party/py/google/colab/_inspector.py b/google/colab/_inspector.py
similarity index 100%
rename from google3/third_party/py/google/colab/_inspector.py
rename to google/colab/_inspector.py
diff --git a/google3/third_party/py/google/colab/_installation_commands.py b/google/colab/_installation_commands.py
similarity index 100%
rename from google3/third_party/py/google/colab/_installation_commands.py
rename to google/colab/_installation_commands.py
diff --git a/google3/third_party/py/google/colab/_interactive_table_helper.py b/google/colab/_interactive_table_helper.py
similarity index 100%
rename from google3/third_party/py/google/colab/_interactive_table_helper.py
rename to google/colab/_interactive_table_helper.py
diff --git a/google3/third_party/py/google/colab/_interactive_table_hint_button.py b/google/colab/_interactive_table_hint_button.py
similarity index 97%
rename from google3/third_party/py/google/colab/_interactive_table_hint_button.py
rename to google/colab/_interactive_table_hint_button.py
index d539016a..420c06bb 100644
--- a/google3/third_party/py/google/colab/_interactive_table_hint_button.py
+++ b/google/colab/_interactive_table_hint_button.py
@@ -28,12 +28,6 @@
 
 _HINT_BUTTON_CSS = """
   <style>
-    .colab-df-container {
-      display:flex;
-      flex-wrap:wrap;
-      gap: 12px;
-    }
-
     .colab-df-convert {
       background-color: #E8F0FE;
       border: none;
@@ -42,6 +36,7 @@
       display: none;
       fill: #1967D2;
       height: 32px;
+      margin: 0 0 0 12px;
       padding: 0 0 0 0;
       width: 32px;
     }
@@ -108,7 +103,7 @@ def _get_html(dataframe, key):
   # pylint: disable=protected-access
   return """
   <div id="{key}">
-    <div class="colab-df-container">
+    <div style="display:flex">
       {df_html}
       <button class="colab-df-convert" onclick="convertToInteractive('{key}')"
               title="Convert this dataframe to an interactive table."
diff --git a/google3/third_party/py/google/colab/_ipython.py b/google/colab/_ipython.py
similarity index 100%
rename from google3/third_party/py/google/colab/_ipython.py
rename to google/colab/_ipython.py
diff --git a/google3/third_party/py/google/colab/_kernel.py b/google/colab/_kernel.py
similarity index 100%
rename from google3/third_party/py/google/colab/_kernel.py
rename to google/colab/_kernel.py
diff --git a/google3/third_party/py/google/colab/_login_handler.py b/google/colab/_login_handler.py
similarity index 100%
rename from google3/third_party/py/google/colab/_login_handler.py
rename to google/colab/_login_handler.py
diff --git a/google3/third_party/py/google/colab/_message.py b/google/colab/_message.py
similarity index 100%
rename from google3/third_party/py/google/colab/_message.py
rename to google/colab/_message.py
diff --git a/google3/third_party/py/google/colab/_pip.py b/google/colab/_pip.py
similarity index 100%
rename from google3/third_party/py/google/colab/_pip.py
rename to google/colab/_pip.py
diff --git a/google3/third_party/py/google/colab/_reprs.py b/google/colab/_reprs.py
similarity index 100%
rename from google3/third_party/py/google/colab/_reprs.py
rename to google/colab/_reprs.py
diff --git a/google3/third_party/py/google/colab/_serverextension/__init__.py b/google/colab/_serverextension/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/_serverextension/__init__.py
rename to google/colab/_serverextension/__init__.py
diff --git a/google3/third_party/py/google/colab/_serverextension/_handlers.py b/google/colab/_serverextension/_handlers.py
similarity index 100%
rename from google3/third_party/py/google/colab/_serverextension/_handlers.py
rename to google/colab/_serverextension/_handlers.py
diff --git a/google3/third_party/py/google/colab/_serverextension/_resource_monitor.py b/google/colab/_serverextension/_resource_monitor.py
similarity index 100%
rename from google3/third_party/py/google/colab/_serverextension/_resource_monitor.py
rename to google/colab/_serverextension/_resource_monitor.py
diff --git a/google3/third_party/py/google/colab/_shell.py b/google/colab/_shell.py
similarity index 100%
rename from google3/third_party/py/google/colab/_shell.py
rename to google/colab/_shell.py
diff --git a/google3/third_party/py/google/colab/_shell_customizations.py b/google/colab/_shell_customizations.py
similarity index 100%
rename from google3/third_party/py/google/colab/_shell_customizations.py
rename to google/colab/_shell_customizations.py
diff --git a/google3/third_party/py/google/colab/_system_commands.py b/google/colab/_system_commands.py
similarity index 100%
rename from google3/third_party/py/google/colab/_system_commands.py
rename to google/colab/_system_commands.py
diff --git a/google3/third_party/py/google/colab/_tensorflow_magics.py b/google/colab/_tensorflow_magics.py
similarity index 100%
rename from google3/third_party/py/google/colab/_tensorflow_magics.py
rename to google/colab/_tensorflow_magics.py
diff --git a/google3/third_party/py/google/colab/_userdata.py b/google/colab/_userdata.py
similarity index 100%
rename from google3/third_party/py/google/colab/_userdata.py
rename to google/colab/_userdata.py
diff --git a/google3/third_party/py/google/colab/_variable_inspector.py b/google/colab/_variable_inspector.py
similarity index 100%
rename from google3/third_party/py/google/colab/_variable_inspector.py
rename to google/colab/_variable_inspector.py
diff --git a/google3/third_party/py/google/colab/auth.py b/google/colab/auth.py
similarity index 100%
rename from google3/third_party/py/google/colab/auth.py
rename to google/colab/auth.py
diff --git a/google3/third_party/py/google/colab/data_table.py b/google/colab/data_table.py
similarity index 100%
rename from google3/third_party/py/google/colab/data_table.py
rename to google/colab/data_table.py
diff --git a/google3/third_party/py/google/colab/drive.py b/google/colab/drive.py
similarity index 100%
rename from google3/third_party/py/google/colab/drive.py
rename to google/colab/drive.py
diff --git a/google3/third_party/py/google/colab/errors.py b/google/colab/errors.py
similarity index 100%
rename from google3/third_party/py/google/colab/errors.py
rename to google/colab/errors.py
diff --git a/google3/third_party/py/google/colab/files.py b/google/colab/files.py
similarity index 100%
rename from google3/third_party/py/google/colab/files.py
rename to google/colab/files.py
diff --git a/google3/third_party/py/google/colab/html/__init__.py b/google/colab/html/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/html/__init__.py
rename to google/colab/html/__init__.py
diff --git a/google3/third_party/py/google/colab/html/_background_server.py b/google/colab/html/_background_server.py
similarity index 100%
rename from google3/third_party/py/google/colab/html/_background_server.py
rename to google/colab/html/_background_server.py
diff --git a/google3/third_party/py/google/colab/html/_html.py b/google/colab/html/_html.py
similarity index 100%
rename from google3/third_party/py/google/colab/html/_html.py
rename to google/colab/html/_html.py
diff --git a/google3/third_party/py/google/colab/html/_provide.py b/google/colab/html/_provide.py
similarity index 99%
rename from google3/third_party/py/google/colab/html/_provide.py
rename to google/colab/html/_provide.py
index d2868538..fc949040 100644
--- a/google3/third_party/py/google/colab/html/_provide.py
+++ b/google/colab/html/_provide.py
@@ -43,10 +43,11 @@
 import uuid
 import weakref
 
-from google.colab.html import _background_server
 import six
 import tornado.web
 
+from google.colab.html import _background_server
+
 
 @six.add_metaclass(abc.ABCMeta)
 class _Resource(object):
diff --git a/google3/third_party/py/google/colab/html/_resources.py b/google/colab/html/_resources.py
similarity index 100%
rename from google3/third_party/py/google/colab/html/_resources.py
rename to google/colab/html/_resources.py
diff --git a/google3/third_party/py/google/colab/html/js/_html.js b/google/colab/html/js/_html.js
similarity index 100%
rename from google3/third_party/py/google/colab/html/js/_html.js
rename to google/colab/html/js/_html.js
diff --git a/google3/third_party/py/google/colab/html/js/_proxy.js b/google/colab/html/js/_proxy.js
similarity index 100%
rename from google3/third_party/py/google/colab/html/js/_proxy.js
rename to google/colab/html/js/_proxy.js
diff --git a/google3/third_party/py/google/colab/output/__init__.py b/google/colab/output/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/__init__.py
rename to google/colab/output/__init__.py
diff --git a/google3/third_party/py/google/colab/output/_area.py b/google/colab/output/_area.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_area.py
rename to google/colab/output/_area.py
diff --git a/google3/third_party/py/google/colab/output/_js.py b/google/colab/output/_js.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_js.py
rename to google/colab/output/_js.py
diff --git a/google3/third_party/py/google/colab/output/_js_builder.py b/google/colab/output/_js_builder.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_js_builder.py
rename to google/colab/output/_js_builder.py
diff --git a/google3/third_party/py/google/colab/output/_publish.py b/google/colab/output/_publish.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_publish.py
rename to google/colab/output/_publish.py
diff --git a/google3/third_party/py/google/colab/output/_tags.py b/google/colab/output/_tags.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_tags.py
rename to google/colab/output/_tags.py
diff --git a/google3/third_party/py/google/colab/output/_util.py b/google/colab/output/_util.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_util.py
rename to google/colab/output/_util.py
diff --git a/google3/third_party/py/google/colab/output/_widgets.py b/google/colab/output/_widgets.py
similarity index 100%
rename from google3/third_party/py/google/colab/output/_widgets.py
rename to google/colab/output/_widgets.py
diff --git a/google3/third_party/py/google/colab/patches/__init__.py b/google/colab/patches/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/patches/__init__.py
rename to google/colab/patches/__init__.py
diff --git a/google3/third_party/py/google/colab/resources/files.js b/google/colab/resources/files.js
similarity index 100%
rename from google3/third_party/py/google/colab/resources/files.js
rename to google/colab/resources/files.js
diff --git a/google3/third_party/py/google/colab/resources/tabbar.css b/google/colab/resources/tabbar.css
similarity index 100%
rename from google3/third_party/py/google/colab/resources/tabbar.css
rename to google/colab/resources/tabbar.css
diff --git a/google3/third_party/py/google/colab/resources/tabbar_main.min.js b/google/colab/resources/tabbar_main.min.js
similarity index 100%
rename from google3/third_party/py/google/colab/resources/tabbar_main.min.js
rename to google/colab/resources/tabbar_main.min.js
diff --git a/google3/third_party/py/google/colab/snippets.py b/google/colab/snippets.py
similarity index 100%
rename from google3/third_party/py/google/colab/snippets.py
rename to google/colab/snippets.py
diff --git a/google3/third_party/py/google/colab/syntax.py b/google/colab/syntax.py
similarity index 100%
rename from google3/third_party/py/google/colab/syntax.py
rename to google/colab/syntax.py
diff --git a/google3/third_party/py/google/colab/widgets/__init__.py b/google/colab/widgets/__init__.py
similarity index 100%
rename from google3/third_party/py/google/colab/widgets/__init__.py
rename to google/colab/widgets/__init__.py
diff --git a/google3/third_party/py/google/colab/widgets/_grid.py b/google/colab/widgets/_grid.py
similarity index 100%
rename from google3/third_party/py/google/colab/widgets/_grid.py
rename to google/colab/widgets/_grid.py
diff --git a/google3/third_party/py/google/colab/widgets/_tabbar.py b/google/colab/widgets/_tabbar.py
similarity index 100%
rename from google3/third_party/py/google/colab/widgets/_tabbar.py
rename to google/colab/widgets/_tabbar.py
diff --git a/google3/third_party/py/google/colab/widgets/_widget.py b/google/colab/widgets/_widget.py
similarity index 100%
rename from google3/third_party/py/google/colab/widgets/_widget.py
rename to google/colab/widgets/_widget.py
diff --git a/google3/third_party/py/google/colab/pkg_files/notebooks/colab-github-demo.ipynb b/notebooks/colab-github-demo.ipynb
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/notebooks/colab-github-demo.ipynb
rename to notebooks/colab-github-demo.ipynb
diff --git a/google3/third_party/py/google/colab/packages/outputframe/README.md b/packages/outputframe/README.md
similarity index 100%
rename from google3/third_party/py/google/colab/packages/outputframe/README.md
rename to packages/outputframe/README.md
diff --git a/google3/third_party/py/google/colab/packages/outputframe/lib/index.d.ts b/packages/outputframe/lib/index.d.ts
similarity index 100%
rename from google3/third_party/py/google/colab/packages/outputframe/lib/index.d.ts
rename to packages/outputframe/lib/index.d.ts
diff --git a/google3/third_party/py/google/colab/packages/outputframe/package.json b/packages/outputframe/package.json
similarity index 100%
rename from google3/third_party/py/google/colab/packages/outputframe/package.json
rename to packages/outputframe/package.json
diff --git a/google3/third_party/py/google/colab/pkg_files/setup.cfg b/setup.cfg
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/setup.cfg
rename to setup.cfg
diff --git a/google3/third_party/py/google/colab/pkg_files/setup.py b/setup.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/setup.py
rename to setup.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/colabtools_loads_test.py b/tests/colabtools_loads_test.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/colabtools_loads_test.py
rename to tests/colabtools_loads_test.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/serverextension/test_handlers.py b/tests/serverextension/test_handlers.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/serverextension/test_handlers.py
rename to tests/serverextension/test_handlers.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/simple.ipynb b/tests/simple.ipynb
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/simple.ipynb
rename to tests/simple.ipynb
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_altair_import_hook.py b/tests/test_altair_import_hook.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_altair_import_hook.py
rename to tests/test_altair_import_hook.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_api_surface.py b/tests/test_api_surface.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_api_surface.py
rename to tests/test_api_surface.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_cv2_import_hook.py b/tests/test_cv2_import_hook.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_cv2_import_hook.py
rename to tests/test_cv2_import_hook.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_data_table.py b/tests/test_data_table.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_data_table.py
rename to tests/test_data_table.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_files_handler.py b/tests/test_files_handler.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_files_handler.py
rename to tests/test_files_handler.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_installation_commands.py b/tests/test_installation_commands.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_installation_commands.py
rename to tests/test_installation_commands.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_jupyter_autocomplete.py b/tests/test_jupyter_autocomplete.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_jupyter_autocomplete.py
rename to tests/test_jupyter_autocomplete.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_system_commands.py b/tests/test_system_commands.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_system_commands.py
rename to tests/test_system_commands.py
diff --git a/google3/third_party/py/google/colab/pkg_files/tests/test_tensorflow_magics.py b/tests/test_tensorflow_magics.py
similarity index 100%
rename from google3/third_party/py/google/colab/pkg_files/tests/test_tensorflow_magics.py
rename to tests/test_tensorflow_magics.py