diff --git a/python-packages/adb/__init__.py b/python-packages/adb/__init__.py
deleted file mode 100644
index 6b509c643..000000000
--- a/python-packages/adb/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from __future__ import absolute_import
-from .device import *  # pylint: disable=wildcard-import
diff --git a/python-packages/adb/device.py b/python-packages/adb/adb/__init__.py
similarity index 100%
rename from python-packages/adb/device.py
rename to python-packages/adb/adb/__init__.py
diff --git a/python-packages/adb/py.typed b/python-packages/adb/adb/py.typed
similarity index 100%
rename from python-packages/adb/py.typed
rename to python-packages/adb/adb/py.typed
diff --git a/python-packages/adb/setup.py b/python-packages/adb/setup.py
index 4322fb785..93a2e1794 100644
--- a/python-packages/adb/setup.py
+++ b/python-packages/adb/setup.py
@@ -22,7 +22,6 @@ setup(
     description='A Python interface to the Android Debug Bridge.',
     license='Apache 2.0',
     keywords='adb android',
-    package_dir={'adb': ''},
     packages=['adb'],
     package_data={'adb': ['py.typed']},
     classifiers=[
diff --git a/python-packages/adb/test.py b/python-packages/adb/tests/test_adb.py
similarity index 100%
rename from python-packages/adb/test.py
rename to python-packages/adb/tests/test_adb.py