diff --git a/packages/rocketchat-issuelinks/client.js b/packages/rocketchat-issuelinks/client/client.js
similarity index 92%
rename from packages/rocketchat-issuelinks/client.js
rename to packages/rocketchat-issuelinks/client/client.js
index 9b75a3ea31c4..d7c236440232 100644
--- a/packages/rocketchat-issuelinks/client.js
+++ b/packages/rocketchat-issuelinks/client/client.js
@@ -1,3 +1,4 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
 import s from 'underscore.string';
 
 //
diff --git a/packages/rocketchat-issuelinks/client/index.js b/packages/rocketchat-issuelinks/client/index.js
new file mode 100644
index 000000000000..d99e4ed77352
--- /dev/null
+++ b/packages/rocketchat-issuelinks/client/index.js
@@ -0,0 +1 @@
+import './client';
diff --git a/packages/rocketchat-issuelinks/package.js b/packages/rocketchat-issuelinks/package.js
index 04607d26e5b7..4f32a343778f 100644
--- a/packages/rocketchat-issuelinks/package.js
+++ b/packages/rocketchat-issuelinks/package.js
@@ -6,9 +6,10 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('rocketchat:lib');
-	api.use('ecmascript');
-
-	api.addFiles('client.js', ['client']);
-	api.addFiles('settings.js', ['server']);
+	api.use([
+		'ecmascript',
+		'rocketchat:lib',
+	]);
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-issuelinks/server/index.js b/packages/rocketchat-issuelinks/server/index.js
new file mode 100644
index 000000000000..97097791afdc
--- /dev/null
+++ b/packages/rocketchat-issuelinks/server/index.js
@@ -0,0 +1 @@
+import './settings';
diff --git a/packages/rocketchat-issuelinks/settings.js b/packages/rocketchat-issuelinks/server/settings.js
similarity index 89%
rename from packages/rocketchat-issuelinks/settings.js
rename to packages/rocketchat-issuelinks/server/settings.js
index 7d12db7f4a5a..b4a96d4e7d86 100644
--- a/packages/rocketchat-issuelinks/settings.js
+++ b/packages/rocketchat-issuelinks/server/settings.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.add('IssueLinks_Enabled', false, {
 	type: 'boolean',
 	i18nLabel: 'Enabled',