diff --git a/packages/chatpal-search/server/provider/index.js b/packages/chatpal-search/server/provider/index.js
index fcccc7d96cde..0f0f25458645 100644
--- a/packages/chatpal-search/server/provider/index.js
+++ b/packages/chatpal-search/server/provider/index.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import ChatpalLogger from '../utils/logger';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms, Messages } from 'meteor/rocketchat:models';
 
 /**
  * Enables HTTP functions on Chatpal Backend
@@ -280,11 +280,11 @@ export default class Index {
 	 * @private
 	 */
 	_existsDataOlderThan(date) {
-		return RocketChat.models.Messages.model.find({ ts:{ $lt: new Date(date) }, t:{ $exists:false } }, { limit:1 }).fetch().length > 0;
+		return Messages.model.find({ ts:{ $lt: new Date(date) }, t:{ $exists:false } }, { limit:1 }).fetch().length > 0;
 	}
 
 	_doesRoomCountDiffer() {
-		return RocketChat.models.Rooms.find({ t:{ $ne:'d' } }).count() !== this._backend.count('room');
+		return Rooms.find({ t:{ $ne:'d' } }).count() !== this._backend.count('room');
 	}
 
 	_doesUserCountDiffer() {
@@ -311,7 +311,7 @@ export default class Index {
 	 * @private
 	 */
 	_indexRooms() {
-		const cursor = RocketChat.models.Rooms.find({ t:{ $ne:'d' } });
+		const cursor = Rooms.find({ t:{ $ne:'d' } });
 
 		ChatpalLogger.debug(`Start indexing ${ cursor.count() } rooms`);
 
@@ -327,7 +327,7 @@ export default class Index {
 		const start = new Date(date - gap);
 		const end = new Date(date);
 
-		const cursor = RocketChat.models.Messages.model.find({ ts:{ $gt: start, $lt: end }, t:{ $exists:false } });
+		const cursor = Messages.model.find({ ts:{ $gt: start, $lt: end }, t:{ $exists:false } });
 
 		ChatpalLogger.debug(`Start indexing ${ cursor.count() } messages between ${ start.toString() } and ${ end.toString() }`);
 
diff --git a/packages/rocketchat-irc/package.js b/packages/rocketchat-irc/package.js
index 13dc5a9f73b7..b586cd98c8bd 100644
--- a/packages/rocketchat-irc/package.js
+++ b/packages/rocketchat-irc/package.js
@@ -11,7 +11,9 @@ Package.onUse(function(api) {
 		'underscore',
 		'rocketchat:utils',
 		'rocketchat:lib',
-		'rocketchat:ui',
+		'rocketchat:callbacks',
+		'rocketchat:settings',
+		'rocketchat:models',
 	]);
 	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-irc/server/irc-bridge/index.js b/packages/rocketchat-irc/server/irc-bridge/index.js
index e40d21006c3e..235d40183e54 100644
--- a/packages/rocketchat-irc/server/irc-bridge/index.js
+++ b/packages/rocketchat-irc/server/irc-bridge/index.js
@@ -1,4 +1,4 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { callbacks } from 'meteor/rocketchat:callbacks';
 import Queue from 'queue-fifo';
 import * as servers from '../servers';
 import * as peerCommandHandlers from './peerHandlers';
@@ -117,18 +117,18 @@ class Bridge {
 	 */
 	setupLocalHandlers() {
 		// Auth
-		RocketChat.callbacks.add('afterValidateLogin', this.onMessageReceived.bind(this, 'local', 'onLogin'), RocketChat.callbacks.priority.LOW, 'irc-on-login');
-		RocketChat.callbacks.add('afterCreateUser', this.onMessageReceived.bind(this, 'local', 'onCreateUser'), RocketChat.callbacks.priority.LOW, 'irc-on-create-user');
+		callbacks.add('afterValidateLogin', this.onMessageReceived.bind(this, 'local', 'onLogin'), callbacks.priority.LOW, 'irc-on-login');
+		callbacks.add('afterCreateUser', this.onMessageReceived.bind(this, 'local', 'onCreateUser'), callbacks.priority.LOW, 'irc-on-create-user');
 		// Joining rooms or channels
-		RocketChat.callbacks.add('afterCreateChannel', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-create-channel');
-		RocketChat.callbacks.add('afterCreateRoom', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-create-room');
-		RocketChat.callbacks.add('afterJoinRoom', this.onMessageReceived.bind(this, 'local', 'onJoinRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-join-room');
+		callbacks.add('afterCreateChannel', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), callbacks.priority.LOW, 'irc-on-create-channel');
+		callbacks.add('afterCreateRoom', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), callbacks.priority.LOW, 'irc-on-create-room');
+		callbacks.add('afterJoinRoom', this.onMessageReceived.bind(this, 'local', 'onJoinRoom'), callbacks.priority.LOW, 'irc-on-join-room');
 		// Leaving rooms or channels
-		RocketChat.callbacks.add('afterLeaveRoom', this.onMessageReceived.bind(this, 'local', 'onLeaveRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-leave-room');
+		callbacks.add('afterLeaveRoom', this.onMessageReceived.bind(this, 'local', 'onLeaveRoom'), callbacks.priority.LOW, 'irc-on-leave-room');
 		// Chatting
-		RocketChat.callbacks.add('afterSaveMessage', this.onMessageReceived.bind(this, 'local', 'onSaveMessage'), RocketChat.callbacks.priority.LOW, 'irc-on-save-message');
+		callbacks.add('afterSaveMessage', this.onMessageReceived.bind(this, 'local', 'onSaveMessage'), callbacks.priority.LOW, 'irc-on-save-message');
 		// Leaving
-		RocketChat.callbacks.add('afterLogoutCleanUp', this.onMessageReceived.bind(this, 'local', 'onLogout'), RocketChat.callbacks.priority.LOW, 'irc-on-logout');
+		callbacks.add('afterLogoutCleanUp', this.onMessageReceived.bind(this, 'local', 'onLogout'), callbacks.priority.LOW, 'irc-on-logout');
 	}
 
 	sendCommand(command, parameters) {
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
index efdb0068f471..31e2ed81eaff 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
@@ -1,7 +1,7 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 
 export default function handleOnCreateRoom(user, room) {
-	const users = RocketChat.models.Users.findByRoomId(room._id);
+	const users = Users.findByRoomId(room._id);
 
 	users.forEach((user) => {
 		if (user.profile.irc.fromIRC) {
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
index c55a7d1bc692..de47b1a7ed9b 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 
 export default function handleOnCreateUser(newUser) {
 	if (!newUser) {
@@ -23,13 +23,13 @@ export default function handleOnCreateUser(newUser) {
 		},
 	});
 
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		_id: newUser._id,
 	});
 
 	this.sendCommand('registerUser', user);
 
-	const rooms = RocketChat.models.Rooms.findBySubscriptionUserId(user._id).fetch();
+	const rooms = Rooms.findBySubscriptionUserId(user._id).fetch();
 
 	rooms.forEach((room) => this.sendCommand('joinedChannel', { room, user }));
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
index 312b7a75f3c7..69b70f79444c 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 
 export default function handleOnLogin(login) {
 	if (login.user === null) {
@@ -23,13 +23,13 @@ export default function handleOnLogin(login) {
 		},
 	});
 
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		_id: login.user._id,
 	});
 
 	this.sendCommand('registerUser', user);
 
-	const rooms = RocketChat.models.Rooms.findBySubscriptionUserId(user._id).fetch();
+	const rooms = Rooms.findBySubscriptionUserId(user._id).fetch();
 
 	rooms.forEach((room) => this.sendCommand('joinedChannel', { room, user }));
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
index 9252d290bebd..25ec81f5abdd 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
@@ -1,13 +1,13 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Subscriptions, Users } from 'meteor/rocketchat:models';
 
 export default function handleOnSaveMessage(message, to) {
 	let toIdentification = '';
 	// Direct message
 	if (to.t === 'd') {
-		const subscriptions = RocketChat.models.Subscriptions.findByRoomId(to._id);
+		const subscriptions = Subscriptions.findByRoomId(to._id);
 		subscriptions.forEach((subscription) => {
 			if (subscription.u.username !== to.username) {
-				const userData = RocketChat.models.Users.findOne({ username: subscription.u.username });
+				const userData = Users.findOne({ username: subscription.u.username });
 				if (userData) {
 					if (userData.profile && userData.profile.irc && userData.profile.irc.nick) {
 						toIdentification = userData.profile.irc.nick;
@@ -28,7 +28,7 @@ export default function handleOnSaveMessage(message, to) {
 		toIdentification = `#${ to.name }`;
 	}
 
-	const user = RocketChat.models.Users.findOne({ _id: message.u._id });
+	const user = Users.findOne({ _id: message.u._id });
 
 	this.sendCommand('sentMessage', { to: toIdentification, user, message: message.msg });
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
index fefc7b37073b..760b0ce3fcdf 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 
 export default function handleQUIT(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -12,5 +12,5 @@ export default function handleQUIT(args) {
 		},
 	});
 
-	RocketChat.models.Rooms.removeUsernameFromAll(user.username);
+	Rooms.removeUsernameFromAll(user.username);
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
index 517f06463d99..4d12fe9b6f9d 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
@@ -1,7 +1,8 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
+import { createRoom, addUserToRoom } from 'meteor/rocketchat:lib';
 
 export default function handleJoinedChannel(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -9,15 +10,15 @@ export default function handleJoinedChannel(args) {
 		throw new Error(`Could not find a user with nick ${ args.nick }`);
 	}
 
-	let room = RocketChat.models.Rooms.findOneByName(args.roomName);
+	let room = Rooms.findOneByName(args.roomName);
 
 	if (!room) {
-		const createdRoom = RocketChat.createRoom('c', args.roomName, user.username, []);
-		room = RocketChat.models.Rooms.findOne({ _id: createdRoom.rid });
+		const createdRoom = createRoom('c', args.roomName, user.username, []);
+		room = Rooms.findOne({ _id: createdRoom.rid });
 
 		this.log(`${ user.username } created room ${ args.roomName }`);
 	} else {
-		RocketChat.addUserToRoom(room._id, user);
+		addUserToRoom(room._id, user);
 
 		this.log(`${ user.username } joined room ${ room.name }`);
 	}
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
index 0fac5da4a864..ce1e47c928b5 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
@@ -1,7 +1,8 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
+import { removeUserFromRoom } from 'meteor/rocketchat:lib';
 
 export default function handleLeftChannel(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -9,12 +10,12 @@ export default function handleLeftChannel(args) {
 		throw new Error(`Could not find a user with nick ${ args.nick }`);
 	}
 
-	const room = RocketChat.models.Rooms.findOneByName(args.roomName);
+	const room = Rooms.findOneByName(args.roomName);
 
 	if (!room) {
 		throw new Error(`Could not find a room with name ${ args.roomName }`);
 	}
 
 	this.log(`${ user.username } left room ${ room.name }`);
-	RocketChat.removeUserFromRoom(room._id, user);
+	removeUserFromRoom(room._id, user);
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
index 79ab997e7d4a..02b3aeb71d4a 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
@@ -1,7 +1,7 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 
 export default function handleNickChanged(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -12,7 +12,7 @@ export default function handleNickChanged(args) {
 	this.log(`${ user.username } changed nick: ${ args.nick } -> ${ args.newNick }`);
 
 	// Update on the database
-	RocketChat.models.Users.update({ _id: user._id }, {
+	Users.update({ _id: user._id }, {
 		$set: {
 			name: args.newNick,
 			'profile.irc.nick': args.newNick,
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
index 4433115dfbfb..209e5e647d47 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
@@ -1,4 +1,5 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms, Subscriptions } from 'meteor/rocketchat:models';
+import { sendMessage } from 'meteor/rocketchat:lib';
 /*
  *
  * Get direct chat room helper
@@ -8,7 +9,7 @@ import { RocketChat } from 'meteor/rocketchat:lib';
 const getDirectRoom = (source, target) => {
 	const rid = [source._id, target._id].sort().join('');
 
-	RocketChat.models.Rooms.upsert({ _id: rid }, {
+	Rooms.upsert({ _id: rid }, {
 		$setOnInsert: {
 			t: 'd',
 			msgs: 0,
@@ -16,7 +17,7 @@ const getDirectRoom = (source, target) => {
 		},
 	});
 
-	RocketChat.models.Subscriptions.upsert({ rid, 'u._id': target._id }, {
+	Subscriptions.upsert({ rid, 'u._id': target._id }, {
 		$setOnInsert: {
 			name: source.username,
 			t: 'd',
@@ -30,7 +31,7 @@ const getDirectRoom = (source, target) => {
 		},
 	});
 
-	RocketChat.models.Subscriptions.upsert({ rid, 'u._id': source._id }, {
+	Subscriptions.upsert({ rid, 'u._id': source._id }, {
 		$setOnInsert: {
 			name: target.username,
 			t: 'd',
@@ -51,7 +52,7 @@ const getDirectRoom = (source, target) => {
 };
 
 export default function handleSentMessage(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -62,9 +63,9 @@ export default function handleSentMessage(args) {
 	let room;
 
 	if (args.roomName) {
-		room = RocketChat.models.Rooms.findOneByName(args.roomName);
+		room = Rooms.findOneByName(args.roomName);
 	} else {
-		const recipientUser = RocketChat.models.Users.findOne({
+		const recipientUser = Users.findOne({
 			'profile.irc.nick': args.recipientNick,
 		});
 
@@ -76,5 +77,5 @@ export default function handleSentMessage(args) {
 		ts: new Date(),
 	};
 
-	RocketChat.sendMessage(user, message, room);
+	sendMessage(user, message, room);
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
index 540cd7cd1f2f..83bad3a16dcd 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 
 export default async function handleUserRegistered(args) {
 	// Check if there is an user with the given username
-	let user = RocketChat.models.Users.findOne({
+	let user = Users.findOne({
 		'profile.irc.username': args.username,
 	});
 
@@ -28,7 +28,7 @@ export default async function handleUserRegistered(args) {
 			},
 		};
 
-		user = RocketChat.models.Users.create(userToInsert);
+		user = Users.create(userToInsert);
 	} else {
 		// ...otherwise, log the user in and update the information
 		this.log(`Logging in ${ args.username } with nick: ${ args.nick }`);
diff --git a/packages/rocketchat-irc/server/irc-settings.js b/packages/rocketchat-irc/server/irc-settings.js
index b434856f46e0..8f6c692d9fdf 100644
--- a/packages/rocketchat-irc/server/irc-settings.js
+++ b/packages/rocketchat-irc/server/irc-settings.js
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.startup(function() {
-	RocketChat.settings.addGroup('IRC_Federation', function() {
+	settings.addGroup('IRC_Federation', function() {
 		this.add('IRC_Enabled', false, {
 			type: 'boolean',
 			i18nLabel: 'Enabled',
diff --git a/packages/rocketchat-irc/server/irc.js b/packages/rocketchat-irc/server/irc.js
index bf99e07c13d4..a5ce60e61c27 100644
--- a/packages/rocketchat-irc/server/irc.js
+++ b/packages/rocketchat-irc/server/irc.js
@@ -1,20 +1,20 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import Bridge from './irc-bridge';
 
-if (!!RocketChat.settings.get('IRC_Enabled') === true) {
+if (!!settings.get('IRC_Enabled') === true) {
 	// Normalize the config values
 	const config = {
 		server: {
-			protocol: RocketChat.settings.get('IRC_Protocol'),
-			host: RocketChat.settings.get('IRC_Host'),
-			port: RocketChat.settings.get('IRC_Port'),
-			name: RocketChat.settings.get('IRC_Name'),
-			description: RocketChat.settings.get('IRC_Description'),
+			protocol: settings.get('IRC_Protocol'),
+			host: settings.get('IRC_Host'),
+			port: settings.get('IRC_Port'),
+			name: settings.get('IRC_Name'),
+			description: settings.get('IRC_Description'),
 		},
 		passwords: {
-			local: RocketChat.settings.get('IRC_Local_Password'),
-			peer: RocketChat.settings.get('IRC_Peer_Password'),
+			local: settings.get('IRC_Local_Password'),
+			peer: settings.get('IRC_Peer_Password'),
 		},
 	};
 
diff --git a/packages/rocketchat-irc/server/methods/resetIrcConnection.js b/packages/rocketchat-irc/server/methods/resetIrcConnection.js
index 39e85122d949..d2dd477dee7f 100644
--- a/packages/rocketchat-irc/server/methods/resetIrcConnection.js
+++ b/packages/rocketchat-irc/server/methods/resetIrcConnection.js
@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { t } from 'meteor/rocketchat:utils';
 import Bridge from '../irc-bridge';
 
 Meteor.methods({
 	resetIrcConnection() {
-		const ircEnabled = (!!RocketChat.settings.get('IRC_Enabled')) === true;
+		const ircEnabled = (!!settings.get('IRC_Enabled')) === true;
 
 		if (Meteor.ircBridge) {
 			Meteor.ircBridge.stop();
@@ -29,15 +29,15 @@ Meteor.methods({
 			// Normalize the config values
 			const config = {
 				server: {
-					protocol: RocketChat.settings.get('IRC_Protocol'),
-					host: RocketChat.settings.get('IRC_Host'),
-					port: RocketChat.settings.get('IRC_Port'),
-					name: RocketChat.settings.get('IRC_Name'),
-					description: RocketChat.settings.get('IRC_Description'),
+					protocol: settings.get('IRC_Protocol'),
+					host: settings.get('IRC_Host'),
+					port: settings.get('IRC_Port'),
+					name: settings.get('IRC_Name'),
+					description: settings.get('IRC_Description'),
 				},
 				passwords: {
-					local: RocketChat.settings.get('IRC_Local_Password'),
-					peer: RocketChat.settings.get('IRC_Peer_Password'),
+					local: settings.get('IRC_Local_Password'),
+					peer: settings.get('IRC_Peer_Password'),
 				},
 			};
 
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',
diff --git a/packages/rocketchat-models/server/index.js b/packages/rocketchat-models/server/index.js
index 16f3e1ff2041..85a378bab44f 100644
--- a/packages/rocketchat-models/server/index.js
+++ b/packages/rocketchat-models/server/index.js
@@ -22,6 +22,7 @@ import EmojiCustom from './models/EmojiCustom';
 import OAuthApps from './models/OAuthApps';
 import OEmbedCache from './models/OEmbedCache';
 import SmarshHistory from './models/SmarshHistory';
+import WebdavAccounts from './models/WebdavAccounts';
 
 export {
 	Base,
@@ -48,4 +49,5 @@ export {
 	OAuthApps,
 	OEmbedCache,
 	SmarshHistory,
+	WebdavAccounts,
 };
diff --git a/packages/rocketchat-models/server/models/Rooms.js b/packages/rocketchat-models/server/models/Rooms.js
index e7dd82ef7856..fd319e8b2f3a 100644
--- a/packages/rocketchat-models/server/models/Rooms.js
+++ b/packages/rocketchat-models/server/models/Rooms.js
@@ -27,6 +27,20 @@ export class Rooms extends Base {
 		return this.findOne(query, options);
 	}
 
+	setJitsiTimeout(_id, time) {
+		const query = {
+			_id,
+		};
+
+		const update = {
+			$set: {
+				jitsiTimeout: time,
+			},
+		};
+
+		return this.update(query, update);
+	}
+
 	findByTokenpass(tokens) {
 		const query = {
 			'tokenpass.tokens.token': {
diff --git a/packages/rocketchat-webdav/server/models/WebdavAccounts.js b/packages/rocketchat-models/server/models/WebdavAccounts.js
similarity index 71%
rename from packages/rocketchat-webdav/server/models/WebdavAccounts.js
rename to packages/rocketchat-models/server/models/WebdavAccounts.js
index 4c26e43bec1b..f1ce436cdd58 100644
--- a/packages/rocketchat-webdav/server/models/WebdavAccounts.js
+++ b/packages/rocketchat-models/server/models/WebdavAccounts.js
@@ -1,9 +1,9 @@
 /**
  * Webdav Accounts model
  */
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Base } from './_Base';
 
-class WebdavAccounts extends RocketChat.models._Base {
+export class WebdavAccounts extends Base {
 	constructor() {
 		super('webdav_accounts');
 
@@ -25,4 +25,4 @@ class WebdavAccounts extends RocketChat.models._Base {
 
 }
 
-RocketChat.models.WebdavAccounts = new WebdavAccounts();
+export default new WebdavAccounts();
diff --git a/packages/rocketchat-videobridge/client/actionLink.js b/packages/rocketchat-videobridge/client/actionLink.js
index 76a01c819d6a..da6fedb7b363 100644
--- a/packages/rocketchat-videobridge/client/actionLink.js
+++ b/packages/rocketchat-videobridge/client/actionLink.js
@@ -1,13 +1,14 @@
 import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { actionLinks } from 'meteor/rocketchat:action-links';
+import { Rooms } from 'meteor/rocketchat:models';
 import toastr from 'toastr';
 
-RocketChat.actionLinks.register('joinJitsiCall', function(message, params, instance) {
+actionLinks.register('joinJitsiCall', function(message, params, instance) {
 	if (Session.get('openedRoom')) {
 		const rid = Session.get('openedRoom');
 
-		const room = RocketChat.models.Rooms.findOne({ _id: rid });
+		const room = Rooms.findOne({ _id: rid });
 		const currentTime = new Date().getTime();
 		const jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
diff --git a/packages/rocketchat-videobridge/client/tabBar.js b/packages/rocketchat-videobridge/client/tabBar.js
index 40ba4d0f187e..5959806ec79c 100644
--- a/packages/rocketchat-videobridge/client/tabBar.js
+++ b/packages/rocketchat-videobridge/client/tabBar.js
@@ -1,29 +1,31 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { TabBar } from 'meteor/rocketchat:ui-utils';
+import { Rooms } from 'meteor/rocketchat:models';
 
 Meteor.startup(function() {
 
 	Tracker.autorun(function() {
-		if (!RocketChat.settings.get('bigbluebutton_Enabled')) {
-			return RocketChat.TabBar.removeButton('bbb_video');
+		if (!settings.get('bigbluebutton_Enabled')) {
+			return TabBar.removeButton('bbb_video');
 		}
-		const live = RocketChat.models.Rooms.findOne({ _id: Session.get('openedRoom'), 'streamingOptions.type': 'call' }, { fields: { streamingOptions: 1 } });
+		const live = Rooms.findOne({ _id: Session.get('openedRoom'), 'streamingOptions.type': 'call' }, { fields: { streamingOptions: 1 } });
 
 		const groups = [];
 
-		if (RocketChat.settings.get('bigbluebutton_enable_d')) {
+		if (settings.get('bigbluebutton_enable_d')) {
 			groups.push('direct');
 		}
-		if (RocketChat.settings.get('bigbluebutton_enable_p')) {
+		if (settings.get('bigbluebutton_enable_p')) {
 			groups.push('group');
 		}
-		if (RocketChat.settings.get('bigbluebutton_enable_c')) {
+		if (settings.get('bigbluebutton_enable_c')) {
 			groups.push('channel');
 		}
 
-		RocketChat.TabBar.addButton({
+		TabBar.addButton({
 			groups,
 			id: 'bbb_video',
 			i18nTitle: 'BBB Video Chat',
@@ -37,8 +39,8 @@ Meteor.startup(function() {
 	});
 
 	Tracker.autorun(function() {
-		if (RocketChat.settings.get('Jitsi_Enabled')) {
-			RocketChat.TabBar.addButton({
+		if (settings.get('Jitsi_Enabled')) {
+			TabBar.addButton({
 				groups: ['direct', 'group'],
 				id: 'video',
 				i18nTitle: 'Video Chat',
@@ -49,20 +51,20 @@ Meteor.startup(function() {
 				order: 12,
 			});
 		} else {
-			RocketChat.TabBar.removeButton('video');
+			TabBar.removeButton('video');
 		}
 	});
 
 	Tracker.autorun(function() {
-		if (RocketChat.settings.get('Jitsi_Enabled') && RocketChat.settings.get('Jitsi_Enable_Channels')) {
-			RocketChat.TabBar.addGroup('video', ['channel']);
+		if (settings.get('Jitsi_Enabled') && settings.get('Jitsi_Enable_Channels')) {
+			TabBar.addGroup('video', ['channel']);
 		} else {
-			RocketChat.TabBar.removeGroup('video', ['channel']);
+			TabBar.removeGroup('video', ['channel']);
 		}
 	});
 
 	Tracker.autorun(function() {
-		if (RocketChat.settings.get('Jitsi_Enabled')) {
+		if (settings.get('Jitsi_Enabled')) {
 			// Load from the jitsi meet instance.
 			if (typeof JitsiMeetExternalAPI === 'undefined') {
 				const prefix = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '';
@@ -73,14 +75,14 @@ Meteor.startup(function() {
 			if (Session.get('openedRoom')) {
 				const rid = Session.get('openedRoom');
 
-				const room = RocketChat.models.Rooms.findOne({ _id: rid });
+				const room = Rooms.findOne({ _id: rid });
 				const currentTime = new Date().getTime();
 				const jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
 				if (jitsiTimeout > currentTime) {
-					RocketChat.TabBar.updateButton('video', { class: 'attention' });
+					TabBar.updateButton('video', { class: 'attention' });
 				} else {
-					RocketChat.TabBar.updateButton('video', { class: '' });
+					TabBar.updateButton('video', { class: '' });
 				}
 			}
 		}
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js
index b0ce866336fd..e8d85cf1dc75 100644
--- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js
+++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { modal } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { modal, TabBar } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
 
 Template.videoFlexTab.helpers({
 	openInNewWindow() {
-		return RocketChat.settings.get('Jitsi_Open_New_Window');
+		return settings.get('Jitsi_Open_New_Window');
 	},
 });
 
@@ -24,7 +24,7 @@ Template.videoFlexTab.onRendered(function() {
 	const height = 500;
 
 	const configOverwrite = {
-		desktopSharingChromeExtId: RocketChat.settings.get('Jitsi_Chrome_Extension'),
+		desktopSharingChromeExtId: settings.get('Jitsi_Chrome_Extension'),
 	};
 	const interfaceConfigOverwrite = {};
 
@@ -37,7 +37,7 @@ Template.videoFlexTab.onRendered(function() {
 
 		this.tabBar.close();
 
-		RocketChat.TabBar.updateButton('video', { class: '' });
+		TabBar.updateButton('video', { class: '' });
 	};
 
 	modal.open({
@@ -54,13 +54,13 @@ Template.videoFlexTab.onRendered(function() {
 		}
 		this.timeout = null;
 		this.autorun(() => {
-			if (RocketChat.settings.get('Jitsi_Enabled')) {
+			if (settings.get('Jitsi_Enabled')) {
 				if (this.tabBar.getState() === 'opened') {
 					const roomId = Session.get('openedRoom');
 
-					const domain = RocketChat.settings.get('Jitsi_Domain');
-					const jitsiRoom = RocketChat.settings.get('Jitsi_URL_Room_Prefix') + RocketChat.settings.get('uniqueID') + roomId;
-					const noSsl = !RocketChat.settings.get('Jitsi_SSL');
+					const domain = settings.get('Jitsi_Domain');
+					const jitsiRoom = settings.get('Jitsi_URL_Room_Prefix') + settings.get('uniqueID') + roomId;
+					const noSsl = !settings.get('Jitsi_SSL');
 
 					if (jitsiRoomActive !== null && jitsiRoomActive !== jitsiRoom) {
 						jitsiRoomActive = null;
@@ -75,9 +75,9 @@ Template.videoFlexTab.onRendered(function() {
 					} else {
 						jitsiRoomActive = jitsiRoom;
 
-						RocketChat.TabBar.updateButton('video', { class: 'red' });
+						TabBar.updateButton('video', { class: 'red' });
 
-						if (RocketChat.settings.get('Jitsi_Open_New_Window')) {
+						if (settings.get('Jitsi_Open_New_Window')) {
 							Meteor.call('jitsi:updateTimeout', roomId);
 
 							timeOut = Meteor.setInterval(() => Meteor.call('jitsi:updateTimeout', roomId), 10 * 1000);
@@ -120,7 +120,7 @@ Template.videoFlexTab.onRendered(function() {
 						}
 					}
 				} else {
-					RocketChat.TabBar.updateButton('video', { class: '' });
+					TabBar.updateButton('video', { class: '' });
 
 					// Clean up and stop updating timeout.
 					if (timeOut) {
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js b/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js
index f1933b7db6a5..f1f3b69d89bb 100644
--- a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js
+++ b/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js
@@ -1,15 +1,17 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { popout } from 'meteor/rocketchat:ui';
+import { settings } from 'meteor/rocketchat:settings';
+import { Rooms } from 'meteor/rocketchat:models';
+import { hasAllPermission } from 'meteor/rocketchat:authorization';
+import { popout } from 'meteor/rocketchat:ui-utils';
 
 Template.videoFlexTabBbb.helpers({
 	openInNewWindow() {
-		return RocketChat.settings.get('Jitsi_Open_New_Window');
+		return settings.get('Jitsi_Open_New_Window');
 	},
 
 	live() {
-		const isLive = RocketChat.models.Rooms.findOne({ _id: this.rid, 'streamingOptions.type': 'call' }, { fields: { streamingOptions: 1 } }) != null;
+		const isLive = Rooms.findOne({ _id: this.rid, 'streamingOptions.type': 'call' }, { fields: { streamingOptions: 1 } }) != null;
 
 		if (isLive === false && popout.context) {
 			popout.close();
@@ -19,8 +21,8 @@ Template.videoFlexTabBbb.helpers({
 	},
 
 	callManagement() {
-		const type = RocketChat.models.Rooms.findOne({ _id: this.rid }).t;
-		return type === 'd' || RocketChat.authz.hasAllPermission('call-management') || RocketChat.authz.hasAllPermission('call-management', this.rid);
+		const type = Rooms.findOne({ _id: this.rid }).t;
+		return type === 'd' || hasAllPermission('call-management') || hasAllPermission('call-management', this.rid);
 	},
 });
 
diff --git a/packages/rocketchat-videobridge/lib/messageType.js b/packages/rocketchat-videobridge/lib/messageType.js
index 6a9f8f3ef579..4363d1dfb560 100644
--- a/packages/rocketchat-videobridge/lib/messageType.js
+++ b/packages/rocketchat-videobridge/lib/messageType.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { MessageTypes } from 'meteor/rocketchat:ui-utils';
 
 Meteor.startup(function() {
-	RocketChat.MessageTypes.registerType({
+	MessageTypes.registerType({
 		id: 'jitsi_call_started',
 		system: true,
 		message: TAPi18n.__('Started_a_video_call'),
diff --git a/packages/rocketchat-videobridge/package.js b/packages/rocketchat-videobridge/package.js
index 7ac995888486..da072c9cf3ed 100644
--- a/packages/rocketchat-videobridge/package.js
+++ b/packages/rocketchat-videobridge/package.js
@@ -10,6 +10,13 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'less',
 		'rocketchat:utils',
+		'rocketchat:settings',
+		'rocketchat:callbacks',
+		'rocketchat:models',
+		'rocketchat:action-links',
+		'rocketchat:authorization',
+		'rocketchat:channel-settings',
+		'rocketchat:ui-utils',
 		'rocketchat:lib',
 		'rocketchat:api',
 		'rocketchat:bigbluebutton',
diff --git a/packages/rocketchat-videobridge/server/actionLink.js b/packages/rocketchat-videobridge/server/actionLink.js
index 41e845b49383..0d07ba64932f 100644
--- a/packages/rocketchat-videobridge/server/actionLink.js
+++ b/packages/rocketchat-videobridge/server/actionLink.js
@@ -1,5 +1,5 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { actionLinks } from 'meteor/rocketchat:action-links';
 
-RocketChat.actionLinks.register('joinJitsiCall', function(/* message, params*/) {
+actionLinks.register('joinJitsiCall', function(/* message, params*/) {
 
 });
diff --git a/packages/rocketchat-videobridge/server/index.js b/packages/rocketchat-videobridge/server/index.js
index bb29a42d80e6..e3a113b21d0d 100644
--- a/packages/rocketchat-videobridge/server/index.js
+++ b/packages/rocketchat-videobridge/server/index.js
@@ -1,6 +1,5 @@
 import '../lib/messageType';
 import './settings';
-import './models/Rooms';
 import './methods/jitsiSetTimeout';
 import './methods/bbb';
 import './actionLink';
diff --git a/packages/rocketchat-videobridge/server/methods/bbb.js b/packages/rocketchat-videobridge/server/methods/bbb.js
index db8dc32351f6..6a960350c75c 100644
--- a/packages/rocketchat-videobridge/server/methods/bbb.js
+++ b/packages/rocketchat-videobridge/server/methods/bbb.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import BigBlueButtonApi from 'meteor/rocketchat:bigbluebutton';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { Rooms, Users } from 'meteor/rocketchat:models';
+import { saveStreamingOptions } from 'meteor/rocketchat:channel-settings';
 import { API } from 'meteor/rocketchat:api';
 import { HTTP } from 'meteor/http';
 import xml2js from 'xml2js';
@@ -12,8 +14,8 @@ const parser = new xml2js.Parser({
 const parseString = Meteor.wrapAsync(parser.parseString);
 
 const getBBBAPI = () => {
-	const url = RocketChat.settings.get('bigbluebutton_server');
-	const secret = RocketChat.settings.get('bigbluebutton_sharedSecret');
+	const url = settings.get('bigbluebutton_server');
+	const secret = settings.get('bigbluebutton_sharedSecret');
 	const api = new BigBlueButtonApi(`${ url }/bigbluebutton/api`, secret);
 	return { api, url };
 };
@@ -29,13 +31,13 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbJoin' });
 		}
 
-		if (!RocketChat.settings.get('bigbluebutton_Enabled')) {
+		if (!settings.get('bigbluebutton_Enabled')) {
 			throw new Meteor.Error('error-not-allowed', 'Not Allowed', { method: 'bbbJoin' });
 		}
 
 		const { api } = getBBBAPI();
-		const meetingID = RocketChat.settings.get('uniqueID') + rid;
-		const room = RocketChat.models.Rooms.findOneById(rid);
+		const meetingID = settings.get('uniqueID') + rid;
+		const room = Rooms.findOneById(rid);
 		const createUrl = api.urlFor('create', {
 			name: room.t === 'd' ? 'Direct' : room.name,
 			meetingID,
@@ -53,7 +55,7 @@ Meteor.methods({
 		const doc = parseString(createResult.content);
 
 		if (doc.response.returncode[0]) {
-			const user = RocketChat.models.Users.findOneById(this.userId);
+			const user = Users.findOneById(this.userId);
 
 			const hookApi = api.urlFor('hooks/create', {
 				meetingID,
@@ -68,7 +70,7 @@ Meteor.methods({
 				return;
 			}
 
-			RocketChat.saveStreamingOptions(rid, {
+			saveStreamingOptions(rid, {
 				type: 'call',
 			});
 
@@ -95,12 +97,12 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbEnd' });
 		}
 
-		if (!RocketChat.settings.get('bigbluebutton_Enabled')) {
+		if (!settings.get('bigbluebutton_Enabled')) {
 			throw new Meteor.Error('error-not-allowed', 'Not Allowed', { method: 'bbbEnd' });
 		}
 
 		const { api } = getBBBAPI();
-		const meetingID = RocketChat.settings.get('uniqueID') + rid;
+		const meetingID = settings.get('uniqueID') + rid;
 		const endApi = api.urlFor('end', {
 			meetingID,
 			password: 'mp', // mp if moderator ap if attendee
@@ -117,7 +119,7 @@ Meteor.methods({
 		const doc = parseString(endApiResult.content);
 
 		if (doc.response.returncode[0] === 'FAILED') {
-			RocketChat.saveStreamingOptions(rid, {});
+			saveStreamingOptions(rid, {});
 		}
 	},
 });
@@ -128,12 +130,12 @@ API.v1.addRoute('videoconference.bbb.update/:id', { authRequired: false }, {
 		const event = JSON.parse(this.bodyParams.event)[0];
 		const eventType = event.data.id;
 		const meetingID = event.data.attributes.meeting['external-meeting-id'];
-		const rid = meetingID.replace(RocketChat.settings.get('uniqueID'), '');
+		const rid = meetingID.replace(settings.get('uniqueID'), '');
 
 		console.log(eventType, rid);
 
 		if (eventType === 'meeting-ended') {
-			RocketChat.saveStreamingOptions(rid, {});
+			saveStreamingOptions(rid, {});
 		}
 
 		// if (eventType === 'user-left') {
diff --git a/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js b/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
index e791f635773c..f15d859da8d0 100644
--- a/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
+++ b/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms, Messages } from 'meteor/rocketchat:models';
+import { callbacks } from 'meteor/rocketchat:callbacks';
 
 Meteor.methods({
 	'jitsi:updateTimeout': (rid) => {
@@ -9,19 +10,19 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'jitsi:updateTimeout' });
 		}
 
-		const room = RocketChat.models.Rooms.findOneById(rid);
+		const room = Rooms.findOneById(rid);
 		const currentTime = new Date().getTime();
 
 		const jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
 		if (jitsiTimeout <= currentTime) {
-			RocketChat.models.Rooms.setJitsiTimeout(rid, new Date(currentTime + 35 * 1000));
-			const message = RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('jitsi_call_started', rid, '', Meteor.user(), {
+			Rooms.setJitsiTimeout(rid, new Date(currentTime + 35 * 1000));
+			const message = Messages.createWithTypeRoomIdMessageAndUser('jitsi_call_started', rid, '', Meteor.user(), {
 				actionLinks : [
 					{ icon: 'icon-videocam', label: TAPi18n.__('Click_to_join'), method_id: 'joinJitsiCall', params: '' },
 				],
 			});
-			const room = RocketChat.models.Rooms.findOneById(rid);
+			const room = Rooms.findOneById(rid);
 			message.msg = TAPi18n.__('Started_a_video_call');
 			message.mentions = [
 				{
@@ -29,9 +30,9 @@ Meteor.methods({
 					username:'here',
 				},
 			];
-			RocketChat.callbacks.run('afterSaveMessage', message, room);
+			callbacks.run('afterSaveMessage', message, room);
 		} else if ((jitsiTimeout - currentTime) / 1000 <= 15) {
-			RocketChat.models.Rooms.setJitsiTimeout(rid, new Date(jitsiTimeout + 25 * 1000));
+			Rooms.setJitsiTimeout(rid, new Date(jitsiTimeout + 25 * 1000));
 		}
 	},
 });
diff --git a/packages/rocketchat-videobridge/server/models/Rooms.js b/packages/rocketchat-videobridge/server/models/Rooms.js
deleted file mode 100644
index f5c4a906d6d6..000000000000
--- a/packages/rocketchat-videobridge/server/models/Rooms.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * sets jitsiTimeout to indicate a call is in progress
- * @param {string} _id - Room id
- * @parm {number} time - time to set
- */
-import { RocketChat } from 'meteor/rocketchat:lib';
-
-RocketChat.models.Rooms.setJitsiTimeout = function(_id, time) {
-	const query = {
-		_id,
-	};
-
-	const update = {
-		$set: {
-			jitsiTimeout: time,
-		},
-	};
-
-	return this.update(query, update);
-};
diff --git a/packages/rocketchat-videobridge/server/settings.js b/packages/rocketchat-videobridge/server/settings.js
index 0285b387c413..2a3cf70e1e51 100644
--- a/packages/rocketchat-videobridge/server/settings.js
+++ b/packages/rocketchat-videobridge/server/settings.js
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.startup(function() {
-	RocketChat.settings.addGroup('Video Conference', function() {
+	settings.addGroup('Video Conference', function() {
 
 		this.section('BigBlueButton', function() {
 
diff --git a/packages/rocketchat-webdav/client/actionButton.js b/packages/rocketchat-webdav/client/actionButton.js
index c2c06c02a93c..8b37e4ac1ddc 100644
--- a/packages/rocketchat-webdav/client/actionButton.js
+++ b/packages/rocketchat-webdav/client/actionButton.js
@@ -1,32 +1,33 @@
 import { Meteor } from 'meteor/meteor';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { t, getURL } from 'meteor/rocketchat:utils';
+import { Subscriptions, WebdavAccounts } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
+import { MessageAction, modal } from 'meteor/rocketchat:ui-utils';
 
 Meteor.startup(function() {
 
-	RocketChat.MessageAction.addButton({
+	MessageAction.addButton({
 		id: 'webdav-upload',
 		icon: 'upload',
 		label: t('Save_To_Webdav'),
 		condition: (message) => {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (Subscriptions.findOne({ rid: message.rid }) == null) {
 				return false;
 			}
-			if (RocketChat.models.WebdavAccounts.findOne() == null) {
+			if (WebdavAccounts.findOne() == null) {
 				return false;
 			}
 			if (!message.file) {
 				return false;
 			}
 
-			return RocketChat.settings.get('Webdav_Integration_Enabled');
+			return settings.get('Webdav_Integration_Enabled');
 		},
 		action() {
 			const [, message] = this._arguments;
 			const [attachment] = message.attachments;
 			const { file } = message;
-			const url = RocketChat.getURL(attachment.title_link, { full: true });
+			const url = getURL(attachment.title_link, { full: true });
 			modal.open({
 				data: {
 					message,
diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.js b/packages/rocketchat-webdav/client/addWebdavAccount.js
index 8683b63314db..d4be6a3c6daa 100644
--- a/packages/rocketchat-webdav/client/addWebdavAccount.js
+++ b/packages/rocketchat-webdav/client/addWebdavAccount.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-webdav/client/collections/WebdavAccounts.js b/packages/rocketchat-webdav/client/collections/WebdavAccounts.js
deleted file mode 100644
index 4e35e772f4cc..000000000000
--- a/packages/rocketchat-webdav/client/collections/WebdavAccounts.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { WebdavAccounts } from 'meteor/rocketchat:models';
-
-RocketChat.models.WebdavAccounts = WebdavAccounts;
diff --git a/packages/rocketchat-webdav/client/index.js b/packages/rocketchat-webdav/client/index.js
index 191a423e1e0f..f98661ff626f 100644
--- a/packages/rocketchat-webdav/client/index.js
+++ b/packages/rocketchat-webdav/client/index.js
@@ -5,6 +5,5 @@ import './webdavFilePicker.html';
 import './webdavFilePicker';
 import './selectWebdavAccount.html';
 import './selectWebdavAccount';
-import './collections/WebdavAccounts';
 import './startup/messageBoxActions';
 import './startup/subscription';
diff --git a/packages/rocketchat-webdav/client/selectWebdavAccount.js b/packages/rocketchat-webdav/client/selectWebdavAccount.js
index 9916342180b0..ca0ca42b7047 100644
--- a/packages/rocketchat-webdav/client/selectWebdavAccount.js
+++ b/packages/rocketchat-webdav/client/selectWebdavAccount.js
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import toastr from 'toastr';
-import { modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 
 Template.selectWebdavAccount.helpers({
 	webdavAccounts() {
-		return RocketChat.models.WebdavAccounts.find().fetch();
+		return WebdavAccounts.find().fetch();
 	},
 	usernamePlusServer(account) {
 		return account.name || `${ account.username }@${ account.server_url.replace(/^https?\:\/\//i, '') }`;
diff --git a/packages/rocketchat-webdav/client/startup/messageBoxActions.js b/packages/rocketchat-webdav/client/startup/messageBoxActions.js
index 4ade4c324840..edd011207e3a 100644
--- a/packages/rocketchat-webdav/client/startup/messageBoxActions.js
+++ b/packages/rocketchat-webdav/client/startup/messageBoxActions.js
@@ -1,13 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { modal } from 'meteor/rocketchat:ui';
 import { t } from 'meteor/rocketchat:utils';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { messageBox, modal } from 'meteor/rocketchat:ui-utils';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 
-RocketChat.messageBox.actions.add('WebDAV', 'Add Server', {
+messageBox.actions.add('WebDAV', 'Add Server', {
 	id: 'add-webdav',
 	icon: 'plus',
-	condition: () => RocketChat.settings.get('Webdav_Integration_Enabled'),
+	condition: () => settings.get('Webdav_Integration_Enabled'),
 	action() {
 		modal.open({
 			title: t('Webdav_add_new_account'),
@@ -24,11 +25,11 @@ RocketChat.messageBox.actions.add('WebDAV', 'Add Server', {
 
 Meteor.startup(function() {
 	Tracker.autorun(() => {
-		const accounts = RocketChat.models.WebdavAccounts.find();
+		const accounts = WebdavAccounts.find();
 
 
 		if (accounts.count() === 0) {
-			return RocketChat.messageBox.actions.remove(/webdav-upload-/ig);
+			return messageBox.actions.remove(/webdav-upload-/ig);
 		}
 
 		accounts.forEach((account) => {
@@ -36,10 +37,10 @@ Meteor.startup(function() {
 			const title = t('Upload_From', {
 				name,
 			});
-			RocketChat.messageBox.actions.add('WebDAV', name, {
+			messageBox.actions.add('WebDAV', name, {
 				id: `webdav-upload-${ account._id.toLowerCase() }`,
 				icon: 'cloud-plus',
-				condition: () => RocketChat.settings.get('Webdav_Integration_Enabled'),
+				condition: () => settings.get('Webdav_Integration_Enabled'),
 				action() {
 					modal.open({
 						data: {
diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.js b/packages/rocketchat-webdav/client/webdavFilePicker.js
index af4e414d5472..9e3939d8fc2e 100644
--- a/packages/rocketchat-webdav/client/webdavFilePicker.js
+++ b/packages/rocketchat-webdav/client/webdavFilePicker.js
@@ -3,8 +3,7 @@ import { Template } from 'meteor/templating';
 import _ from 'underscore';
 import toastr from 'toastr';
 import { Session } from 'meteor/session';
-import { call } from 'meteor/rocketchat:lib';
-import { modal } from 'meteor/rocketchat:ui';
+import { modal, call } from 'meteor/rocketchat:ui-utils';
 import { t } from 'meteor/rocketchat:utils';
 import { fileUploadHandler } from 'meteor/rocketchat:file-upload';
 import { Handlebars } from 'meteor/ui';
diff --git a/packages/rocketchat-webdav/package.js b/packages/rocketchat-webdav/package.js
index e0df4edb26ef..5ac9a52f2b5e 100644
--- a/packages/rocketchat-webdav/package.js
+++ b/packages/rocketchat-webdav/package.js
@@ -16,7 +16,10 @@ Package.onUse(function(api) {
 		'templating',
 		'less',
 		'rocketchat:utils',
+		'rocketchat:ui-utils',
 		'rocketchat:lib',
+		'rocketchat:settings',
+		'rocketchat:models',
 		'rocketchat:api',
 		'rocketchat:grant',
 		'rocketchat:file-upload',
diff --git a/packages/rocketchat-webdav/server/index.js b/packages/rocketchat-webdav/server/index.js
index e07d22970aa0..89e645058e81 100644
--- a/packages/rocketchat-webdav/server/index.js
+++ b/packages/rocketchat-webdav/server/index.js
@@ -3,6 +3,5 @@ import './methods/removeWebdavAccount';
 import './methods/getWebdavFileList';
 import './methods/getFileFromWebdav';
 import './methods/uploadFileToWebdav';
-import './models/WebdavAccounts';
 import './publications/webdavAccounts';
 import './startup/settings';
diff --git a/packages/rocketchat-webdav/server/methods/addWebdavAccount.js b/packages/rocketchat-webdav/server/methods/addWebdavAccount.js
index aff211d4260e..ea150dbceba2 100644
--- a/packages/rocketchat-webdav/server/methods/addWebdavAccount.js
+++ b/packages/rocketchat-webdav/server/methods/addWebdavAccount.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 import { createClient } from 'webdav';
 
 Meteor.methods({
@@ -12,7 +13,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid User', { method: 'addWebdavAccount' });
 		}
 
-		if (!RocketChat.settings.get('Webdav_Integration_Enabled')) {
+		if (!settings.get('Webdav_Integration_Enabled')) {
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'addWebdavAccount' });
 		}
 
@@ -44,7 +45,7 @@ Meteor.methods({
 			name: formData.name,
 		};
 		try {
-			RocketChat.models.WebdavAccounts.insert(accountData);
+			WebdavAccounts.insert(accountData);
 			return { success: true, message: 'webdav-account-saved' };
 		} catch (error) {
 			return { success: false, message: error.code === 11000 ? 'duplicated-account' : 'unknown-write-error', error };
diff --git a/packages/rocketchat-webdav/server/methods/getFileFromWebdav.js b/packages/rocketchat-webdav/server/methods/getFileFromWebdav.js
index c6837e9deeb0..83d945ec876c 100644
--- a/packages/rocketchat-webdav/server/methods/getFileFromWebdav.js
+++ b/packages/rocketchat-webdav/server/methods/getFileFromWebdav.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 import { createClient } from 'webdav';
 
 Meteor.methods({
@@ -7,11 +8,11 @@ Meteor.methods({
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid User', { method: 'addNewWebdavAccount' });
 		}
-		if (!RocketChat.settings.get('Webdav_Integration_Enabled')) {
+		if (!settings.get('Webdav_Integration_Enabled')) {
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'addNewWebdavAccount' });
 		}
 
-		const account = RocketChat.models.WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
+		const account = WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'addNewWebdavAccount' });
 		}
diff --git a/packages/rocketchat-webdav/server/methods/getWebdavFileList.js b/packages/rocketchat-webdav/server/methods/getWebdavFileList.js
index 641c419db618..390a262ffd5e 100644
--- a/packages/rocketchat-webdav/server/methods/getWebdavFileList.js
+++ b/packages/rocketchat-webdav/server/methods/getWebdavFileList.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 import { createClient } from 'webdav';
 
 Meteor.methods({
@@ -8,11 +9,11 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid User', { method: 'addNewWebdavAccount' });
 		}
 
-		if (!RocketChat.settings.get('Webdav_Integration_Enabled')) {
+		if (!settings.get('Webdav_Integration_Enabled')) {
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'addNewWebdavAccount' });
 		}
 
-		const account = RocketChat.models.WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
+		const account = WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'addNewWebdavAccount' });
 		}
diff --git a/packages/rocketchat-webdav/server/methods/removeWebdavAccount.js b/packages/rocketchat-webdav/server/methods/removeWebdavAccount.js
index a74fff96a9d3..1de12cfe4a1c 100644
--- a/packages/rocketchat-webdav/server/methods/removeWebdavAccount.js
+++ b/packages/rocketchat-webdav/server/methods/removeWebdavAccount.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 
 Meteor.methods({
 	removeWebdavAccount(accountId) {
@@ -12,6 +12,6 @@ Meteor.methods({
 		// }
 		check(accountId, String);
 
-		return RocketChat.models.WebdavAccounts.removeByUserAndId(accountId, Meteor.userId());
+		return WebdavAccounts.removeByUserAndId(accountId, Meteor.userId());
 	},
 });
diff --git a/packages/rocketchat-webdav/server/methods/uploadFileToWebdav.js b/packages/rocketchat-webdav/server/methods/uploadFileToWebdav.js
index 416a7ee26100..6d0bab265128 100644
--- a/packages/rocketchat-webdav/server/methods/uploadFileToWebdav.js
+++ b/packages/rocketchat-webdav/server/methods/uploadFileToWebdav.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 import Future from 'fibers/future';
 import { createClient } from 'webdav';
 import stream from 'stream';
@@ -10,11 +11,11 @@ Meteor.methods({
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid User', { method: 'uploadFileToWebdav' });
 		}
-		if (!RocketChat.settings.get('Webdav_Integration_Enabled')) {
+		if (!settings.get('Webdav_Integration_Enabled')) {
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'uploadFileToWebdav' });
 		}
 
-		const account = RocketChat.models.WebdavAccounts.findOne({ _id: accountId });
+		const account = WebdavAccounts.findOne({ _id: accountId });
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'uploadFileToWebdav' });
 		}
diff --git a/packages/rocketchat-webdav/server/publications/webdavAccounts.js b/packages/rocketchat-webdav/server/publications/webdavAccounts.js
index ed8c328da354..554ffbb1a803 100644
--- a/packages/rocketchat-webdav/server/publications/webdavAccounts.js
+++ b/packages/rocketchat-webdav/server/publications/webdavAccounts.js
@@ -1,12 +1,12 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { WebdavAccounts } from 'meteor/rocketchat:models';
 
 Meteor.publish('webdavAccounts', function() {
 	if (!this.userId) {
 		return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'webdavAccounts' }));
 	}
 
-	return RocketChat.models.WebdavAccounts.findWithUserId(this.userId, {
+	return WebdavAccounts.findWithUserId(this.userId, {
 		fields: {
 			_id:1,
 			username: 1,
diff --git a/packages/rocketchat-webdav/server/startup/settings.js b/packages/rocketchat-webdav/server/startup/settings.js
index fc61c4910cf1..5b15ff9345d3 100644
--- a/packages/rocketchat-webdav/server/startup/settings.js
+++ b/packages/rocketchat-webdav/server/startup/settings.js
@@ -1,6 +1,6 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
-RocketChat.settings.addGroup('Webdav Integration', function() {
+settings.addGroup('Webdav Integration', function() {
 	this.add('Webdav_Integration_Enabled', false, {
 		type: 'boolean',
 		public: true,
diff --git a/packages/rocketchat-wordpress/lib/common.js b/packages/rocketchat-wordpress/lib/common.js
index d2c4dd52c651..1d09b2d0f73f 100644
--- a/packages/rocketchat-wordpress/lib/common.js
+++ b/packages/rocketchat-wordpress/lib/common.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 import { CustomOAuth } from 'meteor/rocketchat:custom-oauth';
 import _ from 'underscore';
@@ -18,7 +18,7 @@ const config = {
 const WordPress = new CustomOAuth('wordpress', config);
 
 const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
-	config.serverURL = RocketChat.settings.get('API_Wordpress_URL');
+	config.serverURL = settings.get('API_Wordpress_URL');
 	if (!config.serverURL) {
 		if (config.serverURL === undefined) {
 			return fillSettings();
@@ -32,27 +32,27 @@ const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 	delete config.tokenPath;
 	delete config.scope;
 
-	const serverType = RocketChat.settings.get('Accounts_OAuth_Wordpress_server_type');
+	const serverType = settings.get('Accounts_OAuth_Wordpress_server_type');
 	switch (serverType) {
 		case 'custom':
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_path')) {
-				config.identityPath = RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_path');
+			if (settings.get('Accounts_OAuth_Wordpress_identity_path')) {
+				config.identityPath = settings.get('Accounts_OAuth_Wordpress_identity_path');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via')) {
-				config.identityTokenSentVia = RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via');
+			if (settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via')) {
+				config.identityTokenSentVia = settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_token_path')) {
-				config.tokenPath = RocketChat.settings.get('Accounts_OAuth_Wordpress_token_path');
+			if (settings.get('Accounts_OAuth_Wordpress_token_path')) {
+				config.tokenPath = settings.get('Accounts_OAuth_Wordpress_token_path');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_authorize_path')) {
-				config.authorizePath = RocketChat.settings.get('Accounts_OAuth_Wordpress_authorize_path');
+			if (settings.get('Accounts_OAuth_Wordpress_authorize_path')) {
+				config.authorizePath = settings.get('Accounts_OAuth_Wordpress_authorize_path');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_scope')) {
-				config.scope = RocketChat.settings.get('Accounts_OAuth_Wordpress_scope');
+			if (settings.get('Accounts_OAuth_Wordpress_scope')) {
+				config.scope = settings.get('Accounts_OAuth_Wordpress_scope');
 			}
 			break;
 		case 'wordpress-com':
@@ -69,7 +69,7 @@ const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 
 	const result = WordPress.configure(config);
 	if (Meteor.isServer) {
-		const enabled = RocketChat.settings.get('Accounts_OAuth_Wordpress');
+		const enabled = settings.get('Accounts_OAuth_Wordpress');
 		if (enabled) {
 			ServiceConfiguration.configurations.upsert({
 				service: 'wordpress',
@@ -88,7 +88,7 @@ const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 
 if (Meteor.isServer) {
 	Meteor.startup(function() {
-		return RocketChat.settings.get(/(API\_Wordpress\_URL)?(Accounts\_OAuth\_Wordpress\_)?/, () => fillSettings());
+		return settings.get(/(API\_Wordpress\_URL)?(Accounts\_OAuth\_Wordpress\_)?/, () => fillSettings());
 	});
 } else {
 	Meteor.startup(function() {
diff --git a/packages/rocketchat-wordpress/package.js b/packages/rocketchat-wordpress/package.js
index 710d0fd7a1dc..fff092bbe450 100644
--- a/packages/rocketchat-wordpress/package.js
+++ b/packages/rocketchat-wordpress/package.js
@@ -7,7 +7,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
+		'rocketchat:settings',
 		'rocketchat:custom-oauth',
 		'templating',
 	]);
diff --git a/packages/rocketchat-wordpress/server/startup.js b/packages/rocketchat-wordpress/server/startup.js
index 3dd8d5391bf1..b247f850d687 100644
--- a/packages/rocketchat-wordpress/server/startup.js
+++ b/packages/rocketchat-wordpress/server/startup.js
@@ -1,6 +1,6 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
-RocketChat.settings.addGroup('OAuth', function() {
+settings.addGroup('OAuth', function() {
 	return this.section('WordPress', function() {
 
 		const enableQuery = {