diff --git a/packages/rocketchat-autolinker/client.js b/packages/rocketchat-autolinker/client/client.js
similarity index 100%
rename from packages/rocketchat-autolinker/client.js
rename to packages/rocketchat-autolinker/client/client.js
diff --git a/packages/rocketchat-autolinker/package.js b/packages/rocketchat-autolinker/package.js
index 5ce89297d45c..4b8c67381d82 100644
--- a/packages/rocketchat-autolinker/package.js
+++ b/packages/rocketchat-autolinker/package.js
@@ -13,7 +13,7 @@ Package.onUse(function(api) {
 	api.use('ecmascript');
 	api.use('rocketchat:lib');
 
-	api.addFiles('client.js', 'client');
+	api.addFiles('client/client.js', 'client');
 
-	api.addFiles('settings.js', 'server');
+	api.addFiles('server/settings.js', 'server');
 });
diff --git a/packages/rocketchat-autolinker/settings.js b/packages/rocketchat-autolinker/server/settings.js
similarity index 100%
rename from packages/rocketchat-autolinker/settings.js
rename to packages/rocketchat-autolinker/server/settings.js