diff --git a/packages/rocketchat-importer-hipchat/client/adder.js b/packages/rocketchat-importer-hipchat/client/adder.js
index c9c2944358c6..e7d8c606bf37 100644
--- a/packages/rocketchat-importer-hipchat/client/adder.js
+++ b/packages/rocketchat-importer-hipchat/client/adder.js
@@ -1,4 +1,4 @@
 import { Importers } from 'meteor/rocketchat:importer';
-import { HipChatImporterInfo } from '../info';
+import { HipChatImporterInfo } from '../lib/info';
 
 Importers.add(new HipChatImporterInfo());
diff --git a/packages/rocketchat-importer-hipchat/client/index.js b/packages/rocketchat-importer-hipchat/client/index.js
new file mode 100644
index 000000000000..44a1b3bab84c
--- /dev/null
+++ b/packages/rocketchat-importer-hipchat/client/index.js
@@ -0,0 +1 @@
+import './adder';
diff --git a/packages/rocketchat-importer-hipchat/info.js b/packages/rocketchat-importer-hipchat/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/info.js
rename to packages/rocketchat-importer-hipchat/lib/info.js
diff --git a/packages/rocketchat-importer-hipchat/package.js b/packages/rocketchat-importer-hipchat/package.js
index 89fb275b5517..e98cab765961 100644
--- a/packages/rocketchat-importer-hipchat/package.js
+++ b/packages/rocketchat-importer-hipchat/package.js
@@ -10,16 +10,8 @@ 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');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-importer-hipchat/server/adder.js b/packages/rocketchat-importer-hipchat/server/adder.js
index d68056b5e889..d50cd041f739 100644
--- a/packages/rocketchat-importer-hipchat/server/adder.js
+++ b/packages/rocketchat-importer-hipchat/server/adder.js
@@ -1,5 +1,5 @@
 import { Importers } from 'meteor/rocketchat:importer';
-import { HipChatImporterInfo } from '../info';
+import { HipChatImporterInfo } from '../lib/info';
 import { HipChatImporter } from './importer';
 
 Importers.add(new HipChatImporterInfo(), HipChatImporter);
diff --git a/packages/rocketchat-importer-hipchat/server/importer.js b/packages/rocketchat-importer-hipchat/server/importer.js
index a0956d637182..df31bdeec9f8 100644
--- a/packages/rocketchat-importer-hipchat/server/importer.js
+++ b/packages/rocketchat-importer-hipchat/server/importer.js
@@ -8,6 +8,7 @@ import {
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
 import { RocketChatFile } from 'meteor/rocketchat:file';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';
diff --git a/packages/rocketchat-importer-hipchat/server/index.js b/packages/rocketchat-importer-hipchat/server/index.js
new file mode 100644
index 000000000000..44a1b3bab84c
--- /dev/null
+++ b/packages/rocketchat-importer-hipchat/server/index.js
@@ -0,0 +1 @@
+import './adder';