diff --git a/packages/rocketchat-ui-account/client/account.js b/packages/rocketchat-ui-account/client/account.js
index 40a0e36da2aa..5f95f6e508fd 100644
--- a/packages/rocketchat-ui-account/client/account.js
+++ b/packages/rocketchat-ui-account/client/account.js
@@ -1,5 +1,6 @@
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
+import { SideNav } from 'meteor/rocketchat:ui';
 
 Template.account.onRendered(function() {
 	Tracker.afterFlush(function() {
diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
index f1c8d945636f..0de86a8e74a3 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.js
+++ b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -1,4 +1,6 @@
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t, SideNav } from 'meteor/rocketchat:ui';
 
 Template.accountFlex.events({
 	'click [data-action="close"]'() {
diff --git a/packages/rocketchat-ui-account/client/accountIntegrations.js b/packages/rocketchat-ui-account/client/accountIntegrations.js
index 115f43c814f2..1ec7399c092a 100644
--- a/packages/rocketchat-ui-account/client/accountIntegrations.js
+++ b/packages/rocketchat-ui-account/client/accountIntegrations.js
@@ -1,7 +1,7 @@
-/* global */
-
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t, modal } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 
 Template.accountIntegrations.helpers({
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
index 04f8194b8ad1..679e68429aec 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.js
+++ b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -1,10 +1,11 @@
-/* globals KonchatNotification */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Reload } from 'meteor/reload';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { t, modal, SideNav, KonchatNotification } from 'meteor/rocketchat:ui';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js
index fa70e6cbb4b7..1cd682bfad9b 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.js
+++ b/packages/rocketchat-ui-account/client/accountProfile.js
@@ -4,6 +4,8 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { t, modal, SideNav } from 'meteor/rocketchat:ui';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-ui-account/client/avatar/avatar.js b/packages/rocketchat-ui-account/client/avatar/avatar.js
index e35c1012dd1e..82bab9c9089b 100644
--- a/packages/rocketchat-ui-account/client/avatar/avatar.js
+++ b/packages/rocketchat-ui-account/client/avatar/avatar.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
+import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui';
 
 Template.avatar.helpers({
 	src() {
diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.js b/packages/rocketchat-ui-account/client/avatar/prompt.js
index a3f550635ec4..aee93c8d737e 100644
--- a/packages/rocketchat-ui-account/client/avatar/prompt.js
+++ b/packages/rocketchat-ui-account/client/avatar/prompt.js
@@ -1,10 +1,11 @@
-/* globals fileUploadHandler */
-
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t, SideNav } from 'meteor/rocketchat:ui';
+import { fileUploadHandler } from 'meteor/rocketchat:file-upload';
 import s from 'underscore.string';
 import toastr from 'toastr';
 import mime from 'mime-type/with-db';
diff --git a/packages/rocketchat-ui-account/client/index.js b/packages/rocketchat-ui-account/client/index.js
new file mode 100644
index 000000000000..18631c92c195
--- /dev/null
+++ b/packages/rocketchat-ui-account/client/index.js
@@ -0,0 +1,14 @@
+import './account.html';
+import './accountFlex.html';
+import './accountIntegrations.html';
+import './accountPreferences.html';
+import './accountProfile.html';
+import './avatar/avatar.html';
+import './avatar/prompt.html';
+import './account';
+import './accountFlex';
+import './accountIntegrations';
+import './accountPreferences';
+import './accountProfile';
+import './avatar/avatar';
+import './avatar/prompt';
diff --git a/packages/rocketchat-ui-account/package.js b/packages/rocketchat-ui-account/package.js
index 1644d5a587a6..ccc52f7bf7a7 100644
--- a/packages/rocketchat-ui-account/package.js
+++ b/packages/rocketchat-ui-account/package.js
@@ -18,22 +18,5 @@ Package.onUse(function(api) {
 		'sha',
 		'rocketchat:lazy-load',
 	]);
-
-	api.addFiles('client/account.html', 'client');
-	api.addFiles('client/accountFlex.html', 'client');
-	api.addFiles('client/accountIntegrations.html', 'client');
-	api.addFiles('client/accountPreferences.html', 'client');
-	api.addFiles('client/accountProfile.html', 'client');
-	api.addFiles('client/avatar/avatar.html', 'client');
-	api.addFiles('client/avatar/prompt.html', 'client');
-
-	api.addFiles('client/account.js', 'client');
-	api.addFiles('client/accountFlex.js', 'client');
-	api.addFiles('client/accountIntegrations.js', 'client');
-	api.addFiles('client/accountPreferences.js', 'client');
-	api.addFiles('client/accountProfile.js', 'client');
-	api.addFiles('client/avatar/avatar.js', 'client');
-	api.addFiles('client/avatar/prompt.js', 'client');
-
-	// api.addAssets('styles/side-nav.less', 'client');
+	api.mainModule('client/index.js', 'client');
 });
diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js
index afdfdf183433..0baca53d0b2e 100644
--- a/packages/rocketchat-ui/client/lib/notification.js
+++ b/packages/rocketchat-ui/client/lib/notification.js
@@ -9,14 +9,14 @@ import _ from 'underscore';
 import s from 'underscore.string';
 import { e2e } from 'meteor/rocketchat:e2e';
 
-const KonchatNotification = {
+KonchatNotification = { //eslint-disable-line
 	notificationStatus: new ReactiveVar,
 
 	// notificacoes HTML5
 	getDesktopPermission() {
 		if (window.Notification && (Notification.permission !== 'granted') && !Meteor.settings.public.sandstorm) {
 			return Notification.requestPermission(function(status) {
-				KonchatNotification.notificationStatus.set(status);
+				KonchatNotification.notificationStatus.set(status); //eslint-disable-line
 				if (Notification.permission !== status) {
 					return Notification.permission = status;
 				}
@@ -88,7 +88,7 @@ const KonchatNotification = {
 		/* globals getAvatarAsPng*/
 		return getAvatarAsPng(notification.payload.sender.username, function(avatarAsPng) {
 			notification.icon = avatarAsPng;
-			return KonchatNotification.notify(notification);
+			return KonchatNotification.notify(notification); //eslint-disable-line
 		});
 	},
 
@@ -175,5 +175,3 @@ Meteor.startup(() => {
 		}
 	});
 });
-export { KonchatNotification };
-this.KonchatNotification = KonchatNotification;
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 86c12607be81..47c78bbe751b 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -160,4 +160,5 @@ Package.onUse(function(api) {
 	api.export('popout', 'client');
 	api.export('ChatMessage', 'client');
 	api.export('RoomHistoryManager', 'client');
+	api.export('KonchatNotification', 'client');
 });