diff --git a/bpkg_manager/__init__.py b/bpkg/__init__.py
similarity index 95%
rename from bpkg_manager/__init__.py
rename to bpkg/__init__.py
index f6e64b1..d91223c 100644
--- a/bpkg_manager/__init__.py
+++ b/bpkg/__init__.py
@@ -417,6 +417,30 @@ class USERPREF_PT_packages(bpy.types.Panel):
                 draw_package(pkg, row)
 
 
+# class WM_OT_package_expand(Operator):
+#     bl_idname = "wm.package_expand"
+#     bl_label = ""
+#     bl_description = "Display information and preferences for this package"
+#     bl_options = {'INTERNAL'}
+#
+#     module = StringProperty(
+#             name="Module",
+#             description="Module name of the add-on to expand",
+#             )
+#
+#     def execute(self, context):
+#         import addon_utils
+#
+#         module_name = self.module
+#
+#         mod = addon_utils.addons_fake_modules.get(module_name)
+#         if mod is not None:
+#             info = addon_utils.module_bl_info(mod)
+#             info["show_expanded"] = not info["show_expanded"]
+#
+#         return {'FINISHED'}
+#
+
 class PackageManagerPreferences(bpy.types.AddonPreferences):
     bl_idname = __package__
 
diff --git a/bpkg_manager/appdirs.py b/bpkg/appdirs.py
similarity index 100%
rename from bpkg_manager/appdirs.py
rename to bpkg/appdirs.py
diff --git a/bpkg_manager/cache.py b/bpkg/cache.py
similarity index 100%
rename from bpkg_manager/cache.py
rename to bpkg/cache.py
diff --git a/bpkg_manager/subproc.py b/bpkg/subproc.py
similarity index 99%
rename from bpkg_manager/subproc.py
rename to bpkg/subproc.py
index 5b16df0..f0fd8d9 100644
--- a/bpkg_manager/subproc.py
+++ b/bpkg/subproc.py
@@ -174,6 +174,9 @@ class Repository:
         self.set_from_dict({'url': url})
         self.log.debug("Initializing repository: %s", self.to_dict())
 
+    # def cleanse_packagelist(self):
+    #     """Remove empty packages (no bl_info), packages with no name"""
+
     def refresh(self):
         """
         Requests repo.json from URL and embeds etag/last-modification headers