diff --git a/packages/rocketchat-importer-hipchat-enterprise/client/adder.js b/packages/rocketchat-importer-hipchat-enterprise/client/adder.js
index 92bfe07d193c..21f5a8fe8b5f 100644
--- a/packages/rocketchat-importer-hipchat-enterprise/client/adder.js
+++ b/packages/rocketchat-importer-hipchat-enterprise/client/adder.js
@@ -1,4 +1,4 @@
 import { Importers } from 'meteor/rocketchat:importer';
-import { HipChatEnterpriseImporterInfo } from '../info';
+import { HipChatEnterpriseImporterInfo } from '../lib/info';
 
 Importers.add(new HipChatEnterpriseImporterInfo());
diff --git a/packages/rocketchat-importer-hipchat-enterprise/client/index.js b/packages/rocketchat-importer-hipchat-enterprise/client/index.js
new file mode 100644
index 000000000000..44a1b3bab84c
--- /dev/null
+++ b/packages/rocketchat-importer-hipchat-enterprise/client/index.js
@@ -0,0 +1 @@
+import './adder';
diff --git a/packages/rocketchat-importer-hipchat-enterprise/info.js b/packages/rocketchat-importer-hipchat-enterprise/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/info.js
rename to packages/rocketchat-importer-hipchat-enterprise/lib/info.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/package.js b/packages/rocketchat-importer-hipchat-enterprise/package.js
index 790c86b525ad..6eae9640b4ca 100644
--- a/packages/rocketchat-importer-hipchat-enterprise/package.js
+++ b/packages/rocketchat-importer-hipchat-enterprise/package.js
@@ -10,16 +10,6 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:lib',
 		'rocketchat:importer',
+		'rocketchat:logger',
 	]);
-
-	api.use('rocketchat:logger', 'server');
-
-	// Importer information to both server and client
-	api.addFiles('info.js');
-
-	// Server files
-	api.addFiles(['server/importer.js', 'server/adder.js'], 'server');
-
-	// Client files
-	api.addFiles('client/adder.js', 'client');
 });
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/adder.js b/packages/rocketchat-importer-hipchat-enterprise/server/adder.js
index 20ee8203c469..eb798f47f990 100644
--- a/packages/rocketchat-importer-hipchat-enterprise/server/adder.js
+++ b/packages/rocketchat-importer-hipchat-enterprise/server/adder.js
@@ -1,5 +1,5 @@
 import { Importers } from 'meteor/rocketchat:importer';
-import { HipChatEnterpriseImporterInfo } from '../info';
+import { HipChatEnterpriseImporterInfo } from '../lib/info';
 import { HipChatEnterpriseImporter } from './importer';
 
 Importers.add(new HipChatEnterpriseImporterInfo(), HipChatEnterpriseImporter);
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js b/packages/rocketchat-importer-hipchat-enterprise/server/importer.js
index 815e6da7c848..7bd90970ae97 100644
--- a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js
+++ b/packages/rocketchat-importer-hipchat-enterprise/server/importer.js
@@ -8,6 +8,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import { Readable } from 'stream';
 import path from 'path';
 import s from 'underscore.string';
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/index.js b/packages/rocketchat-importer-hipchat-enterprise/server/index.js
new file mode 100644
index 000000000000..44a1b3bab84c
--- /dev/null
+++ b/packages/rocketchat-importer-hipchat-enterprise/server/index.js
@@ -0,0 +1 @@
+import './adder';