diff --git a/packages/rocketchat-otr/client/index.js b/packages/rocketchat-otr/client/index.js
new file mode 100644
index 000000000000..10af4ea73fda
--- /dev/null
+++ b/packages/rocketchat-otr/client/index.js
@@ -0,0 +1,6 @@
+import './stylesheets/otr.css';
+import './rocketchat.otr';
+import './rocketchat.otr.room';
+import './views/otrFlexTab.html';
+import './views/otrFlexTab';
+import './tabBar';
diff --git a/packages/rocketchat-otr/client/rocketchat.otr.js b/packages/rocketchat-otr/client/rocketchat.otr.js
index f0ce0a582017..67ca64e9a8e0 100644
--- a/packages/rocketchat-otr/client/rocketchat.otr.js
+++ b/packages/rocketchat-otr/client/rocketchat.otr.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 
 class OTR {
 	constructor() {
diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/packages/rocketchat-otr/client/rocketchat.otr.room.js
index 85a36a4bd90a..a70e7b893ebb 100644
--- a/packages/rocketchat-otr/client/rocketchat.otr.room.js
+++ b/packages/rocketchat-otr/client/rocketchat.otr.room.js
@@ -6,9 +6,10 @@ import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { TimeSync } from 'meteor/mizzao:timesync';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui';
 import _ from 'underscore';
 import toastr from 'toastr';
-/* globals crypto */
 
 RocketChat.OTR.Room = class {
 	constructor(userId, roomId) {
diff --git a/packages/rocketchat-otr/client/tabBar.js b/packages/rocketchat-otr/client/tabBar.js
index 9ea07136c7c8..156cf9167c10 100644
--- a/packages/rocketchat-otr/client/tabBar.js
+++ b/packages/rocketchat-otr/client/tabBar.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {
diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.js b/packages/rocketchat-otr/client/views/otrFlexTab.js
index 8503015e855e..ebfbecff3b9f 100644
--- a/packages/rocketchat-otr/client/views/otrFlexTab.js
+++ b/packages/rocketchat-otr/client/views/otrFlexTab.js
@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui';
 
 Template.otrFlexTab.helpers({
 	otrAvailable() {
diff --git a/packages/rocketchat-otr/package.js b/packages/rocketchat-otr/package.js
index d7dc5dd28641..99e0cc5727ba 100644
--- a/packages/rocketchat-otr/package.js
+++ b/packages/rocketchat-otr/package.js
@@ -6,29 +6,13 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-
 	api.use([
 		'ecmascript',
 		'rocketchat:lib',
 		'tracker',
 		'reactive-var',
+		'templating',
 	]);
-
-	api.use('templating', 'client');
-
-	api.addFiles([
-		'client/rocketchat.otr.js',
-		'client/rocketchat.otr.room.js',
-		'client/stylesheets/otr.css',
-		'client/views/otrFlexTab.html',
-		'client/views/otrFlexTab.js',
-		'client/tabBar.js',
-	], 'client');
-
-	api.addFiles([
-		'server/settings.js',
-		'server/models/Messages.js',
-		'server/methods/deleteOldOTRMessages.js',
-		'server/methods/updateOTRAck.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-otr/server/index.js b/packages/rocketchat-otr/server/index.js
new file mode 100644
index 000000000000..3d2d30e4b1ed
--- /dev/null
+++ b/packages/rocketchat-otr/server/index.js
@@ -0,0 +1,4 @@
+import './settings';
+import './models/Messages';
+import './methods/deleteOldOTRMessages';
+import './methods/updateOTRAck';
diff --git a/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js b/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js
index 4a9f150541f6..9763067b0bd6 100644
--- a/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js
+++ b/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	deleteOldOTRMessages(roomId) {
diff --git a/packages/rocketchat-otr/server/methods/updateOTRAck.js b/packages/rocketchat-otr/server/methods/updateOTRAck.js
index 4d09c1efda90..0e5a7c85059e 100644
--- a/packages/rocketchat-otr/server/methods/updateOTRAck.js
+++ b/packages/rocketchat-otr/server/methods/updateOTRAck.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	updateOTRAck(_id, ack) {
diff --git a/packages/rocketchat-otr/server/models/Messages.js b/packages/rocketchat-otr/server/models/Messages.js
index 7a5b34570049..a8af1f83eaac 100644
--- a/packages/rocketchat-otr/server/models/Messages.js
+++ b/packages/rocketchat-otr/server/models/Messages.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Messages.deleteOldOTRMessages = function(roomId, ts) {
 	const query = { rid: roomId, t: 'otr', ts: { $lte: ts } };
 	return this.remove(query);
diff --git a/packages/rocketchat-otr/server/settings.js b/packages/rocketchat-otr/server/settings.js
index bae56c69ffc9..22310dfa5267 100644
--- a/packages/rocketchat-otr/server/settings.js
+++ b/packages/rocketchat-otr/server/settings.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('OTR', function() {
 	this.add('OTR_Enable', true, {
 		type: 'boolean',