diff --git a/packages/rocketchat-tooltip/init.js b/packages/rocketchat-tooltip/client/init.js
similarity index 100%
rename from packages/rocketchat-tooltip/init.js
rename to packages/rocketchat-tooltip/client/init.js
diff --git a/packages/rocketchat-tooltip/rocketchat-tooltip.html b/packages/rocketchat-tooltip/client/rocketchat-tooltip.html
similarity index 100%
rename from packages/rocketchat-tooltip/rocketchat-tooltip.html
rename to packages/rocketchat-tooltip/client/rocketchat-tooltip.html
diff --git a/packages/rocketchat-tooltip/rocketchat-tooltip.js b/packages/rocketchat-tooltip/client/rocketchat-tooltip.js
similarity index 100%
rename from packages/rocketchat-tooltip/rocketchat-tooltip.js
rename to packages/rocketchat-tooltip/client/rocketchat-tooltip.js
diff --git a/packages/rocketchat-tooltip/tooltip.less b/packages/rocketchat-tooltip/client/tooltip.less
similarity index 100%
rename from packages/rocketchat-tooltip/tooltip.less
rename to packages/rocketchat-tooltip/client/tooltip.less
diff --git a/packages/rocketchat-tooltip/package.js b/packages/rocketchat-tooltip/package.js
index 857ebbde68a4..941ce6dede94 100644
--- a/packages/rocketchat-tooltip/package.js
+++ b/packages/rocketchat-tooltip/package.js
@@ -14,10 +14,10 @@ Package.onUse(function(api) {
 	api.use('rocketchat:ui-master');
 	api.use('less');
 
-	api.addFiles('tooltip.less', 'client');
+	api.addFiles('client/tooltip.less', 'client');
 
-	api.addFiles('rocketchat-tooltip.html', 'client');
-	api.addFiles('rocketchat-tooltip.js', 'client');
+	api.addFiles('client/rocketchat-tooltip.html', 'client');
+	api.addFiles('client/rocketchat-tooltip.js', 'client');
 
-	api.addFiles('init.js', 'client');
+	api.addFiles('client/init.js', 'client');
 });