diff --git a/packages/rocketchat-livechat/client/lib/dateHandler.js b/packages/rocketchat-livechat/client/lib/dateHandler.js
index d3263e424898..9e7a37b4b08e 100644
--- a/packages/rocketchat-livechat/client/lib/dateHandler.js
+++ b/packages/rocketchat-livechat/client/lib/dateHandler.js
@@ -1,4 +1,4 @@
-import { handleError } from 'meteor/rocketchat:lib';
+import { handleError } from 'meteor/rocketchat:utils';
 import moment from 'moment';
 
 
diff --git a/packages/rocketchat-livechat/client/roomType.js b/packages/rocketchat-livechat/client/roomType.js
index 013bff416eb2..3a96ff50cfc4 100644
--- a/packages/rocketchat-livechat/client/roomType.js
+++ b/packages/rocketchat-livechat/client/roomType.js
@@ -1,4 +1,4 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { roomTypes } from 'meteor/rocketchat:utils';
 import LivechatRoomType from '../lib/LivechatRoomType';
 
-RocketChat.roomTypes.add(new LivechatRoomType());
+roomTypes.add(new LivechatRoomType());
diff --git a/packages/rocketchat-livechat/client/route.js b/packages/rocketchat-livechat/client/route.js
index dc3431b20b78..6686da5278c6 100644
--- a/packages/rocketchat-livechat/client/route.js
+++ b/packages/rocketchat-livechat/client/route.js
@@ -1,5 +1,5 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { AccountBox } from 'meteor/rocketchat:ui';
+import { AccountBox } from 'meteor/rocketchat:ui-utils';
 
 const livechatManagerRoutes = FlowRouter.group({
 	prefix: '/livechat-manager',
diff --git a/packages/rocketchat-livechat/client/startup/notifyUnreadRooms.js b/packages/rocketchat-livechat/client/startup/notifyUnreadRooms.js
index 355ee7a8e24c..2b840ce185fa 100644
--- a/packages/rocketchat-livechat/client/startup/notifyUnreadRooms.js
+++ b/packages/rocketchat-livechat/client/startup/notifyUnreadRooms.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { getUserPreference } from 'meteor/rocketchat:utils';
+import { Subscriptions, Users } from 'meteor/rocketchat:models';
 
 let audio = null;
 
@@ -22,24 +24,24 @@ const play = (audio) => {
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 
-		if (!RocketChat.settings.get('Livechat_continuous_sound_notification_new_livechat_room')) {
+		if (!settings.get('Livechat_continuous_sound_notification_new_livechat_room')) {
 			stop(audio);
 			return;
 		}
 
-		const subs = RocketChat.models.Subscriptions.find({ t: 'l', ls : { $exists: 0 }, open: true }).count();
+		const subs = Subscriptions.find({ t: 'l', ls : { $exists: 0 }, open: true }).count();
 		if (subs === 0) {
 			stop(audio);
 			return;
 		}
 
-		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
+		const user = Users.findOne(Meteor.userId(), {
 			fields: {
 				'settings.preferences.newRoomNotification': 1,
 			},
 		});
 
-		const newRoomNotification = RocketChat.getUserPreference(user, 'newRoomNotification');
+		const newRoomNotification = getUserPreference(user, 'newRoomNotification');
 
 		[audio] = $(`#${ newRoomNotification }`);
 		play(audio);
diff --git a/packages/rocketchat-livechat/client/ui.js b/packages/rocketchat-livechat/client/ui.js
index bff93a4e0177..2de5ebfe61d6 100644
--- a/packages/rocketchat-livechat/client/ui.js
+++ b/packages/rocketchat-livechat/client/ui.js
@@ -1,15 +1,16 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { AccountBox } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { hasAllPermission } from 'meteor/rocketchat:authorization';
+import { AccountBox, TabBar, MessageTypes } from 'meteor/rocketchat:ui-utils';
 
 AccountBox.addItem({
 	name: 'Livechat',
 	icon: 'livechat',
 	href: 'livechat-current-chats',
 	sideNav: 'livechatFlex',
-	condition: () => RocketChat.settings.get('Livechat_enabled') && RocketChat.authz.hasAllPermission('view-livechat-manager'),
+	condition: () => settings.get('Livechat_enabled') && hasAllPermission('view-livechat-manager'),
 });
 
-RocketChat.TabBar.addButton({
+TabBar.addButton({
 	groups: ['live'],
 	id: 'visitor-info',
 	i18nTitle: 'Visitor_Info',
@@ -18,7 +19,7 @@ RocketChat.TabBar.addButton({
 	order: 0,
 });
 
-RocketChat.TabBar.addButton({
+TabBar.addButton({
 	groups: ['live'],
 	id: 'visitor-history',
 	i18nTitle: 'Past_Chats',
@@ -27,13 +28,13 @@ RocketChat.TabBar.addButton({
 	order: 11,
 });
 
-RocketChat.TabBar.addGroup('message-search', ['live']);
-RocketChat.TabBar.addGroup('starred-messages', ['live']);
-RocketChat.TabBar.addGroup('uploaded-files-list', ['live']);
-RocketChat.TabBar.addGroup('push-notifications', ['live']);
-RocketChat.TabBar.addGroup('video', ['live']);
+TabBar.addGroup('message-search', ['live']);
+TabBar.addGroup('starred-messages', ['live']);
+TabBar.addGroup('uploaded-files-list', ['live']);
+TabBar.addGroup('push-notifications', ['live']);
+TabBar.addGroup('video', ['live']);
 
-RocketChat.TabBar.addButton({
+TabBar.addButton({
 	groups: ['live'],
 	id: 'external-search',
 	i18nTitle: 'Knowledge_Base',
@@ -42,7 +43,7 @@ RocketChat.TabBar.addButton({
 	order: 10,
 });
 
-RocketChat.MessageTypes.registerType({
+MessageTypes.registerType({
 	id: 'livechat-close',
 	system: true,
 	message: 'Conversation_closed',
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
index 20e035043f08..3bd14fc228cb 100644
--- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
+++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
@@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { handleError } from 'meteor/rocketchat:lib';
-import { popover } from 'meteor/rocketchat:ui';
+import { handleError } from 'meteor/rocketchat:utils';
+import { popover } from 'meteor/rocketchat:ui-utils';
 import moment from 'moment';
 import { drawLineChart } from '../../../lib/chartHandler';
 import { setDateRange, updateDateRange } from '../../../lib/dateHandler';
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js
index d044ba627b26..c44cea51ff42 100644
--- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js
+++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js
@@ -1,6 +1,6 @@
 import { Template } from 'meteor/templating';
-import { handleError } from 'meteor/rocketchat:lib';
-import { popover } from 'meteor/rocketchat:ui';
+import { handleError } from 'meteor/rocketchat:utils';
+import { popover } from 'meteor/rocketchat:ui-utils';
 import moment from 'moment';
 import { setDateRange } from '../../../lib/dateHandler';
 
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js
index b1b9522a527e..a1b3da8335c3 100644
--- a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js
+++ b/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js
@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { popover } from 'meteor/rocketchat:ui';
+import { popover } from 'meteor/rocketchat:ui-utils';
 import moment from 'moment';
 import { setDateRange } from '../../../lib/dateHandler';
 
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
index 02f8bb49185f..af636db36e6f 100644
--- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
+++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 
 Template.livechatIntegrationFacebook.helpers({
 	pages() {
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js
index 6ea1d11215d0..bc2d875243f4 100644
--- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js
+++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js
@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { LivechatIntegration } from '../../../collections/LivechatIntegration';
 import _ from 'underscore';
 import s from 'underscore.string';
diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
index d7fab05cbca1..fea6c3f7abc7 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
@@ -4,8 +4,7 @@ import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import s from 'underscore.string';
 import moment from 'moment';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
index 8babe75a5e56..7b1a21b80a1b 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
@@ -4,8 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { AgentUsers } from '../../collections/AgentUsers';
 import _ from 'underscore';
 import moment from 'moment';
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js
index 3fa98254e364..0aea2995ee21 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js
@@ -2,8 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { LivechatCustomField } from '../../collections/LivechatCustomField';
 import toastr from 'toastr';
 
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js
index 24648b63d880..10c93f407887 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js
@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { LivechatCustomField } from '../../collections/LivechatCustomField';
 
 Template.livechatCustomFields.helpers({
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
index 1ecfeddd6966..5000ca150ee9 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
@@ -2,8 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { AgentUsers } from '../../collections/AgentUsers';
 import { LivechatDepartment } from '../../collections/LivechatDepartment';
 import { LivechatDepartmentAgents } from '../../collections/LivechatDepartmentAgents';
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js b/packages/rocketchat-livechat/client/views/app/livechatDepartments.js
index c5a4c3ec883d..c163e237bd14 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatDepartments.js
@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { LivechatDepartment } from '../../collections/LivechatDepartment';
 
 Template.livechatDepartments.helpers({
diff --git a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js b/packages/rocketchat-livechat/client/views/app/livechatInstallation.js
index 9b731b038bb8..9ba6005c3124 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatInstallation.js
@@ -1,10 +1,10 @@
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import s from 'underscore.string';
 
 Template.livechatInstallation.helpers({
 	script() {
-		const siteUrl = s.rtrim(RocketChat.settings.get('Site_Url'), '/');
+		const siteUrl = s.rtrim(settings.get('Site_Url'), '/');
 
 		return `<!-- Start of Rocket.Chat Livechat Script -->
 <script type="text/javascript">
diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js
index 842143026123..17732a1698b5 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js
@@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
+import { settings } from 'meteor/rocketchat:settings';
 import { LivechatOfficeHour } from '../../collections/livechatOfficeHour';
 import toastr from 'toastr';
 import moment from 'moment';
@@ -96,7 +96,7 @@ Template.livechatOfficeHours.events({
 			}
 		}
 
-		RocketChat.settings.set('Livechat_enable_office_hours', instance.enableOfficeHours.get(), (err/* , success*/) => {
+		settings.set('Livechat_enable_office_hours', instance.enableOfficeHours.get(), (err/* , success*/) => {
 			if (err) {
 				return handleError(err);
 			}
@@ -159,6 +159,6 @@ Template.livechatOfficeHours.onCreated(function() {
 	this.enableOfficeHours = new ReactiveVar(null);
 
 	this.autorun(() => {
-		this.enableOfficeHours.set(RocketChat.settings.get('Livechat_enable_office_hours'));
+		this.enableOfficeHours.set(settings.get('Livechat_enable_office_hours'));
 	});
 });
diff --git a/packages/rocketchat-livechat/client/views/app/livechatQueue.js b/packages/rocketchat-livechat/client/views/app/livechatQueue.js
index 097a0d96b03d..4ed479fd2607 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatQueue.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatQueue.js
@@ -1,7 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { hasRole } from 'meteor/rocketchat:authorization';
+import { Users } from 'meteor/rocketchat:models';
 import { LivechatDepartment } from '../../collections/LivechatDepartment';
 import { LivechatQueueUser } from '../../collections/LivechatQueueUser';
 import { AgentUsers } from '../../collections/AgentUsers';
@@ -44,8 +46,8 @@ Template.livechatQueue.helpers({
 	},
 
 	hasPermission() {
-		const user = RocketChat.models.Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
-		return RocketChat.authz.hasRole(Meteor.userId(), 'livechat-manager') || (user.statusLivechat === 'available' && RocketChat.settings.get('Livechat_show_queue_list_link'));
+		const user = Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
+		return hasRole(Meteor.userId(), 'livechat-manager') || (user.statusLivechat === 'available' && settings.get('Livechat_show_queue_list_link'));
 	},
 });
 
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js b/packages/rocketchat-livechat/client/views/app/livechatTriggers.js
index 20886228a6bc..c4a7f5058dc2 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatTriggers.js
@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { LivechatTrigger } from '../../collections/LivechatTrigger';
 
 Template.livechatTriggers.helpers({
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js b/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js
index 5955bd3d8a9a..4792fb188695 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js
@@ -1,8 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { LivechatTrigger } from '../../collections/LivechatTrigger';
 import toastr from 'toastr';
 
diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.js b/packages/rocketchat-livechat/client/views/app/livechatUsers.js
index 8e58dd89d114..7f85b1adabbd 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatUsers.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatUsers.js
@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import { AgentUsers } from '../../collections/AgentUsers';
 import _ from 'underscore';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js b/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js
index e5146f59e9eb..4b5d5420479c 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js
@@ -1,9 +1,9 @@
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { LivechatExternalMessage } from '../../../../lib/LivechatExternalMessage';
 
 Template.externalSearch.helpers({
 	messages() {
-		return RocketChat.models.LivechatExternalMessage.findByRoomId(this.rid, { ts: 1 });
+		return LivechatExternalMessage.findByRoomId(this.rid, { ts: 1 });
 	},
 });
 
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
index 139c1b549c91..b75797e42e94 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:models';
 import { t } from 'meteor/rocketchat:utils';
 import { LivechatVisitor } from '../../../collections/LivechatVisitor';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
index 6466ecd3354d..3f31d762169c 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:models';
 import { t } from 'meteor/rocketchat:utils';
 import { LivechatDepartment } from '../../../collections/LivechatDepartment';
 import { AgentUsers } from '../../../collections/AgentUsers';
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js
index 9a69f8743a56..48e4de631196 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js
@@ -1,8 +1,9 @@
-import { ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:models';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { Mongo } from 'meteor/mongo';
 import moment from 'moment';
+
 const visitorHistory = new Mongo.Collection('visitor_history');
 
 Template.visitorHistory.helpers({
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
index c5ce132cd467..d0bd4b400d19 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
@@ -3,9 +3,11 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { modal, ChatRoom } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { ChatRoom, Rooms, Subscriptions } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
+import { t, handleError, roomTypes } from 'meteor/rocketchat:utils';
+import { hasRole } from 'meteor/rocketchat:authorization';
 import { LivechatVisitor } from '../../../collections/LivechatVisitor';
 import _ from 'underscore';
 import s from 'underscore.string';
@@ -28,7 +30,7 @@ Template.visitorInfo.helpers({
 			user.browser = `${ ua.getBrowser().name } ${ ua.getBrowser().version }`;
 			user.browserIcon = `icon-${ ua.getBrowser().name.toLowerCase() }`;
 
-			user.status = RocketChat.roomTypes.getUserStatus('l', this.rid) || 'offline';
+			user.status = roomTypes.getUserStatus('l', this.rid) || 'offline';
 		}
 		return user;
 	},
@@ -51,7 +53,7 @@ Template.visitorInfo.helpers({
 
 		const data = Template.currentData();
 		if (data && data.rid) {
-			const room = RocketChat.models.Rooms.findOne(data.rid);
+			const room = Rooms.findOne(data.rid);
 			if (room) {
 				livechatData = _.extend(livechatData, room.livechatData);
 			}
@@ -132,7 +134,7 @@ Template.visitorInfo.helpers({
 	},
 
 	guestPool() {
-		return RocketChat.settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+		return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
 	},
 
 	showDetail() {
@@ -142,13 +144,13 @@ Template.visitorInfo.helpers({
 	},
 
 	canSeeButtons() {
-		if (RocketChat.authz.hasRole(Meteor.userId(), 'livechat-manager')) {
+		if (hasRole(Meteor.userId(), 'livechat-manager')) {
 			return true;
 		}
 
 		const data = Template.currentData();
 		if (data && data.rid) {
-			const subscription = RocketChat.models.Subscriptions.findOne({ rid: data.rid });
+			const subscription = Subscriptions.findOne({ rid: data.rid });
 			return subscription !== undefined;
 		}
 		return false;
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
index c5007719fec5..9c223ee7db92 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
@@ -1,6 +1,6 @@
 import { Mongo } from 'meteor/mongo';
 import { Template } from 'meteor/templating';
-import { ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:models';
 import { t } from 'meteor/rocketchat:utils';
 import moment from 'moment';
 
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js
index 8667a60312e6..b87cf714a503 100644
--- a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js
+++ b/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js
@@ -1,6 +1,6 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
 Template.livechatTriggerAction.helpers({
 	hiddenValue(current) {
@@ -18,7 +18,7 @@ Template.livechatTriggerAction.helpers({
 		return !!(this.params && this.params.sender === current);
 	},
 	disableIfGuestPool() {
-		return RocketChat.settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+		return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
 	},
 });
 
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js
index 074bc84bbc56..2550fb1b6a54 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.js
@@ -3,9 +3,13 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { modal, ChatSubscription, KonchatNotification } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { ChatSubscription } from 'meteor/rocketchat:models';
+import { KonchatNotification } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { hasRole } from 'meteor/rocketchat:authorization';
+import { modal } from 'meteor/rocketchat:ui-utils';
+import { Users } from 'meteor/rocketchat:models';
+import { t, handleError, getUserPreference, roomTypes } from 'meteor/rocketchat:utils';
 import { LivechatInquiry } from '../../../lib/LivechatInquiry';
 
 Template.livechat.helpers({
@@ -30,11 +34,11 @@ Template.livechat.helpers({
 			open: true,
 		};
 
-		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
+		const user = Users.findOne(Meteor.userId(), {
 			fields: { 'settings.preferences.sidebarShowUnread': 1 },
 		});
 
-		if (RocketChat.getUserPreference(user, 'sidebarShowUnread')) {
+		if (getUserPreference(user, 'sidebarShowUnread')) {
 			query.alert = { $ne: true };
 		}
 
@@ -64,7 +68,7 @@ Template.livechat.helpers({
 	},
 
 	guestPool() {
-		return RocketChat.settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+		return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
 	},
 
 	available() {
@@ -82,10 +86,10 @@ Template.livechat.helpers({
 	},
 
 	showQueueLink() {
-		if (RocketChat.settings.get('Livechat_Routing_Method') !== 'Least_Amount') {
+		if (settings.get('Livechat_Routing_Method') !== 'Least_Amount') {
 			return false;
 		}
-		return RocketChat.authz.hasRole(Meteor.userId(), 'livechat-manager') || (Template.instance().statusLivechat.get() === 'available' && RocketChat.settings.get('Livechat_show_queue_list_link'));
+		return hasRole(Meteor.userId(), 'livechat-manager') || (Template.instance().statusLivechat.get() === 'available' && settings.get('Livechat_show_queue_list_link'));
 	},
 
 	activeLivechatQueue() {
@@ -120,7 +124,7 @@ Template.livechat.events({
 			if (isConfirm) {
 				Meteor.call('livechat:takeInquiry', this._id, (error, result) => {
 					if (!error) {
-						RocketChat.roomTypes.openRouteLink(result.t, result);
+						roomTypes.openRouteLink(result.t, result);
 					}
 				});
 			}
@@ -133,7 +137,7 @@ Template.livechat.onCreated(function() {
 
 	this.autorun(() => {
 		if (Meteor.userId()) {
-			const user = RocketChat.models.Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
+			const user = Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
 			this.statusLivechat.set(user.statusLivechat);
 		} else {
 			this.statusLivechat.set();
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
index ea3c15a62d04..a6f3041713ac 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
@@ -1,6 +1,5 @@
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { SideNav } from 'meteor/rocketchat:ui';
+import { SideNav, Layout } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
 
 Template.livechatFlex.helpers({
@@ -13,7 +12,7 @@ Template.livechatFlex.helpers({
 		};
 	},
 	embeddedVersion() {
-		return RocketChat.Layout.isEmbedded();
+		return Layout.isEmbedded();
 	},
 });
 
diff --git a/packages/rocketchat-livechat/lib/LivechatExternalMessage.js b/packages/rocketchat-livechat/lib/LivechatExternalMessage.js
index a22c1e5e2e88..4c796b077c81 100644
--- a/packages/rocketchat-livechat/lib/LivechatExternalMessage.js
+++ b/packages/rocketchat-livechat/lib/LivechatExternalMessage.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Base } from 'meteor/rocketchat:models';
 
-class LivechatExternalMessage extends RocketChat.models._Base {
+class LivechatExternalMessageClass extends Base {
 	constructor() {
 		super('livechat_external_message');
 
@@ -18,4 +18,4 @@ class LivechatExternalMessage extends RocketChat.models._Base {
 	}
 }
 
-RocketChat.models.LivechatExternalMessage = new LivechatExternalMessage();
+export const LivechatExternalMessage = new LivechatExternalMessageClass();
diff --git a/packages/rocketchat-livechat/package.js b/packages/rocketchat-livechat/package.js
index 631b29132e3c..b78f63442d48 100644
--- a/packages/rocketchat-livechat/package.js
+++ b/packages/rocketchat-livechat/package.js
@@ -26,6 +26,9 @@ Package.onUse(function(api) {
 		'webapp',
 		'autoupdate',
 		'rocketchat:utils',
+		'rocketchat:ui-utils',
+		'rocketchat:settings',
+		'rocketchat:models',
 		'rocketchat:lib',
 		'rocketchat:authorization',
 		'rocketchat:logger',