diff --git a/plugin/setup.py b/plugin/setup.py
index 455571da..934b2de1 100644
--- a/plugin/setup.py
+++ b/plugin/setup.py
@@ -58,14 +58,14 @@ def get_readme():
     ),
     package_data={
         'xprof': ['static/**'],
-        '': ['_pywrap_profiler_plugin.so', '_pywrap_profiler_plugin.pyd'],
+        'xprof.convert': [
+            '_pywrap_profiler_plugin.so',
+            '_pywrap_profiler_plugin.pyd',
+        ],
     },
     entry_points={
         'tensorboard_plugins': [
-            (
-                'profile ='
-                ' xprof.profile_plugin_loader:ProfilePluginLoader'
-            ),
+            'profile = xprof.profile_plugin_loader:ProfilePluginLoader',
         ],
         'console_scripts': [
             'xprof = xprof.server:main',
diff --git a/plugin/xprof/convert/__init__.py b/plugin/xprof/convert/__init__.py
index f6ce6d2a..2375f6d6 100644
--- a/plugin/xprof/convert/__init__.py
+++ b/plugin/xprof/convert/__init__.py
@@ -13,3 +13,8 @@
 # limitations under the License.
 # ==============================================================================
 """Converter from protobuf to gviz/json format."""
+
+try:
+  from . import _pywrap_profiler_plugin  # pylint: disable=g-import-not-at-top
+except ImportError:
+  pass