diff --git a/packages/rocketchat-crowd/client/index.js b/packages/rocketchat-crowd/client/index.js
new file mode 100644
index 00000000000..fecf898e1ae
--- /dev/null
+++ b/packages/rocketchat-crowd/client/index.js
@@ -0,0 +1 @@
+import './loginHelper';
diff --git a/packages/rocketchat-crowd/package.js b/packages/rocketchat-crowd/package.js
index 567567d05bd..09e46220535 100644
--- a/packages/rocketchat-crowd/package.js
+++ b/packages/rocketchat-crowd/package.js
@@ -6,19 +6,16 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('rocketchat:logger');
-	api.use('rocketchat:lib');
-	api.use('ecmascript');
-	api.use('sha');
+	api.use([
+		'rocketchat:logger',
+		'rocketchat:lib',
+		'ecmascript',
+		'sha',
+		'templating',
+		'accounts-base',
+		'accounts-password',
+	]);
 
-	api.use('templating', 'client');
-
-	api.use('accounts-base', 'server');
-	api.use('accounts-password', 'server');
-
-	api.addFiles('client/loginHelper.js', 'client');
-	api.addFiles('server/crowd.js', 'server');
-	api.addFiles('server/settings.js', 'server');
-
-	api.export('CROWD', 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-crowd/server/crowd.js b/packages/rocketchat-crowd/server/crowd.js
index 52590944e00..c52f39c059a 100644
--- a/packages/rocketchat-crowd/server/crowd.js
+++ b/packages/rocketchat-crowd/server/crowd.js
@@ -1,9 +1,11 @@
-/* globals SyncedCron */
-/* eslint new-cap: [2, {"capIsNewExceptions": ["SHA256"]}] */
-import { SHA256 } from 'meteor/sha';
 import { Meteor } from 'meteor/meteor';
+import { SHA256 } from 'meteor/sha';
+import { SyncedCron } from 'meteor/littledata:synced-cron';
 import { Accounts } from 'meteor/accounts-base';
+import { Logger } from 'meteor/rocketchat:logger';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
+
 const logger = new Logger('CROWD', {});
 
 function fallbackDefaultAccountSystem(bind, username, password) {
@@ -28,7 +30,7 @@ function fallbackDefaultAccountSystem(bind, username, password) {
 	return Accounts._runLoginHandlers(bind, loginRequest);
 }
 
-const CROWD = class CROWD {
+export class CROWD {
 	constructor() {
 		const AtlassianCrowd = require('atlassian-crowd');
 		let url = RocketChat.settings.get('CROWD_URL');
@@ -207,7 +209,7 @@ const CROWD = class CROWD {
 			logger.error('Error creating new crowd user.', error.message);
 		}
 	}
-};
+}
 
 Accounts.registerLoginHandler('crowd', function(loginRequest) {
 	if (!loginRequest.crowd) {
diff --git a/packages/rocketchat-crowd/server/index.js b/packages/rocketchat-crowd/server/index.js
new file mode 100644
index 00000000000..33b6eab8d4f
--- /dev/null
+++ b/packages/rocketchat-crowd/server/index.js
@@ -0,0 +1,7 @@
+import './settings';
+import { CROWD } from './crowd';
+
+export {
+	CROWD,
+};
+
diff --git a/packages/rocketchat-crowd/server/settings.js b/packages/rocketchat-crowd/server/settings.js
index ca80cbce2c9..960a80f687d 100644
--- a/packages/rocketchat-crowd/server/settings.js
+++ b/packages/rocketchat-crowd/server/settings.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.settings.addGroup('AtlassianCrowd', function() {