diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/client/message.coffee
similarity index 100%
rename from packages/rocketchat-ui-message/message/message.coffee
rename to packages/rocketchat-ui-message/client/message.coffee
diff --git a/packages/rocketchat-ui-message/message/message.html b/packages/rocketchat-ui-message/client/message.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/message.html
rename to packages/rocketchat-ui-message/client/message.html
diff --git a/packages/rocketchat-ui-message/message/messageBox.coffee b/packages/rocketchat-ui-message/client/messageBox.coffee
similarity index 100%
rename from packages/rocketchat-ui-message/message/messageBox.coffee
rename to packages/rocketchat-ui-message/client/messageBox.coffee
diff --git a/packages/rocketchat-ui-message/message/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/messageBox.html
rename to packages/rocketchat-ui-message/client/messageBox.html
diff --git a/packages/rocketchat-ui-message/message/messageDropdown.html b/packages/rocketchat-ui-message/client/messageDropdown.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/messageDropdown.html
rename to packages/rocketchat-ui-message/client/messageDropdown.html
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopup.coffee b/packages/rocketchat-ui-message/client/popup/messagePopup.coffee
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopup.coffee
rename to packages/rocketchat-ui-message/client/popup/messagePopup.coffee
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopup.html b/packages/rocketchat-ui-message/client/popup/messagePopup.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopup.html
rename to packages/rocketchat-ui-message/client/popup/messagePopup.html
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupChannel.html b/packages/rocketchat-ui-message/client/popup/messagePopupChannel.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupChannel.html
rename to packages/rocketchat-ui-message/client/popup/messagePopupChannel.html
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupChannel.js b/packages/rocketchat-ui-message/client/popup/messagePopupChannel.js
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupChannel.js
rename to packages/rocketchat-ui-message/client/popup/messagePopupChannel.js
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.coffee
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee
rename to packages/rocketchat-ui-message/client/popup/messagePopupConfig.coffee
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupConfig.html b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupConfig.html
rename to packages/rocketchat-ui-message/client/popup/messagePopupConfig.html
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupEmoji.coffee b/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.coffee
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupEmoji.coffee
rename to packages/rocketchat-ui-message/client/popup/messagePopupEmoji.coffee
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupEmoji.html b/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupEmoji.html
rename to packages/rocketchat-ui-message/client/popup/messagePopupEmoji.html
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupSlashCommand.html b/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommand.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupSlashCommand.html
rename to packages/rocketchat-ui-message/client/popup/messagePopupSlashCommand.html
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupUser.html b/packages/rocketchat-ui-message/client/popup/messagePopupUser.html
similarity index 100%
rename from packages/rocketchat-ui-message/message/popup/messagePopupUser.html
rename to packages/rocketchat-ui-message/client/popup/messagePopupUser.html
diff --git a/packages/rocketchat-ui-message/message/renderMessageBody.js b/packages/rocketchat-ui-message/client/renderMessageBody.js
similarity index 100%
rename from packages/rocketchat-ui-message/message/renderMessageBody.js
rename to packages/rocketchat-ui-message/client/renderMessageBody.js
diff --git a/packages/rocketchat-ui-message/package.js b/packages/rocketchat-ui-message/package.js
index 3478162e846..48e01dd650e 100644
--- a/packages/rocketchat-ui-message/package.js
+++ b/packages/rocketchat-ui-message/package.js
@@ -22,24 +22,24 @@ Package.onUse(function(api) {
 		'rocketchat:ui-account'
 	]);
 
-	api.addFiles('message/message.html', 'client');
-	api.addFiles('message/messageBox.html', 'client');
-	api.addFiles('message/messageDropdown.html', 'client');
-	api.addFiles('message/popup/messagePopup.html', 'client');
-	api.addFiles('message/popup/messagePopupChannel.html', 'client');
-	api.addFiles('message/popup/messagePopupConfig.html', 'client');
-	api.addFiles('message/popup/messagePopupEmoji.html', 'client');
-	api.addFiles('message/popup/messagePopupSlashCommand.html', 'client');
-	api.addFiles('message/popup/messagePopupUser.html', 'client');
+	api.addFiles('client/message.html', 'client');
+	api.addFiles('client/messageBox.html', 'client');
+	api.addFiles('client/messageDropdown.html', 'client');
+	api.addFiles('client/popup/messagePopup.html', 'client');
+	api.addFiles('client/popup/messagePopupChannel.html', 'client');
+	api.addFiles('client/popup/messagePopupConfig.html', 'client');
+	api.addFiles('client/popup/messagePopupEmoji.html', 'client');
+	api.addFiles('client/popup/messagePopupSlashCommand.html', 'client');
+	api.addFiles('client/popup/messagePopupUser.html', 'client');
 
-	api.addFiles('message/message.coffee', 'client');
-	api.addFiles('message/messageBox.coffee', 'client');
-	api.addFiles('message/popup/messagePopup.coffee', 'client');
-	api.addFiles('message/popup/messagePopupChannel.js', 'client');
-	api.addFiles('message/popup/messagePopupConfig.coffee', 'client');
-	api.addFiles('message/popup/messagePopupEmoji.coffee', 'client');
+	api.addFiles('client/message.coffee', 'client');
+	api.addFiles('client/messageBox.coffee', 'client');
+	api.addFiles('client/popup/messagePopup.coffee', 'client');
+	api.addFiles('client/popup/messagePopupChannel.js', 'client');
+	api.addFiles('client/popup/messagePopupConfig.coffee', 'client');
+	api.addFiles('client/popup/messagePopupEmoji.coffee', 'client');
 
-	api.addFiles('message/renderMessageBody.js', 'client');
+	api.addFiles('client/renderMessageBody.js', 'client');
 
 	api.export('renderMessageBody');
 });