diff --git a/.meteor/packages b/.meteor/packages
index 4afdcd082e4fc3e631ebf1ac997845087d2172b6..9d639f09aa82ac2ef9ab496d017d2d7da99fd455 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -4,7 +4,6 @@
 # but you can also edit it by hand.
 
 rocketchat:mongo-config
-rocketchat:cors
 
 accounts-facebook@1.3.2
 accounts-github@1.4.2
@@ -39,125 +38,11 @@ spacebars
 standard-minifier-js@2.4.0
 tracker@1.2.0
 
-rocketchat:2fa
-rocketchat:action-links
-rocketchat:accounts
-rocketchat:analytics
-rocketchat:api
-rocketchat:assets
-rocketchat:authorization
-rocketchat:autolinker
-rocketchat:autotranslate
-rocketchat:bot-helpers
-rocketchat:cas
-rocketchat:channel-settings
-rocketchat:channel-settings-mail-messages
-rocketchat:cloud
-rocketchat:colors
-rocketchat:crowd
-rocketchat:custom-oauth
-rocketchat:custom-sounds
-rocketchat:dolphin
-rocketchat:drupal
-rocketchat:emoji
-rocketchat:emoji-custom
-rocketchat:emoji-emojione
-rocketchat:error-handler
-rocketchat:favico
-rocketchat:federation
-rocketchat:file
-rocketchat:file-upload
-rocketchat:github-enterprise
-rocketchat:gitlab
 #rocketchat:google-natural-language
-rocketchat:google-vision
-rocketchat:grant
-rocketchat:grant-facebook
-rocketchat:grant-github
-rocketchat:grant-google
-rocketchat:graphql
-rocketchat:highlight-words
-rocketchat:iframe-login
-rocketchat:importer
-rocketchat:importer-csv
-rocketchat:importer-hipchat
-rocketchat:importer-hipchat-enterprise
-rocketchat:importer-slack
-rocketchat:importer-slack-users
-rocketchat:integrations
-rocketchat:irc
-rocketchat:issuelinks
-rocketchat:katex
-rocketchat:ldap
-rocketchat:lib
 rocketchat:livechat
-rocketchat:livestream
-rocketchat:logger
-rocketchat:login-token
-rocketchat:mailer
-rocketchat:mapview
-rocketchat:markdown
-rocketchat:mentions
-rocketchat:mentions-flextab
-rocketchat:message-action
-rocketchat:message-attachments
-rocketchat:message-mark-as-unread
-rocketchat:message-pin
-rocketchat:message-snippet
-rocketchat:message-star
-rocketchat:migrations
 rocketchat:monitoring
-rocketchat:oauth2-server-config
-rocketchat:oembed
-rocketchat:otr
-rocketchat:push-notifications
-rocketchat:reactions
-rocketchat:retention-policy
-rocketchat:apps
-rocketchat:sandstorm
-rocketchat:setup-wizard
-rocketchat:slackbridge
-rocketchat:slashcommands-archive
-rocketchat:slashcommands-asciiarts
-rocketchat:slashcommands-create
-rocketchat:slashcommands-help
-rocketchat:slashcommands-hide
-rocketchat:slashcommands-invite
-rocketchat:slashcommands-invite-all
-rocketchat:slashcommands-join
-rocketchat:slashcommands-kick
-rocketchat:slashcommands-leave
-rocketchat:slashcommands-me
-rocketchat:slashcommands-msg
-rocketchat:slashcommands-mute
-rocketchat:slashcommands-open
-rocketchat:slashcommands-topic
-rocketchat:slashcommands-unarchive
-rocketchat:slider
-rocketchat:smarsh-connector
-rocketchat:spotify
-rocketchat:statistics
 rocketchat:streamer
-rocketchat:theme
-rocketchat:tokenpass
-rocketchat:tooltip
-rocketchat:ui
-rocketchat:ui-account
-rocketchat:ui-admin
-rocketchat:ui-clean-history
-rocketchat:ui-flextab
-rocketchat:ui-login
-rocketchat:ui-master
-rocketchat:ui-message
-rocketchat:ui-sidenav
-rocketchat:ui-vrecord
-rocketchat:user-data-download
 rocketchat:version
-rocketchat:videobridge
-rocketchat:webdav
-rocketchat:webrtc
-rocketchat:wordpress
-rocketchat:nrr
 
 konecty:change-case
 konecty:delayed-task
@@ -186,29 +71,10 @@ pauli:accounts-linkedin
 raix:handlebar-helpers
 rocketchat:push
 raix:ui-dropped-event
-steffo:meteor-accounts-saml
 todda00:friendly-slugs
 yasinuslu:blaze-meta
-rocketchat:e2e
 
-rocketchat:blockstack
-rocketchat:version-check
-rocketchat:search
-chatpal:search
-rocketchat:lazy-load
 tap:i18n
-assistify:threading
 underscore@1.0.10
-rocketchat:bigbluebutton
-rocketchat:mailmessages
 juliancwirko:postcss
 littledata:synced-cron
-rocketchat:utils
-rocketchat:settings
-rocketchat:models
-rocketchat:metrics
-rocketchat:callbacks
-rocketchat:notifications
-rocketchat:promises
-rocketchat:ui-utils
-rocketchat:ui-cached-collection
diff --git a/packages/rocketchat-2fa/README.md b/app/2fa/README.md
similarity index 100%
rename from packages/rocketchat-2fa/README.md
rename to app/2fa/README.md
diff --git a/packages/rocketchat-2fa/client/TOTPPassword.js b/app/2fa/client/TOTPPassword.js
similarity index 100%
rename from packages/rocketchat-2fa/client/TOTPPassword.js
rename to app/2fa/client/TOTPPassword.js
diff --git a/packages/rocketchat-2fa/client/accountSecurity.html b/app/2fa/client/accountSecurity.html
similarity index 100%
rename from packages/rocketchat-2fa/client/accountSecurity.html
rename to app/2fa/client/accountSecurity.html
diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/app/2fa/client/accountSecurity.js
similarity index 100%
rename from packages/rocketchat-2fa/client/accountSecurity.js
rename to app/2fa/client/accountSecurity.js
diff --git a/packages/rocketchat-2fa/client/index.js b/app/2fa/client/index.js
similarity index 100%
rename from packages/rocketchat-2fa/client/index.js
rename to app/2fa/client/index.js
diff --git a/packages/rocketchat-2fa/package.js b/app/2fa/package.js
similarity index 100%
rename from packages/rocketchat-2fa/package.js
rename to app/2fa/package.js
diff --git a/packages/rocketchat-2fa/server/index.js b/app/2fa/server/index.js
similarity index 100%
rename from packages/rocketchat-2fa/server/index.js
rename to app/2fa/server/index.js
diff --git a/packages/rocketchat-2fa/server/lib/totp.js b/app/2fa/server/lib/totp.js
similarity index 100%
rename from packages/rocketchat-2fa/server/lib/totp.js
rename to app/2fa/server/lib/totp.js
diff --git a/packages/rocketchat-2fa/server/loginHandler.js b/app/2fa/server/loginHandler.js
similarity index 100%
rename from packages/rocketchat-2fa/server/loginHandler.js
rename to app/2fa/server/loginHandler.js
diff --git a/packages/rocketchat-2fa/server/methods/checkCodesRemaining.js b/app/2fa/server/methods/checkCodesRemaining.js
similarity index 100%
rename from packages/rocketchat-2fa/server/methods/checkCodesRemaining.js
rename to app/2fa/server/methods/checkCodesRemaining.js
diff --git a/packages/rocketchat-2fa/server/methods/disable.js b/app/2fa/server/methods/disable.js
similarity index 100%
rename from packages/rocketchat-2fa/server/methods/disable.js
rename to app/2fa/server/methods/disable.js
diff --git a/packages/rocketchat-2fa/server/methods/enable.js b/app/2fa/server/methods/enable.js
similarity index 100%
rename from packages/rocketchat-2fa/server/methods/enable.js
rename to app/2fa/server/methods/enable.js
diff --git a/packages/rocketchat-2fa/server/methods/regenerateCodes.js b/app/2fa/server/methods/regenerateCodes.js
similarity index 100%
rename from packages/rocketchat-2fa/server/methods/regenerateCodes.js
rename to app/2fa/server/methods/regenerateCodes.js
diff --git a/packages/rocketchat-2fa/server/methods/validateTempToken.js b/app/2fa/server/methods/validateTempToken.js
similarity index 100%
rename from packages/rocketchat-2fa/server/methods/validateTempToken.js
rename to app/2fa/server/methods/validateTempToken.js
diff --git a/packages/rocketchat-2fa/server/startup/settings.js b/app/2fa/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-2fa/server/startup/settings.js
rename to app/2fa/server/startup/settings.js
diff --git a/packages/rocketchat-accounts/README.md b/app/accounts/README.md
similarity index 100%
rename from packages/rocketchat-accounts/README.md
rename to app/accounts/README.md
diff --git a/packages/rocketchat-accounts/package.js b/app/accounts/package.js
similarity index 100%
rename from packages/rocketchat-accounts/package.js
rename to app/accounts/package.js
diff --git a/packages/rocketchat-accounts/server/config.js b/app/accounts/server/config.js
similarity index 100%
rename from packages/rocketchat-accounts/server/config.js
rename to app/accounts/server/config.js
diff --git a/packages/rocketchat-accounts/server/index.js b/app/accounts/server/index.js
similarity index 100%
rename from packages/rocketchat-accounts/server/index.js
rename to app/accounts/server/index.js
diff --git a/packages/rocketchat-action-links/README.md b/app/action-links/README.md
similarity index 100%
rename from packages/rocketchat-action-links/README.md
rename to app/action-links/README.md
diff --git a/packages/rocketchat-action-links/both/lib/actionLinks.js b/app/action-links/both/lib/actionLinks.js
similarity index 100%
rename from packages/rocketchat-action-links/both/lib/actionLinks.js
rename to app/action-links/both/lib/actionLinks.js
diff --git a/packages/rocketchat-action-links/client/index.js b/app/action-links/client/index.js
similarity index 100%
rename from packages/rocketchat-action-links/client/index.js
rename to app/action-links/client/index.js
diff --git a/packages/rocketchat-action-links/client/init.js b/app/action-links/client/init.js
similarity index 100%
rename from packages/rocketchat-action-links/client/init.js
rename to app/action-links/client/init.js
diff --git a/packages/rocketchat-action-links/client/lib/actionLinks.js b/app/action-links/client/lib/actionLinks.js
similarity index 100%
rename from packages/rocketchat-action-links/client/lib/actionLinks.js
rename to app/action-links/client/lib/actionLinks.js
diff --git a/packages/rocketchat-action-links/client/stylesheets/actionLinks.css b/app/action-links/client/stylesheets/actionLinks.css
similarity index 100%
rename from packages/rocketchat-action-links/client/stylesheets/actionLinks.css
rename to app/action-links/client/stylesheets/actionLinks.css
diff --git a/packages/rocketchat-action-links/package.js b/app/action-links/package.js
similarity index 100%
rename from packages/rocketchat-action-links/package.js
rename to app/action-links/package.js
diff --git a/packages/rocketchat-action-links/server/actionLinkHandler.js b/app/action-links/server/actionLinkHandler.js
similarity index 100%
rename from packages/rocketchat-action-links/server/actionLinkHandler.js
rename to app/action-links/server/actionLinkHandler.js
diff --git a/packages/rocketchat-action-links/server/index.js b/app/action-links/server/index.js
similarity index 100%
rename from packages/rocketchat-action-links/server/index.js
rename to app/action-links/server/index.js
diff --git a/packages/rocketchat-analytics/README.md b/app/analytics/README.md
similarity index 100%
rename from packages/rocketchat-analytics/README.md
rename to app/analytics/README.md
diff --git a/packages/rocketchat-analytics/client/index.js b/app/analytics/client/index.js
similarity index 100%
rename from packages/rocketchat-analytics/client/index.js
rename to app/analytics/client/index.js
diff --git a/packages/rocketchat-analytics/client/loadScript.js b/app/analytics/client/loadScript.js
similarity index 100%
rename from packages/rocketchat-analytics/client/loadScript.js
rename to app/analytics/client/loadScript.js
diff --git a/packages/rocketchat-analytics/client/trackEvents.js b/app/analytics/client/trackEvents.js
similarity index 100%
rename from packages/rocketchat-analytics/client/trackEvents.js
rename to app/analytics/client/trackEvents.js
diff --git a/packages/rocketchat-analytics/package.js b/app/analytics/package.js
similarity index 100%
rename from packages/rocketchat-analytics/package.js
rename to app/analytics/package.js
diff --git a/packages/rocketchat-analytics/server/index.js b/app/analytics/server/index.js
similarity index 100%
rename from packages/rocketchat-analytics/server/index.js
rename to app/analytics/server/index.js
diff --git a/packages/rocketchat-analytics/server/settings.js b/app/analytics/server/settings.js
similarity index 100%
rename from packages/rocketchat-analytics/server/settings.js
rename to app/analytics/server/settings.js
diff --git a/packages/rocketchat-api/package.js b/app/api/package.js
similarity index 100%
rename from packages/rocketchat-api/package.js
rename to app/api/package.js
diff --git a/packages/rocketchat-api/server/api.js b/app/api/server/api.js
similarity index 100%
rename from packages/rocketchat-api/server/api.js
rename to app/api/server/api.js
diff --git a/packages/rocketchat-api/server/default/info.js b/app/api/server/default/info.js
similarity index 100%
rename from packages/rocketchat-api/server/default/info.js
rename to app/api/server/default/info.js
diff --git a/packages/rocketchat-api/server/helpers/README.md b/app/api/server/helpers/README.md
similarity index 100%
rename from packages/rocketchat-api/server/helpers/README.md
rename to app/api/server/helpers/README.md
diff --git a/packages/rocketchat-api/server/helpers/composeRoomWithLastMessage.js b/app/api/server/helpers/composeRoomWithLastMessage.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/composeRoomWithLastMessage.js
rename to app/api/server/helpers/composeRoomWithLastMessage.js
diff --git a/packages/rocketchat-api/server/helpers/deprecationWarning.js b/app/api/server/helpers/deprecationWarning.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/deprecationWarning.js
rename to app/api/server/helpers/deprecationWarning.js
diff --git a/packages/rocketchat-api/server/helpers/getLoggedInUser.js b/app/api/server/helpers/getLoggedInUser.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/getLoggedInUser.js
rename to app/api/server/helpers/getLoggedInUser.js
diff --git a/packages/rocketchat-api/server/helpers/getPaginationItems.js b/app/api/server/helpers/getPaginationItems.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/getPaginationItems.js
rename to app/api/server/helpers/getPaginationItems.js
diff --git a/packages/rocketchat-api/server/helpers/getUserFromParams.js b/app/api/server/helpers/getUserFromParams.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/getUserFromParams.js
rename to app/api/server/helpers/getUserFromParams.js
diff --git a/packages/rocketchat-api/server/helpers/getUserInfo.js b/app/api/server/helpers/getUserInfo.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/getUserInfo.js
rename to app/api/server/helpers/getUserInfo.js
diff --git a/packages/rocketchat-api/server/helpers/insertUserObject.js b/app/api/server/helpers/insertUserObject.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/insertUserObject.js
rename to app/api/server/helpers/insertUserObject.js
diff --git a/packages/rocketchat-api/server/helpers/isUserFromParams.js b/app/api/server/helpers/isUserFromParams.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/isUserFromParams.js
rename to app/api/server/helpers/isUserFromParams.js
diff --git a/packages/rocketchat-api/server/helpers/parseJsonQuery.js b/app/api/server/helpers/parseJsonQuery.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/parseJsonQuery.js
rename to app/api/server/helpers/parseJsonQuery.js
diff --git a/packages/rocketchat-api/server/helpers/requestParams.js b/app/api/server/helpers/requestParams.js
similarity index 100%
rename from packages/rocketchat-api/server/helpers/requestParams.js
rename to app/api/server/helpers/requestParams.js
diff --git a/packages/rocketchat-api/server/index.js b/app/api/server/index.js
similarity index 100%
rename from packages/rocketchat-api/server/index.js
rename to app/api/server/index.js
diff --git a/packages/rocketchat-api/server/settings.js b/app/api/server/settings.js
similarity index 100%
rename from packages/rocketchat-api/server/settings.js
rename to app/api/server/settings.js
diff --git a/packages/rocketchat-api/server/v1/assets.js b/app/api/server/v1/assets.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/assets.js
rename to app/api/server/v1/assets.js
diff --git a/packages/rocketchat-api/server/v1/channels.js b/app/api/server/v1/channels.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/channels.js
rename to app/api/server/v1/channels.js
diff --git a/packages/rocketchat-api/server/v1/chat.js b/app/api/server/v1/chat.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/chat.js
rename to app/api/server/v1/chat.js
diff --git a/packages/rocketchat-api/server/v1/commands.js b/app/api/server/v1/commands.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/commands.js
rename to app/api/server/v1/commands.js
diff --git a/packages/rocketchat-api/server/v1/e2e.js b/app/api/server/v1/e2e.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/e2e.js
rename to app/api/server/v1/e2e.js
diff --git a/packages/rocketchat-api/server/v1/emoji-custom.js b/app/api/server/v1/emoji-custom.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/emoji-custom.js
rename to app/api/server/v1/emoji-custom.js
diff --git a/packages/rocketchat-api/server/v1/groups.js b/app/api/server/v1/groups.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/groups.js
rename to app/api/server/v1/groups.js
diff --git a/packages/rocketchat-api/server/v1/im.js b/app/api/server/v1/im.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/im.js
rename to app/api/server/v1/im.js
diff --git a/packages/rocketchat-api/server/v1/import.js b/app/api/server/v1/import.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/import.js
rename to app/api/server/v1/import.js
diff --git a/packages/rocketchat-api/server/v1/integrations.js b/app/api/server/v1/integrations.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/integrations.js
rename to app/api/server/v1/integrations.js
diff --git a/packages/rocketchat-api/server/v1/misc.js b/app/api/server/v1/misc.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/misc.js
rename to app/api/server/v1/misc.js
diff --git a/packages/rocketchat-api/server/v1/permissions.js b/app/api/server/v1/permissions.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/permissions.js
rename to app/api/server/v1/permissions.js
diff --git a/packages/rocketchat-api/server/v1/push.js b/app/api/server/v1/push.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/push.js
rename to app/api/server/v1/push.js
diff --git a/packages/rocketchat-api/server/v1/roles.js b/app/api/server/v1/roles.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/roles.js
rename to app/api/server/v1/roles.js
diff --git a/packages/rocketchat-api/server/v1/rooms.js b/app/api/server/v1/rooms.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/rooms.js
rename to app/api/server/v1/rooms.js
diff --git a/packages/rocketchat-api/server/v1/settings.js b/app/api/server/v1/settings.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/settings.js
rename to app/api/server/v1/settings.js
diff --git a/packages/rocketchat-api/server/v1/stats.js b/app/api/server/v1/stats.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/stats.js
rename to app/api/server/v1/stats.js
diff --git a/packages/rocketchat-api/server/v1/subscriptions.js b/app/api/server/v1/subscriptions.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/subscriptions.js
rename to app/api/server/v1/subscriptions.js
diff --git a/packages/rocketchat-api/server/v1/users.js b/app/api/server/v1/users.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/users.js
rename to app/api/server/v1/users.js
diff --git a/packages/rocketchat-api/server/v1/video-conference.js b/app/api/server/v1/video-conference.js
similarity index 100%
rename from packages/rocketchat-api/server/v1/video-conference.js
rename to app/api/server/v1/video-conference.js
diff --git a/packages/rocketchat-apps/.gitignore b/app/apps/.gitignore
similarity index 100%
rename from packages/rocketchat-apps/.gitignore
rename to app/apps/.gitignore
diff --git a/packages/rocketchat-apps/README.md b/app/apps/README.md
similarity index 100%
rename from packages/rocketchat-apps/README.md
rename to app/apps/README.md
diff --git a/packages/rocketchat-apps/assets/stylesheets/apps.css b/app/apps/assets/stylesheets/apps.css
similarity index 100%
rename from packages/rocketchat-apps/assets/stylesheets/apps.css
rename to app/apps/assets/stylesheets/apps.css
diff --git a/packages/rocketchat-apps/client/admin/appInstall.html b/app/apps/client/admin/appInstall.html
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appInstall.html
rename to app/apps/client/admin/appInstall.html
diff --git a/packages/rocketchat-apps/client/admin/appInstall.js b/app/apps/client/admin/appInstall.js
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appInstall.js
rename to app/apps/client/admin/appInstall.js
diff --git a/packages/rocketchat-apps/client/admin/appLogs.html b/app/apps/client/admin/appLogs.html
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appLogs.html
rename to app/apps/client/admin/appLogs.html
diff --git a/packages/rocketchat-apps/client/admin/appLogs.js b/app/apps/client/admin/appLogs.js
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appLogs.js
rename to app/apps/client/admin/appLogs.js
diff --git a/packages/rocketchat-apps/client/admin/appManage.html b/app/apps/client/admin/appManage.html
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appManage.html
rename to app/apps/client/admin/appManage.html
diff --git a/packages/rocketchat-apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appManage.js
rename to app/apps/client/admin/appManage.js
diff --git a/packages/rocketchat-apps/client/admin/appWhatIsIt.html b/app/apps/client/admin/appWhatIsIt.html
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appWhatIsIt.html
rename to app/apps/client/admin/appWhatIsIt.html
diff --git a/packages/rocketchat-apps/client/admin/appWhatIsIt.js b/app/apps/client/admin/appWhatIsIt.js
similarity index 100%
rename from packages/rocketchat-apps/client/admin/appWhatIsIt.js
rename to app/apps/client/admin/appWhatIsIt.js
diff --git a/packages/rocketchat-apps/client/admin/apps.html b/app/apps/client/admin/apps.html
similarity index 100%
rename from packages/rocketchat-apps/client/admin/apps.html
rename to app/apps/client/admin/apps.html
diff --git a/packages/rocketchat-apps/client/admin/apps.js b/app/apps/client/admin/apps.js
similarity index 100%
rename from packages/rocketchat-apps/client/admin/apps.js
rename to app/apps/client/admin/apps.js
diff --git a/packages/rocketchat-apps/client/communication/index.js b/app/apps/client/communication/index.js
similarity index 100%
rename from packages/rocketchat-apps/client/communication/index.js
rename to app/apps/client/communication/index.js
diff --git a/packages/rocketchat-apps/client/communication/websockets.js b/app/apps/client/communication/websockets.js
similarity index 100%
rename from packages/rocketchat-apps/client/communication/websockets.js
rename to app/apps/client/communication/websockets.js
diff --git a/packages/rocketchat-apps/client/index.js b/app/apps/client/index.js
similarity index 100%
rename from packages/rocketchat-apps/client/index.js
rename to app/apps/client/index.js
diff --git a/packages/rocketchat-apps/client/orchestrator.js b/app/apps/client/orchestrator.js
similarity index 100%
rename from packages/rocketchat-apps/client/orchestrator.js
rename to app/apps/client/orchestrator.js
diff --git a/packages/rocketchat-apps/lib/misc/Utilities.js b/app/apps/lib/misc/Utilities.js
similarity index 100%
rename from packages/rocketchat-apps/lib/misc/Utilities.js
rename to app/apps/lib/misc/Utilities.js
diff --git a/packages/rocketchat-apps/package.js b/app/apps/package.js
similarity index 100%
rename from packages/rocketchat-apps/package.js
rename to app/apps/package.js
diff --git a/packages/rocketchat-apps/server/bridges/activation.js b/app/apps/server/bridges/activation.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/activation.js
rename to app/apps/server/bridges/activation.js
diff --git a/packages/rocketchat-apps/server/bridges/api.js b/app/apps/server/bridges/api.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/api.js
rename to app/apps/server/bridges/api.js
diff --git a/packages/rocketchat-apps/server/bridges/bridges.js b/app/apps/server/bridges/bridges.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/bridges.js
rename to app/apps/server/bridges/bridges.js
diff --git a/packages/rocketchat-apps/server/bridges/commands.js b/app/apps/server/bridges/commands.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/commands.js
rename to app/apps/server/bridges/commands.js
diff --git a/packages/rocketchat-apps/server/bridges/details.js b/app/apps/server/bridges/details.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/details.js
rename to app/apps/server/bridges/details.js
diff --git a/packages/rocketchat-apps/server/bridges/environmental.js b/app/apps/server/bridges/environmental.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/environmental.js
rename to app/apps/server/bridges/environmental.js
diff --git a/packages/rocketchat-apps/server/bridges/http.js b/app/apps/server/bridges/http.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/http.js
rename to app/apps/server/bridges/http.js
diff --git a/packages/rocketchat-apps/server/bridges/index.js b/app/apps/server/bridges/index.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/index.js
rename to app/apps/server/bridges/index.js
diff --git a/packages/rocketchat-apps/server/bridges/internal.js b/app/apps/server/bridges/internal.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/internal.js
rename to app/apps/server/bridges/internal.js
diff --git a/packages/rocketchat-apps/server/bridges/listeners.js b/app/apps/server/bridges/listeners.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/listeners.js
rename to app/apps/server/bridges/listeners.js
diff --git a/packages/rocketchat-apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/messages.js
rename to app/apps/server/bridges/messages.js
diff --git a/packages/rocketchat-apps/server/bridges/persistence.js b/app/apps/server/bridges/persistence.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/persistence.js
rename to app/apps/server/bridges/persistence.js
diff --git a/packages/rocketchat-apps/server/bridges/rooms.js b/app/apps/server/bridges/rooms.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/rooms.js
rename to app/apps/server/bridges/rooms.js
diff --git a/packages/rocketchat-apps/server/bridges/settings.js b/app/apps/server/bridges/settings.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/settings.js
rename to app/apps/server/bridges/settings.js
diff --git a/packages/rocketchat-apps/server/bridges/users.js b/app/apps/server/bridges/users.js
similarity index 100%
rename from packages/rocketchat-apps/server/bridges/users.js
rename to app/apps/server/bridges/users.js
diff --git a/packages/rocketchat-apps/server/communication/index.js b/app/apps/server/communication/index.js
similarity index 100%
rename from packages/rocketchat-apps/server/communication/index.js
rename to app/apps/server/communication/index.js
diff --git a/packages/rocketchat-apps/server/communication/methods.js b/app/apps/server/communication/methods.js
similarity index 100%
rename from packages/rocketchat-apps/server/communication/methods.js
rename to app/apps/server/communication/methods.js
diff --git a/packages/rocketchat-apps/server/communication/rest.js b/app/apps/server/communication/rest.js
similarity index 100%
rename from packages/rocketchat-apps/server/communication/rest.js
rename to app/apps/server/communication/rest.js
diff --git a/packages/rocketchat-apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js
similarity index 100%
rename from packages/rocketchat-apps/server/communication/websockets.js
rename to app/apps/server/communication/websockets.js
diff --git a/packages/rocketchat-apps/server/converters/index.js b/app/apps/server/converters/index.js
similarity index 100%
rename from packages/rocketchat-apps/server/converters/index.js
rename to app/apps/server/converters/index.js
diff --git a/packages/rocketchat-apps/server/converters/messages.js b/app/apps/server/converters/messages.js
similarity index 100%
rename from packages/rocketchat-apps/server/converters/messages.js
rename to app/apps/server/converters/messages.js
diff --git a/packages/rocketchat-apps/server/converters/rooms.js b/app/apps/server/converters/rooms.js
similarity index 100%
rename from packages/rocketchat-apps/server/converters/rooms.js
rename to app/apps/server/converters/rooms.js
diff --git a/packages/rocketchat-apps/server/converters/settings.js b/app/apps/server/converters/settings.js
similarity index 100%
rename from packages/rocketchat-apps/server/converters/settings.js
rename to app/apps/server/converters/settings.js
diff --git a/packages/rocketchat-apps/server/converters/users.js b/app/apps/server/converters/users.js
similarity index 100%
rename from packages/rocketchat-apps/server/converters/users.js
rename to app/apps/server/converters/users.js
diff --git a/packages/rocketchat-apps/server/index.js b/app/apps/server/index.js
similarity index 100%
rename from packages/rocketchat-apps/server/index.js
rename to app/apps/server/index.js
diff --git a/packages/rocketchat-apps/server/orchestrator.js b/app/apps/server/orchestrator.js
similarity index 100%
rename from packages/rocketchat-apps/server/orchestrator.js
rename to app/apps/server/orchestrator.js
diff --git a/packages/rocketchat-apps/server/storage/index.js b/app/apps/server/storage/index.js
similarity index 100%
rename from packages/rocketchat-apps/server/storage/index.js
rename to app/apps/server/storage/index.js
diff --git a/packages/rocketchat-apps/server/storage/logs-storage.js b/app/apps/server/storage/logs-storage.js
similarity index 100%
rename from packages/rocketchat-apps/server/storage/logs-storage.js
rename to app/apps/server/storage/logs-storage.js
diff --git a/packages/rocketchat-apps/server/storage/storage.js b/app/apps/server/storage/storage.js
similarity index 100%
rename from packages/rocketchat-apps/server/storage/storage.js
rename to app/apps/server/storage/storage.js
diff --git a/packages/rocketchat-assets/package.js b/app/assets/package.js
similarity index 100%
rename from packages/rocketchat-assets/package.js
rename to app/assets/package.js
diff --git a/packages/rocketchat-assets/server/assets.js b/app/assets/server/assets.js
similarity index 100%
rename from packages/rocketchat-assets/server/assets.js
rename to app/assets/server/assets.js
diff --git a/packages/rocketchat-assets/server/index.js b/app/assets/server/index.js
similarity index 100%
rename from packages/rocketchat-assets/server/index.js
rename to app/assets/server/index.js
diff --git a/packages/rocketchat-authorization/README.md b/app/authorization/README.md
similarity index 100%
rename from packages/rocketchat-authorization/README.md
rename to app/authorization/README.md
diff --git a/packages/rocketchat-authorization/client/hasPermission.js b/app/authorization/client/hasPermission.js
similarity index 100%
rename from packages/rocketchat-authorization/client/hasPermission.js
rename to app/authorization/client/hasPermission.js
diff --git a/packages/rocketchat-authorization/client/hasRole.js b/app/authorization/client/hasRole.js
similarity index 100%
rename from packages/rocketchat-authorization/client/hasRole.js
rename to app/authorization/client/hasRole.js
diff --git a/packages/rocketchat-authorization/client/index.js b/app/authorization/client/index.js
similarity index 100%
rename from packages/rocketchat-authorization/client/index.js
rename to app/authorization/client/index.js
diff --git a/packages/rocketchat-authorization/client/lib/ChatPermissions.js b/app/authorization/client/lib/ChatPermissions.js
similarity index 100%
rename from packages/rocketchat-authorization/client/lib/ChatPermissions.js
rename to app/authorization/client/lib/ChatPermissions.js
diff --git a/packages/rocketchat-authorization/client/requiresPermission.html b/app/authorization/client/requiresPermission.html
similarity index 100%
rename from packages/rocketchat-authorization/client/requiresPermission.html
rename to app/authorization/client/requiresPermission.html
diff --git a/packages/rocketchat-authorization/client/route.js b/app/authorization/client/route.js
similarity index 100%
rename from packages/rocketchat-authorization/client/route.js
rename to app/authorization/client/route.js
diff --git a/packages/rocketchat-authorization/client/startup.js b/app/authorization/client/startup.js
similarity index 100%
rename from packages/rocketchat-authorization/client/startup.js
rename to app/authorization/client/startup.js
diff --git a/packages/rocketchat-authorization/client/stylesheets/permissions.css b/app/authorization/client/stylesheets/permissions.css
similarity index 100%
rename from packages/rocketchat-authorization/client/stylesheets/permissions.css
rename to app/authorization/client/stylesheets/permissions.css
diff --git a/packages/rocketchat-authorization/client/usersNameChanged.js b/app/authorization/client/usersNameChanged.js
similarity index 100%
rename from packages/rocketchat-authorization/client/usersNameChanged.js
rename to app/authorization/client/usersNameChanged.js
diff --git a/packages/rocketchat-authorization/client/views/permissions.html b/app/authorization/client/views/permissions.html
similarity index 100%
rename from packages/rocketchat-authorization/client/views/permissions.html
rename to app/authorization/client/views/permissions.html
diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/app/authorization/client/views/permissions.js
similarity index 100%
rename from packages/rocketchat-authorization/client/views/permissions.js
rename to app/authorization/client/views/permissions.js
diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.html b/app/authorization/client/views/permissionsRole.html
similarity index 100%
rename from packages/rocketchat-authorization/client/views/permissionsRole.html
rename to app/authorization/client/views/permissionsRole.html
diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.js b/app/authorization/client/views/permissionsRole.js
similarity index 100%
rename from packages/rocketchat-authorization/client/views/permissionsRole.js
rename to app/authorization/client/views/permissionsRole.js
diff --git a/packages/rocketchat-authorization/package.js b/app/authorization/package.js
similarity index 100%
rename from packages/rocketchat-authorization/package.js
rename to app/authorization/package.js
diff --git a/packages/rocketchat-authorization/server/functions/addUserRoles.js b/app/authorization/server/functions/addUserRoles.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/addUserRoles.js
rename to app/authorization/server/functions/addUserRoles.js
diff --git a/packages/rocketchat-authorization/server/functions/canAccessRoom.js b/app/authorization/server/functions/canAccessRoom.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/canAccessRoom.js
rename to app/authorization/server/functions/canAccessRoom.js
diff --git a/packages/rocketchat-authorization/server/functions/getRoles.js b/app/authorization/server/functions/getRoles.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/getRoles.js
rename to app/authorization/server/functions/getRoles.js
diff --git a/packages/rocketchat-authorization/server/functions/getUsersInRole.js b/app/authorization/server/functions/getUsersInRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/getUsersInRole.js
rename to app/authorization/server/functions/getUsersInRole.js
diff --git a/packages/rocketchat-authorization/server/functions/hasPermission.js b/app/authorization/server/functions/hasPermission.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/hasPermission.js
rename to app/authorization/server/functions/hasPermission.js
diff --git a/packages/rocketchat-authorization/server/functions/hasRole.js b/app/authorization/server/functions/hasRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/hasRole.js
rename to app/authorization/server/functions/hasRole.js
diff --git a/packages/rocketchat-authorization/server/functions/removeUserFromRoles.js b/app/authorization/server/functions/removeUserFromRoles.js
similarity index 100%
rename from packages/rocketchat-authorization/server/functions/removeUserFromRoles.js
rename to app/authorization/server/functions/removeUserFromRoles.js
diff --git a/packages/rocketchat-authorization/server/index.js b/app/authorization/server/index.js
similarity index 100%
rename from packages/rocketchat-authorization/server/index.js
rename to app/authorization/server/index.js
diff --git a/packages/rocketchat-authorization/server/methods/addPermissionToRole.js b/app/authorization/server/methods/addPermissionToRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/methods/addPermissionToRole.js
rename to app/authorization/server/methods/addPermissionToRole.js
diff --git a/packages/rocketchat-authorization/server/methods/addUserToRole.js b/app/authorization/server/methods/addUserToRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/methods/addUserToRole.js
rename to app/authorization/server/methods/addUserToRole.js
diff --git a/packages/rocketchat-authorization/server/methods/deleteRole.js b/app/authorization/server/methods/deleteRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/methods/deleteRole.js
rename to app/authorization/server/methods/deleteRole.js
diff --git a/packages/rocketchat-authorization/server/methods/removeRoleFromPermission.js b/app/authorization/server/methods/removeRoleFromPermission.js
similarity index 100%
rename from packages/rocketchat-authorization/server/methods/removeRoleFromPermission.js
rename to app/authorization/server/methods/removeRoleFromPermission.js
diff --git a/packages/rocketchat-authorization/server/methods/removeUserFromRole.js b/app/authorization/server/methods/removeUserFromRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/methods/removeUserFromRole.js
rename to app/authorization/server/methods/removeUserFromRole.js
diff --git a/packages/rocketchat-authorization/server/methods/saveRole.js b/app/authorization/server/methods/saveRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/methods/saveRole.js
rename to app/authorization/server/methods/saveRole.js
diff --git a/packages/rocketchat-authorization/server/publications/permissions.js b/app/authorization/server/publications/permissions.js
similarity index 100%
rename from packages/rocketchat-authorization/server/publications/permissions.js
rename to app/authorization/server/publications/permissions.js
diff --git a/packages/rocketchat-authorization/server/publications/roles.js b/app/authorization/server/publications/roles.js
similarity index 100%
rename from packages/rocketchat-authorization/server/publications/roles.js
rename to app/authorization/server/publications/roles.js
diff --git a/packages/rocketchat-authorization/server/publications/usersInRole.js b/app/authorization/server/publications/usersInRole.js
similarity index 100%
rename from packages/rocketchat-authorization/server/publications/usersInRole.js
rename to app/authorization/server/publications/usersInRole.js
diff --git a/packages/rocketchat-authorization/server/startup.js b/app/authorization/server/startup.js
similarity index 100%
rename from packages/rocketchat-authorization/server/startup.js
rename to app/authorization/server/startup.js
diff --git a/packages/rocketchat-autolinker/client/client.js b/app/autolinker/client/client.js
similarity index 100%
rename from packages/rocketchat-autolinker/client/client.js
rename to app/autolinker/client/client.js
diff --git a/packages/rocketchat-autolinker/client/index.js b/app/autolinker/client/index.js
similarity index 100%
rename from packages/rocketchat-autolinker/client/index.js
rename to app/autolinker/client/index.js
diff --git a/packages/rocketchat-autolinker/package.js b/app/autolinker/package.js
similarity index 100%
rename from packages/rocketchat-autolinker/package.js
rename to app/autolinker/package.js
diff --git a/packages/rocketchat-autolinker/server/index.js b/app/autolinker/server/index.js
similarity index 100%
rename from packages/rocketchat-autolinker/server/index.js
rename to app/autolinker/server/index.js
diff --git a/packages/rocketchat-autolinker/server/settings.js b/app/autolinker/server/settings.js
similarity index 100%
rename from packages/rocketchat-autolinker/server/settings.js
rename to app/autolinker/server/settings.js
diff --git a/packages/rocketchat-autotranslate/README.md b/app/autotranslate/README.md
similarity index 100%
rename from packages/rocketchat-autotranslate/README.md
rename to app/autotranslate/README.md
diff --git a/packages/rocketchat-autotranslate/client/index.js b/app/autotranslate/client/index.js
similarity index 100%
rename from packages/rocketchat-autotranslate/client/index.js
rename to app/autotranslate/client/index.js
diff --git a/packages/rocketchat-autotranslate/client/lib/actionButton.js b/app/autotranslate/client/lib/actionButton.js
similarity index 100%
rename from packages/rocketchat-autotranslate/client/lib/actionButton.js
rename to app/autotranslate/client/lib/actionButton.js
diff --git a/packages/rocketchat-autotranslate/client/lib/autotranslate.js b/app/autotranslate/client/lib/autotranslate.js
similarity index 100%
rename from packages/rocketchat-autotranslate/client/lib/autotranslate.js
rename to app/autotranslate/client/lib/autotranslate.js
diff --git a/packages/rocketchat-autotranslate/client/lib/tabBar.js b/app/autotranslate/client/lib/tabBar.js
similarity index 100%
rename from packages/rocketchat-autotranslate/client/lib/tabBar.js
rename to app/autotranslate/client/lib/tabBar.js
diff --git a/packages/rocketchat-autotranslate/client/stylesheets/autotranslate.css b/app/autotranslate/client/stylesheets/autotranslate.css
similarity index 100%
rename from packages/rocketchat-autotranslate/client/stylesheets/autotranslate.css
rename to app/autotranslate/client/stylesheets/autotranslate.css
diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.html b/app/autotranslate/client/views/autoTranslateFlexTab.html
similarity index 100%
rename from packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.html
rename to app/autotranslate/client/views/autoTranslateFlexTab.html
diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js b/app/autotranslate/client/views/autoTranslateFlexTab.js
similarity index 100%
rename from packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
rename to app/autotranslate/client/views/autoTranslateFlexTab.js
diff --git a/packages/rocketchat-autotranslate/package.js b/app/autotranslate/package.js
similarity index 100%
rename from packages/rocketchat-autotranslate/package.js
rename to app/autotranslate/package.js
diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/app/autotranslate/server/autotranslate.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/autotranslate.js
rename to app/autotranslate/server/autotranslate.js
diff --git a/packages/rocketchat-autotranslate/server/index.js b/app/autotranslate/server/index.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/index.js
rename to app/autotranslate/server/index.js
diff --git a/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js b/app/autotranslate/server/methods/getSupportedLanguages.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js
rename to app/autotranslate/server/methods/getSupportedLanguages.js
diff --git a/packages/rocketchat-autotranslate/server/methods/saveSettings.js b/app/autotranslate/server/methods/saveSettings.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/methods/saveSettings.js
rename to app/autotranslate/server/methods/saveSettings.js
diff --git a/packages/rocketchat-autotranslate/server/methods/translateMessage.js b/app/autotranslate/server/methods/translateMessage.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/methods/translateMessage.js
rename to app/autotranslate/server/methods/translateMessage.js
diff --git a/packages/rocketchat-autotranslate/server/permissions.js b/app/autotranslate/server/permissions.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/permissions.js
rename to app/autotranslate/server/permissions.js
diff --git a/packages/rocketchat-autotranslate/server/settings.js b/app/autotranslate/server/settings.js
similarity index 100%
rename from packages/rocketchat-autotranslate/server/settings.js
rename to app/autotranslate/server/settings.js
diff --git a/packages/rocketchat-bigbluebutton/package.js b/app/bigbluebutton/package.js
similarity index 100%
rename from packages/rocketchat-bigbluebutton/package.js
rename to app/bigbluebutton/package.js
diff --git a/packages/rocketchat-bigbluebutton/server/bigbluebutton-api.js b/app/bigbluebutton/server/bigbluebutton-api.js
similarity index 100%
rename from packages/rocketchat-bigbluebutton/server/bigbluebutton-api.js
rename to app/bigbluebutton/server/bigbluebutton-api.js
diff --git a/packages/rocketchat-blockstack/client/main.js b/app/blockstack/client/main.js
similarity index 100%
rename from packages/rocketchat-blockstack/client/main.js
rename to app/blockstack/client/main.js
diff --git a/packages/rocketchat-blockstack/client/routes.js b/app/blockstack/client/routes.js
similarity index 100%
rename from packages/rocketchat-blockstack/client/routes.js
rename to app/blockstack/client/routes.js
diff --git a/packages/rocketchat-blockstack/package.js b/app/blockstack/package.js
similarity index 100%
rename from packages/rocketchat-blockstack/package.js
rename to app/blockstack/package.js
diff --git a/packages/rocketchat-blockstack/server/logger.js b/app/blockstack/server/logger.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/logger.js
rename to app/blockstack/server/logger.js
diff --git a/packages/rocketchat-blockstack/server/loginHandler.js b/app/blockstack/server/loginHandler.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/loginHandler.js
rename to app/blockstack/server/loginHandler.js
diff --git a/packages/rocketchat-blockstack/server/main.js b/app/blockstack/server/main.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/main.js
rename to app/blockstack/server/main.js
diff --git a/packages/rocketchat-blockstack/server/routes.js b/app/blockstack/server/routes.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/routes.js
rename to app/blockstack/server/routes.js
diff --git a/packages/rocketchat-blockstack/server/settings.js b/app/blockstack/server/settings.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/settings.js
rename to app/blockstack/server/settings.js
diff --git a/packages/rocketchat-blockstack/server/tokenHandler.js b/app/blockstack/server/tokenHandler.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/tokenHandler.js
rename to app/blockstack/server/tokenHandler.js
diff --git a/packages/rocketchat-blockstack/server/userHandler.js b/app/blockstack/server/userHandler.js
similarity index 100%
rename from packages/rocketchat-blockstack/server/userHandler.js
rename to app/blockstack/server/userHandler.js
diff --git a/packages/rocketchat-bot-helpers/README.md b/app/bot-helpers/README.md
similarity index 100%
rename from packages/rocketchat-bot-helpers/README.md
rename to app/bot-helpers/README.md
diff --git a/packages/rocketchat-bot-helpers/package.js b/app/bot-helpers/package.js
similarity index 100%
rename from packages/rocketchat-bot-helpers/package.js
rename to app/bot-helpers/package.js
diff --git a/packages/rocketchat-bot-helpers/server/index.js b/app/bot-helpers/server/index.js
similarity index 100%
rename from packages/rocketchat-bot-helpers/server/index.js
rename to app/bot-helpers/server/index.js
diff --git a/packages/rocketchat-bot-helpers/server/settings.js b/app/bot-helpers/server/settings.js
similarity index 100%
rename from packages/rocketchat-bot-helpers/server/settings.js
rename to app/bot-helpers/server/settings.js
diff --git a/packages/rocketchat-callbacks/client/index.js b/app/callbacks/client/index.js
similarity index 100%
rename from packages/rocketchat-callbacks/client/index.js
rename to app/callbacks/client/index.js
diff --git a/packages/rocketchat-callbacks/lib/callbacks.js b/app/callbacks/lib/callbacks.js
similarity index 100%
rename from packages/rocketchat-callbacks/lib/callbacks.js
rename to app/callbacks/lib/callbacks.js
diff --git a/packages/rocketchat-callbacks/package.js b/app/callbacks/package.js
similarity index 100%
rename from packages/rocketchat-callbacks/package.js
rename to app/callbacks/package.js
diff --git a/packages/rocketchat-callbacks/server/index.js b/app/callbacks/server/index.js
similarity index 100%
rename from packages/rocketchat-callbacks/server/index.js
rename to app/callbacks/server/index.js
diff --git a/packages/rocketchat-cas/client/cas_client.js b/app/cas/client/cas_client.js
similarity index 100%
rename from packages/rocketchat-cas/client/cas_client.js
rename to app/cas/client/cas_client.js
diff --git a/packages/rocketchat-cas/client/index.js b/app/cas/client/index.js
similarity index 100%
rename from packages/rocketchat-cas/client/index.js
rename to app/cas/client/index.js
diff --git a/packages/rocketchat-cas/package.js b/app/cas/package.js
similarity index 100%
rename from packages/rocketchat-cas/package.js
rename to app/cas/package.js
diff --git a/packages/rocketchat-cas/server/cas_rocketchat.js b/app/cas/server/cas_rocketchat.js
similarity index 100%
rename from packages/rocketchat-cas/server/cas_rocketchat.js
rename to app/cas/server/cas_rocketchat.js
diff --git a/packages/rocketchat-cas/server/cas_server.js b/app/cas/server/cas_server.js
similarity index 100%
rename from packages/rocketchat-cas/server/cas_server.js
rename to app/cas/server/cas_server.js
diff --git a/packages/rocketchat-cas/server/index.js b/app/cas/server/index.js
similarity index 100%
rename from packages/rocketchat-cas/server/index.js
rename to app/cas/server/index.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/index.js b/app/channel-settings-mail-messages/client/index.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/client/index.js
rename to app/channel-settings-mail-messages/client/index.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/lib/startup.js b/app/channel-settings-mail-messages/client/lib/startup.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/client/lib/startup.js
rename to app/channel-settings-mail-messages/client/lib/startup.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js b/app/channel-settings-mail-messages/client/resetSelection.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js
rename to app/channel-settings-mail-messages/client/resetSelection.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html b/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.html
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html
rename to app/channel-settings-mail-messages/client/views/mailMessagesInstructions.html
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
rename to app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/package.js b/app/channel-settings-mail-messages/package.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/package.js
rename to app/channel-settings-mail-messages/package.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/server/index.js b/app/channel-settings-mail-messages/server/index.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/server/index.js
rename to app/channel-settings-mail-messages/server/index.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/server/lib/startup.js b/app/channel-settings-mail-messages/server/lib/startup.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/server/lib/startup.js
rename to app/channel-settings-mail-messages/server/lib/startup.js
diff --git a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js b/app/channel-settings-mail-messages/server/methods/mailMessages.js
similarity index 100%
rename from packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
rename to app/channel-settings-mail-messages/server/methods/mailMessages.js
diff --git a/packages/rocketchat-channel-settings/client/index.js b/app/channel-settings/client/index.js
similarity index 100%
rename from packages/rocketchat-channel-settings/client/index.js
rename to app/channel-settings/client/index.js
diff --git a/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js b/app/channel-settings/client/lib/ChannelSettings.js
similarity index 100%
rename from packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
rename to app/channel-settings/client/lib/ChannelSettings.js
diff --git a/packages/rocketchat-channel-settings/client/startup/messageTypes.js b/app/channel-settings/client/startup/messageTypes.js
similarity index 100%
rename from packages/rocketchat-channel-settings/client/startup/messageTypes.js
rename to app/channel-settings/client/startup/messageTypes.js
diff --git a/packages/rocketchat-channel-settings/client/startup/tabBar.js b/app/channel-settings/client/startup/tabBar.js
similarity index 100%
rename from packages/rocketchat-channel-settings/client/startup/tabBar.js
rename to app/channel-settings/client/startup/tabBar.js
diff --git a/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js b/app/channel-settings/client/startup/trackSettingsChange.js
similarity index 100%
rename from packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js
rename to app/channel-settings/client/startup/trackSettingsChange.js
diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css b/app/channel-settings/client/stylesheets/channel-settings.css
similarity index 100%
rename from packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
rename to app/channel-settings/client/stylesheets/channel-settings.css
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/app/channel-settings/client/views/channelSettings.html
similarity index 100%
rename from packages/rocketchat-channel-settings/client/views/channelSettings.html
rename to app/channel-settings/client/views/channelSettings.html
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
similarity index 100%
rename from packages/rocketchat-channel-settings/client/views/channelSettings.js
rename to app/channel-settings/client/views/channelSettings.js
diff --git a/packages/rocketchat-channel-settings/package.js b/app/channel-settings/package.js
similarity index 100%
rename from packages/rocketchat-channel-settings/package.js
rename to app/channel-settings/package.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveReactWhenReadOnly.js b/app/channel-settings/server/functions/saveReactWhenReadOnly.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveReactWhenReadOnly.js
rename to app/channel-settings/server/functions/saveReactWhenReadOnly.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js b/app/channel-settings/server/functions/saveRoomAnnouncement.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js
rename to app/channel-settings/server/functions/saveRoomAnnouncement.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomCustomFields.js b/app/channel-settings/server/functions/saveRoomCustomFields.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomCustomFields.js
rename to app/channel-settings/server/functions/saveRoomCustomFields.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js b/app/channel-settings/server/functions/saveRoomDescription.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js
rename to app/channel-settings/server/functions/saveRoomDescription.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomName.js b/app/channel-settings/server/functions/saveRoomName.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomName.js
rename to app/channel-settings/server/functions/saveRoomName.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomReadOnly.js b/app/channel-settings/server/functions/saveRoomReadOnly.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomReadOnly.js
rename to app/channel-settings/server/functions/saveRoomReadOnly.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomSystemMessages.js b/app/channel-settings/server/functions/saveRoomSystemMessages.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomSystemMessages.js
rename to app/channel-settings/server/functions/saveRoomSystemMessages.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomTokens.js b/app/channel-settings/server/functions/saveRoomTokens.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomTokens.js
rename to app/channel-settings/server/functions/saveRoomTokens.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js b/app/channel-settings/server/functions/saveRoomTopic.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js
rename to app/channel-settings/server/functions/saveRoomTopic.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomType.js b/app/channel-settings/server/functions/saveRoomType.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveRoomType.js
rename to app/channel-settings/server/functions/saveRoomType.js
diff --git a/packages/rocketchat-channel-settings/server/functions/saveStreamingOptions.js b/app/channel-settings/server/functions/saveStreamingOptions.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/functions/saveStreamingOptions.js
rename to app/channel-settings/server/functions/saveStreamingOptions.js
diff --git a/packages/rocketchat-channel-settings/server/index.js b/app/channel-settings/server/index.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/index.js
rename to app/channel-settings/server/index.js
diff --git a/packages/rocketchat-channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/methods/saveRoomSettings.js
rename to app/channel-settings/server/methods/saveRoomSettings.js
diff --git a/packages/rocketchat-channel-settings/server/startup.js b/app/channel-settings/server/startup.js
similarity index 100%
rename from packages/rocketchat-channel-settings/server/startup.js
rename to app/channel-settings/server/startup.js
diff --git a/packages/chatpal-search/client/index.js b/app/chatpal-search/client/index.js
similarity index 100%
rename from packages/chatpal-search/client/index.js
rename to app/chatpal-search/client/index.js
diff --git a/packages/chatpal-search/client/route.js b/app/chatpal-search/client/route.js
similarity index 100%
rename from packages/chatpal-search/client/route.js
rename to app/chatpal-search/client/route.js
diff --git a/packages/chatpal-search/client/style.css b/app/chatpal-search/client/style.css
similarity index 100%
rename from packages/chatpal-search/client/style.css
rename to app/chatpal-search/client/style.css
diff --git a/packages/chatpal-search/client/template/admin.html b/app/chatpal-search/client/template/admin.html
similarity index 100%
rename from packages/chatpal-search/client/template/admin.html
rename to app/chatpal-search/client/template/admin.html
diff --git a/packages/chatpal-search/client/template/admin.js b/app/chatpal-search/client/template/admin.js
similarity index 100%
rename from packages/chatpal-search/client/template/admin.js
rename to app/chatpal-search/client/template/admin.js
diff --git a/packages/chatpal-search/client/template/result.html b/app/chatpal-search/client/template/result.html
similarity index 100%
rename from packages/chatpal-search/client/template/result.html
rename to app/chatpal-search/client/template/result.html
diff --git a/packages/chatpal-search/client/template/result.js b/app/chatpal-search/client/template/result.js
similarity index 100%
rename from packages/chatpal-search/client/template/result.js
rename to app/chatpal-search/client/template/result.js
diff --git a/packages/chatpal-search/client/template/suggestion.html b/app/chatpal-search/client/template/suggestion.html
similarity index 100%
rename from packages/chatpal-search/client/template/suggestion.html
rename to app/chatpal-search/client/template/suggestion.html
diff --git a/packages/chatpal-search/client/template/suggestion.js b/app/chatpal-search/client/template/suggestion.js
similarity index 100%
rename from packages/chatpal-search/client/template/suggestion.js
rename to app/chatpal-search/client/template/suggestion.js
diff --git a/packages/chatpal-search/package.js b/app/chatpal-search/package.js
similarity index 100%
rename from packages/chatpal-search/package.js
rename to app/chatpal-search/package.js
diff --git a/packages/chatpal-search/server/asset/config.js b/app/chatpal-search/server/asset/config.js
similarity index 100%
rename from packages/chatpal-search/server/asset/config.js
rename to app/chatpal-search/server/asset/config.js
diff --git a/packages/chatpal-search/server/index.js b/app/chatpal-search/server/index.js
similarity index 100%
rename from packages/chatpal-search/server/index.js
rename to app/chatpal-search/server/index.js
diff --git a/packages/chatpal-search/server/provider/index.js b/app/chatpal-search/server/provider/index.js
similarity index 100%
rename from packages/chatpal-search/server/provider/index.js
rename to app/chatpal-search/server/provider/index.js
diff --git a/packages/chatpal-search/server/provider/provider.js b/app/chatpal-search/server/provider/provider.js
similarity index 100%
rename from packages/chatpal-search/server/provider/provider.js
rename to app/chatpal-search/server/provider/provider.js
diff --git a/packages/chatpal-search/server/utils/logger.js b/app/chatpal-search/server/utils/logger.js
similarity index 100%
rename from packages/chatpal-search/server/utils/logger.js
rename to app/chatpal-search/server/utils/logger.js
diff --git a/packages/chatpal-search/server/utils/utils.js b/app/chatpal-search/server/utils/utils.js
similarity index 100%
rename from packages/chatpal-search/server/utils/utils.js
rename to app/chatpal-search/server/utils/utils.js
diff --git a/packages/rocketchat-cloud/client/admin/callback.html b/app/cloud/client/admin/callback.html
similarity index 100%
rename from packages/rocketchat-cloud/client/admin/callback.html
rename to app/cloud/client/admin/callback.html
diff --git a/packages/rocketchat-cloud/client/admin/callback.js b/app/cloud/client/admin/callback.js
similarity index 100%
rename from packages/rocketchat-cloud/client/admin/callback.js
rename to app/cloud/client/admin/callback.js
diff --git a/packages/rocketchat-cloud/client/admin/cloud.html b/app/cloud/client/admin/cloud.html
similarity index 100%
rename from packages/rocketchat-cloud/client/admin/cloud.html
rename to app/cloud/client/admin/cloud.html
diff --git a/packages/rocketchat-cloud/client/admin/cloud.js b/app/cloud/client/admin/cloud.js
similarity index 100%
rename from packages/rocketchat-cloud/client/admin/cloud.js
rename to app/cloud/client/admin/cloud.js
diff --git a/packages/rocketchat-cloud/client/index.js b/app/cloud/client/index.js
similarity index 100%
rename from packages/rocketchat-cloud/client/index.js
rename to app/cloud/client/index.js
diff --git a/packages/rocketchat-cloud/package.js b/app/cloud/package.js
similarity index 100%
rename from packages/rocketchat-cloud/package.js
rename to app/cloud/package.js
diff --git a/packages/rocketchat-cloud/server/functions/connectWorkspace.js b/app/cloud/server/functions/connectWorkspace.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/connectWorkspace.js
rename to app/cloud/server/functions/connectWorkspace.js
diff --git a/packages/rocketchat-cloud/server/functions/finishOAuthAuthorization.js b/app/cloud/server/functions/finishOAuthAuthorization.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/finishOAuthAuthorization.js
rename to app/cloud/server/functions/finishOAuthAuthorization.js
diff --git a/packages/rocketchat-cloud/server/functions/getOAuthAuthorizationUrl.js b/app/cloud/server/functions/getOAuthAuthorizationUrl.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/getOAuthAuthorizationUrl.js
rename to app/cloud/server/functions/getOAuthAuthorizationUrl.js
diff --git a/packages/rocketchat-cloud/server/functions/getRedirectUri.js b/app/cloud/server/functions/getRedirectUri.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/getRedirectUri.js
rename to app/cloud/server/functions/getRedirectUri.js
diff --git a/packages/rocketchat-cloud/server/functions/getWorkspaceAccessToken.js b/app/cloud/server/functions/getWorkspaceAccessToken.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/getWorkspaceAccessToken.js
rename to app/cloud/server/functions/getWorkspaceAccessToken.js
diff --git a/packages/rocketchat-cloud/server/functions/getWorkspaceLicense.js b/app/cloud/server/functions/getWorkspaceLicense.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/getWorkspaceLicense.js
rename to app/cloud/server/functions/getWorkspaceLicense.js
diff --git a/packages/rocketchat-cloud/server/functions/retrieveRegistrationStatus.js b/app/cloud/server/functions/retrieveRegistrationStatus.js
similarity index 100%
rename from packages/rocketchat-cloud/server/functions/retrieveRegistrationStatus.js
rename to app/cloud/server/functions/retrieveRegistrationStatus.js
diff --git a/packages/rocketchat-cloud/server/index.js b/app/cloud/server/index.js
similarity index 100%
rename from packages/rocketchat-cloud/server/index.js
rename to app/cloud/server/index.js
diff --git a/packages/rocketchat-cloud/server/methods.js b/app/cloud/server/methods.js
similarity index 100%
rename from packages/rocketchat-cloud/server/methods.js
rename to app/cloud/server/methods.js
diff --git a/packages/rocketchat-colors/client/client.js b/app/colors/client/client.js
similarity index 100%
rename from packages/rocketchat-colors/client/client.js
rename to app/colors/client/client.js
diff --git a/packages/rocketchat-colors/client/index.js b/app/colors/client/index.js
similarity index 100%
rename from packages/rocketchat-colors/client/index.js
rename to app/colors/client/index.js
diff --git a/packages/rocketchat-colors/client/style.css b/app/colors/client/style.css
similarity index 100%
rename from packages/rocketchat-colors/client/style.css
rename to app/colors/client/style.css
diff --git a/packages/rocketchat-colors/package.js b/app/colors/package.js
similarity index 100%
rename from packages/rocketchat-colors/package.js
rename to app/colors/package.js
diff --git a/packages/rocketchat-colors/server/index.js b/app/colors/server/index.js
similarity index 100%
rename from packages/rocketchat-colors/server/index.js
rename to app/colors/server/index.js
diff --git a/packages/rocketchat-colors/server/settings.js b/app/colors/server/settings.js
similarity index 100%
rename from packages/rocketchat-colors/server/settings.js
rename to app/colors/server/settings.js
diff --git a/packages/rocketchat-cors/client/index.js b/app/cors/client/index.js
similarity index 100%
rename from packages/rocketchat-cors/client/index.js
rename to app/cors/client/index.js
diff --git a/packages/rocketchat-cors/lib/common.js b/app/cors/lib/common.js
similarity index 100%
rename from packages/rocketchat-cors/lib/common.js
rename to app/cors/lib/common.js
diff --git a/packages/rocketchat-cors/package.js b/app/cors/package.js
similarity index 100%
rename from packages/rocketchat-cors/package.js
rename to app/cors/package.js
diff --git a/packages/rocketchat-cors/server/cors.js b/app/cors/server/cors.js
similarity index 100%
rename from packages/rocketchat-cors/server/cors.js
rename to app/cors/server/cors.js
diff --git a/packages/rocketchat-cors/server/index.js b/app/cors/server/index.js
similarity index 100%
rename from packages/rocketchat-cors/server/index.js
rename to app/cors/server/index.js
diff --git a/packages/rocketchat-crowd/client/index.js b/app/crowd/client/index.js
similarity index 100%
rename from packages/rocketchat-crowd/client/index.js
rename to app/crowd/client/index.js
diff --git a/packages/rocketchat-crowd/client/loginHelper.js b/app/crowd/client/loginHelper.js
similarity index 100%
rename from packages/rocketchat-crowd/client/loginHelper.js
rename to app/crowd/client/loginHelper.js
diff --git a/packages/rocketchat-crowd/package.js b/app/crowd/package.js
similarity index 100%
rename from packages/rocketchat-crowd/package.js
rename to app/crowd/package.js
diff --git a/packages/rocketchat-crowd/server/crowd.js b/app/crowd/server/crowd.js
similarity index 100%
rename from packages/rocketchat-crowd/server/crowd.js
rename to app/crowd/server/crowd.js
diff --git a/packages/rocketchat-crowd/server/index.js b/app/crowd/server/index.js
similarity index 100%
rename from packages/rocketchat-crowd/server/index.js
rename to app/crowd/server/index.js
diff --git a/packages/rocketchat-crowd/server/settings.js b/app/crowd/server/settings.js
similarity index 100%
rename from packages/rocketchat-crowd/server/settings.js
rename to app/crowd/server/settings.js
diff --git a/packages/rocketchat-custom-oauth/.gitignore b/app/custom-oauth/.gitignore
similarity index 100%
rename from packages/rocketchat-custom-oauth/.gitignore
rename to app/custom-oauth/.gitignore
diff --git a/packages/rocketchat-custom-oauth/README.md b/app/custom-oauth/README.md
similarity index 100%
rename from packages/rocketchat-custom-oauth/README.md
rename to app/custom-oauth/README.md
diff --git a/packages/rocketchat-custom-oauth/client/custom_oauth_client.js b/app/custom-oauth/client/custom_oauth_client.js
similarity index 100%
rename from packages/rocketchat-custom-oauth/client/custom_oauth_client.js
rename to app/custom-oauth/client/custom_oauth_client.js
diff --git a/packages/rocketchat-custom-oauth/client/index.js b/app/custom-oauth/client/index.js
similarity index 100%
rename from packages/rocketchat-custom-oauth/client/index.js
rename to app/custom-oauth/client/index.js
diff --git a/packages/rocketchat-custom-oauth/package.js b/app/custom-oauth/package.js
similarity index 100%
rename from packages/rocketchat-custom-oauth/package.js
rename to app/custom-oauth/package.js
diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/app/custom-oauth/server/custom_oauth_server.js
similarity index 100%
rename from packages/rocketchat-custom-oauth/server/custom_oauth_server.js
rename to app/custom-oauth/server/custom_oauth_server.js
diff --git a/packages/rocketchat-custom-oauth/server/index.js b/app/custom-oauth/server/index.js
similarity index 100%
rename from packages/rocketchat-custom-oauth/server/index.js
rename to app/custom-oauth/server/index.js
diff --git a/packages/rocketchat-custom-sounds/assets/stylesheets/customSoundsAdmin.css b/app/custom-sounds/assets/stylesheets/customSoundsAdmin.css
similarity index 100%
rename from packages/rocketchat-custom-sounds/assets/stylesheets/customSoundsAdmin.css
rename to app/custom-sounds/assets/stylesheets/customSoundsAdmin.css
diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSoundEdit.html b/app/custom-sounds/client/admin/adminSoundEdit.html
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/adminSoundEdit.html
rename to app/custom-sounds/client/admin/adminSoundEdit.html
diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSoundInfo.html b/app/custom-sounds/client/admin/adminSoundInfo.html
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/adminSoundInfo.html
rename to app/custom-sounds/client/admin/adminSoundInfo.html
diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSounds.html b/app/custom-sounds/client/admin/adminSounds.html
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/adminSounds.html
rename to app/custom-sounds/client/admin/adminSounds.html
diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSounds.js b/app/custom-sounds/client/admin/adminSounds.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/adminSounds.js
rename to app/custom-sounds/client/admin/adminSounds.js
diff --git a/packages/rocketchat-custom-sounds/client/admin/route.js b/app/custom-sounds/client/admin/route.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/route.js
rename to app/custom-sounds/client/admin/route.js
diff --git a/packages/rocketchat-custom-sounds/client/admin/soundEdit.html b/app/custom-sounds/client/admin/soundEdit.html
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/soundEdit.html
rename to app/custom-sounds/client/admin/soundEdit.html
diff --git a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js b/app/custom-sounds/client/admin/soundEdit.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/soundEdit.js
rename to app/custom-sounds/client/admin/soundEdit.js
diff --git a/packages/rocketchat-custom-sounds/client/admin/soundInfo.html b/app/custom-sounds/client/admin/soundInfo.html
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/soundInfo.html
rename to app/custom-sounds/client/admin/soundInfo.html
diff --git a/packages/rocketchat-custom-sounds/client/admin/soundInfo.js b/app/custom-sounds/client/admin/soundInfo.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/soundInfo.js
rename to app/custom-sounds/client/admin/soundInfo.js
diff --git a/packages/rocketchat-custom-sounds/client/admin/startup.js b/app/custom-sounds/client/admin/startup.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/admin/startup.js
rename to app/custom-sounds/client/admin/startup.js
diff --git a/packages/rocketchat-custom-sounds/client/index.js b/app/custom-sounds/client/index.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/index.js
rename to app/custom-sounds/client/index.js
diff --git a/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js b/app/custom-sounds/client/lib/CustomSounds.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
rename to app/custom-sounds/client/lib/CustomSounds.js
diff --git a/packages/rocketchat-custom-sounds/client/notifications/deleteCustomSound.js b/app/custom-sounds/client/notifications/deleteCustomSound.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/notifications/deleteCustomSound.js
rename to app/custom-sounds/client/notifications/deleteCustomSound.js
diff --git a/packages/rocketchat-custom-sounds/client/notifications/updateCustomSound.js b/app/custom-sounds/client/notifications/updateCustomSound.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/client/notifications/updateCustomSound.js
rename to app/custom-sounds/client/notifications/updateCustomSound.js
diff --git a/packages/rocketchat-custom-sounds/package.js b/app/custom-sounds/package.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/package.js
rename to app/custom-sounds/package.js
diff --git a/packages/rocketchat-custom-sounds/server/index.js b/app/custom-sounds/server/index.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/index.js
rename to app/custom-sounds/server/index.js
diff --git a/packages/rocketchat-custom-sounds/server/methods/deleteCustomSound.js b/app/custom-sounds/server/methods/deleteCustomSound.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/methods/deleteCustomSound.js
rename to app/custom-sounds/server/methods/deleteCustomSound.js
diff --git a/packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js b/app/custom-sounds/server/methods/insertOrUpdateSound.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js
rename to app/custom-sounds/server/methods/insertOrUpdateSound.js
diff --git a/packages/rocketchat-custom-sounds/server/methods/listCustomSounds.js b/app/custom-sounds/server/methods/listCustomSounds.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/methods/listCustomSounds.js
rename to app/custom-sounds/server/methods/listCustomSounds.js
diff --git a/packages/rocketchat-custom-sounds/server/methods/uploadCustomSound.js b/app/custom-sounds/server/methods/uploadCustomSound.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/methods/uploadCustomSound.js
rename to app/custom-sounds/server/methods/uploadCustomSound.js
diff --git a/packages/rocketchat-custom-sounds/server/publications/customSounds.js b/app/custom-sounds/server/publications/customSounds.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/publications/customSounds.js
rename to app/custom-sounds/server/publications/customSounds.js
diff --git a/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js b/app/custom-sounds/server/startup/custom-sounds.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
rename to app/custom-sounds/server/startup/custom-sounds.js
diff --git a/packages/rocketchat-custom-sounds/server/startup/permissions.js b/app/custom-sounds/server/startup/permissions.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/startup/permissions.js
rename to app/custom-sounds/server/startup/permissions.js
diff --git a/packages/rocketchat-custom-sounds/server/startup/settings.js b/app/custom-sounds/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-custom-sounds/server/startup/settings.js
rename to app/custom-sounds/server/startup/settings.js
diff --git a/packages/rocketchat-dolphin/client/index.js b/app/dolphin/client/index.js
similarity index 100%
rename from packages/rocketchat-dolphin/client/index.js
rename to app/dolphin/client/index.js
diff --git a/packages/rocketchat-dolphin/client/login-button.css b/app/dolphin/client/login-button.css
similarity index 100%
rename from packages/rocketchat-dolphin/client/login-button.css
rename to app/dolphin/client/login-button.css
diff --git a/packages/rocketchat-dolphin/lib/common.js b/app/dolphin/lib/common.js
similarity index 100%
rename from packages/rocketchat-dolphin/lib/common.js
rename to app/dolphin/lib/common.js
diff --git a/packages/rocketchat-dolphin/package.js b/app/dolphin/package.js
similarity index 100%
rename from packages/rocketchat-dolphin/package.js
rename to app/dolphin/package.js
diff --git a/packages/rocketchat-dolphin/server/index.js b/app/dolphin/server/index.js
similarity index 100%
rename from packages/rocketchat-dolphin/server/index.js
rename to app/dolphin/server/index.js
diff --git a/packages/rocketchat-dolphin/server/startup.js b/app/dolphin/server/startup.js
similarity index 100%
rename from packages/rocketchat-dolphin/server/startup.js
rename to app/dolphin/server/startup.js
diff --git a/packages/rocketchat-drupal/README.md b/app/drupal/README.md
similarity index 100%
rename from packages/rocketchat-drupal/README.md
rename to app/drupal/README.md
diff --git a/packages/rocketchat-drupal/client/index.js b/app/drupal/client/index.js
similarity index 100%
rename from packages/rocketchat-drupal/client/index.js
rename to app/drupal/client/index.js
diff --git a/packages/rocketchat-drupal/client/login-button.css b/app/drupal/client/login-button.css
similarity index 100%
rename from packages/rocketchat-drupal/client/login-button.css
rename to app/drupal/client/login-button.css
diff --git a/packages/rocketchat-drupal/lib/common.js b/app/drupal/lib/common.js
similarity index 100%
rename from packages/rocketchat-drupal/lib/common.js
rename to app/drupal/lib/common.js
diff --git a/packages/rocketchat-drupal/package.js b/app/drupal/package.js
similarity index 100%
rename from packages/rocketchat-drupal/package.js
rename to app/drupal/package.js
diff --git a/packages/rocketchat-drupal/server/index.js b/app/drupal/server/index.js
similarity index 100%
rename from packages/rocketchat-drupal/server/index.js
rename to app/drupal/server/index.js
diff --git a/packages/rocketchat-drupal/server/startup.js b/app/drupal/server/startup.js
similarity index 100%
rename from packages/rocketchat-drupal/server/startup.js
rename to app/drupal/server/startup.js
diff --git a/packages/rocketchat-e2e/client/accountEncryption.html b/app/e2e/client/accountEncryption.html
similarity index 100%
rename from packages/rocketchat-e2e/client/accountEncryption.html
rename to app/e2e/client/accountEncryption.html
diff --git a/packages/rocketchat-e2e/client/accountEncryption.js b/app/e2e/client/accountEncryption.js
similarity index 100%
rename from packages/rocketchat-e2e/client/accountEncryption.js
rename to app/e2e/client/accountEncryption.js
diff --git a/packages/rocketchat-e2e/client/events.js b/app/e2e/client/events.js
similarity index 100%
rename from packages/rocketchat-e2e/client/events.js
rename to app/e2e/client/events.js
diff --git a/packages/rocketchat-e2e/client/helper.js b/app/e2e/client/helper.js
similarity index 100%
rename from packages/rocketchat-e2e/client/helper.js
rename to app/e2e/client/helper.js
diff --git a/packages/rocketchat-e2e/client/rocketchat.e2e.js b/app/e2e/client/rocketchat.e2e.js
similarity index 100%
rename from packages/rocketchat-e2e/client/rocketchat.e2e.js
rename to app/e2e/client/rocketchat.e2e.js
diff --git a/packages/rocketchat-e2e/client/rocketchat.e2e.room.js b/app/e2e/client/rocketchat.e2e.room.js
similarity index 100%
rename from packages/rocketchat-e2e/client/rocketchat.e2e.room.js
rename to app/e2e/client/rocketchat.e2e.room.js
diff --git a/packages/rocketchat-e2e/client/stylesheets/e2e.less b/app/e2e/client/stylesheets/e2e.less
similarity index 100%
rename from packages/rocketchat-e2e/client/stylesheets/e2e.less
rename to app/e2e/client/stylesheets/e2e.less
diff --git a/packages/rocketchat-e2e/package.js b/app/e2e/package.js
similarity index 100%
rename from packages/rocketchat-e2e/package.js
rename to app/e2e/package.js
diff --git a/packages/rocketchat-e2e/server/index.js b/app/e2e/server/index.js
similarity index 100%
rename from packages/rocketchat-e2e/server/index.js
rename to app/e2e/server/index.js
diff --git a/packages/rocketchat-e2e/server/methods/fetchMyKeys.js b/app/e2e/server/methods/fetchMyKeys.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/fetchMyKeys.js
rename to app/e2e/server/methods/fetchMyKeys.js
diff --git a/packages/rocketchat-e2e/server/methods/getUsersOfRoomWithoutKey.js b/app/e2e/server/methods/getUsersOfRoomWithoutKey.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/getUsersOfRoomWithoutKey.js
rename to app/e2e/server/methods/getUsersOfRoomWithoutKey.js
diff --git a/packages/rocketchat-e2e/server/methods/requestSubscriptionKeys.js b/app/e2e/server/methods/requestSubscriptionKeys.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/requestSubscriptionKeys.js
rename to app/e2e/server/methods/requestSubscriptionKeys.js
diff --git a/packages/rocketchat-e2e/server/methods/resetUserE2EKey.js b/app/e2e/server/methods/resetUserE2EKey.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/resetUserE2EKey.js
rename to app/e2e/server/methods/resetUserE2EKey.js
diff --git a/packages/rocketchat-e2e/server/methods/setRoomKeyID.js b/app/e2e/server/methods/setRoomKeyID.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/setRoomKeyID.js
rename to app/e2e/server/methods/setRoomKeyID.js
diff --git a/packages/rocketchat-e2e/server/methods/setUserPublicAndPivateKeys.js b/app/e2e/server/methods/setUserPublicAndPivateKeys.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/setUserPublicAndPivateKeys.js
rename to app/e2e/server/methods/setUserPublicAndPivateKeys.js
diff --git a/packages/rocketchat-e2e/server/methods/updateGroupKey.js b/app/e2e/server/methods/updateGroupKey.js
similarity index 100%
rename from packages/rocketchat-e2e/server/methods/updateGroupKey.js
rename to app/e2e/server/methods/updateGroupKey.js
diff --git a/packages/rocketchat-e2e/server/settings.js b/app/e2e/server/settings.js
similarity index 100%
rename from packages/rocketchat-e2e/server/settings.js
rename to app/e2e/server/settings.js
diff --git a/packages/rocketchat-emoji-custom/assets/stylesheets/emojiCustomAdmin.css b/app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css
similarity index 100%
rename from packages/rocketchat-emoji-custom/assets/stylesheets/emojiCustomAdmin.css
rename to app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css
diff --git a/packages/rocketchat-emoji-custom/client/admin/adminEmoji.html b/app/emoji-custom/client/admin/adminEmoji.html
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/adminEmoji.html
rename to app/emoji-custom/client/admin/adminEmoji.html
diff --git a/packages/rocketchat-emoji-custom/client/admin/adminEmoji.js b/app/emoji-custom/client/admin/adminEmoji.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/adminEmoji.js
rename to app/emoji-custom/client/admin/adminEmoji.js
diff --git a/packages/rocketchat-emoji-custom/client/admin/adminEmojiEdit.html b/app/emoji-custom/client/admin/adminEmojiEdit.html
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/adminEmojiEdit.html
rename to app/emoji-custom/client/admin/adminEmojiEdit.html
diff --git a/packages/rocketchat-emoji-custom/client/admin/adminEmojiInfo.html b/app/emoji-custom/client/admin/adminEmojiInfo.html
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/adminEmojiInfo.html
rename to app/emoji-custom/client/admin/adminEmojiInfo.html
diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiEdit.html b/app/emoji-custom/client/admin/emojiEdit.html
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/emojiEdit.html
rename to app/emoji-custom/client/admin/emojiEdit.html
diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiEdit.js b/app/emoji-custom/client/admin/emojiEdit.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/emojiEdit.js
rename to app/emoji-custom/client/admin/emojiEdit.js
diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiInfo.html b/app/emoji-custom/client/admin/emojiInfo.html
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/emojiInfo.html
rename to app/emoji-custom/client/admin/emojiInfo.html
diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiInfo.js b/app/emoji-custom/client/admin/emojiInfo.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/emojiInfo.js
rename to app/emoji-custom/client/admin/emojiInfo.js
diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiPreview.html b/app/emoji-custom/client/admin/emojiPreview.html
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/emojiPreview.html
rename to app/emoji-custom/client/admin/emojiPreview.html
diff --git a/packages/rocketchat-emoji-custom/client/admin/route.js b/app/emoji-custom/client/admin/route.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/route.js
rename to app/emoji-custom/client/admin/route.js
diff --git a/packages/rocketchat-emoji-custom/client/admin/startup.js b/app/emoji-custom/client/admin/startup.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/admin/startup.js
rename to app/emoji-custom/client/admin/startup.js
diff --git a/packages/rocketchat-emoji-custom/client/index.js b/app/emoji-custom/client/index.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/index.js
rename to app/emoji-custom/client/index.js
diff --git a/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js b/app/emoji-custom/client/lib/emojiCustom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/lib/emojiCustom.js
rename to app/emoji-custom/client/lib/emojiCustom.js
diff --git a/packages/rocketchat-emoji-custom/client/lib/function-isSet.js b/app/emoji-custom/client/lib/function-isSet.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/lib/function-isSet.js
rename to app/emoji-custom/client/lib/function-isSet.js
diff --git a/packages/rocketchat-emoji-custom/client/notifications/deleteEmojiCustom.js b/app/emoji-custom/client/notifications/deleteEmojiCustom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/notifications/deleteEmojiCustom.js
rename to app/emoji-custom/client/notifications/deleteEmojiCustom.js
diff --git a/packages/rocketchat-emoji-custom/client/notifications/updateEmojiCustom.js b/app/emoji-custom/client/notifications/updateEmojiCustom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/client/notifications/updateEmojiCustom.js
rename to app/emoji-custom/client/notifications/updateEmojiCustom.js
diff --git a/packages/rocketchat-emoji-custom/package.js b/app/emoji-custom/package.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/package.js
rename to app/emoji-custom/package.js
diff --git a/packages/rocketchat-emoji-custom/server/index.js b/app/emoji-custom/server/index.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/index.js
rename to app/emoji-custom/server/index.js
diff --git a/packages/rocketchat-emoji-custom/server/methods/deleteEmojiCustom.js b/app/emoji-custom/server/methods/deleteEmojiCustom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/methods/deleteEmojiCustom.js
rename to app/emoji-custom/server/methods/deleteEmojiCustom.js
diff --git a/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js b/app/emoji-custom/server/methods/insertOrUpdateEmoji.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
rename to app/emoji-custom/server/methods/insertOrUpdateEmoji.js
diff --git a/packages/rocketchat-emoji-custom/server/methods/listEmojiCustom.js b/app/emoji-custom/server/methods/listEmojiCustom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/methods/listEmojiCustom.js
rename to app/emoji-custom/server/methods/listEmojiCustom.js
diff --git a/packages/rocketchat-emoji-custom/server/methods/uploadEmojiCustom.js b/app/emoji-custom/server/methods/uploadEmojiCustom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/methods/uploadEmojiCustom.js
rename to app/emoji-custom/server/methods/uploadEmojiCustom.js
diff --git a/packages/rocketchat-emoji-custom/server/publications/fullEmojiData.js b/app/emoji-custom/server/publications/fullEmojiData.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/publications/fullEmojiData.js
rename to app/emoji-custom/server/publications/fullEmojiData.js
diff --git a/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js b/app/emoji-custom/server/startup/emoji-custom.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/startup/emoji-custom.js
rename to app/emoji-custom/server/startup/emoji-custom.js
diff --git a/packages/rocketchat-emoji-custom/server/startup/settings.js b/app/emoji-custom/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-emoji-custom/server/startup/settings.js
rename to app/emoji-custom/server/startup/settings.js
diff --git a/packages/rocketchat-emoji-emojione/.gitignore b/app/emoji-emojione/.gitignore
similarity index 100%
rename from packages/rocketchat-emoji-emojione/.gitignore
rename to app/emoji-emojione/.gitignore
diff --git a/packages/rocketchat-emoji-emojione/README.md b/app/emoji-emojione/README.md
similarity index 100%
rename from packages/rocketchat-emoji-emojione/README.md
rename to app/emoji-emojione/README.md
diff --git a/packages/rocketchat-emoji-emojione/client/index.js b/app/emoji-emojione/client/index.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/client/index.js
rename to app/emoji-emojione/client/index.js
diff --git a/packages/rocketchat-emoji-emojione/client/sprites.css b/app/emoji-emojione/client/sprites.css
similarity index 100%
rename from packages/rocketchat-emoji-emojione/client/sprites.css
rename to app/emoji-emojione/client/sprites.css
diff --git a/packages/rocketchat-emoji-emojione/emojione.sprites.mustache b/app/emoji-emojione/emojione.sprites.mustache
similarity index 100%
rename from packages/rocketchat-emoji-emojione/emojione.sprites.mustache
rename to app/emoji-emojione/emojione.sprites.mustache
diff --git a/packages/rocketchat-emoji-emojione/lib/emojiPicker.js b/app/emoji-emojione/lib/emojiPicker.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/lib/emojiPicker.js
rename to app/emoji-emojione/lib/emojiPicker.js
diff --git a/packages/rocketchat-emoji-emojione/lib/generateEmojiIndex.js b/app/emoji-emojione/lib/generateEmojiIndex.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/lib/generateEmojiIndex.js
rename to app/emoji-emojione/lib/generateEmojiIndex.js
diff --git a/packages/rocketchat-emoji-emojione/lib/rocketchat.js b/app/emoji-emojione/lib/rocketchat.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/lib/rocketchat.js
rename to app/emoji-emojione/lib/rocketchat.js
diff --git a/packages/rocketchat-emoji-emojione/package.js b/app/emoji-emojione/package.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/package.js
rename to app/emoji-emojione/package.js
diff --git a/packages/rocketchat-emoji-emojione/server/callbacks.js b/app/emoji-emojione/server/callbacks.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/server/callbacks.js
rename to app/emoji-emojione/server/callbacks.js
diff --git a/packages/rocketchat-emoji-emojione/server/index.js b/app/emoji-emojione/server/index.js
similarity index 100%
rename from packages/rocketchat-emoji-emojione/server/index.js
rename to app/emoji-emojione/server/index.js
diff --git a/packages/rocketchat-emoji/client/emojiParser.js b/app/emoji/client/emojiParser.js
similarity index 100%
rename from packages/rocketchat-emoji/client/emojiParser.js
rename to app/emoji/client/emojiParser.js
diff --git a/packages/rocketchat-emoji/client/emojiPicker.html b/app/emoji/client/emojiPicker.html
similarity index 100%
rename from packages/rocketchat-emoji/client/emojiPicker.html
rename to app/emoji/client/emojiPicker.html
diff --git a/packages/rocketchat-emoji/client/emojiPicker.js b/app/emoji/client/emojiPicker.js
similarity index 100%
rename from packages/rocketchat-emoji/client/emojiPicker.js
rename to app/emoji/client/emojiPicker.js
diff --git a/packages/rocketchat-emoji/client/function-isSet.js b/app/emoji/client/function-isSet.js
similarity index 100%
rename from packages/rocketchat-emoji/client/function-isSet.js
rename to app/emoji/client/function-isSet.js
diff --git a/packages/rocketchat-emoji/client/index.js b/app/emoji/client/index.js
similarity index 100%
rename from packages/rocketchat-emoji/client/index.js
rename to app/emoji/client/index.js
diff --git a/packages/rocketchat-emoji/client/lib/EmojiPicker.js b/app/emoji/client/lib/EmojiPicker.js
similarity index 100%
rename from packages/rocketchat-emoji/client/lib/EmojiPicker.js
rename to app/emoji/client/lib/EmojiPicker.js
diff --git a/packages/rocketchat-emoji/client/lib/emojiRenderer.js b/app/emoji/client/lib/emojiRenderer.js
similarity index 100%
rename from packages/rocketchat-emoji/client/lib/emojiRenderer.js
rename to app/emoji/client/lib/emojiRenderer.js
diff --git a/packages/rocketchat-emoji/lib/rocketchat.js b/app/emoji/lib/rocketchat.js
similarity index 100%
rename from packages/rocketchat-emoji/lib/rocketchat.js
rename to app/emoji/lib/rocketchat.js
diff --git a/packages/rocketchat-emoji/package.js b/app/emoji/package.js
similarity index 100%
rename from packages/rocketchat-emoji/package.js
rename to app/emoji/package.js
diff --git a/packages/rocketchat-emoji/server/index.js b/app/emoji/server/index.js
similarity index 100%
rename from packages/rocketchat-emoji/server/index.js
rename to app/emoji/server/index.js
diff --git a/packages/rocketchat-error-handler/package.js b/app/error-handler/package.js
similarity index 100%
rename from packages/rocketchat-error-handler/package.js
rename to app/error-handler/package.js
diff --git a/packages/rocketchat-error-handler/server/index.js b/app/error-handler/server/index.js
similarity index 100%
rename from packages/rocketchat-error-handler/server/index.js
rename to app/error-handler/server/index.js
diff --git a/packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js b/app/error-handler/server/lib/RocketChat.ErrorHandler.js
similarity index 100%
rename from packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js
rename to app/error-handler/server/lib/RocketChat.ErrorHandler.js
diff --git a/packages/rocketchat-error-handler/server/startup/settings.js b/app/error-handler/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-error-handler/server/startup/settings.js
rename to app/error-handler/server/startup/settings.js
diff --git a/packages/rocketchat-favico/client/favico.js b/app/favico/client/favico.js
similarity index 100%
rename from packages/rocketchat-favico/client/favico.js
rename to app/favico/client/favico.js
diff --git a/packages/rocketchat-favico/client/index.js b/app/favico/client/index.js
similarity index 100%
rename from packages/rocketchat-favico/client/index.js
rename to app/favico/client/index.js
diff --git a/packages/rocketchat-favico/package.js b/app/favico/package.js
similarity index 100%
rename from packages/rocketchat-favico/package.js
rename to app/favico/package.js
diff --git a/packages/rocketchat-federation/README.md b/app/federation/README.md
similarity index 100%
rename from packages/rocketchat-federation/README.md
rename to app/federation/README.md
diff --git a/packages/rocketchat-federation/client/main.js b/app/federation/client/main.js
similarity index 100%
rename from packages/rocketchat-federation/client/main.js
rename to app/federation/client/main.js
diff --git a/packages/rocketchat-federation/package.js b/app/federation/package.js
similarity index 100%
rename from packages/rocketchat-federation/package.js
rename to app/federation/package.js
diff --git a/packages/rocketchat-federation/server/federatedResources/FederatedMessage.js b/app/federation/server/federatedResources/FederatedMessage.js
similarity index 100%
rename from packages/rocketchat-federation/server/federatedResources/FederatedMessage.js
rename to app/federation/server/federatedResources/FederatedMessage.js
diff --git a/packages/rocketchat-federation/server/federatedResources/FederatedResource.js b/app/federation/server/federatedResources/FederatedResource.js
similarity index 100%
rename from packages/rocketchat-federation/server/federatedResources/FederatedResource.js
rename to app/federation/server/federatedResources/FederatedResource.js
diff --git a/packages/rocketchat-federation/server/federatedResources/FederatedRoom.js b/app/federation/server/federatedResources/FederatedRoom.js
similarity index 100%
rename from packages/rocketchat-federation/server/federatedResources/FederatedRoom.js
rename to app/federation/server/federatedResources/FederatedRoom.js
diff --git a/packages/rocketchat-federation/server/federatedResources/FederatedUser.js b/app/federation/server/federatedResources/FederatedUser.js
similarity index 100%
rename from packages/rocketchat-federation/server/federatedResources/FederatedUser.js
rename to app/federation/server/federatedResources/FederatedUser.js
diff --git a/packages/rocketchat-federation/server/federatedResources/index.js b/app/federation/server/federatedResources/index.js
similarity index 100%
rename from packages/rocketchat-federation/server/federatedResources/index.js
rename to app/federation/server/federatedResources/index.js
diff --git a/packages/rocketchat-federation/server/federation-settings.js b/app/federation/server/federation-settings.js
similarity index 100%
rename from packages/rocketchat-federation/server/federation-settings.js
rename to app/federation/server/federation-settings.js
diff --git a/packages/rocketchat-federation/server/logger.js b/app/federation/server/logger.js
similarity index 100%
rename from packages/rocketchat-federation/server/logger.js
rename to app/federation/server/logger.js
diff --git a/packages/rocketchat-federation/server/main.js b/app/federation/server/main.js
similarity index 100%
rename from packages/rocketchat-federation/server/main.js
rename to app/federation/server/main.js
diff --git a/packages/rocketchat-federation/server/methods/federationAddUser.js b/app/federation/server/methods/federationAddUser.js
similarity index 100%
rename from packages/rocketchat-federation/server/methods/federationAddUser.js
rename to app/federation/server/methods/federationAddUser.js
diff --git a/packages/rocketchat-federation/server/methods/federationSearchUsers.js b/app/federation/server/methods/federationSearchUsers.js
similarity index 100%
rename from packages/rocketchat-federation/server/methods/federationSearchUsers.js
rename to app/federation/server/methods/federationSearchUsers.js
diff --git a/packages/rocketchat-federation/server/methods/index.js b/app/federation/server/methods/index.js
similarity index 100%
rename from packages/rocketchat-federation/server/methods/index.js
rename to app/federation/server/methods/index.js
diff --git a/packages/rocketchat-federation/server/peerClient.js b/app/federation/server/peerClient.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerClient.js
rename to app/federation/server/peerClient.js
diff --git a/packages/rocketchat-federation/server/peerDNS.js b/app/federation/server/peerDNS.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerDNS.js
rename to app/federation/server/peerDNS.js
diff --git a/packages/rocketchat-federation/server/peerHTTP.js b/app/federation/server/peerHTTP.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerHTTP.js
rename to app/federation/server/peerHTTP.js
diff --git a/packages/rocketchat-federation/server/peerServer/index.js b/app/federation/server/peerServer/index.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerServer/index.js
rename to app/federation/server/peerServer/index.js
diff --git a/packages/rocketchat-federation/server/peerServer/peerServer.js b/app/federation/server/peerServer/peerServer.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerServer/peerServer.js
rename to app/federation/server/peerServer/peerServer.js
diff --git a/packages/rocketchat-federation/server/peerServer/routes/events.js b/app/federation/server/peerServer/routes/events.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerServer/routes/events.js
rename to app/federation/server/peerServer/routes/events.js
diff --git a/packages/rocketchat-federation/server/peerServer/routes/uploads.js b/app/federation/server/peerServer/routes/uploads.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerServer/routes/uploads.js
rename to app/federation/server/peerServer/routes/uploads.js
diff --git a/packages/rocketchat-federation/server/peerServer/routes/users.js b/app/federation/server/peerServer/routes/users.js
similarity index 100%
rename from packages/rocketchat-federation/server/peerServer/routes/users.js
rename to app/federation/server/peerServer/routes/users.js
diff --git a/packages/rocketchat-federation/server/settingsUpdater.js b/app/federation/server/settingsUpdater.js
similarity index 100%
rename from packages/rocketchat-federation/server/settingsUpdater.js
rename to app/federation/server/settingsUpdater.js
diff --git a/packages/rocketchat-file-upload/client/index.js b/app/file-upload/client/index.js
similarity index 100%
rename from packages/rocketchat-file-upload/client/index.js
rename to app/file-upload/client/index.js
diff --git a/packages/rocketchat-file-upload/client/lib/fileUploadHandler.js b/app/file-upload/client/lib/fileUploadHandler.js
similarity index 100%
rename from packages/rocketchat-file-upload/client/lib/fileUploadHandler.js
rename to app/file-upload/client/lib/fileUploadHandler.js
diff --git a/packages/rocketchat-file-upload/globalFileRestrictions.js b/app/file-upload/globalFileRestrictions.js
similarity index 100%
rename from packages/rocketchat-file-upload/globalFileRestrictions.js
rename to app/file-upload/globalFileRestrictions.js
diff --git a/packages/rocketchat-file-upload/lib/FileUpload.js b/app/file-upload/lib/FileUpload.js
similarity index 100%
rename from packages/rocketchat-file-upload/lib/FileUpload.js
rename to app/file-upload/lib/FileUpload.js
diff --git a/packages/rocketchat-file-upload/lib/FileUploadBase.js b/app/file-upload/lib/FileUploadBase.js
similarity index 100%
rename from packages/rocketchat-file-upload/lib/FileUploadBase.js
rename to app/file-upload/lib/FileUploadBase.js
diff --git a/packages/rocketchat-file-upload/package.js b/app/file-upload/package.js
similarity index 100%
rename from packages/rocketchat-file-upload/package.js
rename to app/file-upload/package.js
diff --git a/packages/rocketchat-file-upload/server/config/AmazonS3.js b/app/file-upload/server/config/AmazonS3.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/AmazonS3.js
rename to app/file-upload/server/config/AmazonS3.js
diff --git a/packages/rocketchat-file-upload/server/config/FileSystem.js b/app/file-upload/server/config/FileSystem.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/FileSystem.js
rename to app/file-upload/server/config/FileSystem.js
diff --git a/packages/rocketchat-file-upload/server/config/GoogleStorage.js b/app/file-upload/server/config/GoogleStorage.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/GoogleStorage.js
rename to app/file-upload/server/config/GoogleStorage.js
diff --git a/packages/rocketchat-file-upload/server/config/GridFS.js b/app/file-upload/server/config/GridFS.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/GridFS.js
rename to app/file-upload/server/config/GridFS.js
diff --git a/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js b/app/file-upload/server/config/Slingshot_DEPRECATED.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js
rename to app/file-upload/server/config/Slingshot_DEPRECATED.js
diff --git a/packages/rocketchat-file-upload/server/config/Webdav.js b/app/file-upload/server/config/Webdav.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/Webdav.js
rename to app/file-upload/server/config/Webdav.js
diff --git a/packages/rocketchat-file-upload/server/config/_configUploadStorage.js b/app/file-upload/server/config/_configUploadStorage.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/config/_configUploadStorage.js
rename to app/file-upload/server/config/_configUploadStorage.js
diff --git a/packages/rocketchat-file-upload/server/index.js b/app/file-upload/server/index.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/index.js
rename to app/file-upload/server/index.js
diff --git a/packages/rocketchat-file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/lib/FileUpload.js
rename to app/file-upload/server/lib/FileUpload.js
diff --git a/packages/rocketchat-file-upload/server/lib/proxy.js b/app/file-upload/server/lib/proxy.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/lib/proxy.js
rename to app/file-upload/server/lib/proxy.js
diff --git a/packages/rocketchat-file-upload/server/lib/requests.js b/app/file-upload/server/lib/requests.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/lib/requests.js
rename to app/file-upload/server/lib/requests.js
diff --git a/packages/rocketchat-file-upload/server/methods/getS3FileUrl.js b/app/file-upload/server/methods/getS3FileUrl.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/methods/getS3FileUrl.js
rename to app/file-upload/server/methods/getS3FileUrl.js
diff --git a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js b/app/file-upload/server/methods/sendFileMessage.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/methods/sendFileMessage.js
rename to app/file-upload/server/methods/sendFileMessage.js
diff --git a/packages/rocketchat-file-upload/server/startup/settings.js b/app/file-upload/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-file-upload/server/startup/settings.js
rename to app/file-upload/server/startup/settings.js
diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/client.js b/app/file-upload/ufs/AmazonS3/client.js
similarity index 100%
rename from packages/rocketchat-file-upload/ufs/AmazonS3/client.js
rename to app/file-upload/ufs/AmazonS3/client.js
diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/app/file-upload/ufs/AmazonS3/server.js
similarity index 100%
rename from packages/rocketchat-file-upload/ufs/AmazonS3/server.js
rename to app/file-upload/ufs/AmazonS3/server.js
diff --git a/packages/rocketchat-file-upload/ufs/GoogleStorage/client.js b/app/file-upload/ufs/GoogleStorage/client.js
similarity index 100%
rename from packages/rocketchat-file-upload/ufs/GoogleStorage/client.js
rename to app/file-upload/ufs/GoogleStorage/client.js
diff --git a/packages/rocketchat-file-upload/ufs/GoogleStorage/server.js b/app/file-upload/ufs/GoogleStorage/server.js
similarity index 100%
rename from packages/rocketchat-file-upload/ufs/GoogleStorage/server.js
rename to app/file-upload/ufs/GoogleStorage/server.js
diff --git a/packages/rocketchat-file-upload/ufs/Webdav/client.js b/app/file-upload/ufs/Webdav/client.js
similarity index 100%
rename from packages/rocketchat-file-upload/ufs/Webdav/client.js
rename to app/file-upload/ufs/Webdav/client.js
diff --git a/packages/rocketchat-file-upload/ufs/Webdav/server.js b/app/file-upload/ufs/Webdav/server.js
similarity index 100%
rename from packages/rocketchat-file-upload/ufs/Webdav/server.js
rename to app/file-upload/ufs/Webdav/server.js
diff --git a/packages/rocketchat-file/package.js b/app/file/package.js
similarity index 100%
rename from packages/rocketchat-file/package.js
rename to app/file/package.js
diff --git a/packages/rocketchat-file/server/file.server.js b/app/file/server/file.server.js
similarity index 100%
rename from packages/rocketchat-file/server/file.server.js
rename to app/file/server/file.server.js
diff --git a/packages/rocketchat-file/server/index.js b/app/file/server/index.js
similarity index 100%
rename from packages/rocketchat-file/server/index.js
rename to app/file/server/index.js
diff --git a/packages/rocketchat-github-enterprise/client/github-enterprise-login-button.css b/app/github-enterprise/client/github-enterprise-login-button.css
similarity index 100%
rename from packages/rocketchat-github-enterprise/client/github-enterprise-login-button.css
rename to app/github-enterprise/client/github-enterprise-login-button.css
diff --git a/packages/rocketchat-github-enterprise/client/index.js b/app/github-enterprise/client/index.js
similarity index 100%
rename from packages/rocketchat-github-enterprise/client/index.js
rename to app/github-enterprise/client/index.js
diff --git a/packages/rocketchat-github-enterprise/lib/common.js b/app/github-enterprise/lib/common.js
similarity index 100%
rename from packages/rocketchat-github-enterprise/lib/common.js
rename to app/github-enterprise/lib/common.js
diff --git a/packages/rocketchat-github-enterprise/package.js b/app/github-enterprise/package.js
similarity index 100%
rename from packages/rocketchat-github-enterprise/package.js
rename to app/github-enterprise/package.js
diff --git a/packages/rocketchat-github-enterprise/server/index.js b/app/github-enterprise/server/index.js
similarity index 100%
rename from packages/rocketchat-github-enterprise/server/index.js
rename to app/github-enterprise/server/index.js
diff --git a/packages/rocketchat-github-enterprise/server/startup.js b/app/github-enterprise/server/startup.js
similarity index 100%
rename from packages/rocketchat-github-enterprise/server/startup.js
rename to app/github-enterprise/server/startup.js
diff --git a/packages/rocketchat-gitlab/client/gitlab-login-button.css b/app/gitlab/client/gitlab-login-button.css
similarity index 100%
rename from packages/rocketchat-gitlab/client/gitlab-login-button.css
rename to app/gitlab/client/gitlab-login-button.css
diff --git a/packages/rocketchat-gitlab/client/index.js b/app/gitlab/client/index.js
similarity index 100%
rename from packages/rocketchat-gitlab/client/index.js
rename to app/gitlab/client/index.js
diff --git a/packages/rocketchat-gitlab/lib/common.js b/app/gitlab/lib/common.js
similarity index 100%
rename from packages/rocketchat-gitlab/lib/common.js
rename to app/gitlab/lib/common.js
diff --git a/packages/rocketchat-gitlab/package.js b/app/gitlab/package.js
similarity index 100%
rename from packages/rocketchat-gitlab/package.js
rename to app/gitlab/package.js
diff --git a/packages/rocketchat-gitlab/server/index.js b/app/gitlab/server/index.js
similarity index 100%
rename from packages/rocketchat-gitlab/server/index.js
rename to app/gitlab/server/index.js
diff --git a/packages/rocketchat-gitlab/server/startup.js b/app/gitlab/server/startup.js
similarity index 100%
rename from packages/rocketchat-gitlab/server/startup.js
rename to app/gitlab/server/startup.js
diff --git a/packages/rocketchat-google-vision/README.md b/app/google-vision/README.md
similarity index 100%
rename from packages/rocketchat-google-vision/README.md
rename to app/google-vision/README.md
diff --git a/packages/rocketchat-google-vision/client/googlevision.js b/app/google-vision/client/googlevision.js
similarity index 100%
rename from packages/rocketchat-google-vision/client/googlevision.js
rename to app/google-vision/client/googlevision.js
diff --git a/packages/rocketchat-google-vision/client/index.js b/app/google-vision/client/index.js
similarity index 100%
rename from packages/rocketchat-google-vision/client/index.js
rename to app/google-vision/client/index.js
diff --git a/packages/rocketchat-google-vision/package.js b/app/google-vision/package.js
similarity index 100%
rename from packages/rocketchat-google-vision/package.js
rename to app/google-vision/package.js
diff --git a/packages/rocketchat-google-vision/server/googlevision.js b/app/google-vision/server/googlevision.js
similarity index 100%
rename from packages/rocketchat-google-vision/server/googlevision.js
rename to app/google-vision/server/googlevision.js
diff --git a/packages/rocketchat-google-vision/server/index.js b/app/google-vision/server/index.js
similarity index 100%
rename from packages/rocketchat-google-vision/server/index.js
rename to app/google-vision/server/index.js
diff --git a/packages/rocketchat-google-vision/server/settings.js b/app/google-vision/server/settings.js
similarity index 100%
rename from packages/rocketchat-google-vision/server/settings.js
rename to app/google-vision/server/settings.js
diff --git a/packages/rocketchat-grant-facebook/README.md b/app/grant-facebook/README.md
similarity index 100%
rename from packages/rocketchat-grant-facebook/README.md
rename to app/grant-facebook/README.md
diff --git a/packages/rocketchat-grant-facebook/package.js b/app/grant-facebook/package.js
similarity index 100%
rename from packages/rocketchat-grant-facebook/package.js
rename to app/grant-facebook/package.js
diff --git a/packages/rocketchat-grant-facebook/server/index.js b/app/grant-facebook/server/index.js
similarity index 100%
rename from packages/rocketchat-grant-facebook/server/index.js
rename to app/grant-facebook/server/index.js
diff --git a/packages/rocketchat-grant-github/README.md b/app/grant-github/README.md
similarity index 100%
rename from packages/rocketchat-grant-github/README.md
rename to app/grant-github/README.md
diff --git a/packages/rocketchat-grant-github/package.js b/app/grant-github/package.js
similarity index 100%
rename from packages/rocketchat-grant-github/package.js
rename to app/grant-github/package.js
diff --git a/packages/rocketchat-grant-github/server/index.js b/app/grant-github/server/index.js
similarity index 100%
rename from packages/rocketchat-grant-github/server/index.js
rename to app/grant-github/server/index.js
diff --git a/packages/rocketchat-grant-google/README.md b/app/grant-google/README.md
similarity index 100%
rename from packages/rocketchat-grant-google/README.md
rename to app/grant-google/README.md
diff --git a/packages/rocketchat-grant-google/package.js b/app/grant-google/package.js
similarity index 100%
rename from packages/rocketchat-grant-google/package.js
rename to app/grant-google/package.js
diff --git a/packages/rocketchat-grant-google/server/index.js b/app/grant-google/server/index.js
similarity index 100%
rename from packages/rocketchat-grant-google/server/index.js
rename to app/grant-google/server/index.js
diff --git a/packages/rocketchat-grant/README.md b/app/grant/README.md
similarity index 100%
rename from packages/rocketchat-grant/README.md
rename to app/grant/README.md
diff --git a/packages/rocketchat-grant/package.js b/app/grant/package.js
similarity index 100%
rename from packages/rocketchat-grant/package.js
rename to app/grant/package.js
diff --git a/packages/rocketchat-grant/server/authenticate.js b/app/grant/server/authenticate.js
similarity index 100%
rename from packages/rocketchat-grant/server/authenticate.js
rename to app/grant/server/authenticate.js
diff --git a/packages/rocketchat-grant/server/error.js b/app/grant/server/error.js
similarity index 100%
rename from packages/rocketchat-grant/server/error.js
rename to app/grant/server/error.js
diff --git a/packages/rocketchat-grant/server/grant.js b/app/grant/server/grant.js
similarity index 100%
rename from packages/rocketchat-grant/server/grant.js
rename to app/grant/server/grant.js
diff --git a/packages/rocketchat-grant/server/index.js b/app/grant/server/index.js
similarity index 100%
rename from packages/rocketchat-grant/server/index.js
rename to app/grant/server/index.js
diff --git a/packages/rocketchat-grant/server/providers.js b/app/grant/server/providers.js
similarity index 100%
rename from packages/rocketchat-grant/server/providers.js
rename to app/grant/server/providers.js
diff --git a/packages/rocketchat-grant/server/redirect.js b/app/grant/server/redirect.js
similarity index 100%
rename from packages/rocketchat-grant/server/redirect.js
rename to app/grant/server/redirect.js
diff --git a/packages/rocketchat-grant/server/routes.js b/app/grant/server/routes.js
similarity index 100%
rename from packages/rocketchat-grant/server/routes.js
rename to app/grant/server/routes.js
diff --git a/packages/rocketchat-grant/server/settings.js b/app/grant/server/settings.js
similarity index 100%
rename from packages/rocketchat-grant/server/settings.js
rename to app/grant/server/settings.js
diff --git a/packages/rocketchat-grant/server/storage.js b/app/grant/server/storage.js
similarity index 100%
rename from packages/rocketchat-grant/server/storage.js
rename to app/grant/server/storage.js
diff --git a/packages/rocketchat-graphql/README.md b/app/graphql/README.md
similarity index 100%
rename from packages/rocketchat-graphql/README.md
rename to app/graphql/README.md
diff --git a/packages/rocketchat-graphql/package.js b/app/graphql/package.js
similarity index 100%
rename from packages/rocketchat-graphql/package.js
rename to app/graphql/package.js
diff --git a/packages/rocketchat-graphql/server/api.js b/app/graphql/server/api.js
similarity index 100%
rename from packages/rocketchat-graphql/server/api.js
rename to app/graphql/server/api.js
diff --git a/packages/rocketchat-graphql/server/helpers/authenticated.js b/app/graphql/server/helpers/authenticated.js
similarity index 100%
rename from packages/rocketchat-graphql/server/helpers/authenticated.js
rename to app/graphql/server/helpers/authenticated.js
diff --git a/packages/rocketchat-graphql/server/helpers/dateToFloat.js b/app/graphql/server/helpers/dateToFloat.js
similarity index 100%
rename from packages/rocketchat-graphql/server/helpers/dateToFloat.js
rename to app/graphql/server/helpers/dateToFloat.js
diff --git a/packages/rocketchat-graphql/server/index.js b/app/graphql/server/index.js
similarity index 100%
rename from packages/rocketchat-graphql/server/index.js
rename to app/graphql/server/index.js
diff --git a/packages/rocketchat-graphql/server/mocks/accounts/graphql-api.js b/app/graphql/server/mocks/accounts/graphql-api.js
similarity index 100%
rename from packages/rocketchat-graphql/server/mocks/accounts/graphql-api.js
rename to app/graphql/server/mocks/accounts/graphql-api.js
diff --git a/packages/rocketchat-graphql/server/resolvers/accounts/OauthProvider-type.js b/app/graphql/server/resolvers/accounts/OauthProvider-type.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/accounts/OauthProvider-type.js
rename to app/graphql/server/resolvers/accounts/OauthProvider-type.js
diff --git a/packages/rocketchat-graphql/server/resolvers/accounts/index.js b/app/graphql/server/resolvers/accounts/index.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/accounts/index.js
rename to app/graphql/server/resolvers/accounts/index.js
diff --git a/packages/rocketchat-graphql/server/resolvers/accounts/oauthProviders.js b/app/graphql/server/resolvers/accounts/oauthProviders.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/accounts/oauthProviders.js
rename to app/graphql/server/resolvers/accounts/oauthProviders.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/Channel-type.js b/app/graphql/server/resolvers/channels/Channel-type.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/Channel-type.js
rename to app/graphql/server/resolvers/channels/Channel-type.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/ChannelFilter-input.js b/app/graphql/server/resolvers/channels/ChannelFilter-input.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/ChannelFilter-input.js
rename to app/graphql/server/resolvers/channels/ChannelFilter-input.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/ChannelNameAndDirect-input.js b/app/graphql/server/resolvers/channels/ChannelNameAndDirect-input.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/ChannelNameAndDirect-input.js
rename to app/graphql/server/resolvers/channels/ChannelNameAndDirect-input.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/ChannelSort-enum.js b/app/graphql/server/resolvers/channels/ChannelSort-enum.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/ChannelSort-enum.js
rename to app/graphql/server/resolvers/channels/ChannelSort-enum.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/Privacy-enum.js b/app/graphql/server/resolvers/channels/Privacy-enum.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/Privacy-enum.js
rename to app/graphql/server/resolvers/channels/Privacy-enum.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/channelByName.js b/app/graphql/server/resolvers/channels/channelByName.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/channelByName.js
rename to app/graphql/server/resolvers/channels/channelByName.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/channels.js b/app/graphql/server/resolvers/channels/channels.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/channels.js
rename to app/graphql/server/resolvers/channels/channels.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/channelsByUser.js b/app/graphql/server/resolvers/channels/channelsByUser.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/channelsByUser.js
rename to app/graphql/server/resolvers/channels/channelsByUser.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/createChannel.js b/app/graphql/server/resolvers/channels/createChannel.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/createChannel.js
rename to app/graphql/server/resolvers/channels/createChannel.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/deleteChannel.js b/app/graphql/server/resolvers/channels/deleteChannel.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/deleteChannel.js
rename to app/graphql/server/resolvers/channels/deleteChannel.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/directChannel.js b/app/graphql/server/resolvers/channels/directChannel.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/directChannel.js
rename to app/graphql/server/resolvers/channels/directChannel.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/hideChannel.js b/app/graphql/server/resolvers/channels/hideChannel.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/hideChannel.js
rename to app/graphql/server/resolvers/channels/hideChannel.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/index.js b/app/graphql/server/resolvers/channels/index.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/index.js
rename to app/graphql/server/resolvers/channels/index.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/leaveChannel.js b/app/graphql/server/resolvers/channels/leaveChannel.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/leaveChannel.js
rename to app/graphql/server/resolvers/channels/leaveChannel.js
diff --git a/packages/rocketchat-graphql/server/resolvers/channels/settings.js b/app/graphql/server/resolvers/channels/settings.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/channels/settings.js
rename to app/graphql/server/resolvers/channels/settings.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/Message-type.js b/app/graphql/server/resolvers/messages/Message-type.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/Message-type.js
rename to app/graphql/server/resolvers/messages/Message-type.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/MessageIdentifier-input.js b/app/graphql/server/resolvers/messages/MessageIdentifier-input.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/MessageIdentifier-input.js
rename to app/graphql/server/resolvers/messages/MessageIdentifier-input.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/MessagesWithCursor-type.js b/app/graphql/server/resolvers/messages/MessagesWithCursor-type.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/MessagesWithCursor-type.js
rename to app/graphql/server/resolvers/messages/MessagesWithCursor-type.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/Reaction-type.js b/app/graphql/server/resolvers/messages/Reaction-type.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/Reaction-type.js
rename to app/graphql/server/resolvers/messages/Reaction-type.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/addReactionToMessage.js b/app/graphql/server/resolvers/messages/addReactionToMessage.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/addReactionToMessage.js
rename to app/graphql/server/resolvers/messages/addReactionToMessage.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/chatMessageAdded.js b/app/graphql/server/resolvers/messages/chatMessageAdded.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/chatMessageAdded.js
rename to app/graphql/server/resolvers/messages/chatMessageAdded.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/deleteMessage.js b/app/graphql/server/resolvers/messages/deleteMessage.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/deleteMessage.js
rename to app/graphql/server/resolvers/messages/deleteMessage.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/editMessage.js b/app/graphql/server/resolvers/messages/editMessage.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/editMessage.js
rename to app/graphql/server/resolvers/messages/editMessage.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/index.js b/app/graphql/server/resolvers/messages/index.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/index.js
rename to app/graphql/server/resolvers/messages/index.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/messages.js b/app/graphql/server/resolvers/messages/messages.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/messages.js
rename to app/graphql/server/resolvers/messages/messages.js
diff --git a/packages/rocketchat-graphql/server/resolvers/messages/sendMessage.js b/app/graphql/server/resolvers/messages/sendMessage.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/messages/sendMessage.js
rename to app/graphql/server/resolvers/messages/sendMessage.js
diff --git a/packages/rocketchat-graphql/server/resolvers/users/User-type.js b/app/graphql/server/resolvers/users/User-type.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/users/User-type.js
rename to app/graphql/server/resolvers/users/User-type.js
diff --git a/packages/rocketchat-graphql/server/resolvers/users/UserStatus-enum.js b/app/graphql/server/resolvers/users/UserStatus-enum.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/users/UserStatus-enum.js
rename to app/graphql/server/resolvers/users/UserStatus-enum.js
diff --git a/packages/rocketchat-graphql/server/resolvers/users/index.js b/app/graphql/server/resolvers/users/index.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/users/index.js
rename to app/graphql/server/resolvers/users/index.js
diff --git a/packages/rocketchat-graphql/server/resolvers/users/setStatus.js b/app/graphql/server/resolvers/users/setStatus.js
similarity index 100%
rename from packages/rocketchat-graphql/server/resolvers/users/setStatus.js
rename to app/graphql/server/resolvers/users/setStatus.js
diff --git a/packages/rocketchat-graphql/server/schema.js b/app/graphql/server/schema.js
similarity index 100%
rename from packages/rocketchat-graphql/server/schema.js
rename to app/graphql/server/schema.js
diff --git a/packages/rocketchat-graphql/server/schemas/accounts/LoginResult-type.graphqls b/app/graphql/server/schemas/accounts/LoginResult-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/accounts/LoginResult-type.graphqls
rename to app/graphql/server/schemas/accounts/LoginResult-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/accounts/OauthProvider-type.graphqls b/app/graphql/server/schemas/accounts/OauthProvider-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/accounts/OauthProvider-type.graphqls
rename to app/graphql/server/schemas/accounts/OauthProvider-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/accounts/oauthProviders.graphqls b/app/graphql/server/schemas/accounts/oauthProviders.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/accounts/oauthProviders.graphqls
rename to app/graphql/server/schemas/accounts/oauthProviders.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/Channel-type.graphqls b/app/graphql/server/schemas/channels/Channel-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/Channel-type.graphqls
rename to app/graphql/server/schemas/channels/Channel-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/ChannelFilter-input.graphqls b/app/graphql/server/schemas/channels/ChannelFilter-input.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/ChannelFilter-input.graphqls
rename to app/graphql/server/schemas/channels/ChannelFilter-input.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/ChannelNameAndDirect-input.graphqls b/app/graphql/server/schemas/channels/ChannelNameAndDirect-input.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/ChannelNameAndDirect-input.graphqls
rename to app/graphql/server/schemas/channels/ChannelNameAndDirect-input.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/ChannelSort-enum.graphqls b/app/graphql/server/schemas/channels/ChannelSort-enum.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/ChannelSort-enum.graphqls
rename to app/graphql/server/schemas/channels/ChannelSort-enum.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/Privacy-enum.graphqls b/app/graphql/server/schemas/channels/Privacy-enum.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/Privacy-enum.graphqls
rename to app/graphql/server/schemas/channels/Privacy-enum.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/channelByName.graphqls b/app/graphql/server/schemas/channels/channelByName.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/channelByName.graphqls
rename to app/graphql/server/schemas/channels/channelByName.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/channels.graphqls b/app/graphql/server/schemas/channels/channels.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/channels.graphqls
rename to app/graphql/server/schemas/channels/channels.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/channelsByUser.graphqls b/app/graphql/server/schemas/channels/channelsByUser.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/channelsByUser.graphqls
rename to app/graphql/server/schemas/channels/channelsByUser.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/createChannel.graphqls b/app/graphql/server/schemas/channels/createChannel.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/createChannel.graphqls
rename to app/graphql/server/schemas/channels/createChannel.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/deleteChannel.graphqls b/app/graphql/server/schemas/channels/deleteChannel.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/deleteChannel.graphqls
rename to app/graphql/server/schemas/channels/deleteChannel.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/directChannel.graphqls b/app/graphql/server/schemas/channels/directChannel.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/directChannel.graphqls
rename to app/graphql/server/schemas/channels/directChannel.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/hideChannel.graphqls b/app/graphql/server/schemas/channels/hideChannel.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/hideChannel.graphqls
rename to app/graphql/server/schemas/channels/hideChannel.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/channels/leaveChannel.graphqls b/app/graphql/server/schemas/channels/leaveChannel.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/channels/leaveChannel.graphqls
rename to app/graphql/server/schemas/channels/leaveChannel.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/Message-type.graphqls b/app/graphql/server/schemas/messages/Message-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/Message-type.graphqls
rename to app/graphql/server/schemas/messages/Message-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/MessageIdentifier-input.graphqls b/app/graphql/server/schemas/messages/MessageIdentifier-input.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/MessageIdentifier-input.graphqls
rename to app/graphql/server/schemas/messages/MessageIdentifier-input.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/MessagesWithCursor-type.graphqls b/app/graphql/server/schemas/messages/MessagesWithCursor-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/MessagesWithCursor-type.graphqls
rename to app/graphql/server/schemas/messages/MessagesWithCursor-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/Reaction-type.graphqls b/app/graphql/server/schemas/messages/Reaction-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/Reaction-type.graphqls
rename to app/graphql/server/schemas/messages/Reaction-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/addReactionToMessage.graphqls b/app/graphql/server/schemas/messages/addReactionToMessage.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/addReactionToMessage.graphqls
rename to app/graphql/server/schemas/messages/addReactionToMessage.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/chatMessageAdded.graphqls b/app/graphql/server/schemas/messages/chatMessageAdded.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/chatMessageAdded.graphqls
rename to app/graphql/server/schemas/messages/chatMessageAdded.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/deleteMessage.graphqls b/app/graphql/server/schemas/messages/deleteMessage.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/deleteMessage.graphqls
rename to app/graphql/server/schemas/messages/deleteMessage.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/editMessage.graphqls b/app/graphql/server/schemas/messages/editMessage.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/editMessage.graphqls
rename to app/graphql/server/schemas/messages/editMessage.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/messages.graphqls b/app/graphql/server/schemas/messages/messages.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/messages.graphqls
rename to app/graphql/server/schemas/messages/messages.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/messages/sendMessage.graphqls b/app/graphql/server/schemas/messages/sendMessage.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/messages/sendMessage.graphqls
rename to app/graphql/server/schemas/messages/sendMessage.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/users/User-type.graphqls b/app/graphql/server/schemas/users/User-type.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/users/User-type.graphqls
rename to app/graphql/server/schemas/users/User-type.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/users/UserStatus-enum.graphqls b/app/graphql/server/schemas/users/UserStatus-enum.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/users/UserStatus-enum.graphqls
rename to app/graphql/server/schemas/users/UserStatus-enum.graphqls
diff --git a/packages/rocketchat-graphql/server/schemas/users/setStatus.graphqls b/app/graphql/server/schemas/users/setStatus.graphqls
similarity index 100%
rename from packages/rocketchat-graphql/server/schemas/users/setStatus.graphqls
rename to app/graphql/server/schemas/users/setStatus.graphqls
diff --git a/packages/rocketchat-graphql/server/settings.js b/app/graphql/server/settings.js
similarity index 100%
rename from packages/rocketchat-graphql/server/settings.js
rename to app/graphql/server/settings.js
diff --git a/packages/rocketchat-graphql/server/subscriptions.js b/app/graphql/server/subscriptions.js
similarity index 100%
rename from packages/rocketchat-graphql/server/subscriptions.js
rename to app/graphql/server/subscriptions.js
diff --git a/packages/rocketchat-highlight-words/client/client.js b/app/highlight-words/client/client.js
similarity index 100%
rename from packages/rocketchat-highlight-words/client/client.js
rename to app/highlight-words/client/client.js
diff --git a/packages/rocketchat-highlight-words/client/helper.js b/app/highlight-words/client/helper.js
similarity index 100%
rename from packages/rocketchat-highlight-words/client/helper.js
rename to app/highlight-words/client/helper.js
diff --git a/packages/rocketchat-highlight-words/client/index.js b/app/highlight-words/client/index.js
similarity index 100%
rename from packages/rocketchat-highlight-words/client/index.js
rename to app/highlight-words/client/index.js
diff --git a/packages/rocketchat-highlight-words/package.js b/app/highlight-words/package.js
similarity index 100%
rename from packages/rocketchat-highlight-words/package.js
rename to app/highlight-words/package.js
diff --git a/packages/rocketchat-highlight-words/tests/helper.test.js b/app/highlight-words/tests/helper.test.js
similarity index 100%
rename from packages/rocketchat-highlight-words/tests/helper.test.js
rename to app/highlight-words/tests/helper.test.js
diff --git a/packages/rocketchat-iframe-login/client/iframe_client.js b/app/iframe-login/client/iframe_client.js
similarity index 100%
rename from packages/rocketchat-iframe-login/client/iframe_client.js
rename to app/iframe-login/client/iframe_client.js
diff --git a/packages/rocketchat-iframe-login/client/index.js b/app/iframe-login/client/index.js
similarity index 100%
rename from packages/rocketchat-iframe-login/client/index.js
rename to app/iframe-login/client/index.js
diff --git a/packages/rocketchat-iframe-login/package.js b/app/iframe-login/package.js
similarity index 100%
rename from packages/rocketchat-iframe-login/package.js
rename to app/iframe-login/package.js
diff --git a/packages/rocketchat-iframe-login/server/iframe_rocketchat.js b/app/iframe-login/server/iframe_rocketchat.js
similarity index 100%
rename from packages/rocketchat-iframe-login/server/iframe_rocketchat.js
rename to app/iframe-login/server/iframe_rocketchat.js
diff --git a/packages/rocketchat-iframe-login/server/iframe_server.js b/app/iframe-login/server/iframe_server.js
similarity index 100%
rename from packages/rocketchat-iframe-login/server/iframe_server.js
rename to app/iframe-login/server/iframe_server.js
diff --git a/packages/rocketchat-iframe-login/server/index.js b/app/iframe-login/server/index.js
similarity index 100%
rename from packages/rocketchat-iframe-login/server/index.js
rename to app/iframe-login/server/index.js
diff --git a/packages/rocketchat-importer-csv/client/adder.js b/app/importer-csv/client/adder.js
similarity index 100%
rename from packages/rocketchat-importer-csv/client/adder.js
rename to app/importer-csv/client/adder.js
diff --git a/packages/rocketchat-importer-csv/client/index.js b/app/importer-csv/client/index.js
similarity index 100%
rename from packages/rocketchat-importer-csv/client/index.js
rename to app/importer-csv/client/index.js
diff --git a/packages/rocketchat-importer-csv/lib/info.js b/app/importer-csv/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-csv/lib/info.js
rename to app/importer-csv/lib/info.js
diff --git a/packages/rocketchat-importer-csv/package.js b/app/importer-csv/package.js
similarity index 100%
rename from packages/rocketchat-importer-csv/package.js
rename to app/importer-csv/package.js
diff --git a/packages/rocketchat-importer-csv/server/adder.js b/app/importer-csv/server/adder.js
similarity index 100%
rename from packages/rocketchat-importer-csv/server/adder.js
rename to app/importer-csv/server/adder.js
diff --git a/packages/rocketchat-importer-csv/server/importer.js b/app/importer-csv/server/importer.js
similarity index 100%
rename from packages/rocketchat-importer-csv/server/importer.js
rename to app/importer-csv/server/importer.js
diff --git a/packages/rocketchat-importer-csv/server/index.js b/app/importer-csv/server/index.js
similarity index 100%
rename from packages/rocketchat-importer-csv/server/index.js
rename to app/importer-csv/server/index.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/client/adder.js b/app/importer-hipchat-enterprise/client/adder.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/client/adder.js
rename to app/importer-hipchat-enterprise/client/adder.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/client/index.js b/app/importer-hipchat-enterprise/client/index.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/client/index.js
rename to app/importer-hipchat-enterprise/client/index.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/lib/info.js b/app/importer-hipchat-enterprise/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/lib/info.js
rename to app/importer-hipchat-enterprise/lib/info.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/package.js b/app/importer-hipchat-enterprise/package.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/package.js
rename to app/importer-hipchat-enterprise/package.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/adder.js b/app/importer-hipchat-enterprise/server/adder.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/server/adder.js
rename to app/importer-hipchat-enterprise/server/adder.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js b/app/importer-hipchat-enterprise/server/importer.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/server/importer.js
rename to app/importer-hipchat-enterprise/server/importer.js
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/index.js b/app/importer-hipchat-enterprise/server/index.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat-enterprise/server/index.js
rename to app/importer-hipchat-enterprise/server/index.js
diff --git a/packages/rocketchat-importer-hipchat/client/adder.js b/app/importer-hipchat/client/adder.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/client/adder.js
rename to app/importer-hipchat/client/adder.js
diff --git a/packages/rocketchat-importer-hipchat/client/index.js b/app/importer-hipchat/client/index.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/client/index.js
rename to app/importer-hipchat/client/index.js
diff --git a/packages/rocketchat-importer-hipchat/lib/info.js b/app/importer-hipchat/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/lib/info.js
rename to app/importer-hipchat/lib/info.js
diff --git a/packages/rocketchat-importer-hipchat/package.js b/app/importer-hipchat/package.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/package.js
rename to app/importer-hipchat/package.js
diff --git a/packages/rocketchat-importer-hipchat/server/adder.js b/app/importer-hipchat/server/adder.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/server/adder.js
rename to app/importer-hipchat/server/adder.js
diff --git a/packages/rocketchat-importer-hipchat/server/importer.js b/app/importer-hipchat/server/importer.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/server/importer.js
rename to app/importer-hipchat/server/importer.js
diff --git a/packages/rocketchat-importer-hipchat/server/index.js b/app/importer-hipchat/server/index.js
similarity index 100%
rename from packages/rocketchat-importer-hipchat/server/index.js
rename to app/importer-hipchat/server/index.js
diff --git a/packages/rocketchat-importer-slack-users/client/adder.js b/app/importer-slack-users/client/adder.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/client/adder.js
rename to app/importer-slack-users/client/adder.js
diff --git a/packages/rocketchat-importer-slack-users/client/index.js b/app/importer-slack-users/client/index.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/client/index.js
rename to app/importer-slack-users/client/index.js
diff --git a/packages/rocketchat-importer-slack-users/lib/info.js b/app/importer-slack-users/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/lib/info.js
rename to app/importer-slack-users/lib/info.js
diff --git a/packages/rocketchat-importer-slack-users/package.js b/app/importer-slack-users/package.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/package.js
rename to app/importer-slack-users/package.js
diff --git a/packages/rocketchat-importer-slack-users/server/adder.js b/app/importer-slack-users/server/adder.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/server/adder.js
rename to app/importer-slack-users/server/adder.js
diff --git a/packages/rocketchat-importer-slack-users/server/importer.js b/app/importer-slack-users/server/importer.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/server/importer.js
rename to app/importer-slack-users/server/importer.js
diff --git a/packages/rocketchat-importer-slack-users/server/index.js b/app/importer-slack-users/server/index.js
similarity index 100%
rename from packages/rocketchat-importer-slack-users/server/index.js
rename to app/importer-slack-users/server/index.js
diff --git a/packages/rocketchat-importer-slack/client/adder.js b/app/importer-slack/client/adder.js
similarity index 100%
rename from packages/rocketchat-importer-slack/client/adder.js
rename to app/importer-slack/client/adder.js
diff --git a/packages/rocketchat-importer-slack/client/index.js b/app/importer-slack/client/index.js
similarity index 100%
rename from packages/rocketchat-importer-slack/client/index.js
rename to app/importer-slack/client/index.js
diff --git a/packages/rocketchat-importer-slack/lib/info.js b/app/importer-slack/lib/info.js
similarity index 100%
rename from packages/rocketchat-importer-slack/lib/info.js
rename to app/importer-slack/lib/info.js
diff --git a/packages/rocketchat-importer-slack/package.js b/app/importer-slack/package.js
similarity index 100%
rename from packages/rocketchat-importer-slack/package.js
rename to app/importer-slack/package.js
diff --git a/packages/rocketchat-importer-slack/server/adder.js b/app/importer-slack/server/adder.js
similarity index 100%
rename from packages/rocketchat-importer-slack/server/adder.js
rename to app/importer-slack/server/adder.js
diff --git a/packages/rocketchat-importer-slack/server/importer.js b/app/importer-slack/server/importer.js
similarity index 100%
rename from packages/rocketchat-importer-slack/server/importer.js
rename to app/importer-slack/server/importer.js
diff --git a/packages/rocketchat-importer-slack/server/index.js b/app/importer-slack/server/index.js
similarity index 100%
rename from packages/rocketchat-importer-slack/server/index.js
rename to app/importer-slack/server/index.js
diff --git a/packages/rocketchat-importer/client/ImporterWebsocketReceiver.js b/app/importer/client/ImporterWebsocketReceiver.js
similarity index 100%
rename from packages/rocketchat-importer/client/ImporterWebsocketReceiver.js
rename to app/importer/client/ImporterWebsocketReceiver.js
diff --git a/packages/rocketchat-importer/client/admin/adminImport.html b/app/importer/client/admin/adminImport.html
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImport.html
rename to app/importer/client/admin/adminImport.html
diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/app/importer/client/admin/adminImport.js
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImport.js
rename to app/importer/client/admin/adminImport.js
diff --git a/packages/rocketchat-importer/client/admin/adminImportHistory.html b/app/importer/client/admin/adminImportHistory.html
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImportHistory.html
rename to app/importer/client/admin/adminImportHistory.html
diff --git a/packages/rocketchat-importer/client/admin/adminImportHistory.js b/app/importer/client/admin/adminImportHistory.js
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImportHistory.js
rename to app/importer/client/admin/adminImportHistory.js
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.html b/app/importer/client/admin/adminImportPrepare.html
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImportPrepare.html
rename to app/importer/client/admin/adminImportPrepare.html
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/app/importer/client/admin/adminImportPrepare.js
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImportPrepare.js
rename to app/importer/client/admin/adminImportPrepare.js
diff --git a/packages/rocketchat-importer/client/admin/adminImportProgress.html b/app/importer/client/admin/adminImportProgress.html
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImportProgress.html
rename to app/importer/client/admin/adminImportProgress.html
diff --git a/packages/rocketchat-importer/client/admin/adminImportProgress.js b/app/importer/client/admin/adminImportProgress.js
similarity index 100%
rename from packages/rocketchat-importer/client/admin/adminImportProgress.js
rename to app/importer/client/admin/adminImportProgress.js
diff --git a/packages/rocketchat-importer/client/index.js b/app/importer/client/index.js
similarity index 100%
rename from packages/rocketchat-importer/client/index.js
rename to app/importer/client/index.js
diff --git a/packages/rocketchat-importer/lib/ImporterInfo.js b/app/importer/lib/ImporterInfo.js
similarity index 100%
rename from packages/rocketchat-importer/lib/ImporterInfo.js
rename to app/importer/lib/ImporterInfo.js
diff --git a/packages/rocketchat-importer/lib/ImporterProgressStep.js b/app/importer/lib/ImporterProgressStep.js
similarity index 100%
rename from packages/rocketchat-importer/lib/ImporterProgressStep.js
rename to app/importer/lib/ImporterProgressStep.js
diff --git a/packages/rocketchat-importer/lib/Importers.js b/app/importer/lib/Importers.js
similarity index 100%
rename from packages/rocketchat-importer/lib/Importers.js
rename to app/importer/lib/Importers.js
diff --git a/packages/rocketchat-importer/package.js b/app/importer/package.js
similarity index 100%
rename from packages/rocketchat-importer/package.js
rename to app/importer/package.js
diff --git a/packages/rocketchat-importer/server/classes/ImporterBase.js b/app/importer/server/classes/ImporterBase.js
similarity index 100%
rename from packages/rocketchat-importer/server/classes/ImporterBase.js
rename to app/importer/server/classes/ImporterBase.js
diff --git a/packages/rocketchat-importer/server/classes/ImporterProgress.js b/app/importer/server/classes/ImporterProgress.js
similarity index 100%
rename from packages/rocketchat-importer/server/classes/ImporterProgress.js
rename to app/importer/server/classes/ImporterProgress.js
diff --git a/packages/rocketchat-importer/server/classes/ImporterSelection.js b/app/importer/server/classes/ImporterSelection.js
similarity index 100%
rename from packages/rocketchat-importer/server/classes/ImporterSelection.js
rename to app/importer/server/classes/ImporterSelection.js
diff --git a/packages/rocketchat-importer/server/classes/ImporterSelectionChannel.js b/app/importer/server/classes/ImporterSelectionChannel.js
similarity index 100%
rename from packages/rocketchat-importer/server/classes/ImporterSelectionChannel.js
rename to app/importer/server/classes/ImporterSelectionChannel.js
diff --git a/packages/rocketchat-importer/server/classes/ImporterSelectionUser.js b/app/importer/server/classes/ImporterSelectionUser.js
similarity index 100%
rename from packages/rocketchat-importer/server/classes/ImporterSelectionUser.js
rename to app/importer/server/classes/ImporterSelectionUser.js
diff --git a/packages/rocketchat-importer/server/classes/ImporterWebsocket.js b/app/importer/server/classes/ImporterWebsocket.js
similarity index 100%
rename from packages/rocketchat-importer/server/classes/ImporterWebsocket.js
rename to app/importer/server/classes/ImporterWebsocket.js
diff --git a/packages/rocketchat-importer/server/index.js b/app/importer/server/index.js
similarity index 100%
rename from packages/rocketchat-importer/server/index.js
rename to app/importer/server/index.js
diff --git a/packages/rocketchat-importer/server/methods/downloadPublicImportFile.js b/app/importer/server/methods/downloadPublicImportFile.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/downloadPublicImportFile.js
rename to app/importer/server/methods/downloadPublicImportFile.js
diff --git a/packages/rocketchat-importer/server/methods/getImportFileData.js b/app/importer/server/methods/getImportFileData.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/getImportFileData.js
rename to app/importer/server/methods/getImportFileData.js
diff --git a/packages/rocketchat-importer/server/methods/getImportProgress.js b/app/importer/server/methods/getImportProgress.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/getImportProgress.js
rename to app/importer/server/methods/getImportProgress.js
diff --git a/packages/rocketchat-importer/server/methods/getLatestImportOperations.js b/app/importer/server/methods/getLatestImportOperations.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/getLatestImportOperations.js
rename to app/importer/server/methods/getLatestImportOperations.js
diff --git a/packages/rocketchat-importer/server/methods/getSelectionData.js b/app/importer/server/methods/getSelectionData.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/getSelectionData.js
rename to app/importer/server/methods/getSelectionData.js
diff --git a/packages/rocketchat-importer/server/methods/prepareImport.js b/app/importer/server/methods/prepareImport.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/prepareImport.js
rename to app/importer/server/methods/prepareImport.js
diff --git a/packages/rocketchat-importer/server/methods/restartImport.js b/app/importer/server/methods/restartImport.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/restartImport.js
rename to app/importer/server/methods/restartImport.js
diff --git a/packages/rocketchat-importer/server/methods/setupImporter.js b/app/importer/server/methods/setupImporter.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/setupImporter.js
rename to app/importer/server/methods/setupImporter.js
diff --git a/packages/rocketchat-importer/server/methods/startImport.js b/app/importer/server/methods/startImport.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/startImport.js
rename to app/importer/server/methods/startImport.js
diff --git a/packages/rocketchat-importer/server/methods/uploadImportFile.js b/app/importer/server/methods/uploadImportFile.js
similarity index 100%
rename from packages/rocketchat-importer/server/methods/uploadImportFile.js
rename to app/importer/server/methods/uploadImportFile.js
diff --git a/packages/rocketchat-importer/server/models/Imports.js b/app/importer/server/models/Imports.js
similarity index 100%
rename from packages/rocketchat-importer/server/models/Imports.js
rename to app/importer/server/models/Imports.js
diff --git a/packages/rocketchat-importer/server/models/RawImports.js b/app/importer/server/models/RawImports.js
similarity index 100%
rename from packages/rocketchat-importer/server/models/RawImports.js
rename to app/importer/server/models/RawImports.js
diff --git a/packages/rocketchat-importer/server/startup/setImportsToInvalid.js b/app/importer/server/startup/setImportsToInvalid.js
similarity index 100%
rename from packages/rocketchat-importer/server/startup/setImportsToInvalid.js
rename to app/importer/server/startup/setImportsToInvalid.js
diff --git a/packages/rocketchat-importer/server/startup/store.js b/app/importer/server/startup/store.js
similarity index 100%
rename from packages/rocketchat-importer/server/startup/store.js
rename to app/importer/server/startup/store.js
diff --git a/packages/rocketchat-integrations/client/collections.js b/app/integrations/client/collections.js
similarity index 100%
rename from packages/rocketchat-integrations/client/collections.js
rename to app/integrations/client/collections.js
diff --git a/packages/rocketchat-integrations/client/index.js b/app/integrations/client/index.js
similarity index 100%
rename from packages/rocketchat-integrations/client/index.js
rename to app/integrations/client/index.js
diff --git a/packages/rocketchat-integrations/client/route.js b/app/integrations/client/route.js
similarity index 100%
rename from packages/rocketchat-integrations/client/route.js
rename to app/integrations/client/route.js
diff --git a/packages/rocketchat-integrations/client/startup.js b/app/integrations/client/startup.js
similarity index 100%
rename from packages/rocketchat-integrations/client/startup.js
rename to app/integrations/client/startup.js
diff --git a/packages/rocketchat-integrations/client/stylesheets/integrations.css b/app/integrations/client/stylesheets/integrations.css
similarity index 100%
rename from packages/rocketchat-integrations/client/stylesheets/integrations.css
rename to app/integrations/client/stylesheets/integrations.css
diff --git a/packages/rocketchat-integrations/client/views/additional/zapier.html b/app/integrations/client/views/additional/zapier.html
similarity index 100%
rename from packages/rocketchat-integrations/client/views/additional/zapier.html
rename to app/integrations/client/views/additional/zapier.html
diff --git a/packages/rocketchat-integrations/client/views/integrations.html b/app/integrations/client/views/integrations.html
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrations.html
rename to app/integrations/client/views/integrations.html
diff --git a/packages/rocketchat-integrations/client/views/integrations.js b/app/integrations/client/views/integrations.js
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrations.js
rename to app/integrations/client/views/integrations.js
diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.html b/app/integrations/client/views/integrationsIncoming.html
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsIncoming.html
rename to app/integrations/client/views/integrationsIncoming.html
diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.js b/app/integrations/client/views/integrationsIncoming.js
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsIncoming.js
rename to app/integrations/client/views/integrationsIncoming.js
diff --git a/packages/rocketchat-integrations/client/views/integrationsNew.html b/app/integrations/client/views/integrationsNew.html
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsNew.html
rename to app/integrations/client/views/integrationsNew.html
diff --git a/packages/rocketchat-integrations/client/views/integrationsNew.js b/app/integrations/client/views/integrationsNew.js
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsNew.js
rename to app/integrations/client/views/integrationsNew.js
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html b/app/integrations/client/views/integrationsOutgoing.html
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsOutgoing.html
rename to app/integrations/client/views/integrationsOutgoing.html
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js b/app/integrations/client/views/integrationsOutgoing.js
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsOutgoing.js
rename to app/integrations/client/views/integrationsOutgoing.js
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html b/app/integrations/client/views/integrationsOutgoingHistory.html
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
rename to app/integrations/client/views/integrationsOutgoingHistory.html
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js b/app/integrations/client/views/integrationsOutgoingHistory.js
similarity index 100%
rename from packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
rename to app/integrations/client/views/integrationsOutgoingHistory.js
diff --git a/packages/rocketchat-integrations/lib/rocketchat.js b/app/integrations/lib/rocketchat.js
similarity index 100%
rename from packages/rocketchat-integrations/lib/rocketchat.js
rename to app/integrations/lib/rocketchat.js
diff --git a/packages/rocketchat-integrations/package.js b/app/integrations/package.js
similarity index 100%
rename from packages/rocketchat-integrations/package.js
rename to app/integrations/package.js
diff --git a/packages/rocketchat-integrations/server/api/api.js b/app/integrations/server/api/api.js
similarity index 100%
rename from packages/rocketchat-integrations/server/api/api.js
rename to app/integrations/server/api/api.js
diff --git a/packages/rocketchat-integrations/server/index.js b/app/integrations/server/index.js
similarity index 100%
rename from packages/rocketchat-integrations/server/index.js
rename to app/integrations/server/index.js
diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/app/integrations/server/lib/triggerHandler.js
similarity index 100%
rename from packages/rocketchat-integrations/server/lib/triggerHandler.js
rename to app/integrations/server/lib/triggerHandler.js
diff --git a/packages/rocketchat-integrations/server/lib/validation.js b/app/integrations/server/lib/validation.js
similarity index 100%
rename from packages/rocketchat-integrations/server/lib/validation.js
rename to app/integrations/server/lib/validation.js
diff --git a/packages/rocketchat-integrations/server/logger.js b/app/integrations/server/logger.js
similarity index 100%
rename from packages/rocketchat-integrations/server/logger.js
rename to app/integrations/server/logger.js
diff --git a/packages/rocketchat-integrations/server/methods/clearIntegrationHistory.js b/app/integrations/server/methods/clearIntegrationHistory.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/clearIntegrationHistory.js
rename to app/integrations/server/methods/clearIntegrationHistory.js
diff --git a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js b/app/integrations/server/methods/incoming/addIncomingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js
rename to app/integrations/server/methods/incoming/addIncomingIntegration.js
diff --git a/packages/rocketchat-integrations/server/methods/incoming/deleteIncomingIntegration.js b/app/integrations/server/methods/incoming/deleteIncomingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/incoming/deleteIncomingIntegration.js
rename to app/integrations/server/methods/incoming/deleteIncomingIntegration.js
diff --git a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js b/app/integrations/server/methods/incoming/updateIncomingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
rename to app/integrations/server/methods/incoming/updateIncomingIntegration.js
diff --git a/packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.js b/app/integrations/server/methods/outgoing/addOutgoingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.js
rename to app/integrations/server/methods/outgoing/addOutgoingIntegration.js
diff --git a/packages/rocketchat-integrations/server/methods/outgoing/deleteOutgoingIntegration.js b/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/outgoing/deleteOutgoingIntegration.js
rename to app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js
diff --git a/packages/rocketchat-integrations/server/methods/outgoing/replayOutgoingIntegration.js b/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/outgoing/replayOutgoingIntegration.js
rename to app/integrations/server/methods/outgoing/replayOutgoingIntegration.js
diff --git a/packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.js b/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js
similarity index 100%
rename from packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.js
rename to app/integrations/server/methods/outgoing/updateOutgoingIntegration.js
diff --git a/packages/rocketchat-integrations/server/publications/integrationHistory.js b/app/integrations/server/publications/integrationHistory.js
similarity index 100%
rename from packages/rocketchat-integrations/server/publications/integrationHistory.js
rename to app/integrations/server/publications/integrationHistory.js
diff --git a/packages/rocketchat-integrations/server/publications/integrations.js b/app/integrations/server/publications/integrations.js
similarity index 100%
rename from packages/rocketchat-integrations/server/publications/integrations.js
rename to app/integrations/server/publications/integrations.js
diff --git a/packages/rocketchat-integrations/server/triggers.js b/app/integrations/server/triggers.js
similarity index 100%
rename from packages/rocketchat-integrations/server/triggers.js
rename to app/integrations/server/triggers.js
diff --git a/packages/rocketchat-irc/README.md b/app/irc/README.md
similarity index 100%
rename from packages/rocketchat-irc/README.md
rename to app/irc/README.md
diff --git a/packages/rocketchat-irc/package.js b/app/irc/package.js
similarity index 100%
rename from packages/rocketchat-irc/package.js
rename to app/irc/package.js
diff --git a/packages/rocketchat-irc/server/index.js b/app/irc/server/index.js
similarity index 100%
rename from packages/rocketchat-irc/server/index.js
rename to app/irc/server/index.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/index.js b/app/irc/server/irc-bridge/index.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/index.js
rename to app/irc/server/irc-bridge/index.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/index.js b/app/irc/server/irc-bridge/localHandlers/index.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/index.js
rename to app/irc/server/irc-bridge/localHandlers/index.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js b/app/irc/server/irc-bridge/localHandlers/onCreateRoom.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
rename to app/irc/server/irc-bridge/localHandlers/onCreateRoom.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js b/app/irc/server/irc-bridge/localHandlers/onCreateUser.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
rename to app/irc/server/irc-bridge/localHandlers/onCreateUser.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onJoinRoom.js b/app/irc/server/irc-bridge/localHandlers/onJoinRoom.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onJoinRoom.js
rename to app/irc/server/irc-bridge/localHandlers/onJoinRoom.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLeaveRoom.js b/app/irc/server/irc-bridge/localHandlers/onLeaveRoom.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onLeaveRoom.js
rename to app/irc/server/irc-bridge/localHandlers/onLeaveRoom.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js b/app/irc/server/irc-bridge/localHandlers/onLogin.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
rename to app/irc/server/irc-bridge/localHandlers/onLogin.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogout.js b/app/irc/server/irc-bridge/localHandlers/onLogout.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogout.js
rename to app/irc/server/irc-bridge/localHandlers/onLogout.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js b/app/irc/server/irc-bridge/localHandlers/onSaveMessage.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
rename to app/irc/server/irc-bridge/localHandlers/onSaveMessage.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js b/app/irc/server/irc-bridge/peerHandlers/disconnected.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
rename to app/irc/server/irc-bridge/peerHandlers/disconnected.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/index.js b/app/irc/server/irc-bridge/peerHandlers/index.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/index.js
rename to app/irc/server/irc-bridge/peerHandlers/index.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js b/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
rename to app/irc/server/irc-bridge/peerHandlers/joinedChannel.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js b/app/irc/server/irc-bridge/peerHandlers/leftChannel.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
rename to app/irc/server/irc-bridge/peerHandlers/leftChannel.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js b/app/irc/server/irc-bridge/peerHandlers/nickChanged.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
rename to app/irc/server/irc-bridge/peerHandlers/nickChanged.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js b/app/irc/server/irc-bridge/peerHandlers/sentMessage.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
rename to app/irc/server/irc-bridge/peerHandlers/sentMessage.js
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js b/app/irc/server/irc-bridge/peerHandlers/userRegistered.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
rename to app/irc/server/irc-bridge/peerHandlers/userRegistered.js
diff --git a/packages/rocketchat-irc/server/irc-settings.js b/app/irc/server/irc-settings.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc-settings.js
rename to app/irc/server/irc-settings.js
diff --git a/packages/rocketchat-irc/server/irc.js b/app/irc/server/irc.js
similarity index 100%
rename from packages/rocketchat-irc/server/irc.js
rename to app/irc/server/irc.js
diff --git a/packages/rocketchat-irc/server/methods/resetIrcConnection.js b/app/irc/server/methods/resetIrcConnection.js
similarity index 100%
rename from packages/rocketchat-irc/server/methods/resetIrcConnection.js
rename to app/irc/server/methods/resetIrcConnection.js
diff --git a/packages/rocketchat-irc/server/servers/RFC2813/codes.js b/app/irc/server/servers/RFC2813/codes.js
similarity index 100%
rename from packages/rocketchat-irc/server/servers/RFC2813/codes.js
rename to app/irc/server/servers/RFC2813/codes.js
diff --git a/packages/rocketchat-irc/server/servers/RFC2813/index.js b/app/irc/server/servers/RFC2813/index.js
similarity index 100%
rename from packages/rocketchat-irc/server/servers/RFC2813/index.js
rename to app/irc/server/servers/RFC2813/index.js
diff --git a/packages/rocketchat-irc/server/servers/RFC2813/localCommandHandlers.js b/app/irc/server/servers/RFC2813/localCommandHandlers.js
similarity index 100%
rename from packages/rocketchat-irc/server/servers/RFC2813/localCommandHandlers.js
rename to app/irc/server/servers/RFC2813/localCommandHandlers.js
diff --git a/packages/rocketchat-irc/server/servers/RFC2813/parseMessage.js b/app/irc/server/servers/RFC2813/parseMessage.js
similarity index 100%
rename from packages/rocketchat-irc/server/servers/RFC2813/parseMessage.js
rename to app/irc/server/servers/RFC2813/parseMessage.js
diff --git a/packages/rocketchat-irc/server/servers/RFC2813/peerCommandHandlers.js b/app/irc/server/servers/RFC2813/peerCommandHandlers.js
similarity index 100%
rename from packages/rocketchat-irc/server/servers/RFC2813/peerCommandHandlers.js
rename to app/irc/server/servers/RFC2813/peerCommandHandlers.js
diff --git a/packages/rocketchat-irc/server/servers/index.js b/app/irc/server/servers/index.js
similarity index 100%
rename from packages/rocketchat-irc/server/servers/index.js
rename to app/irc/server/servers/index.js
diff --git a/packages/rocketchat-issuelinks/client/client.js b/app/issuelinks/client/client.js
similarity index 100%
rename from packages/rocketchat-issuelinks/client/client.js
rename to app/issuelinks/client/client.js
diff --git a/packages/rocketchat-issuelinks/client/index.js b/app/issuelinks/client/index.js
similarity index 100%
rename from packages/rocketchat-issuelinks/client/index.js
rename to app/issuelinks/client/index.js
diff --git a/packages/rocketchat-issuelinks/package.js b/app/issuelinks/package.js
similarity index 100%
rename from packages/rocketchat-issuelinks/package.js
rename to app/issuelinks/package.js
diff --git a/packages/rocketchat-issuelinks/server/index.js b/app/issuelinks/server/index.js
similarity index 100%
rename from packages/rocketchat-issuelinks/server/index.js
rename to app/issuelinks/server/index.js
diff --git a/packages/rocketchat-issuelinks/server/settings.js b/app/issuelinks/server/settings.js
similarity index 100%
rename from packages/rocketchat-issuelinks/server/settings.js
rename to app/issuelinks/server/settings.js
diff --git a/packages/rocketchat-katex/.eslintrc b/app/katex/.eslintrc
similarity index 100%
rename from packages/rocketchat-katex/.eslintrc
rename to app/katex/.eslintrc
diff --git a/packages/rocketchat-katex/client/index.js b/app/katex/client/index.js
similarity index 100%
rename from packages/rocketchat-katex/client/index.js
rename to app/katex/client/index.js
diff --git a/packages/rocketchat-katex/client/style.css b/app/katex/client/style.css
similarity index 100%
rename from packages/rocketchat-katex/client/style.css
rename to app/katex/client/style.css
diff --git a/packages/rocketchat-katex/lib/katex.js b/app/katex/lib/katex.js
similarity index 100%
rename from packages/rocketchat-katex/lib/katex.js
rename to app/katex/lib/katex.js
diff --git a/packages/rocketchat-katex/package-lock.json b/app/katex/package-lock.json
similarity index 100%
rename from packages/rocketchat-katex/package-lock.json
rename to app/katex/package-lock.json
diff --git a/packages/rocketchat-katex/package.js b/app/katex/package.js
similarity index 100%
rename from packages/rocketchat-katex/package.js
rename to app/katex/package.js
diff --git a/packages/rocketchat-katex/package.json b/app/katex/package.json
similarity index 100%
rename from packages/rocketchat-katex/package.json
rename to app/katex/package.json
diff --git a/packages/rocketchat-katex/server/index.js b/app/katex/server/index.js
similarity index 100%
rename from packages/rocketchat-katex/server/index.js
rename to app/katex/server/index.js
diff --git a/packages/rocketchat-katex/server/settings.js b/app/katex/server/settings.js
similarity index 100%
rename from packages/rocketchat-katex/server/settings.js
rename to app/katex/server/settings.js
diff --git a/packages/rocketchat-lazy-load/client/index.js b/app/lazy-load/client/index.js
similarity index 100%
rename from packages/rocketchat-lazy-load/client/index.js
rename to app/lazy-load/client/index.js
diff --git a/packages/rocketchat-lazy-load/client/lazyloadImage.html b/app/lazy-load/client/lazyloadImage.html
similarity index 100%
rename from packages/rocketchat-lazy-load/client/lazyloadImage.html
rename to app/lazy-load/client/lazyloadImage.html
diff --git a/packages/rocketchat-lazy-load/client/lazyloadImage.js b/app/lazy-load/client/lazyloadImage.js
similarity index 100%
rename from packages/rocketchat-lazy-load/client/lazyloadImage.js
rename to app/lazy-load/client/lazyloadImage.js
diff --git a/packages/rocketchat-lazy-load/package.js b/app/lazy-load/package.js
similarity index 100%
rename from packages/rocketchat-lazy-load/package.js
rename to app/lazy-load/package.js
diff --git a/packages/rocketchat-ldap/client/index.js b/app/ldap/client/index.js
similarity index 100%
rename from packages/rocketchat-ldap/client/index.js
rename to app/ldap/client/index.js
diff --git a/packages/rocketchat-ldap/client/loginHelper.js b/app/ldap/client/loginHelper.js
similarity index 100%
rename from packages/rocketchat-ldap/client/loginHelper.js
rename to app/ldap/client/loginHelper.js
diff --git a/packages/rocketchat-ldap/package.js b/app/ldap/package.js
similarity index 100%
rename from packages/rocketchat-ldap/package.js
rename to app/ldap/package.js
diff --git a/packages/rocketchat-ldap/server/index.js b/app/ldap/server/index.js
similarity index 100%
rename from packages/rocketchat-ldap/server/index.js
rename to app/ldap/server/index.js
diff --git a/packages/rocketchat-ldap/server/ldap.js b/app/ldap/server/ldap.js
similarity index 100%
rename from packages/rocketchat-ldap/server/ldap.js
rename to app/ldap/server/ldap.js
diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/app/ldap/server/loginHandler.js
similarity index 100%
rename from packages/rocketchat-ldap/server/loginHandler.js
rename to app/ldap/server/loginHandler.js
diff --git a/packages/rocketchat-ldap/server/settings.js b/app/ldap/server/settings.js
similarity index 100%
rename from packages/rocketchat-ldap/server/settings.js
rename to app/ldap/server/settings.js
diff --git a/packages/rocketchat-ldap/server/sync.js b/app/ldap/server/sync.js
similarity index 100%
rename from packages/rocketchat-ldap/server/sync.js
rename to app/ldap/server/sync.js
diff --git a/packages/rocketchat-ldap/server/syncUsers.js b/app/ldap/server/syncUsers.js
similarity index 100%
rename from packages/rocketchat-ldap/server/syncUsers.js
rename to app/ldap/server/syncUsers.js
diff --git a/packages/rocketchat-ldap/server/testConnection.js b/app/ldap/server/testConnection.js
similarity index 100%
rename from packages/rocketchat-ldap/server/testConnection.js
rename to app/ldap/server/testConnection.js
diff --git a/packages/rocketchat-lib/README.md b/app/lib/README.md
similarity index 100%
rename from packages/rocketchat-lib/README.md
rename to app/lib/README.md
diff --git a/packages/rocketchat-lib/client/CustomTranslations.js b/app/lib/client/CustomTranslations.js
similarity index 100%
rename from packages/rocketchat-lib/client/CustomTranslations.js
rename to app/lib/client/CustomTranslations.js
diff --git a/packages/rocketchat-lib/client/OAuthProxy.js b/app/lib/client/OAuthProxy.js
similarity index 100%
rename from packages/rocketchat-lib/client/OAuthProxy.js
rename to app/lib/client/OAuthProxy.js
diff --git a/packages/rocketchat-lib/client/UserDeleted.js b/app/lib/client/UserDeleted.js
similarity index 100%
rename from packages/rocketchat-lib/client/UserDeleted.js
rename to app/lib/client/UserDeleted.js
diff --git a/packages/rocketchat-lib/client/defaultTabBars.js b/app/lib/client/defaultTabBars.js
similarity index 100%
rename from packages/rocketchat-lib/client/defaultTabBars.js
rename to app/lib/client/defaultTabBars.js
diff --git a/packages/rocketchat-lib/client/index.js b/app/lib/client/index.js
similarity index 100%
rename from packages/rocketchat-lib/client/index.js
rename to app/lib/client/index.js
diff --git a/packages/rocketchat-lib/client/lib/LoginPresence.js b/app/lib/client/lib/LoginPresence.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/LoginPresence.js
rename to app/lib/client/lib/LoginPresence.js
diff --git a/packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js b/app/lib/client/lib/RocketChatAnnouncement.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js
rename to app/lib/client/lib/RocketChatAnnouncement.js
diff --git a/packages/rocketchat-lib/client/lib/formatDate.js b/app/lib/client/lib/formatDate.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/formatDate.js
rename to app/lib/client/lib/formatDate.js
diff --git a/packages/rocketchat-lib/client/lib/index.js b/app/lib/client/lib/index.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/index.js
rename to app/lib/client/lib/index.js
diff --git a/packages/rocketchat-lib/client/lib/settings.js b/app/lib/client/lib/settings.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/settings.js
rename to app/lib/client/lib/settings.js
diff --git a/packages/rocketchat-lib/client/lib/startup/commands.js b/app/lib/client/lib/startup/commands.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/startup/commands.js
rename to app/lib/client/lib/startup/commands.js
diff --git a/packages/rocketchat-lib/client/lib/userRoles.js b/app/lib/client/lib/userRoles.js
similarity index 100%
rename from packages/rocketchat-lib/client/lib/userRoles.js
rename to app/lib/client/lib/userRoles.js
diff --git a/packages/rocketchat-lib/client/methods/sendMessage.js b/app/lib/client/methods/sendMessage.js
similarity index 100%
rename from packages/rocketchat-lib/client/methods/sendMessage.js
rename to app/lib/client/methods/sendMessage.js
diff --git a/packages/rocketchat-lib/client/views/customFieldsForm.html b/app/lib/client/views/customFieldsForm.html
similarity index 100%
rename from packages/rocketchat-lib/client/views/customFieldsForm.html
rename to app/lib/client/views/customFieldsForm.html
diff --git a/packages/rocketchat-lib/client/views/customFieldsForm.js b/app/lib/client/views/customFieldsForm.js
similarity index 100%
rename from packages/rocketchat-lib/client/views/customFieldsForm.js
rename to app/lib/client/views/customFieldsForm.js
diff --git a/packages/rocketchat-lib/lib/MessageTypes.js b/app/lib/lib/MessageTypes.js
similarity index 100%
rename from packages/rocketchat-lib/lib/MessageTypes.js
rename to app/lib/lib/MessageTypes.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/conversation.js b/app/lib/lib/roomTypes/conversation.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/conversation.js
rename to app/lib/lib/roomTypes/conversation.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/direct.js
rename to app/lib/lib/roomTypes/direct.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/favorite.js b/app/lib/lib/roomTypes/favorite.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/favorite.js
rename to app/lib/lib/roomTypes/favorite.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/index.js b/app/lib/lib/roomTypes/index.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/index.js
rename to app/lib/lib/roomTypes/index.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/private.js b/app/lib/lib/roomTypes/private.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/private.js
rename to app/lib/lib/roomTypes/private.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/public.js b/app/lib/lib/roomTypes/public.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/public.js
rename to app/lib/lib/roomTypes/public.js
diff --git a/packages/rocketchat-lib/lib/roomTypes/unread.js b/app/lib/lib/roomTypes/unread.js
similarity index 100%
rename from packages/rocketchat-lib/lib/roomTypes/unread.js
rename to app/lib/lib/roomTypes/unread.js
diff --git a/packages/rocketchat-lib/lib/startup/settingsOnLoadSiteUrl.js b/app/lib/lib/startup/settingsOnLoadSiteUrl.js
similarity index 100%
rename from packages/rocketchat-lib/lib/startup/settingsOnLoadSiteUrl.js
rename to app/lib/lib/startup/settingsOnLoadSiteUrl.js
diff --git a/packages/rocketchat-lib/package.js b/app/lib/package.js
similarity index 100%
rename from packages/rocketchat-lib/package.js
rename to app/lib/package.js
diff --git a/packages/rocketchat-lib/server/functions/addUserToDefaultChannels.js b/app/lib/server/functions/addUserToDefaultChannels.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/addUserToDefaultChannels.js
rename to app/lib/server/functions/addUserToDefaultChannels.js
diff --git a/packages/rocketchat-lib/server/functions/addUserToRoom.js b/app/lib/server/functions/addUserToRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/addUserToRoom.js
rename to app/lib/server/functions/addUserToRoom.js
diff --git a/packages/rocketchat-lib/server/functions/archiveRoom.js b/app/lib/server/functions/archiveRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/archiveRoom.js
rename to app/lib/server/functions/archiveRoom.js
diff --git a/packages/rocketchat-lib/server/functions/attachMessage.js b/app/lib/server/functions/attachMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/attachMessage.js
rename to app/lib/server/functions/attachMessage.js
diff --git a/packages/rocketchat-lib/server/functions/checkEmailAvailability.js b/app/lib/server/functions/checkEmailAvailability.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/checkEmailAvailability.js
rename to app/lib/server/functions/checkEmailAvailability.js
diff --git a/packages/rocketchat-lib/server/functions/checkUsernameAvailability.js b/app/lib/server/functions/checkUsernameAvailability.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/checkUsernameAvailability.js
rename to app/lib/server/functions/checkUsernameAvailability.js
diff --git a/packages/rocketchat-lib/server/functions/cleanRoomHistory.js b/app/lib/server/functions/cleanRoomHistory.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/cleanRoomHistory.js
rename to app/lib/server/functions/cleanRoomHistory.js
diff --git a/packages/rocketchat-lib/server/functions/createRoom.js b/app/lib/server/functions/createRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/createRoom.js
rename to app/lib/server/functions/createRoom.js
diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/app/lib/server/functions/deleteMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/deleteMessage.js
rename to app/lib/server/functions/deleteMessage.js
diff --git a/packages/rocketchat-lib/server/functions/deleteRoom.js b/app/lib/server/functions/deleteRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/deleteRoom.js
rename to app/lib/server/functions/deleteRoom.js
diff --git a/packages/rocketchat-lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/deleteUser.js
rename to app/lib/server/functions/deleteUser.js
diff --git a/packages/rocketchat-lib/server/functions/getAvatarSuggestionForUser.js b/app/lib/server/functions/getAvatarSuggestionForUser.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/getAvatarSuggestionForUser.js
rename to app/lib/server/functions/getAvatarSuggestionForUser.js
diff --git a/packages/rocketchat-lib/server/functions/getFullUserData.js b/app/lib/server/functions/getFullUserData.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/getFullUserData.js
rename to app/lib/server/functions/getFullUserData.js
diff --git a/packages/rocketchat-lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js b/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js
rename to app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js
diff --git a/packages/rocketchat-lib/server/functions/getUsernameSuggestion.js b/app/lib/server/functions/getUsernameSuggestion.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/getUsernameSuggestion.js
rename to app/lib/server/functions/getUsernameSuggestion.js
diff --git a/packages/rocketchat-lib/server/functions/index.js b/app/lib/server/functions/index.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/index.js
rename to app/lib/server/functions/index.js
diff --git a/packages/rocketchat-lib/server/functions/insertMessage.js b/app/lib/server/functions/insertMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/insertMessage.js
rename to app/lib/server/functions/insertMessage.js
diff --git a/packages/rocketchat-lib/server/functions/isTheLastMessage.js b/app/lib/server/functions/isTheLastMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/isTheLastMessage.js
rename to app/lib/server/functions/isTheLastMessage.js
diff --git a/packages/rocketchat-lib/server/functions/loadMessageHistory.js b/app/lib/server/functions/loadMessageHistory.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/loadMessageHistory.js
rename to app/lib/server/functions/loadMessageHistory.js
diff --git a/packages/rocketchat-lib/server/functions/notifications/audio.js b/app/lib/server/functions/notifications/audio.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/notifications/audio.js
rename to app/lib/server/functions/notifications/audio.js
diff --git a/packages/rocketchat-lib/server/functions/notifications/desktop.js b/app/lib/server/functions/notifications/desktop.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/notifications/desktop.js
rename to app/lib/server/functions/notifications/desktop.js
diff --git a/packages/rocketchat-lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/notifications/email.js
rename to app/lib/server/functions/notifications/email.js
diff --git a/packages/rocketchat-lib/server/functions/notifications/index.js b/app/lib/server/functions/notifications/index.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/notifications/index.js
rename to app/lib/server/functions/notifications/index.js
diff --git a/packages/rocketchat-lib/server/functions/notifications/mobile.js b/app/lib/server/functions/notifications/mobile.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/notifications/mobile.js
rename to app/lib/server/functions/notifications/mobile.js
diff --git a/packages/rocketchat-lib/server/functions/processWebhookMessage.js b/app/lib/server/functions/processWebhookMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/processWebhookMessage.js
rename to app/lib/server/functions/processWebhookMessage.js
diff --git a/packages/rocketchat-lib/server/functions/removeUserFromRoom.js b/app/lib/server/functions/removeUserFromRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/removeUserFromRoom.js
rename to app/lib/server/functions/removeUserFromRoom.js
diff --git a/packages/rocketchat-lib/server/functions/saveCustomFields.js b/app/lib/server/functions/saveCustomFields.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/saveCustomFields.js
rename to app/lib/server/functions/saveCustomFields.js
diff --git a/packages/rocketchat-lib/server/functions/saveCustomFieldsWithoutValidation.js b/app/lib/server/functions/saveCustomFieldsWithoutValidation.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/saveCustomFieldsWithoutValidation.js
rename to app/lib/server/functions/saveCustomFieldsWithoutValidation.js
diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/app/lib/server/functions/saveUser.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/saveUser.js
rename to app/lib/server/functions/saveUser.js
diff --git a/packages/rocketchat-lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/sendMessage.js
rename to app/lib/server/functions/sendMessage.js
diff --git a/packages/rocketchat-lib/server/functions/setEmail.js b/app/lib/server/functions/setEmail.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/setEmail.js
rename to app/lib/server/functions/setEmail.js
diff --git a/packages/rocketchat-lib/server/functions/setRealName.js b/app/lib/server/functions/setRealName.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/setRealName.js
rename to app/lib/server/functions/setRealName.js
diff --git a/packages/rocketchat-lib/server/functions/setUserAvatar.js b/app/lib/server/functions/setUserAvatar.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/setUserAvatar.js
rename to app/lib/server/functions/setUserAvatar.js
diff --git a/packages/rocketchat-lib/server/functions/setUsername.js b/app/lib/server/functions/setUsername.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/setUsername.js
rename to app/lib/server/functions/setUsername.js
diff --git a/packages/rocketchat-lib/server/functions/unarchiveRoom.js b/app/lib/server/functions/unarchiveRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/unarchiveRoom.js
rename to app/lib/server/functions/unarchiveRoom.js
diff --git a/packages/rocketchat-lib/server/functions/updateMessage.js b/app/lib/server/functions/updateMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/updateMessage.js
rename to app/lib/server/functions/updateMessage.js
diff --git a/packages/rocketchat-lib/server/functions/validateCustomFields.js b/app/lib/server/functions/validateCustomFields.js
similarity index 100%
rename from packages/rocketchat-lib/server/functions/validateCustomFields.js
rename to app/lib/server/functions/validateCustomFields.js
diff --git a/packages/rocketchat-lib/server/index.js b/app/lib/server/index.js
similarity index 100%
rename from packages/rocketchat-lib/server/index.js
rename to app/lib/server/index.js
diff --git a/packages/rocketchat-lib/server/lib/PasswordPolicyClass.js b/app/lib/server/lib/PasswordPolicyClass.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/PasswordPolicyClass.js
rename to app/lib/server/lib/PasswordPolicyClass.js
diff --git a/packages/rocketchat-lib/server/lib/RateLimiter.js b/app/lib/server/lib/RateLimiter.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/RateLimiter.js
rename to app/lib/server/lib/RateLimiter.js
diff --git a/packages/rocketchat-lib/server/lib/bugsnag.js b/app/lib/server/lib/bugsnag.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/bugsnag.js
rename to app/lib/server/lib/bugsnag.js
diff --git a/packages/rocketchat-lib/server/lib/configLogger.js b/app/lib/server/lib/configLogger.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/configLogger.js
rename to app/lib/server/lib/configLogger.js
diff --git a/packages/rocketchat-lib/server/lib/debug.js b/app/lib/server/lib/debug.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/debug.js
rename to app/lib/server/lib/debug.js
diff --git a/packages/rocketchat-lib/server/lib/defaultBlockedDomainsList.js b/app/lib/server/lib/defaultBlockedDomainsList.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/defaultBlockedDomainsList.js
rename to app/lib/server/lib/defaultBlockedDomainsList.js
diff --git a/packages/rocketchat-lib/server/lib/index.js b/app/lib/server/lib/index.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/index.js
rename to app/lib/server/lib/index.js
diff --git a/packages/rocketchat-lib/server/lib/interceptDirectReplyEmails.js b/app/lib/server/lib/interceptDirectReplyEmails.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/interceptDirectReplyEmails.js
rename to app/lib/server/lib/interceptDirectReplyEmails.js
diff --git a/packages/rocketchat-lib/server/lib/loginErrorMessageOverride.js b/app/lib/server/lib/loginErrorMessageOverride.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/loginErrorMessageOverride.js
rename to app/lib/server/lib/loginErrorMessageOverride.js
diff --git a/packages/rocketchat-lib/server/lib/msgStream.js b/app/lib/server/lib/msgStream.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/msgStream.js
rename to app/lib/server/lib/msgStream.js
diff --git a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js b/app/lib/server/lib/notifyUsersOnMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
rename to app/lib/server/lib/notifyUsersOnMessage.js
diff --git a/packages/rocketchat-lib/server/lib/passwordPolicy.js b/app/lib/server/lib/passwordPolicy.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/passwordPolicy.js
rename to app/lib/server/lib/passwordPolicy.js
diff --git a/packages/rocketchat-lib/server/lib/processDirectEmail.js b/app/lib/server/lib/processDirectEmail.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/processDirectEmail.js
rename to app/lib/server/lib/processDirectEmail.js
diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
rename to app/lib/server/lib/sendNotificationsOnMessage.js
diff --git a/packages/rocketchat-lib/server/lib/validateEmailDomain.js b/app/lib/server/lib/validateEmailDomain.js
similarity index 100%
rename from packages/rocketchat-lib/server/lib/validateEmailDomain.js
rename to app/lib/server/lib/validateEmailDomain.js
diff --git a/packages/rocketchat-lib/server/methods/addOAuthService.js b/app/lib/server/methods/addOAuthService.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/addOAuthService.js
rename to app/lib/server/methods/addOAuthService.js
diff --git a/packages/rocketchat-lib/server/methods/addUserToRoom.js b/app/lib/server/methods/addUserToRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/addUserToRoom.js
rename to app/lib/server/methods/addUserToRoom.js
diff --git a/packages/rocketchat-lib/server/methods/addUsersToRoom.js b/app/lib/server/methods/addUsersToRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/addUsersToRoom.js
rename to app/lib/server/methods/addUsersToRoom.js
diff --git a/packages/rocketchat-lib/server/methods/archiveRoom.js b/app/lib/server/methods/archiveRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/archiveRoom.js
rename to app/lib/server/methods/archiveRoom.js
diff --git a/packages/rocketchat-lib/server/methods/blockUser.js b/app/lib/server/methods/blockUser.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/blockUser.js
rename to app/lib/server/methods/blockUser.js
diff --git a/packages/rocketchat-lib/server/methods/checkRegistrationSecretURL.js b/app/lib/server/methods/checkRegistrationSecretURL.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/checkRegistrationSecretURL.js
rename to app/lib/server/methods/checkRegistrationSecretURL.js
diff --git a/packages/rocketchat-lib/server/methods/checkUsernameAvailability.js b/app/lib/server/methods/checkUsernameAvailability.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/checkUsernameAvailability.js
rename to app/lib/server/methods/checkUsernameAvailability.js
diff --git a/packages/rocketchat-lib/server/methods/cleanRoomHistory.js b/app/lib/server/methods/cleanRoomHistory.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/cleanRoomHistory.js
rename to app/lib/server/methods/cleanRoomHistory.js
diff --git a/packages/rocketchat-lib/server/methods/createChannel.js b/app/lib/server/methods/createChannel.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/createChannel.js
rename to app/lib/server/methods/createChannel.js
diff --git a/packages/rocketchat-lib/server/methods/createPrivateGroup.js b/app/lib/server/methods/createPrivateGroup.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/createPrivateGroup.js
rename to app/lib/server/methods/createPrivateGroup.js
diff --git a/packages/rocketchat-lib/server/methods/createToken.js b/app/lib/server/methods/createToken.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/createToken.js
rename to app/lib/server/methods/createToken.js
diff --git a/packages/rocketchat-lib/server/methods/deleteMessage.js b/app/lib/server/methods/deleteMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/deleteMessage.js
rename to app/lib/server/methods/deleteMessage.js
diff --git a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js b/app/lib/server/methods/deleteUserOwnAccount.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
rename to app/lib/server/methods/deleteUserOwnAccount.js
diff --git a/packages/rocketchat-lib/server/methods/executeSlashCommandPreview.js b/app/lib/server/methods/executeSlashCommandPreview.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/executeSlashCommandPreview.js
rename to app/lib/server/methods/executeSlashCommandPreview.js
diff --git a/packages/rocketchat-lib/server/methods/filterATAllTag.js b/app/lib/server/methods/filterATAllTag.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/filterATAllTag.js
rename to app/lib/server/methods/filterATAllTag.js
diff --git a/packages/rocketchat-lib/server/methods/filterATHereTag.js b/app/lib/server/methods/filterATHereTag.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/filterATHereTag.js
rename to app/lib/server/methods/filterATHereTag.js
diff --git a/packages/rocketchat-lib/server/methods/filterBadWords.js b/app/lib/server/methods/filterBadWords.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/filterBadWords.js
rename to app/lib/server/methods/filterBadWords.js
diff --git a/packages/rocketchat-lib/server/methods/getChannelHistory.js b/app/lib/server/methods/getChannelHistory.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getChannelHistory.js
rename to app/lib/server/methods/getChannelHistory.js
diff --git a/packages/rocketchat-lib/server/methods/getFullUserData.js b/app/lib/server/methods/getFullUserData.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getFullUserData.js
rename to app/lib/server/methods/getFullUserData.js
diff --git a/packages/rocketchat-lib/server/methods/getRoomJoinCode.js b/app/lib/server/methods/getRoomJoinCode.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getRoomJoinCode.js
rename to app/lib/server/methods/getRoomJoinCode.js
diff --git a/packages/rocketchat-lib/server/methods/getRoomMessageMetadata.js b/app/lib/server/methods/getRoomMessageMetadata.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getRoomMessageMetadata.js
rename to app/lib/server/methods/getRoomMessageMetadata.js
diff --git a/packages/rocketchat-lib/server/methods/getRoomRoles.js b/app/lib/server/methods/getRoomRoles.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getRoomRoles.js
rename to app/lib/server/methods/getRoomRoles.js
diff --git a/packages/rocketchat-lib/server/methods/getServerInfo.js b/app/lib/server/methods/getServerInfo.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getServerInfo.js
rename to app/lib/server/methods/getServerInfo.js
diff --git a/packages/rocketchat-lib/server/methods/getSingleMessage.js b/app/lib/server/methods/getSingleMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getSingleMessage.js
rename to app/lib/server/methods/getSingleMessage.js
diff --git a/packages/rocketchat-lib/server/methods/getSlashCommandPreviews.js b/app/lib/server/methods/getSlashCommandPreviews.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getSlashCommandPreviews.js
rename to app/lib/server/methods/getSlashCommandPreviews.js
diff --git a/packages/rocketchat-lib/server/methods/getUserRoles.js b/app/lib/server/methods/getUserRoles.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getUserRoles.js
rename to app/lib/server/methods/getUserRoles.js
diff --git a/packages/rocketchat-lib/server/methods/getUsernameSuggestion.js b/app/lib/server/methods/getUsernameSuggestion.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/getUsernameSuggestion.js
rename to app/lib/server/methods/getUsernameSuggestion.js
diff --git a/packages/rocketchat-lib/server/methods/insertOrUpdateUser.js b/app/lib/server/methods/insertOrUpdateUser.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/insertOrUpdateUser.js
rename to app/lib/server/methods/insertOrUpdateUser.js
diff --git a/packages/rocketchat-lib/server/methods/joinDefaultChannels.js b/app/lib/server/methods/joinDefaultChannels.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/joinDefaultChannels.js
rename to app/lib/server/methods/joinDefaultChannels.js
diff --git a/packages/rocketchat-lib/server/methods/joinRoom.js b/app/lib/server/methods/joinRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/joinRoom.js
rename to app/lib/server/methods/joinRoom.js
diff --git a/packages/rocketchat-lib/server/methods/leaveRoom.js b/app/lib/server/methods/leaveRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/leaveRoom.js
rename to app/lib/server/methods/leaveRoom.js
diff --git a/packages/rocketchat-lib/server/methods/refreshOAuthService.js b/app/lib/server/methods/refreshOAuthService.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/refreshOAuthService.js
rename to app/lib/server/methods/refreshOAuthService.js
diff --git a/packages/rocketchat-lib/server/methods/removeOAuthService.js b/app/lib/server/methods/removeOAuthService.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/removeOAuthService.js
rename to app/lib/server/methods/removeOAuthService.js
diff --git a/packages/rocketchat-lib/server/methods/restartServer.js b/app/lib/server/methods/restartServer.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/restartServer.js
rename to app/lib/server/methods/restartServer.js
diff --git a/packages/rocketchat-lib/server/methods/robotMethods.js b/app/lib/server/methods/robotMethods.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/robotMethods.js
rename to app/lib/server/methods/robotMethods.js
diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/app/lib/server/methods/saveSetting.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/saveSetting.js
rename to app/lib/server/methods/saveSetting.js
diff --git a/packages/rocketchat-lib/server/methods/saveSettings.js b/app/lib/server/methods/saveSettings.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/saveSettings.js
rename to app/lib/server/methods/saveSettings.js
diff --git a/packages/rocketchat-lib/server/methods/sendInvitationEmail.js b/app/lib/server/methods/sendInvitationEmail.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/sendInvitationEmail.js
rename to app/lib/server/methods/sendInvitationEmail.js
diff --git a/packages/rocketchat-lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/sendMessage.js
rename to app/lib/server/methods/sendMessage.js
diff --git a/packages/rocketchat-lib/server/methods/sendSMTPTestEmail.js b/app/lib/server/methods/sendSMTPTestEmail.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/sendSMTPTestEmail.js
rename to app/lib/server/methods/sendSMTPTestEmail.js
diff --git a/packages/rocketchat-lib/server/methods/setAdminStatus.js b/app/lib/server/methods/setAdminStatus.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/setAdminStatus.js
rename to app/lib/server/methods/setAdminStatus.js
diff --git a/packages/rocketchat-lib/server/methods/setEmail.js b/app/lib/server/methods/setEmail.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/setEmail.js
rename to app/lib/server/methods/setEmail.js
diff --git a/packages/rocketchat-lib/server/methods/setRealName.js b/app/lib/server/methods/setRealName.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/setRealName.js
rename to app/lib/server/methods/setRealName.js
diff --git a/packages/rocketchat-lib/server/methods/setUsername.js b/app/lib/server/methods/setUsername.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/setUsername.js
rename to app/lib/server/methods/setUsername.js
diff --git a/packages/rocketchat-lib/server/methods/unarchiveRoom.js b/app/lib/server/methods/unarchiveRoom.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/unarchiveRoom.js
rename to app/lib/server/methods/unarchiveRoom.js
diff --git a/packages/rocketchat-lib/server/methods/unblockUser.js b/app/lib/server/methods/unblockUser.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/unblockUser.js
rename to app/lib/server/methods/unblockUser.js
diff --git a/packages/rocketchat-lib/server/methods/updateMessage.js b/app/lib/server/methods/updateMessage.js
similarity index 100%
rename from packages/rocketchat-lib/server/methods/updateMessage.js
rename to app/lib/server/methods/updateMessage.js
diff --git a/packages/rocketchat-lib/server/oauth/facebook.js b/app/lib/server/oauth/facebook.js
similarity index 100%
rename from packages/rocketchat-lib/server/oauth/facebook.js
rename to app/lib/server/oauth/facebook.js
diff --git a/packages/rocketchat-lib/server/oauth/google.js b/app/lib/server/oauth/google.js
similarity index 100%
rename from packages/rocketchat-lib/server/oauth/google.js
rename to app/lib/server/oauth/google.js
diff --git a/packages/rocketchat-lib/server/oauth/oauth.js b/app/lib/server/oauth/oauth.js
similarity index 100%
rename from packages/rocketchat-lib/server/oauth/oauth.js
rename to app/lib/server/oauth/oauth.js
diff --git a/packages/rocketchat-lib/server/oauth/proxy.js b/app/lib/server/oauth/proxy.js
similarity index 100%
rename from packages/rocketchat-lib/server/oauth/proxy.js
rename to app/lib/server/oauth/proxy.js
diff --git a/packages/rocketchat-lib/server/oauth/twitter.js b/app/lib/server/oauth/twitter.js
similarity index 100%
rename from packages/rocketchat-lib/server/oauth/twitter.js
rename to app/lib/server/oauth/twitter.js
diff --git a/packages/rocketchat-lib/server/publications/settings.js b/app/lib/server/publications/settings.js
similarity index 100%
rename from packages/rocketchat-lib/server/publications/settings.js
rename to app/lib/server/publications/settings.js
diff --git a/packages/rocketchat-lib/server/startup/email.js b/app/lib/server/startup/email.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/email.js
rename to app/lib/server/startup/email.js
diff --git a/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js b/app/lib/server/startup/oAuthServicesUpdate.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
rename to app/lib/server/startup/oAuthServicesUpdate.js
diff --git a/packages/rocketchat-lib/server/startup/rateLimiter.js b/app/lib/server/startup/rateLimiter.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/rateLimiter.js
rename to app/lib/server/startup/rateLimiter.js
diff --git a/packages/rocketchat-lib/server/startup/robots.js b/app/lib/server/startup/robots.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/robots.js
rename to app/lib/server/startup/robots.js
diff --git a/packages/rocketchat-lib/server/startup/settings.js b/app/lib/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/settings.js
rename to app/lib/server/startup/settings.js
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js b/app/lib/server/startup/settingsOnLoadCdnPrefix.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js
rename to app/lib/server/startup/settingsOnLoadCdnPrefix.js
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadDirectReply.js b/app/lib/server/startup/settingsOnLoadDirectReply.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/settingsOnLoadDirectReply.js
rename to app/lib/server/startup/settingsOnLoadDirectReply.js
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js b/app/lib/server/startup/settingsOnLoadSMTP.js
similarity index 100%
rename from packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
rename to app/lib/server/startup/settingsOnLoadSMTP.js
diff --git a/packages/rocketchat-lib/startup/defaultRoomTypes.js b/app/lib/startup/defaultRoomTypes.js
similarity index 100%
rename from packages/rocketchat-lib/startup/defaultRoomTypes.js
rename to app/lib/startup/defaultRoomTypes.js
diff --git a/packages/rocketchat-lib/startup/index.js b/app/lib/startup/index.js
similarity index 100%
rename from packages/rocketchat-lib/startup/index.js
rename to app/lib/startup/index.js
diff --git a/packages/rocketchat-lib/tests/server.mocks.js b/app/lib/tests/server.mocks.js
similarity index 100%
rename from packages/rocketchat-lib/tests/server.mocks.js
rename to app/lib/tests/server.mocks.js
diff --git a/packages/rocketchat-lib/tests/server.tests.js b/app/lib/tests/server.tests.js
similarity index 100%
rename from packages/rocketchat-lib/tests/server.tests.js
rename to app/lib/tests/server.tests.js
diff --git a/packages/rocketchat-livechat/client/collections/AgentUsers.js b/app/livechat/client/collections/AgentUsers.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/AgentUsers.js
rename to app/livechat/client/collections/AgentUsers.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatCustomField.js b/app/livechat/client/collections/LivechatCustomField.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatCustomField.js
rename to app/livechat/client/collections/LivechatCustomField.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatDepartment.js b/app/livechat/client/collections/LivechatDepartment.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatDepartment.js
rename to app/livechat/client/collections/LivechatDepartment.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatDepartmentAgents.js b/app/livechat/client/collections/LivechatDepartmentAgents.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatDepartmentAgents.js
rename to app/livechat/client/collections/LivechatDepartmentAgents.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatIntegration.js b/app/livechat/client/collections/LivechatIntegration.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatIntegration.js
rename to app/livechat/client/collections/LivechatIntegration.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatMonitoring.js b/app/livechat/client/collections/LivechatMonitoring.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatMonitoring.js
rename to app/livechat/client/collections/LivechatMonitoring.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatQueueUser.js b/app/livechat/client/collections/LivechatQueueUser.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatQueueUser.js
rename to app/livechat/client/collections/LivechatQueueUser.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatTrigger.js b/app/livechat/client/collections/LivechatTrigger.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatTrigger.js
rename to app/livechat/client/collections/LivechatTrigger.js
diff --git a/packages/rocketchat-livechat/client/collections/LivechatVisitor.js b/app/livechat/client/collections/LivechatVisitor.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/LivechatVisitor.js
rename to app/livechat/client/collections/LivechatVisitor.js
diff --git a/packages/rocketchat-livechat/client/collections/livechatOfficeHour.js b/app/livechat/client/collections/livechatOfficeHour.js
similarity index 100%
rename from packages/rocketchat-livechat/client/collections/livechatOfficeHour.js
rename to app/livechat/client/collections/livechatOfficeHour.js
diff --git a/packages/rocketchat-livechat/client/index.js b/app/livechat/client/index.js
similarity index 100%
rename from packages/rocketchat-livechat/client/index.js
rename to app/livechat/client/index.js
diff --git a/packages/rocketchat-livechat/client/lib/chartHandler.js b/app/livechat/client/lib/chartHandler.js
similarity index 100%
rename from packages/rocketchat-livechat/client/lib/chartHandler.js
rename to app/livechat/client/lib/chartHandler.js
diff --git a/packages/rocketchat-livechat/client/lib/dataHandler.js b/app/livechat/client/lib/dataHandler.js
similarity index 100%
rename from packages/rocketchat-livechat/client/lib/dataHandler.js
rename to app/livechat/client/lib/dataHandler.js
diff --git a/packages/rocketchat-livechat/client/lib/dateHandler.js b/app/livechat/client/lib/dateHandler.js
similarity index 100%
rename from packages/rocketchat-livechat/client/lib/dateHandler.js
rename to app/livechat/client/lib/dateHandler.js
diff --git a/packages/rocketchat-livechat/client/methods/changeLivechatStatus.js b/app/livechat/client/methods/changeLivechatStatus.js
similarity index 100%
rename from packages/rocketchat-livechat/client/methods/changeLivechatStatus.js
rename to app/livechat/client/methods/changeLivechatStatus.js
diff --git a/packages/rocketchat-livechat/client/roomType.js b/app/livechat/client/roomType.js
similarity index 100%
rename from packages/rocketchat-livechat/client/roomType.js
rename to app/livechat/client/roomType.js
diff --git a/packages/rocketchat-livechat/client/route.js b/app/livechat/client/route.js
similarity index 100%
rename from packages/rocketchat-livechat/client/route.js
rename to app/livechat/client/route.js
diff --git a/packages/rocketchat-livechat/client/startup/notifyUnreadRooms.js b/app/livechat/client/startup/notifyUnreadRooms.js
similarity index 100%
rename from packages/rocketchat-livechat/client/startup/notifyUnreadRooms.js
rename to app/livechat/client/startup/notifyUnreadRooms.js
diff --git a/packages/rocketchat-livechat/client/stylesheets/livechat.less b/app/livechat/client/stylesheets/livechat.less
similarity index 100%
rename from packages/rocketchat-livechat/client/stylesheets/livechat.less
rename to app/livechat/client/stylesheets/livechat.less
diff --git a/packages/rocketchat-livechat/client/ui.js b/app/livechat/client/ui.js
similarity index 100%
rename from packages/rocketchat-livechat/client/ui.js
rename to app/livechat/client/ui.js
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.html b/app/livechat/client/views/app/analytics/livechatAnalytics.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.html
rename to app/livechat/client/views/app/analytics/livechatAnalytics.html
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js b/app/livechat/client/views/app/analytics/livechatAnalytics.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
rename to app/livechat/client/views/app/analytics/livechatAnalytics.js
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.html b/app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.html
rename to app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.html
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js b/app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js
rename to app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.html b/app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.html
rename to app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.html
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js b/app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatAnalyticsDaterange.js
rename to app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.js
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.html b/app/livechat/client/views/app/analytics/livechatRealTimeMonitoring.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.html
rename to app/livechat/client/views/app/analytics/livechatRealTimeMonitoring.html
diff --git a/packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js b/app/livechat/client/views/app/analytics/livechatRealTimeMonitoring.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js
rename to app/livechat/client/views/app/analytics/livechatRealTimeMonitoring.js
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.html b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.html
rename to app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
rename to app/livechat/client/views/app/integrations/livechatIntegrationFacebook.js
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.html b/app/livechat/client/views/app/integrations/livechatIntegrationWebhook.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.html
rename to app/livechat/client/views/app/integrations/livechatIntegrationWebhook.html
diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js b/app/livechat/client/views/app/integrations/livechatIntegrationWebhook.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js
rename to app/livechat/client/views/app/integrations/livechatIntegrationWebhook.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.html b/app/livechat/client/views/app/livechatAppearance.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatAppearance.html
rename to app/livechat/client/views/app/livechatAppearance.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/app/livechat/client/views/app/livechatAppearance.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatAppearance.js
rename to app/livechat/client/views/app/livechatAppearance.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.html b/app/livechat/client/views/app/livechatCurrentChats.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatCurrentChats.html
rename to app/livechat/client/views/app/livechatCurrentChats.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js b/app/livechat/client/views/app/livechatCurrentChats.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
rename to app/livechat/client/views/app/livechatCurrentChats.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.html b/app/livechat/client/views/app/livechatCustomFieldForm.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.html
rename to app/livechat/client/views/app/livechatCustomFieldForm.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js b/app/livechat/client/views/app/livechatCustomFieldForm.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js
rename to app/livechat/client/views/app/livechatCustomFieldForm.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.html b/app/livechat/client/views/app/livechatCustomFields.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatCustomFields.html
rename to app/livechat/client/views/app/livechatCustomFields.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js b/app/livechat/client/views/app/livechatCustomFields.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatCustomFields.js
rename to app/livechat/client/views/app/livechatCustomFields.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDashboard.html b/app/livechat/client/views/app/livechatDashboard.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatDashboard.html
rename to app/livechat/client/views/app/livechatDashboard.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.html b/app/livechat/client/views/app/livechatDepartmentForm.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.html
rename to app/livechat/client/views/app/livechatDepartmentForm.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/app/livechat/client/views/app/livechatDepartmentForm.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
rename to app/livechat/client/views/app/livechatDepartmentForm.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartments.html b/app/livechat/client/views/app/livechatDepartments.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatDepartments.html
rename to app/livechat/client/views/app/livechatDepartments.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js b/app/livechat/client/views/app/livechatDepartments.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatDepartments.js
rename to app/livechat/client/views/app/livechatDepartments.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatInstallation.html b/app/livechat/client/views/app/livechatInstallation.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatInstallation.html
rename to app/livechat/client/views/app/livechatInstallation.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js b/app/livechat/client/views/app/livechatInstallation.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatInstallation.js
rename to app/livechat/client/views/app/livechatInstallation.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatIntegrations.html b/app/livechat/client/views/app/livechatIntegrations.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatIntegrations.html
rename to app/livechat/client/views/app/livechatIntegrations.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatNotSubscribed.html b/app/livechat/client/views/app/livechatNotSubscribed.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatNotSubscribed.html
rename to app/livechat/client/views/app/livechatNotSubscribed.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.html b/app/livechat/client/views/app/livechatOfficeHours.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatOfficeHours.html
rename to app/livechat/client/views/app/livechatOfficeHours.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js b/app/livechat/client/views/app/livechatOfficeHours.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js
rename to app/livechat/client/views/app/livechatOfficeHours.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatQueue.html b/app/livechat/client/views/app/livechatQueue.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatQueue.html
rename to app/livechat/client/views/app/livechatQueue.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatQueue.js b/app/livechat/client/views/app/livechatQueue.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatQueue.js
rename to app/livechat/client/views/app/livechatQueue.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.html b/app/livechat/client/views/app/livechatTriggers.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggers.html
rename to app/livechat/client/views/app/livechatTriggers.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js b/app/livechat/client/views/app/livechatTriggers.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggers.js
rename to app/livechat/client/views/app/livechatTriggers.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.html b/app/livechat/client/views/app/livechatTriggersForm.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggersForm.html
rename to app/livechat/client/views/app/livechatTriggersForm.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js b/app/livechat/client/views/app/livechatTriggersForm.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js
rename to app/livechat/client/views/app/livechatTriggersForm.js
diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.html b/app/livechat/client/views/app/livechatUsers.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatUsers.html
rename to app/livechat/client/views/app/livechatUsers.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.js b/app/livechat/client/views/app/livechatUsers.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatUsers.js
rename to app/livechat/client/views/app/livechatUsers.js
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.html b/app/livechat/client/views/app/tabbar/externalSearch.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.html
rename to app/livechat/client/views/app/tabbar/externalSearch.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js b/app/livechat/client/views/app/tabbar/externalSearch.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js
rename to app/livechat/client/views/app/tabbar/externalSearch.js
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.html b/app/livechat/client/views/app/tabbar/visitorEdit.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.html
rename to app/livechat/client/views/app/tabbar/visitorEdit.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js b/app/livechat/client/views/app/tabbar/visitorEdit.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
rename to app/livechat/client/views/app/tabbar/visitorEdit.js
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.html b/app/livechat/client/views/app/tabbar/visitorForward.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.html
rename to app/livechat/client/views/app/tabbar/visitorForward.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js b/app/livechat/client/views/app/tabbar/visitorForward.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
rename to app/livechat/client/views/app/tabbar/visitorForward.js
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.html b/app/livechat/client/views/app/tabbar/visitorHistory.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.html
rename to app/livechat/client/views/app/tabbar/visitorHistory.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js b/app/livechat/client/views/app/tabbar/visitorHistory.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js
rename to app/livechat/client/views/app/tabbar/visitorHistory.js
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html b/app/livechat/client/views/app/tabbar/visitorInfo.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
rename to app/livechat/client/views/app/tabbar/visitorInfo.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
rename to app/livechat/client/views/app/tabbar/visitorInfo.js
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.html b/app/livechat/client/views/app/tabbar/visitorNavigation.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.html
rename to app/livechat/client/views/app/tabbar/visitorNavigation.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js b/app/livechat/client/views/app/tabbar/visitorNavigation.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
rename to app/livechat/client/views/app/tabbar/visitorNavigation.js
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.html b/app/livechat/client/views/app/triggers/livechatTriggerAction.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.html
rename to app/livechat/client/views/app/triggers/livechatTriggerAction.html
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js b/app/livechat/client/views/app/triggers/livechatTriggerAction.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js
rename to app/livechat/client/views/app/triggers/livechatTriggerAction.js
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.html b/app/livechat/client/views/app/triggers/livechatTriggerCondition.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.html
rename to app/livechat/client/views/app/triggers/livechatTriggerCondition.html
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js b/app/livechat/client/views/app/triggers/livechatTriggerCondition.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js
rename to app/livechat/client/views/app/triggers/livechatTriggerCondition.js
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.html b/app/livechat/client/views/sideNav/livechat.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/sideNav/livechat.html
rename to app/livechat/client/views/sideNav/livechat.html
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/sideNav/livechat.js
rename to app/livechat/client/views/sideNav/livechat.js
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/app/livechat/client/views/sideNav/livechatFlex.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
rename to app/livechat/client/views/sideNav/livechatFlex.html
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/app/livechat/client/views/sideNav/livechatFlex.js
similarity index 100%
rename from packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
rename to app/livechat/client/views/sideNav/livechatFlex.js
diff --git a/packages/rocketchat-livechat/imports/server/rest/departments.js b/app/livechat/imports/server/rest/departments.js
similarity index 100%
rename from packages/rocketchat-livechat/imports/server/rest/departments.js
rename to app/livechat/imports/server/rest/departments.js
diff --git a/packages/rocketchat-livechat/imports/server/rest/facebook.js b/app/livechat/imports/server/rest/facebook.js
similarity index 100%
rename from packages/rocketchat-livechat/imports/server/rest/facebook.js
rename to app/livechat/imports/server/rest/facebook.js
diff --git a/packages/rocketchat-livechat/imports/server/rest/sms.js b/app/livechat/imports/server/rest/sms.js
similarity index 100%
rename from packages/rocketchat-livechat/imports/server/rest/sms.js
rename to app/livechat/imports/server/rest/sms.js
diff --git a/packages/rocketchat-livechat/imports/server/rest/upload.js b/app/livechat/imports/server/rest/upload.js
similarity index 100%
rename from packages/rocketchat-livechat/imports/server/rest/upload.js
rename to app/livechat/imports/server/rest/upload.js
diff --git a/packages/rocketchat-livechat/imports/server/rest/users.js b/app/livechat/imports/server/rest/users.js
similarity index 100%
rename from packages/rocketchat-livechat/imports/server/rest/users.js
rename to app/livechat/imports/server/rest/users.js
diff --git a/packages/rocketchat-livechat/lib/LivechatExternalMessage.js b/app/livechat/lib/LivechatExternalMessage.js
similarity index 100%
rename from packages/rocketchat-livechat/lib/LivechatExternalMessage.js
rename to app/livechat/lib/LivechatExternalMessage.js
diff --git a/packages/rocketchat-livechat/lib/LivechatInquiry.js b/app/livechat/lib/LivechatInquiry.js
similarity index 100%
rename from packages/rocketchat-livechat/lib/LivechatInquiry.js
rename to app/livechat/lib/LivechatInquiry.js
diff --git a/packages/rocketchat-livechat/lib/LivechatRoomType.js b/app/livechat/lib/LivechatRoomType.js
similarity index 100%
rename from packages/rocketchat-livechat/lib/LivechatRoomType.js
rename to app/livechat/lib/LivechatRoomType.js
diff --git a/packages/rocketchat-livechat/lib/messageTypes.js b/app/livechat/lib/messageTypes.js
similarity index 100%
rename from packages/rocketchat-livechat/lib/messageTypes.js
rename to app/livechat/lib/messageTypes.js
diff --git a/app/livechat/package.js b/app/livechat/package.js
new file mode 100644
index 0000000000000000000000000000000000000000..a62ce160514347e891e703f0e692bde143e817d2
--- /dev/null
+++ b/app/livechat/package.js
@@ -0,0 +1,60 @@
+Package.describe({
+	name: 'rocketchat:livechat',
+	version: '0.0.1',
+	summary: 'Livechat plugin for Rocket.Chat',
+});
+
+Package.registerBuildPlugin({
+	name: 'Livechat',
+	use: [
+		'ecmascript',
+	],
+	sources: [
+		'plugin/build-livechat.js',
+	],
+	npmDependencies: {
+		shelljs: '0.8.1',
+		'uglify-js': '2.8.29',
+	},
+});
+
+Package.onUse(function(api) {
+	api.use([
+		'ecmascript',
+		'webapp',
+		'autoupdate',
+		'rocketchat:utils',
+		'rocketchat:action-links',
+		'rocketchat:ui-utils',
+		'rocketchat:settings',
+		'rocketchat:callbacks',
+		'rocketchat:models',
+		'rocketchat:lib',
+		'rocketchat:authorization',
+		'rocketchat:logger',
+		'rocketchat:api',
+		'rocketchat:theme',
+		'rocketchat:streamer',
+		'konecty:user-presence',
+		'rocketchat:ui',
+		'kadira:flow-router',
+		'kadira:blaze-layout',
+		'templating',
+		'http',
+		'check',
+		'mongo',
+		'ddp-rate-limiter',
+		'rocketchat:sms',
+		'tracker',
+		'less',
+	]);
+	// livechat app
+	api.addAssets('assets/demo.html', 'client');
+	// DEPRECATED
+	api.addAssets('assets/rocket-livechat.js', 'client'); // this file is still added to not break currently installed livechat widgets
+	api.addAssets('assets/rocketchat-livechat.min.js', 'client');
+	api.addAssets('public/head.html', 'server');
+	api.addFiles('client/stylesheets/livechat.less', 'client');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
+});
diff --git a/packages/rocketchat-livechat/server/agentStatus.js b/app/livechat/server/agentStatus.js
similarity index 100%
rename from packages/rocketchat-livechat/server/agentStatus.js
rename to app/livechat/server/agentStatus.js
diff --git a/packages/rocketchat-livechat/server/api.js b/app/livechat/server/api.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api.js
rename to app/livechat/server/api.js
diff --git a/packages/rocketchat-livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/lib/livechat.js
rename to app/livechat/server/api/lib/livechat.js
diff --git a/packages/rocketchat-livechat/server/api/rest.js b/app/livechat/server/api/rest.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/rest.js
rename to app/livechat/server/api/rest.js
diff --git a/packages/rocketchat-livechat/server/api/v1/agent.js b/app/livechat/server/api/v1/agent.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/agent.js
rename to app/livechat/server/api/v1/agent.js
diff --git a/packages/rocketchat-livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/config.js
rename to app/livechat/server/api/v1/config.js
diff --git a/packages/rocketchat-livechat/server/api/v1/customField.js b/app/livechat/server/api/v1/customField.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/customField.js
rename to app/livechat/server/api/v1/customField.js
diff --git a/packages/rocketchat-livechat/server/api/v1/message.js b/app/livechat/server/api/v1/message.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/message.js
rename to app/livechat/server/api/v1/message.js
diff --git a/packages/rocketchat-livechat/server/api/v1/offlineMessage.js b/app/livechat/server/api/v1/offlineMessage.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/offlineMessage.js
rename to app/livechat/server/api/v1/offlineMessage.js
diff --git a/packages/rocketchat-livechat/server/api/v1/pageVisited.js b/app/livechat/server/api/v1/pageVisited.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/pageVisited.js
rename to app/livechat/server/api/v1/pageVisited.js
diff --git a/packages/rocketchat-livechat/server/api/v1/room.js b/app/livechat/server/api/v1/room.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/room.js
rename to app/livechat/server/api/v1/room.js
diff --git a/packages/rocketchat-livechat/server/api/v1/transcript.js b/app/livechat/server/api/v1/transcript.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/transcript.js
rename to app/livechat/server/api/v1/transcript.js
diff --git a/packages/rocketchat-livechat/server/api/v1/videoCall.js b/app/livechat/server/api/v1/videoCall.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/videoCall.js
rename to app/livechat/server/api/v1/videoCall.js
diff --git a/packages/rocketchat-livechat/server/api/v1/visitor.js b/app/livechat/server/api/v1/visitor.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/v1/visitor.js
rename to app/livechat/server/api/v1/visitor.js
diff --git a/packages/rocketchat-livechat/server/config.js b/app/livechat/server/config.js
similarity index 100%
rename from packages/rocketchat-livechat/server/config.js
rename to app/livechat/server/config.js
diff --git a/packages/rocketchat-livechat/server/hooks/RDStation.js b/app/livechat/server/hooks/RDStation.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/RDStation.js
rename to app/livechat/server/hooks/RDStation.js
diff --git a/packages/rocketchat-livechat/server/hooks/externalMessage.js b/app/livechat/server/hooks/externalMessage.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/externalMessage.js
rename to app/livechat/server/hooks/externalMessage.js
diff --git a/packages/rocketchat-livechat/server/hooks/leadCapture.js b/app/livechat/server/hooks/leadCapture.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/leadCapture.js
rename to app/livechat/server/hooks/leadCapture.js
diff --git a/packages/rocketchat-livechat/server/hooks/markRoomResponded.js b/app/livechat/server/hooks/markRoomResponded.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/markRoomResponded.js
rename to app/livechat/server/hooks/markRoomResponded.js
diff --git a/packages/rocketchat-livechat/server/hooks/offlineMessage.js b/app/livechat/server/hooks/offlineMessage.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/offlineMessage.js
rename to app/livechat/server/hooks/offlineMessage.js
diff --git a/packages/rocketchat-livechat/server/hooks/saveAnalyticsData.js b/app/livechat/server/hooks/saveAnalyticsData.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/saveAnalyticsData.js
rename to app/livechat/server/hooks/saveAnalyticsData.js
diff --git a/packages/rocketchat-livechat/server/hooks/sendToCRM.js b/app/livechat/server/hooks/sendToCRM.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/sendToCRM.js
rename to app/livechat/server/hooks/sendToCRM.js
diff --git a/packages/rocketchat-livechat/server/hooks/sendToFacebook.js b/app/livechat/server/hooks/sendToFacebook.js
similarity index 100%
rename from packages/rocketchat-livechat/server/hooks/sendToFacebook.js
rename to app/livechat/server/hooks/sendToFacebook.js
diff --git a/packages/rocketchat-livechat/server/index.js b/app/livechat/server/index.js
similarity index 100%
rename from packages/rocketchat-livechat/server/index.js
rename to app/livechat/server/index.js
diff --git a/packages/rocketchat-livechat/server/lib/Analytics.js b/app/livechat/server/lib/Analytics.js
similarity index 100%
rename from packages/rocketchat-livechat/server/lib/Analytics.js
rename to app/livechat/server/lib/Analytics.js
diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
similarity index 100%
rename from packages/rocketchat-livechat/server/lib/Livechat.js
rename to app/livechat/server/lib/Livechat.js
diff --git a/packages/rocketchat-livechat/server/lib/OfficeClock.js b/app/livechat/server/lib/OfficeClock.js
similarity index 100%
rename from packages/rocketchat-livechat/server/lib/OfficeClock.js
rename to app/livechat/server/lib/OfficeClock.js
diff --git a/packages/rocketchat-livechat/server/lib/OmniChannel.js b/app/livechat/server/lib/OmniChannel.js
similarity index 100%
rename from packages/rocketchat-livechat/server/lib/OmniChannel.js
rename to app/livechat/server/lib/OmniChannel.js
diff --git a/packages/rocketchat-livechat/server/lib/QueueMethods.js b/app/livechat/server/lib/QueueMethods.js
similarity index 100%
rename from packages/rocketchat-livechat/server/lib/QueueMethods.js
rename to app/livechat/server/lib/QueueMethods.js
diff --git a/packages/rocketchat-livechat/server/livechat.js b/app/livechat/server/livechat.js
similarity index 100%
rename from packages/rocketchat-livechat/server/livechat.js
rename to app/livechat/server/livechat.js
diff --git a/packages/rocketchat-livechat/server/methods/addAgent.js b/app/livechat/server/methods/addAgent.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/addAgent.js
rename to app/livechat/server/methods/addAgent.js
diff --git a/packages/rocketchat-livechat/server/methods/addManager.js b/app/livechat/server/methods/addManager.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/addManager.js
rename to app/livechat/server/methods/addManager.js
diff --git a/packages/rocketchat-livechat/server/methods/changeLivechatStatus.js b/app/livechat/server/methods/changeLivechatStatus.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/changeLivechatStatus.js
rename to app/livechat/server/methods/changeLivechatStatus.js
diff --git a/packages/rocketchat-livechat/server/methods/closeByVisitor.js b/app/livechat/server/methods/closeByVisitor.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/closeByVisitor.js
rename to app/livechat/server/methods/closeByVisitor.js
diff --git a/packages/rocketchat-livechat/server/methods/closeRoom.js b/app/livechat/server/methods/closeRoom.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/closeRoom.js
rename to app/livechat/server/methods/closeRoom.js
diff --git a/packages/rocketchat-livechat/server/methods/facebook.js b/app/livechat/server/methods/facebook.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/facebook.js
rename to app/livechat/server/methods/facebook.js
diff --git a/packages/rocketchat-livechat/server/methods/getAgentData.js b/app/livechat/server/methods/getAgentData.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getAgentData.js
rename to app/livechat/server/methods/getAgentData.js
diff --git a/packages/rocketchat-livechat/server/methods/getAgentOverviewData.js b/app/livechat/server/methods/getAgentOverviewData.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getAgentOverviewData.js
rename to app/livechat/server/methods/getAgentOverviewData.js
diff --git a/packages/rocketchat-livechat/server/methods/getAnalyticsChartData.js b/app/livechat/server/methods/getAnalyticsChartData.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getAnalyticsChartData.js
rename to app/livechat/server/methods/getAnalyticsChartData.js
diff --git a/packages/rocketchat-livechat/server/methods/getAnalyticsOverviewData.js b/app/livechat/server/methods/getAnalyticsOverviewData.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getAnalyticsOverviewData.js
rename to app/livechat/server/methods/getAnalyticsOverviewData.js
diff --git a/packages/rocketchat-livechat/server/methods/getCustomFields.js b/app/livechat/server/methods/getCustomFields.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getCustomFields.js
rename to app/livechat/server/methods/getCustomFields.js
diff --git a/packages/rocketchat-livechat/server/methods/getInitialData.js b/app/livechat/server/methods/getInitialData.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getInitialData.js
rename to app/livechat/server/methods/getInitialData.js
diff --git a/packages/rocketchat-livechat/server/methods/getNextAgent.js b/app/livechat/server/methods/getNextAgent.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/getNextAgent.js
rename to app/livechat/server/methods/getNextAgent.js
diff --git a/packages/rocketchat-livechat/server/methods/loadHistory.js b/app/livechat/server/methods/loadHistory.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/loadHistory.js
rename to app/livechat/server/methods/loadHistory.js
diff --git a/packages/rocketchat-livechat/server/methods/loginByToken.js b/app/livechat/server/methods/loginByToken.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/loginByToken.js
rename to app/livechat/server/methods/loginByToken.js
diff --git a/packages/rocketchat-livechat/server/methods/pageVisited.js b/app/livechat/server/methods/pageVisited.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/pageVisited.js
rename to app/livechat/server/methods/pageVisited.js
diff --git a/packages/rocketchat-livechat/server/methods/registerGuest.js b/app/livechat/server/methods/registerGuest.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/registerGuest.js
rename to app/livechat/server/methods/registerGuest.js
diff --git a/packages/rocketchat-livechat/server/methods/removeAgent.js b/app/livechat/server/methods/removeAgent.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/removeAgent.js
rename to app/livechat/server/methods/removeAgent.js
diff --git a/packages/rocketchat-livechat/server/methods/removeCustomField.js b/app/livechat/server/methods/removeCustomField.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/removeCustomField.js
rename to app/livechat/server/methods/removeCustomField.js
diff --git a/packages/rocketchat-livechat/server/methods/removeDepartment.js b/app/livechat/server/methods/removeDepartment.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/removeDepartment.js
rename to app/livechat/server/methods/removeDepartment.js
diff --git a/packages/rocketchat-livechat/server/methods/removeManager.js b/app/livechat/server/methods/removeManager.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/removeManager.js
rename to app/livechat/server/methods/removeManager.js
diff --git a/packages/rocketchat-livechat/server/methods/removeRoom.js b/app/livechat/server/methods/removeRoom.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/removeRoom.js
rename to app/livechat/server/methods/removeRoom.js
diff --git a/packages/rocketchat-livechat/server/methods/removeTrigger.js b/app/livechat/server/methods/removeTrigger.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/removeTrigger.js
rename to app/livechat/server/methods/removeTrigger.js
diff --git a/packages/rocketchat-livechat/server/methods/returnAsInquiry.js b/app/livechat/server/methods/returnAsInquiry.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/returnAsInquiry.js
rename to app/livechat/server/methods/returnAsInquiry.js
diff --git a/packages/rocketchat-livechat/server/methods/saveAppearance.js b/app/livechat/server/methods/saveAppearance.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveAppearance.js
rename to app/livechat/server/methods/saveAppearance.js
diff --git a/packages/rocketchat-livechat/server/methods/saveCustomField.js b/app/livechat/server/methods/saveCustomField.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveCustomField.js
rename to app/livechat/server/methods/saveCustomField.js
diff --git a/packages/rocketchat-livechat/server/methods/saveDepartment.js b/app/livechat/server/methods/saveDepartment.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveDepartment.js
rename to app/livechat/server/methods/saveDepartment.js
diff --git a/packages/rocketchat-livechat/server/methods/saveInfo.js b/app/livechat/server/methods/saveInfo.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveInfo.js
rename to app/livechat/server/methods/saveInfo.js
diff --git a/packages/rocketchat-livechat/server/methods/saveIntegration.js b/app/livechat/server/methods/saveIntegration.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveIntegration.js
rename to app/livechat/server/methods/saveIntegration.js
diff --git a/packages/rocketchat-livechat/server/methods/saveOfficeHours.js b/app/livechat/server/methods/saveOfficeHours.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveOfficeHours.js
rename to app/livechat/server/methods/saveOfficeHours.js
diff --git a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js b/app/livechat/server/methods/saveSurveyFeedback.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
rename to app/livechat/server/methods/saveSurveyFeedback.js
diff --git a/packages/rocketchat-livechat/server/methods/saveTrigger.js b/app/livechat/server/methods/saveTrigger.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/saveTrigger.js
rename to app/livechat/server/methods/saveTrigger.js
diff --git a/packages/rocketchat-livechat/server/methods/searchAgent.js b/app/livechat/server/methods/searchAgent.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/searchAgent.js
rename to app/livechat/server/methods/searchAgent.js
diff --git a/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js b/app/livechat/server/methods/sendFileLivechatMessage.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js
rename to app/livechat/server/methods/sendFileLivechatMessage.js
diff --git a/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js b/app/livechat/server/methods/sendMessageLivechat.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/sendMessageLivechat.js
rename to app/livechat/server/methods/sendMessageLivechat.js
diff --git a/packages/rocketchat-livechat/server/methods/sendOfflineMessage.js b/app/livechat/server/methods/sendOfflineMessage.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/sendOfflineMessage.js
rename to app/livechat/server/methods/sendOfflineMessage.js
diff --git a/packages/rocketchat-livechat/server/methods/sendTranscript.js b/app/livechat/server/methods/sendTranscript.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/sendTranscript.js
rename to app/livechat/server/methods/sendTranscript.js
diff --git a/packages/rocketchat-livechat/server/methods/setCustomField.js b/app/livechat/server/methods/setCustomField.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/setCustomField.js
rename to app/livechat/server/methods/setCustomField.js
diff --git a/packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js b/app/livechat/server/methods/setDepartmentForVisitor.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js
rename to app/livechat/server/methods/setDepartmentForVisitor.js
diff --git a/packages/rocketchat-livechat/server/methods/startFileUploadRoom.js b/app/livechat/server/methods/startFileUploadRoom.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/startFileUploadRoom.js
rename to app/livechat/server/methods/startFileUploadRoom.js
diff --git a/packages/rocketchat-livechat/server/methods/startVideoCall.js b/app/livechat/server/methods/startVideoCall.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/startVideoCall.js
rename to app/livechat/server/methods/startVideoCall.js
diff --git a/packages/rocketchat-livechat/server/methods/takeInquiry.js b/app/livechat/server/methods/takeInquiry.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/takeInquiry.js
rename to app/livechat/server/methods/takeInquiry.js
diff --git a/packages/rocketchat-livechat/server/methods/transfer.js b/app/livechat/server/methods/transfer.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/transfer.js
rename to app/livechat/server/methods/transfer.js
diff --git a/packages/rocketchat-livechat/server/methods/webhookTest.js b/app/livechat/server/methods/webhookTest.js
similarity index 100%
rename from packages/rocketchat-livechat/server/methods/webhookTest.js
rename to app/livechat/server/methods/webhookTest.js
diff --git a/packages/rocketchat-livechat/server/permissions.js b/app/livechat/server/permissions.js
similarity index 100%
rename from packages/rocketchat-livechat/server/permissions.js
rename to app/livechat/server/permissions.js
diff --git a/packages/rocketchat-livechat/server/publications/customFields.js b/app/livechat/server/publications/customFields.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/customFields.js
rename to app/livechat/server/publications/customFields.js
diff --git a/packages/rocketchat-livechat/server/publications/departmentAgents.js b/app/livechat/server/publications/departmentAgents.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/departmentAgents.js
rename to app/livechat/server/publications/departmentAgents.js
diff --git a/packages/rocketchat-livechat/server/publications/externalMessages.js b/app/livechat/server/publications/externalMessages.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/externalMessages.js
rename to app/livechat/server/publications/externalMessages.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatAgents.js b/app/livechat/server/publications/livechatAgents.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatAgents.js
rename to app/livechat/server/publications/livechatAgents.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatAppearance.js b/app/livechat/server/publications/livechatAppearance.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatAppearance.js
rename to app/livechat/server/publications/livechatAppearance.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatDepartments.js b/app/livechat/server/publications/livechatDepartments.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatDepartments.js
rename to app/livechat/server/publications/livechatDepartments.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatInquiries.js b/app/livechat/server/publications/livechatInquiries.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatInquiries.js
rename to app/livechat/server/publications/livechatInquiries.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatIntegration.js b/app/livechat/server/publications/livechatIntegration.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatIntegration.js
rename to app/livechat/server/publications/livechatIntegration.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatManagers.js b/app/livechat/server/publications/livechatManagers.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatManagers.js
rename to app/livechat/server/publications/livechatManagers.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatMonitoring.js b/app/livechat/server/publications/livechatMonitoring.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatMonitoring.js
rename to app/livechat/server/publications/livechatMonitoring.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatOfficeHours.js b/app/livechat/server/publications/livechatOfficeHours.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatOfficeHours.js
rename to app/livechat/server/publications/livechatOfficeHours.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatQueue.js b/app/livechat/server/publications/livechatQueue.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatQueue.js
rename to app/livechat/server/publications/livechatQueue.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatRooms.js b/app/livechat/server/publications/livechatRooms.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatRooms.js
rename to app/livechat/server/publications/livechatRooms.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatTriggers.js b/app/livechat/server/publications/livechatTriggers.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatTriggers.js
rename to app/livechat/server/publications/livechatTriggers.js
diff --git a/packages/rocketchat-livechat/server/publications/livechatVisitors.js b/app/livechat/server/publications/livechatVisitors.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/livechatVisitors.js
rename to app/livechat/server/publications/livechatVisitors.js
diff --git a/packages/rocketchat-livechat/server/publications/visitorHistory.js b/app/livechat/server/publications/visitorHistory.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/visitorHistory.js
rename to app/livechat/server/publications/visitorHistory.js
diff --git a/packages/rocketchat-livechat/server/publications/visitorInfo.js b/app/livechat/server/publications/visitorInfo.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/visitorInfo.js
rename to app/livechat/server/publications/visitorInfo.js
diff --git a/packages/rocketchat-livechat/server/publications/visitorPageVisited.js b/app/livechat/server/publications/visitorPageVisited.js
similarity index 100%
rename from packages/rocketchat-livechat/server/publications/visitorPageVisited.js
rename to app/livechat/server/publications/visitorPageVisited.js
diff --git a/packages/rocketchat-livechat/server/roomType.js b/app/livechat/server/roomType.js
similarity index 100%
rename from packages/rocketchat-livechat/server/roomType.js
rename to app/livechat/server/roomType.js
diff --git a/packages/rocketchat-livechat/server/sendMessageBySMS.js b/app/livechat/server/sendMessageBySMS.js
similarity index 100%
rename from packages/rocketchat-livechat/server/sendMessageBySMS.js
rename to app/livechat/server/sendMessageBySMS.js
diff --git a/packages/rocketchat-livechat/server/startup.js b/app/livechat/server/startup.js
similarity index 100%
rename from packages/rocketchat-livechat/server/startup.js
rename to app/livechat/server/startup.js
diff --git a/packages/rocketchat-livechat/server/unclosedLivechats.js b/app/livechat/server/unclosedLivechats.js
similarity index 100%
rename from packages/rocketchat-livechat/server/unclosedLivechats.js
rename to app/livechat/server/unclosedLivechats.js
diff --git a/packages/rocketchat-livechat/server/visitorStatus.js b/app/livechat/server/visitorStatus.js
similarity index 100%
rename from packages/rocketchat-livechat/server/visitorStatus.js
rename to app/livechat/server/visitorStatus.js
diff --git a/packages/rocketchat-livestream/.gitignore b/app/livestream/.gitignore
similarity index 100%
rename from packages/rocketchat-livestream/.gitignore
rename to app/livestream/.gitignore
diff --git a/packages/rocketchat-livestream/client/index.js b/app/livestream/client/index.js
similarity index 100%
rename from packages/rocketchat-livestream/client/index.js
rename to app/livestream/client/index.js
diff --git a/packages/rocketchat-livestream/client/oauth.js b/app/livestream/client/oauth.js
similarity index 100%
rename from packages/rocketchat-livestream/client/oauth.js
rename to app/livestream/client/oauth.js
diff --git a/packages/rocketchat-livestream/client/styles/liveStreamTab.css b/app/livestream/client/styles/liveStreamTab.css
similarity index 100%
rename from packages/rocketchat-livestream/client/styles/liveStreamTab.css
rename to app/livestream/client/styles/liveStreamTab.css
diff --git a/packages/rocketchat-livestream/client/tabBar.js b/app/livestream/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-livestream/client/tabBar.js
rename to app/livestream/client/tabBar.js
diff --git a/packages/rocketchat-livestream/client/views/broadcastView.html b/app/livestream/client/views/broadcastView.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/broadcastView.html
rename to app/livestream/client/views/broadcastView.html
diff --git a/packages/rocketchat-livestream/client/views/broadcastView.js b/app/livestream/client/views/broadcastView.js
similarity index 100%
rename from packages/rocketchat-livestream/client/views/broadcastView.js
rename to app/livestream/client/views/broadcastView.js
diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.html b/app/livestream/client/views/liveStreamTab.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamTab.html
rename to app/livestream/client/views/liveStreamTab.html
diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.js b/app/livestream/client/views/liveStreamTab.js
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamTab.js
rename to app/livestream/client/views/liveStreamTab.js
diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.html b/app/livestream/client/views/liveStreamView.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamView.html
rename to app/livestream/client/views/liveStreamView.html
diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.js b/app/livestream/client/views/liveStreamView.js
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamView.js
rename to app/livestream/client/views/liveStreamView.js
diff --git a/packages/rocketchat-livestream/client/views/livestreamBroadcast.html b/app/livestream/client/views/livestreamBroadcast.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/livestreamBroadcast.html
rename to app/livestream/client/views/livestreamBroadcast.html
diff --git a/packages/rocketchat-livestream/client/views/livestreamBroadcast.js b/app/livestream/client/views/livestreamBroadcast.js
similarity index 100%
rename from packages/rocketchat-livestream/client/views/livestreamBroadcast.js
rename to app/livestream/client/views/livestreamBroadcast.js
diff --git a/packages/rocketchat-livestream/package.js b/app/livestream/package.js
similarity index 100%
rename from packages/rocketchat-livestream/package.js
rename to app/livestream/package.js
diff --git a/packages/rocketchat-livestream/server/functions/livestream.js b/app/livestream/server/functions/livestream.js
similarity index 100%
rename from packages/rocketchat-livestream/server/functions/livestream.js
rename to app/livestream/server/functions/livestream.js
diff --git a/packages/rocketchat-livestream/server/index.js b/app/livestream/server/index.js
similarity index 100%
rename from packages/rocketchat-livestream/server/index.js
rename to app/livestream/server/index.js
diff --git a/packages/rocketchat-livestream/server/methods.js b/app/livestream/server/methods.js
similarity index 100%
rename from packages/rocketchat-livestream/server/methods.js
rename to app/livestream/server/methods.js
diff --git a/packages/rocketchat-livestream/server/routes.js b/app/livestream/server/routes.js
similarity index 100%
rename from packages/rocketchat-livestream/server/routes.js
rename to app/livestream/server/routes.js
diff --git a/packages/rocketchat-livestream/server/settings.js b/app/livestream/server/settings.js
similarity index 100%
rename from packages/rocketchat-livestream/server/settings.js
rename to app/livestream/server/settings.js
diff --git a/packages/rocketchat-logger/README.md b/app/logger/README.md
similarity index 100%
rename from packages/rocketchat-logger/README.md
rename to app/logger/README.md
diff --git a/packages/rocketchat-logger/client/ansispan.js b/app/logger/client/ansispan.js
similarity index 100%
rename from packages/rocketchat-logger/client/ansispan.js
rename to app/logger/client/ansispan.js
diff --git a/packages/rocketchat-logger/client/index.js b/app/logger/client/index.js
similarity index 100%
rename from packages/rocketchat-logger/client/index.js
rename to app/logger/client/index.js
diff --git a/packages/rocketchat-logger/client/logger.js b/app/logger/client/logger.js
similarity index 100%
rename from packages/rocketchat-logger/client/logger.js
rename to app/logger/client/logger.js
diff --git a/packages/rocketchat-logger/client/viewLogs.js b/app/logger/client/viewLogs.js
similarity index 100%
rename from packages/rocketchat-logger/client/viewLogs.js
rename to app/logger/client/viewLogs.js
diff --git a/packages/rocketchat-logger/client/views/viewLogs.html b/app/logger/client/views/viewLogs.html
similarity index 100%
rename from packages/rocketchat-logger/client/views/viewLogs.html
rename to app/logger/client/views/viewLogs.html
diff --git a/packages/rocketchat-logger/client/views/viewLogs.js b/app/logger/client/views/viewLogs.js
similarity index 100%
rename from packages/rocketchat-logger/client/views/viewLogs.js
rename to app/logger/client/views/viewLogs.js
diff --git a/packages/rocketchat-logger/package.js b/app/logger/package.js
similarity index 100%
rename from packages/rocketchat-logger/package.js
rename to app/logger/package.js
diff --git a/packages/rocketchat-logger/server/index.js b/app/logger/server/index.js
similarity index 100%
rename from packages/rocketchat-logger/server/index.js
rename to app/logger/server/index.js
diff --git a/packages/rocketchat-logger/server/server.js b/app/logger/server/server.js
similarity index 100%
rename from packages/rocketchat-logger/server/server.js
rename to app/logger/server/server.js
diff --git a/packages/rocketchat-mail-messages/client/index.js b/app/mail-messages/client/index.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/index.js
rename to app/mail-messages/client/index.js
diff --git a/packages/rocketchat-mail-messages/client/router.js b/app/mail-messages/client/router.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/router.js
rename to app/mail-messages/client/router.js
diff --git a/packages/rocketchat-mail-messages/client/startup.js b/app/mail-messages/client/startup.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/startup.js
rename to app/mail-messages/client/startup.js
diff --git a/packages/rocketchat-mail-messages/client/views/mailer.html b/app/mail-messages/client/views/mailer.html
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailer.html
rename to app/mail-messages/client/views/mailer.html
diff --git a/packages/rocketchat-mail-messages/client/views/mailer.js b/app/mail-messages/client/views/mailer.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailer.js
rename to app/mail-messages/client/views/mailer.js
diff --git a/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.html b/app/mail-messages/client/views/mailerUnsubscribe.html
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.html
rename to app/mail-messages/client/views/mailerUnsubscribe.html
diff --git a/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js b/app/mail-messages/client/views/mailerUnsubscribe.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js
rename to app/mail-messages/client/views/mailerUnsubscribe.js
diff --git a/packages/rocketchat-mail-messages/package.js b/app/mail-messages/package.js
similarity index 100%
rename from packages/rocketchat-mail-messages/package.js
rename to app/mail-messages/package.js
diff --git a/packages/rocketchat-mail-messages/server/functions/sendMail.js b/app/mail-messages/server/functions/sendMail.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/functions/sendMail.js
rename to app/mail-messages/server/functions/sendMail.js
diff --git a/packages/rocketchat-mail-messages/server/functions/unsubscribe.js b/app/mail-messages/server/functions/unsubscribe.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/functions/unsubscribe.js
rename to app/mail-messages/server/functions/unsubscribe.js
diff --git a/packages/rocketchat-mail-messages/server/index.js b/app/mail-messages/server/index.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/index.js
rename to app/mail-messages/server/index.js
diff --git a/packages/rocketchat-mail-messages/server/lib/Mailer.js b/app/mail-messages/server/lib/Mailer.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/lib/Mailer.js
rename to app/mail-messages/server/lib/Mailer.js
diff --git a/packages/rocketchat-mail-messages/server/methods/sendMail.js b/app/mail-messages/server/methods/sendMail.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/methods/sendMail.js
rename to app/mail-messages/server/methods/sendMail.js
diff --git a/packages/rocketchat-mail-messages/server/methods/unsubscribe.js b/app/mail-messages/server/methods/unsubscribe.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/methods/unsubscribe.js
rename to app/mail-messages/server/methods/unsubscribe.js
diff --git a/packages/rocketchat-mail-messages/server/startup.js b/app/mail-messages/server/startup.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/startup.js
rename to app/mail-messages/server/startup.js
diff --git a/packages/rocketchat-mailer/package.js b/app/mailer/package.js
similarity index 100%
rename from packages/rocketchat-mailer/package.js
rename to app/mailer/package.js
diff --git a/packages/rocketchat-mailer/server/api.js b/app/mailer/server/api.js
similarity index 100%
rename from packages/rocketchat-mailer/server/api.js
rename to app/mailer/server/api.js
diff --git a/packages/rocketchat-mapview/client/index.js b/app/mapview/client/index.js
similarity index 100%
rename from packages/rocketchat-mapview/client/index.js
rename to app/mapview/client/index.js
diff --git a/packages/rocketchat-mapview/client/mapview.js b/app/mapview/client/mapview.js
similarity index 100%
rename from packages/rocketchat-mapview/client/mapview.js
rename to app/mapview/client/mapview.js
diff --git a/packages/rocketchat-mapview/package.js b/app/mapview/package.js
similarity index 100%
rename from packages/rocketchat-mapview/package.js
rename to app/mapview/package.js
diff --git a/packages/rocketchat-mapview/server/index.js b/app/mapview/server/index.js
similarity index 100%
rename from packages/rocketchat-mapview/server/index.js
rename to app/mapview/server/index.js
diff --git a/packages/rocketchat-mapview/server/settings.js b/app/mapview/server/settings.js
similarity index 100%
rename from packages/rocketchat-mapview/server/settings.js
rename to app/mapview/server/settings.js
diff --git a/packages/rocketchat-markdown/client/index.js b/app/markdown/client/index.js
similarity index 100%
rename from packages/rocketchat-markdown/client/index.js
rename to app/markdown/client/index.js
diff --git a/packages/rocketchat-markdown/lib/markdown.js b/app/markdown/lib/markdown.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/markdown.js
rename to app/markdown/lib/markdown.js
diff --git a/packages/rocketchat-markdown/lib/parser/marked/marked.js b/app/markdown/lib/parser/marked/marked.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/parser/marked/marked.js
rename to app/markdown/lib/parser/marked/marked.js
diff --git a/packages/rocketchat-markdown/lib/parser/original/code.js b/app/markdown/lib/parser/original/code.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/parser/original/code.js
rename to app/markdown/lib/parser/original/code.js
diff --git a/packages/rocketchat-markdown/lib/parser/original/markdown.js b/app/markdown/lib/parser/original/markdown.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/parser/original/markdown.js
rename to app/markdown/lib/parser/original/markdown.js
diff --git a/packages/rocketchat-markdown/lib/parser/original/original.js b/app/markdown/lib/parser/original/original.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/parser/original/original.js
rename to app/markdown/lib/parser/original/original.js
diff --git a/packages/rocketchat-markdown/package.js b/app/markdown/package.js
similarity index 100%
rename from packages/rocketchat-markdown/package.js
rename to app/markdown/package.js
diff --git a/packages/rocketchat-markdown/server/index.js b/app/markdown/server/index.js
similarity index 100%
rename from packages/rocketchat-markdown/server/index.js
rename to app/markdown/server/index.js
diff --git a/packages/rocketchat-markdown/server/settings.js b/app/markdown/server/settings.js
similarity index 100%
rename from packages/rocketchat-markdown/server/settings.js
rename to app/markdown/server/settings.js
diff --git a/packages/rocketchat-markdown/tests/client.mocks.js b/app/markdown/tests/client.mocks.js
similarity index 100%
rename from packages/rocketchat-markdown/tests/client.mocks.js
rename to app/markdown/tests/client.mocks.js
diff --git a/packages/rocketchat-markdown/tests/client.tests.js b/app/markdown/tests/client.tests.js
similarity index 100%
rename from packages/rocketchat-markdown/tests/client.tests.js
rename to app/markdown/tests/client.tests.js
diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/app/mentions-flextab/client/actionButton.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/actionButton.js
rename to app/mentions-flextab/client/actionButton.js
diff --git a/packages/rocketchat-mentions-flextab/client/index.js b/app/mentions-flextab/client/index.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/index.js
rename to app/mentions-flextab/client/index.js
diff --git a/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js b/app/mentions-flextab/client/lib/MentionedMessage.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js
rename to app/mentions-flextab/client/lib/MentionedMessage.js
diff --git a/packages/rocketchat-mentions-flextab/client/tabBar.js b/app/mentions-flextab/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/tabBar.js
rename to app/mentions-flextab/client/tabBar.js
diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html b/app/mentions-flextab/client/views/mentionsFlexTab.html
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html
rename to app/mentions-flextab/client/views/mentionsFlexTab.html
diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/app/mentions-flextab/client/views/mentionsFlexTab.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
rename to app/mentions-flextab/client/views/mentionsFlexTab.js
diff --git a/packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less b/app/mentions-flextab/client/views/stylesheets/mentionsFlexTab.less
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less
rename to app/mentions-flextab/client/views/stylesheets/mentionsFlexTab.less
diff --git a/packages/rocketchat-mentions-flextab/package.js b/app/mentions-flextab/package.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/package.js
rename to app/mentions-flextab/package.js
diff --git a/packages/rocketchat-mentions-flextab/server/index.js b/app/mentions-flextab/server/index.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/server/index.js
rename to app/mentions-flextab/server/index.js
diff --git a/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js b/app/mentions-flextab/server/publications/mentionedMessages.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js
rename to app/mentions-flextab/server/publications/mentionedMessages.js
diff --git a/packages/rocketchat-mentions/client/client.js b/app/mentions/client/client.js
similarity index 100%
rename from packages/rocketchat-mentions/client/client.js
rename to app/mentions/client/client.js
diff --git a/packages/rocketchat-mentions/client/index.js b/app/mentions/client/index.js
similarity index 100%
rename from packages/rocketchat-mentions/client/index.js
rename to app/mentions/client/index.js
diff --git a/packages/rocketchat-mentions/lib/Mentions.js b/app/mentions/lib/Mentions.js
similarity index 100%
rename from packages/rocketchat-mentions/lib/Mentions.js
rename to app/mentions/lib/Mentions.js
diff --git a/packages/rocketchat-mentions/package.js b/app/mentions/package.js
similarity index 100%
rename from packages/rocketchat-mentions/package.js
rename to app/mentions/package.js
diff --git a/packages/rocketchat-mentions/server/Mentions.js b/app/mentions/server/Mentions.js
similarity index 100%
rename from packages/rocketchat-mentions/server/Mentions.js
rename to app/mentions/server/Mentions.js
diff --git a/packages/rocketchat-mentions/server/index.js b/app/mentions/server/index.js
similarity index 100%
rename from packages/rocketchat-mentions/server/index.js
rename to app/mentions/server/index.js
diff --git a/packages/rocketchat-mentions/server/methods/getUserMentionsByChannel.js b/app/mentions/server/methods/getUserMentionsByChannel.js
similarity index 100%
rename from packages/rocketchat-mentions/server/methods/getUserMentionsByChannel.js
rename to app/mentions/server/methods/getUserMentionsByChannel.js
diff --git a/packages/rocketchat-mentions/server/server.js b/app/mentions/server/server.js
similarity index 100%
rename from packages/rocketchat-mentions/server/server.js
rename to app/mentions/server/server.js
diff --git a/packages/rocketchat-mentions/tests/client.tests.js b/app/mentions/tests/client.tests.js
similarity index 100%
rename from packages/rocketchat-mentions/tests/client.tests.js
rename to app/mentions/tests/client.tests.js
diff --git a/packages/rocketchat-mentions/tests/server.tests.js b/app/mentions/tests/server.tests.js
similarity index 100%
rename from packages/rocketchat-mentions/tests/server.tests.js
rename to app/mentions/tests/server.tests.js
diff --git a/packages/rocketchat-message-action/client/index.js b/app/message-action/client/index.js
similarity index 100%
rename from packages/rocketchat-message-action/client/index.js
rename to app/message-action/client/index.js
diff --git a/packages/rocketchat-message-action/client/messageAction.html b/app/message-action/client/messageAction.html
similarity index 100%
rename from packages/rocketchat-message-action/client/messageAction.html
rename to app/message-action/client/messageAction.html
diff --git a/packages/rocketchat-message-action/client/messageAction.js b/app/message-action/client/messageAction.js
similarity index 100%
rename from packages/rocketchat-message-action/client/messageAction.js
rename to app/message-action/client/messageAction.js
diff --git a/packages/rocketchat-message-action/client/stylesheets/messageAction.css b/app/message-action/client/stylesheets/messageAction.css
similarity index 100%
rename from packages/rocketchat-message-action/client/stylesheets/messageAction.css
rename to app/message-action/client/stylesheets/messageAction.css
diff --git a/packages/rocketchat-message-action/package.js b/app/message-action/package.js
similarity index 100%
rename from packages/rocketchat-message-action/package.js
rename to app/message-action/package.js
diff --git a/packages/rocketchat-message-attachments/client/index.js b/app/message-attachments/client/index.js
similarity index 100%
rename from packages/rocketchat-message-attachments/client/index.js
rename to app/message-attachments/client/index.js
diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
similarity index 100%
rename from packages/rocketchat-message-attachments/client/messageAttachment.html
rename to app/message-attachments/client/messageAttachment.html
diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/app/message-attachments/client/messageAttachment.js
similarity index 100%
rename from packages/rocketchat-message-attachments/client/messageAttachment.js
rename to app/message-attachments/client/messageAttachment.js
diff --git a/packages/rocketchat-message-attachments/client/renderField.html b/app/message-attachments/client/renderField.html
similarity index 100%
rename from packages/rocketchat-message-attachments/client/renderField.html
rename to app/message-attachments/client/renderField.html
diff --git a/packages/rocketchat-message-attachments/client/renderField.js b/app/message-attachments/client/renderField.js
similarity index 100%
rename from packages/rocketchat-message-attachments/client/renderField.js
rename to app/message-attachments/client/renderField.js
diff --git a/packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.css b/app/message-attachments/client/stylesheets/messageAttachments.css
similarity index 100%
rename from packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.css
rename to app/message-attachments/client/stylesheets/messageAttachments.css
diff --git a/packages/rocketchat-message-attachments/package.js b/app/message-attachments/package.js
similarity index 100%
rename from packages/rocketchat-message-attachments/package.js
rename to app/message-attachments/package.js
diff --git a/packages/rocketchat-message-mark-as-unread/client/actionButton.js b/app/message-mark-as-unread/client/actionButton.js
similarity index 100%
rename from packages/rocketchat-message-mark-as-unread/client/actionButton.js
rename to app/message-mark-as-unread/client/actionButton.js
diff --git a/packages/rocketchat-message-mark-as-unread/client/index.js b/app/message-mark-as-unread/client/index.js
similarity index 100%
rename from packages/rocketchat-message-mark-as-unread/client/index.js
rename to app/message-mark-as-unread/client/index.js
diff --git a/packages/rocketchat-message-mark-as-unread/package.js b/app/message-mark-as-unread/package.js
similarity index 100%
rename from packages/rocketchat-message-mark-as-unread/package.js
rename to app/message-mark-as-unread/package.js
diff --git a/packages/rocketchat-message-mark-as-unread/server/index.js b/app/message-mark-as-unread/server/index.js
similarity index 100%
rename from packages/rocketchat-message-mark-as-unread/server/index.js
rename to app/message-mark-as-unread/server/index.js
diff --git a/packages/rocketchat-message-mark-as-unread/server/logger.js b/app/message-mark-as-unread/server/logger.js
similarity index 100%
rename from packages/rocketchat-message-mark-as-unread/server/logger.js
rename to app/message-mark-as-unread/server/logger.js
diff --git a/packages/rocketchat-message-mark-as-unread/server/unreadMessages.js b/app/message-mark-as-unread/server/unreadMessages.js
similarity index 100%
rename from packages/rocketchat-message-mark-as-unread/server/unreadMessages.js
rename to app/message-mark-as-unread/server/unreadMessages.js
diff --git a/packages/rocketchat-message-pin/client/actionButton.js b/app/message-pin/client/actionButton.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/actionButton.js
rename to app/message-pin/client/actionButton.js
diff --git a/packages/rocketchat-message-pin/client/index.js b/app/message-pin/client/index.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/index.js
rename to app/message-pin/client/index.js
diff --git a/packages/rocketchat-message-pin/client/lib/PinnedMessage.js b/app/message-pin/client/lib/PinnedMessage.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/lib/PinnedMessage.js
rename to app/message-pin/client/lib/PinnedMessage.js
diff --git a/packages/rocketchat-message-pin/client/messageType.js b/app/message-pin/client/messageType.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/messageType.js
rename to app/message-pin/client/messageType.js
diff --git a/packages/rocketchat-message-pin/client/pinMessage.js b/app/message-pin/client/pinMessage.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/pinMessage.js
rename to app/message-pin/client/pinMessage.js
diff --git a/packages/rocketchat-message-pin/client/tabBar.js b/app/message-pin/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/tabBar.js
rename to app/message-pin/client/tabBar.js
diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.html b/app/message-pin/client/views/pinnedMessages.html
similarity index 100%
rename from packages/rocketchat-message-pin/client/views/pinnedMessages.html
rename to app/message-pin/client/views/pinnedMessages.html
diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.js b/app/message-pin/client/views/pinnedMessages.js
similarity index 100%
rename from packages/rocketchat-message-pin/client/views/pinnedMessages.js
rename to app/message-pin/client/views/pinnedMessages.js
diff --git a/packages/rocketchat-message-pin/client/views/stylesheets/messagepin.css b/app/message-pin/client/views/stylesheets/messagepin.css
similarity index 100%
rename from packages/rocketchat-message-pin/client/views/stylesheets/messagepin.css
rename to app/message-pin/client/views/stylesheets/messagepin.css
diff --git a/packages/rocketchat-message-pin/package.js b/app/message-pin/package.js
similarity index 100%
rename from packages/rocketchat-message-pin/package.js
rename to app/message-pin/package.js
diff --git a/packages/rocketchat-message-pin/server/index.js b/app/message-pin/server/index.js
similarity index 100%
rename from packages/rocketchat-message-pin/server/index.js
rename to app/message-pin/server/index.js
diff --git a/packages/rocketchat-message-pin/server/pinMessage.js b/app/message-pin/server/pinMessage.js
similarity index 100%
rename from packages/rocketchat-message-pin/server/pinMessage.js
rename to app/message-pin/server/pinMessage.js
diff --git a/packages/rocketchat-message-pin/server/publications/pinnedMessages.js b/app/message-pin/server/publications/pinnedMessages.js
similarity index 100%
rename from packages/rocketchat-message-pin/server/publications/pinnedMessages.js
rename to app/message-pin/server/publications/pinnedMessages.js
diff --git a/packages/rocketchat-message-pin/server/settings.js b/app/message-pin/server/settings.js
similarity index 100%
rename from packages/rocketchat-message-pin/server/settings.js
rename to app/message-pin/server/settings.js
diff --git a/packages/rocketchat-message-pin/server/startup/indexes.js b/app/message-pin/server/startup/indexes.js
similarity index 100%
rename from packages/rocketchat-message-pin/server/startup/indexes.js
rename to app/message-pin/server/startup/indexes.js
diff --git a/packages/rocketchat-message-snippet/client/actionButton.js b/app/message-snippet/client/actionButton.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/actionButton.js
rename to app/message-snippet/client/actionButton.js
diff --git a/packages/rocketchat-message-snippet/client/index.js b/app/message-snippet/client/index.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/index.js
rename to app/message-snippet/client/index.js
diff --git a/packages/rocketchat-message-snippet/client/lib/collections.js b/app/message-snippet/client/lib/collections.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/lib/collections.js
rename to app/message-snippet/client/lib/collections.js
diff --git a/packages/rocketchat-message-snippet/client/messageType.js b/app/message-snippet/client/messageType.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/messageType.js
rename to app/message-snippet/client/messageType.js
diff --git a/packages/rocketchat-message-snippet/client/page/snippetPage.html b/app/message-snippet/client/page/snippetPage.html
similarity index 100%
rename from packages/rocketchat-message-snippet/client/page/snippetPage.html
rename to app/message-snippet/client/page/snippetPage.html
diff --git a/packages/rocketchat-message-snippet/client/page/snippetPage.js b/app/message-snippet/client/page/snippetPage.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/page/snippetPage.js
rename to app/message-snippet/client/page/snippetPage.js
diff --git a/packages/rocketchat-message-snippet/client/page/stylesheets/snippetPage.css b/app/message-snippet/client/page/stylesheets/snippetPage.css
similarity index 100%
rename from packages/rocketchat-message-snippet/client/page/stylesheets/snippetPage.css
rename to app/message-snippet/client/page/stylesheets/snippetPage.css
diff --git a/packages/rocketchat-message-snippet/client/router.js b/app/message-snippet/client/router.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/router.js
rename to app/message-snippet/client/router.js
diff --git a/packages/rocketchat-message-snippet/client/snippetMessage.js b/app/message-snippet/client/snippetMessage.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/snippetMessage.js
rename to app/message-snippet/client/snippetMessage.js
diff --git a/packages/rocketchat-message-snippet/client/tabBar/tabBar.js b/app/message-snippet/client/tabBar/tabBar.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/tabBar/tabBar.js
rename to app/message-snippet/client/tabBar/tabBar.js
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html b/app/message-snippet/client/tabBar/views/snippetedMessages.html
similarity index 100%
rename from packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html
rename to app/message-snippet/client/tabBar/views/snippetedMessages.html
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js b/app/message-snippet/client/tabBar/views/snippetedMessages.js
similarity index 100%
rename from packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
rename to app/message-snippet/client/tabBar/views/snippetedMessages.js
diff --git a/packages/rocketchat-message-snippet/package.js b/app/message-snippet/package.js
similarity index 100%
rename from packages/rocketchat-message-snippet/package.js
rename to app/message-snippet/package.js
diff --git a/packages/rocketchat-message-snippet/server/index.js b/app/message-snippet/server/index.js
similarity index 100%
rename from packages/rocketchat-message-snippet/server/index.js
rename to app/message-snippet/server/index.js
diff --git a/packages/rocketchat-message-snippet/server/methods/snippetMessage.js b/app/message-snippet/server/methods/snippetMessage.js
similarity index 100%
rename from packages/rocketchat-message-snippet/server/methods/snippetMessage.js
rename to app/message-snippet/server/methods/snippetMessage.js
diff --git a/packages/rocketchat-message-snippet/server/publications/snippetedMessage.js b/app/message-snippet/server/publications/snippetedMessage.js
similarity index 100%
rename from packages/rocketchat-message-snippet/server/publications/snippetedMessage.js
rename to app/message-snippet/server/publications/snippetedMessage.js
diff --git a/packages/rocketchat-message-snippet/server/publications/snippetedMessagesByRoom.js b/app/message-snippet/server/publications/snippetedMessagesByRoom.js
similarity index 100%
rename from packages/rocketchat-message-snippet/server/publications/snippetedMessagesByRoom.js
rename to app/message-snippet/server/publications/snippetedMessagesByRoom.js
diff --git a/packages/rocketchat-message-snippet/server/requests.js b/app/message-snippet/server/requests.js
similarity index 100%
rename from packages/rocketchat-message-snippet/server/requests.js
rename to app/message-snippet/server/requests.js
diff --git a/packages/rocketchat-message-snippet/server/startup/settings.js b/app/message-snippet/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-message-snippet/server/startup/settings.js
rename to app/message-snippet/server/startup/settings.js
diff --git a/packages/rocketchat-message-star/client/actionButton.js b/app/message-star/client/actionButton.js
similarity index 100%
rename from packages/rocketchat-message-star/client/actionButton.js
rename to app/message-star/client/actionButton.js
diff --git a/packages/rocketchat-message-star/client/index.js b/app/message-star/client/index.js
similarity index 100%
rename from packages/rocketchat-message-star/client/index.js
rename to app/message-star/client/index.js
diff --git a/packages/rocketchat-message-star/client/lib/StarredMessage.js b/app/message-star/client/lib/StarredMessage.js
similarity index 100%
rename from packages/rocketchat-message-star/client/lib/StarredMessage.js
rename to app/message-star/client/lib/StarredMessage.js
diff --git a/packages/rocketchat-message-star/client/starMessage.js b/app/message-star/client/starMessage.js
similarity index 100%
rename from packages/rocketchat-message-star/client/starMessage.js
rename to app/message-star/client/starMessage.js
diff --git a/packages/rocketchat-message-star/client/tabBar.js b/app/message-star/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-message-star/client/tabBar.js
rename to app/message-star/client/tabBar.js
diff --git a/packages/rocketchat-message-star/client/views/starredMessages.html b/app/message-star/client/views/starredMessages.html
similarity index 100%
rename from packages/rocketchat-message-star/client/views/starredMessages.html
rename to app/message-star/client/views/starredMessages.html
diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/app/message-star/client/views/starredMessages.js
similarity index 100%
rename from packages/rocketchat-message-star/client/views/starredMessages.js
rename to app/message-star/client/views/starredMessages.js
diff --git a/packages/rocketchat-message-star/client/views/stylesheets/messagestar.css b/app/message-star/client/views/stylesheets/messagestar.css
similarity index 100%
rename from packages/rocketchat-message-star/client/views/stylesheets/messagestar.css
rename to app/message-star/client/views/stylesheets/messagestar.css
diff --git a/packages/rocketchat-message-star/package.js b/app/message-star/package.js
similarity index 100%
rename from packages/rocketchat-message-star/package.js
rename to app/message-star/package.js
diff --git a/packages/rocketchat-message-star/server/index.js b/app/message-star/server/index.js
similarity index 100%
rename from packages/rocketchat-message-star/server/index.js
rename to app/message-star/server/index.js
diff --git a/packages/rocketchat-message-star/server/publications/starredMessages.js b/app/message-star/server/publications/starredMessages.js
similarity index 100%
rename from packages/rocketchat-message-star/server/publications/starredMessages.js
rename to app/message-star/server/publications/starredMessages.js
diff --git a/packages/rocketchat-message-star/server/settings.js b/app/message-star/server/settings.js
similarity index 100%
rename from packages/rocketchat-message-star/server/settings.js
rename to app/message-star/server/settings.js
diff --git a/packages/rocketchat-message-star/server/starMessage.js b/app/message-star/server/starMessage.js
similarity index 100%
rename from packages/rocketchat-message-star/server/starMessage.js
rename to app/message-star/server/starMessage.js
diff --git a/packages/rocketchat-message-star/server/startup/indexes.js b/app/message-star/server/startup/indexes.js
similarity index 100%
rename from packages/rocketchat-message-star/server/startup/indexes.js
rename to app/message-star/server/startup/indexes.js
diff --git a/packages/meteor-accounts-saml/CHANGELOG.md b/app/meteor-accounts-saml/CHANGELOG.md
similarity index 100%
rename from packages/meteor-accounts-saml/CHANGELOG.md
rename to app/meteor-accounts-saml/CHANGELOG.md
diff --git a/packages/meteor-accounts-saml/README.md b/app/meteor-accounts-saml/README.md
similarity index 100%
rename from packages/meteor-accounts-saml/README.md
rename to app/meteor-accounts-saml/README.md
diff --git a/packages/meteor-accounts-saml/client/index.js b/app/meteor-accounts-saml/client/index.js
similarity index 100%
rename from packages/meteor-accounts-saml/client/index.js
rename to app/meteor-accounts-saml/client/index.js
diff --git a/packages/meteor-accounts-saml/client/saml_client.js b/app/meteor-accounts-saml/client/saml_client.js
similarity index 100%
rename from packages/meteor-accounts-saml/client/saml_client.js
rename to app/meteor-accounts-saml/client/saml_client.js
diff --git a/packages/meteor-accounts-saml/package.js b/app/meteor-accounts-saml/package.js
similarity index 100%
rename from packages/meteor-accounts-saml/package.js
rename to app/meteor-accounts-saml/package.js
diff --git a/packages/meteor-accounts-saml/server/index.js b/app/meteor-accounts-saml/server/index.js
similarity index 100%
rename from packages/meteor-accounts-saml/server/index.js
rename to app/meteor-accounts-saml/server/index.js
diff --git a/packages/meteor-accounts-saml/server/saml_rocketchat.js b/app/meteor-accounts-saml/server/saml_rocketchat.js
similarity index 100%
rename from packages/meteor-accounts-saml/server/saml_rocketchat.js
rename to app/meteor-accounts-saml/server/saml_rocketchat.js
diff --git a/packages/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js
similarity index 100%
rename from packages/meteor-accounts-saml/server/saml_server.js
rename to app/meteor-accounts-saml/server/saml_server.js
diff --git a/packages/meteor-accounts-saml/server/saml_utils.js b/app/meteor-accounts-saml/server/saml_utils.js
similarity index 100%
rename from packages/meteor-accounts-saml/server/saml_utils.js
rename to app/meteor-accounts-saml/server/saml_utils.js
diff --git a/packages/rocketchat-metrics/package.js b/app/metrics/package.js
similarity index 100%
rename from packages/rocketchat-metrics/package.js
rename to app/metrics/package.js
diff --git a/packages/rocketchat-metrics/server/callbacksMetrics.js b/app/metrics/server/callbacksMetrics.js
similarity index 100%
rename from packages/rocketchat-metrics/server/callbacksMetrics.js
rename to app/metrics/server/callbacksMetrics.js
diff --git a/packages/rocketchat-metrics/server/index.js b/app/metrics/server/index.js
similarity index 100%
rename from packages/rocketchat-metrics/server/index.js
rename to app/metrics/server/index.js
diff --git a/packages/rocketchat-metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
similarity index 100%
rename from packages/rocketchat-metrics/server/lib/metrics.js
rename to app/metrics/server/lib/metrics.js
diff --git a/packages/rocketchat-metrics/server/lib/statsTracker.js b/app/metrics/server/lib/statsTracker.js
similarity index 100%
rename from packages/rocketchat-metrics/server/lib/statsTracker.js
rename to app/metrics/server/lib/statsTracker.js
diff --git a/packages/rocketchat-migrations/package.js b/app/migrations/package.js
similarity index 100%
rename from packages/rocketchat-migrations/package.js
rename to app/migrations/package.js
diff --git a/packages/rocketchat-migrations/server/index.js b/app/migrations/server/index.js
similarity index 100%
rename from packages/rocketchat-migrations/server/index.js
rename to app/migrations/server/index.js
diff --git a/packages/rocketchat-migrations/server/migrations.js b/app/migrations/server/migrations.js
similarity index 100%
rename from packages/rocketchat-migrations/server/migrations.js
rename to app/migrations/server/migrations.js
diff --git a/packages/rocketchat-models/client/index.js b/app/models/client/index.js
similarity index 100%
rename from packages/rocketchat-models/client/index.js
rename to app/models/client/index.js
diff --git a/packages/rocketchat-models/client/models/Avatars.js b/app/models/client/models/Avatars.js
similarity index 100%
rename from packages/rocketchat-models/client/models/Avatars.js
rename to app/models/client/models/Avatars.js
diff --git a/packages/rocketchat-models/client/models/CachedChannelList.js b/app/models/client/models/CachedChannelList.js
similarity index 100%
rename from packages/rocketchat-models/client/models/CachedChannelList.js
rename to app/models/client/models/CachedChannelList.js
diff --git a/packages/rocketchat-models/client/models/CachedChatRoom.js b/app/models/client/models/CachedChatRoom.js
similarity index 100%
rename from packages/rocketchat-models/client/models/CachedChatRoom.js
rename to app/models/client/models/CachedChatRoom.js
diff --git a/packages/rocketchat-models/client/models/CachedChatSubscription.js b/app/models/client/models/CachedChatSubscription.js
similarity index 100%
rename from packages/rocketchat-models/client/models/CachedChatSubscription.js
rename to app/models/client/models/CachedChatSubscription.js
diff --git a/packages/rocketchat-models/client/models/CachedUserList.js b/app/models/client/models/CachedUserList.js
similarity index 100%
rename from packages/rocketchat-models/client/models/CachedUserList.js
rename to app/models/client/models/CachedUserList.js
diff --git a/packages/rocketchat-models/client/models/ChatMessage.js b/app/models/client/models/ChatMessage.js
similarity index 100%
rename from packages/rocketchat-models/client/models/ChatMessage.js
rename to app/models/client/models/ChatMessage.js
diff --git a/packages/rocketchat-models/client/models/ChatPermissions.js b/app/models/client/models/ChatPermissions.js
similarity index 100%
rename from packages/rocketchat-models/client/models/ChatPermissions.js
rename to app/models/client/models/ChatPermissions.js
diff --git a/packages/rocketchat-models/client/models/ChatRoom.js b/app/models/client/models/ChatRoom.js
similarity index 100%
rename from packages/rocketchat-models/client/models/ChatRoom.js
rename to app/models/client/models/ChatRoom.js
diff --git a/packages/rocketchat-models/client/models/ChatSubscription.js b/app/models/client/models/ChatSubscription.js
similarity index 100%
rename from packages/rocketchat-models/client/models/ChatSubscription.js
rename to app/models/client/models/ChatSubscription.js
diff --git a/packages/rocketchat-models/client/models/CustomSounds.js b/app/models/client/models/CustomSounds.js
similarity index 100%
rename from packages/rocketchat-models/client/models/CustomSounds.js
rename to app/models/client/models/CustomSounds.js
diff --git a/packages/rocketchat-models/client/models/EmojiCustom.js b/app/models/client/models/EmojiCustom.js
similarity index 100%
rename from packages/rocketchat-models/client/models/EmojiCustom.js
rename to app/models/client/models/EmojiCustom.js
diff --git a/packages/rocketchat-models/client/models/Roles.js b/app/models/client/models/Roles.js
similarity index 100%
rename from packages/rocketchat-models/client/models/Roles.js
rename to app/models/client/models/Roles.js
diff --git a/packages/rocketchat-models/client/models/RoomRoles.js b/app/models/client/models/RoomRoles.js
similarity index 100%
rename from packages/rocketchat-models/client/models/RoomRoles.js
rename to app/models/client/models/RoomRoles.js
diff --git a/packages/rocketchat-models/client/models/Subscriptions.js b/app/models/client/models/Subscriptions.js
similarity index 100%
rename from packages/rocketchat-models/client/models/Subscriptions.js
rename to app/models/client/models/Subscriptions.js
diff --git a/packages/rocketchat-models/client/models/Uploads.js b/app/models/client/models/Uploads.js
similarity index 100%
rename from packages/rocketchat-models/client/models/Uploads.js
rename to app/models/client/models/Uploads.js
diff --git a/packages/rocketchat-models/client/models/UserAndRoom.js b/app/models/client/models/UserAndRoom.js
similarity index 100%
rename from packages/rocketchat-models/client/models/UserAndRoom.js
rename to app/models/client/models/UserAndRoom.js
diff --git a/packages/rocketchat-models/client/models/UserDataFiles.js b/app/models/client/models/UserDataFiles.js
similarity index 100%
rename from packages/rocketchat-models/client/models/UserDataFiles.js
rename to app/models/client/models/UserDataFiles.js
diff --git a/packages/rocketchat-models/client/models/UserRoles.js b/app/models/client/models/UserRoles.js
similarity index 100%
rename from packages/rocketchat-models/client/models/UserRoles.js
rename to app/models/client/models/UserRoles.js
diff --git a/packages/rocketchat-models/client/models/Users.js b/app/models/client/models/Users.js
similarity index 100%
rename from packages/rocketchat-models/client/models/Users.js
rename to app/models/client/models/Users.js
diff --git a/packages/rocketchat-models/client/models/WebdavAccounts.js b/app/models/client/models/WebdavAccounts.js
similarity index 100%
rename from packages/rocketchat-models/client/models/WebdavAccounts.js
rename to app/models/client/models/WebdavAccounts.js
diff --git a/packages/rocketchat-models/client/models/_Base.js b/app/models/client/models/_Base.js
similarity index 100%
rename from packages/rocketchat-models/client/models/_Base.js
rename to app/models/client/models/_Base.js
diff --git a/packages/rocketchat-models/package.js b/app/models/package.js
similarity index 100%
rename from packages/rocketchat-models/package.js
rename to app/models/package.js
diff --git a/packages/rocketchat-models/server/index.js b/app/models/server/index.js
similarity index 100%
rename from packages/rocketchat-models/server/index.js
rename to app/models/server/index.js
diff --git a/packages/rocketchat-models/server/models/Avatars.js b/app/models/server/models/Avatars.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Avatars.js
rename to app/models/server/models/Avatars.js
diff --git a/packages/rocketchat-models/server/models/CredentialTokens.js b/app/models/server/models/CredentialTokens.js
similarity index 100%
rename from packages/rocketchat-models/server/models/CredentialTokens.js
rename to app/models/server/models/CredentialTokens.js
diff --git a/packages/rocketchat-models/server/models/CustomSounds.js b/app/models/server/models/CustomSounds.js
similarity index 100%
rename from packages/rocketchat-models/server/models/CustomSounds.js
rename to app/models/server/models/CustomSounds.js
diff --git a/packages/rocketchat-models/server/models/EmojiCustom.js b/app/models/server/models/EmojiCustom.js
similarity index 100%
rename from packages/rocketchat-models/server/models/EmojiCustom.js
rename to app/models/server/models/EmojiCustom.js
diff --git a/packages/rocketchat-models/server/models/ExportOperations.js b/app/models/server/models/ExportOperations.js
similarity index 100%
rename from packages/rocketchat-models/server/models/ExportOperations.js
rename to app/models/server/models/ExportOperations.js
diff --git a/packages/rocketchat-models/server/models/FederationDNSCache.js b/app/models/server/models/FederationDNSCache.js
similarity index 100%
rename from packages/rocketchat-models/server/models/FederationDNSCache.js
rename to app/models/server/models/FederationDNSCache.js
diff --git a/packages/rocketchat-models/server/models/FederationEvents.js b/app/models/server/models/FederationEvents.js
similarity index 100%
rename from packages/rocketchat-models/server/models/FederationEvents.js
rename to app/models/server/models/FederationEvents.js
diff --git a/packages/rocketchat-models/server/models/FederationKeys.js b/app/models/server/models/FederationKeys.js
similarity index 100%
rename from packages/rocketchat-models/server/models/FederationKeys.js
rename to app/models/server/models/FederationKeys.js
diff --git a/packages/rocketchat-models/server/models/IntegrationHistory.js b/app/models/server/models/IntegrationHistory.js
similarity index 100%
rename from packages/rocketchat-models/server/models/IntegrationHistory.js
rename to app/models/server/models/IntegrationHistory.js
diff --git a/packages/rocketchat-models/server/models/Integrations.js b/app/models/server/models/Integrations.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Integrations.js
rename to app/models/server/models/Integrations.js
diff --git a/packages/rocketchat-models/server/models/LivechatCustomField.js b/app/models/server/models/LivechatCustomField.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatCustomField.js
rename to app/models/server/models/LivechatCustomField.js
diff --git a/packages/rocketchat-models/server/models/LivechatDepartment.js b/app/models/server/models/LivechatDepartment.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatDepartment.js
rename to app/models/server/models/LivechatDepartment.js
diff --git a/packages/rocketchat-models/server/models/LivechatDepartmentAgents.js b/app/models/server/models/LivechatDepartmentAgents.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatDepartmentAgents.js
rename to app/models/server/models/LivechatDepartmentAgents.js
diff --git a/packages/rocketchat-models/server/models/LivechatOfficeHour.js b/app/models/server/models/LivechatOfficeHour.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatOfficeHour.js
rename to app/models/server/models/LivechatOfficeHour.js
diff --git a/packages/rocketchat-models/server/models/LivechatPageVisited.js b/app/models/server/models/LivechatPageVisited.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatPageVisited.js
rename to app/models/server/models/LivechatPageVisited.js
diff --git a/packages/rocketchat-models/server/models/LivechatTrigger.js b/app/models/server/models/LivechatTrigger.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatTrigger.js
rename to app/models/server/models/LivechatTrigger.js
diff --git a/packages/rocketchat-models/server/models/LivechatVisitors.js b/app/models/server/models/LivechatVisitors.js
similarity index 100%
rename from packages/rocketchat-models/server/models/LivechatVisitors.js
rename to app/models/server/models/LivechatVisitors.js
diff --git a/packages/rocketchat-models/server/models/Messages.js b/app/models/server/models/Messages.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Messages.js
rename to app/models/server/models/Messages.js
diff --git a/packages/rocketchat-models/server/models/OAuthApps.js b/app/models/server/models/OAuthApps.js
similarity index 100%
rename from packages/rocketchat-models/server/models/OAuthApps.js
rename to app/models/server/models/OAuthApps.js
diff --git a/packages/rocketchat-models/server/models/OEmbedCache.js b/app/models/server/models/OEmbedCache.js
similarity index 100%
rename from packages/rocketchat-models/server/models/OEmbedCache.js
rename to app/models/server/models/OEmbedCache.js
diff --git a/packages/rocketchat-models/server/models/Permissions.js b/app/models/server/models/Permissions.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Permissions.js
rename to app/models/server/models/Permissions.js
diff --git a/packages/rocketchat-models/server/models/ReadReceipts.js b/app/models/server/models/ReadReceipts.js
similarity index 100%
rename from packages/rocketchat-models/server/models/ReadReceipts.js
rename to app/models/server/models/ReadReceipts.js
diff --git a/packages/rocketchat-models/server/models/Reports.js b/app/models/server/models/Reports.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Reports.js
rename to app/models/server/models/Reports.js
diff --git a/packages/rocketchat-models/server/models/Roles.js b/app/models/server/models/Roles.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Roles.js
rename to app/models/server/models/Roles.js
diff --git a/packages/rocketchat-models/server/models/Rooms.js b/app/models/server/models/Rooms.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Rooms.js
rename to app/models/server/models/Rooms.js
diff --git a/packages/rocketchat-models/server/models/Sessions.js b/app/models/server/models/Sessions.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Sessions.js
rename to app/models/server/models/Sessions.js
diff --git a/packages/rocketchat-models/server/models/Settings.js b/app/models/server/models/Settings.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Settings.js
rename to app/models/server/models/Settings.js
diff --git a/packages/rocketchat-models/server/models/SmarshHistory.js b/app/models/server/models/SmarshHistory.js
similarity index 100%
rename from packages/rocketchat-models/server/models/SmarshHistory.js
rename to app/models/server/models/SmarshHistory.js
diff --git a/packages/rocketchat-models/server/models/Statistics.js b/app/models/server/models/Statistics.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Statistics.js
rename to app/models/server/models/Statistics.js
diff --git a/packages/rocketchat-models/server/models/Subscriptions.js b/app/models/server/models/Subscriptions.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Subscriptions.js
rename to app/models/server/models/Subscriptions.js
diff --git a/packages/rocketchat-models/server/models/Uploads.js b/app/models/server/models/Uploads.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Uploads.js
rename to app/models/server/models/Uploads.js
diff --git a/packages/rocketchat-models/server/models/UserDataFiles.js b/app/models/server/models/UserDataFiles.js
similarity index 100%
rename from packages/rocketchat-models/server/models/UserDataFiles.js
rename to app/models/server/models/UserDataFiles.js
diff --git a/packages/rocketchat-models/server/models/Users.js b/app/models/server/models/Users.js
similarity index 100%
rename from packages/rocketchat-models/server/models/Users.js
rename to app/models/server/models/Users.js
diff --git a/packages/rocketchat-models/server/models/WebdavAccounts.js b/app/models/server/models/WebdavAccounts.js
similarity index 100%
rename from packages/rocketchat-models/server/models/WebdavAccounts.js
rename to app/models/server/models/WebdavAccounts.js
diff --git a/packages/rocketchat-models/server/models/_Base.js b/app/models/server/models/_Base.js
similarity index 100%
rename from packages/rocketchat-models/server/models/_Base.js
rename to app/models/server/models/_Base.js
diff --git a/packages/rocketchat-models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js
similarity index 100%
rename from packages/rocketchat-models/server/models/_BaseDb.js
rename to app/models/server/models/_BaseDb.js
diff --git a/packages/rocketchat-models/server/models/apps-logs-model.js b/app/models/server/models/apps-logs-model.js
similarity index 100%
rename from packages/rocketchat-models/server/models/apps-logs-model.js
rename to app/models/server/models/apps-logs-model.js
diff --git a/packages/rocketchat-models/server/models/apps-model.js b/app/models/server/models/apps-model.js
similarity index 100%
rename from packages/rocketchat-models/server/models/apps-model.js
rename to app/models/server/models/apps-model.js
diff --git a/packages/rocketchat-models/server/models/apps-persistence-model.js b/app/models/server/models/apps-persistence-model.js
similarity index 100%
rename from packages/rocketchat-models/server/models/apps-persistence-model.js
rename to app/models/server/models/apps-persistence-model.js
diff --git a/packages/rocketchat-notifications/client/index.js b/app/notifications/client/index.js
similarity index 100%
rename from packages/rocketchat-notifications/client/index.js
rename to app/notifications/client/index.js
diff --git a/packages/rocketchat-notifications/client/lib/Notifications.js b/app/notifications/client/lib/Notifications.js
similarity index 100%
rename from packages/rocketchat-notifications/client/lib/Notifications.js
rename to app/notifications/client/lib/Notifications.js
diff --git a/packages/rocketchat-notifications/package.js b/app/notifications/package.js
similarity index 100%
rename from packages/rocketchat-notifications/package.js
rename to app/notifications/package.js
diff --git a/packages/rocketchat-notifications/server/index.js b/app/notifications/server/index.js
similarity index 100%
rename from packages/rocketchat-notifications/server/index.js
rename to app/notifications/server/index.js
diff --git a/packages/rocketchat-notifications/server/lib/Notifications.js b/app/notifications/server/lib/Notifications.js
similarity index 100%
rename from packages/rocketchat-notifications/server/lib/Notifications.js
rename to app/notifications/server/lib/Notifications.js
diff --git a/packages/rocketchat-nrr/README.md b/app/nrr/README.md
similarity index 100%
rename from packages/rocketchat-nrr/README.md
rename to app/nrr/README.md
diff --git a/packages/rocketchat-nrr/client/index.js b/app/nrr/client/index.js
similarity index 100%
rename from packages/rocketchat-nrr/client/index.js
rename to app/nrr/client/index.js
diff --git a/packages/rocketchat-nrr/client/nrr.js b/app/nrr/client/nrr.js
similarity index 100%
rename from packages/rocketchat-nrr/client/nrr.js
rename to app/nrr/client/nrr.js
diff --git a/packages/rocketchat-nrr/package.js b/app/nrr/package.js
similarity index 100%
rename from packages/rocketchat-nrr/package.js
rename to app/nrr/package.js
diff --git a/packages/rocketchat-oauth2-server-config/.gitignore b/app/oauth2-server-config/.gitignore
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/.gitignore
rename to app/oauth2-server-config/.gitignore
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/collection.js b/app/oauth2-server-config/client/admin/collection.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/collection.js
rename to app/oauth2-server-config/client/admin/collection.js
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/route.js b/app/oauth2-server-config/client/admin/route.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/route.js
rename to app/oauth2-server-config/client/admin/route.js
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/startup.js b/app/oauth2-server-config/client/admin/startup.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/startup.js
rename to app/oauth2-server-config/client/admin/startup.js
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.html b/app/oauth2-server-config/client/admin/views/oauthApp.html
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.html
rename to app/oauth2-server-config/client/admin/views/oauthApp.html
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js b/app/oauth2-server-config/client/admin/views/oauthApp.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js
rename to app/oauth2-server-config/client/admin/views/oauthApp.js
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApps.html b/app/oauth2-server-config/client/admin/views/oauthApps.html
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/views/oauthApps.html
rename to app/oauth2-server-config/client/admin/views/oauthApps.html
diff --git a/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApps.js b/app/oauth2-server-config/client/admin/views/oauthApps.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/admin/views/oauthApps.js
rename to app/oauth2-server-config/client/admin/views/oauthApps.js
diff --git a/packages/rocketchat-oauth2-server-config/client/index.js b/app/oauth2-server-config/client/index.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/index.js
rename to app/oauth2-server-config/client/index.js
diff --git a/packages/rocketchat-oauth2-server-config/client/oauth/oauth2-client.html b/app/oauth2-server-config/client/oauth/oauth2-client.html
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/oauth/oauth2-client.html
rename to app/oauth2-server-config/client/oauth/oauth2-client.html
diff --git a/packages/rocketchat-oauth2-server-config/client/oauth/oauth2-client.js b/app/oauth2-server-config/client/oauth/oauth2-client.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/oauth/oauth2-client.js
rename to app/oauth2-server-config/client/oauth/oauth2-client.js
diff --git a/packages/rocketchat-oauth2-server-config/client/oauth/stylesheets/oauth2.css b/app/oauth2-server-config/client/oauth/stylesheets/oauth2.css
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/client/oauth/stylesheets/oauth2.css
rename to app/oauth2-server-config/client/oauth/stylesheets/oauth2.css
diff --git a/packages/rocketchat-oauth2-server-config/package.js b/app/oauth2-server-config/package.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/package.js
rename to app/oauth2-server-config/package.js
diff --git a/packages/rocketchat-oauth2-server-config/server/admin/methods/addOAuthApp.js b/app/oauth2-server-config/server/admin/methods/addOAuthApp.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/admin/methods/addOAuthApp.js
rename to app/oauth2-server-config/server/admin/methods/addOAuthApp.js
diff --git a/packages/rocketchat-oauth2-server-config/server/admin/methods/deleteOAuthApp.js b/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/admin/methods/deleteOAuthApp.js
rename to app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js
diff --git a/packages/rocketchat-oauth2-server-config/server/admin/methods/updateOAuthApp.js b/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/admin/methods/updateOAuthApp.js
rename to app/oauth2-server-config/server/admin/methods/updateOAuthApp.js
diff --git a/packages/rocketchat-oauth2-server-config/server/admin/publications/oauthApps.js b/app/oauth2-server-config/server/admin/publications/oauthApps.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/admin/publications/oauthApps.js
rename to app/oauth2-server-config/server/admin/publications/oauthApps.js
diff --git a/packages/rocketchat-oauth2-server-config/server/index.js b/app/oauth2-server-config/server/index.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/index.js
rename to app/oauth2-server-config/server/index.js
diff --git a/packages/rocketchat-oauth2-server-config/server/oauth/default-services.js b/app/oauth2-server-config/server/oauth/default-services.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/oauth/default-services.js
rename to app/oauth2-server-config/server/oauth/default-services.js
diff --git a/packages/rocketchat-oauth2-server-config/server/oauth/oauth2-server.js b/app/oauth2-server-config/server/oauth/oauth2-server.js
similarity index 100%
rename from packages/rocketchat-oauth2-server-config/server/oauth/oauth2-server.js
rename to app/oauth2-server-config/server/oauth/oauth2-server.js
diff --git a/packages/rocketchat-oembed/client/baseWidget.html b/app/oembed/client/baseWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/baseWidget.html
rename to app/oembed/client/baseWidget.html
diff --git a/packages/rocketchat-oembed/client/baseWidget.js b/app/oembed/client/baseWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/baseWidget.js
rename to app/oembed/client/baseWidget.js
diff --git a/packages/rocketchat-oembed/client/index.js b/app/oembed/client/index.js
similarity index 100%
rename from packages/rocketchat-oembed/client/index.js
rename to app/oembed/client/index.js
diff --git a/packages/rocketchat-oembed/client/oembedAudioWidget.html b/app/oembed/client/oembedAudioWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedAudioWidget.html
rename to app/oembed/client/oembedAudioWidget.html
diff --git a/packages/rocketchat-oembed/client/oembedAudioWidget.js b/app/oembed/client/oembedAudioWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedAudioWidget.js
rename to app/oembed/client/oembedAudioWidget.js
diff --git a/packages/rocketchat-oembed/client/oembedFrameWidget.html b/app/oembed/client/oembedFrameWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedFrameWidget.html
rename to app/oembed/client/oembedFrameWidget.html
diff --git a/packages/rocketchat-oembed/client/oembedFrameWidget.js b/app/oembed/client/oembedFrameWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedFrameWidget.js
rename to app/oembed/client/oembedFrameWidget.js
diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/app/oembed/client/oembedImageWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedImageWidget.html
rename to app/oembed/client/oembedImageWidget.html
diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.js b/app/oembed/client/oembedImageWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedImageWidget.js
rename to app/oembed/client/oembedImageWidget.js
diff --git a/packages/rocketchat-oembed/client/oembedSandstormGrain.html b/app/oembed/client/oembedSandstormGrain.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedSandstormGrain.html
rename to app/oembed/client/oembedSandstormGrain.html
diff --git a/packages/rocketchat-oembed/client/oembedSandstormGrain.js b/app/oembed/client/oembedSandstormGrain.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedSandstormGrain.js
rename to app/oembed/client/oembedSandstormGrain.js
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.html b/app/oembed/client/oembedUrlWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedUrlWidget.html
rename to app/oembed/client/oembedUrlWidget.html
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.js b/app/oembed/client/oembedUrlWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedUrlWidget.js
rename to app/oembed/client/oembedUrlWidget.js
diff --git a/packages/rocketchat-oembed/client/oembedVideoWidget.html b/app/oembed/client/oembedVideoWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedVideoWidget.html
rename to app/oembed/client/oembedVideoWidget.html
diff --git a/packages/rocketchat-oembed/client/oembedVideoWidget.js b/app/oembed/client/oembedVideoWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedVideoWidget.js
rename to app/oembed/client/oembedVideoWidget.js
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.html b/app/oembed/client/oembedYoutubeWidget.html
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedYoutubeWidget.html
rename to app/oembed/client/oembedYoutubeWidget.html
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.js b/app/oembed/client/oembedYoutubeWidget.js
similarity index 100%
rename from packages/rocketchat-oembed/client/oembedYoutubeWidget.js
rename to app/oembed/client/oembedYoutubeWidget.js
diff --git a/packages/rocketchat-oembed/package.js b/app/oembed/package.js
similarity index 100%
rename from packages/rocketchat-oembed/package.js
rename to app/oembed/package.js
diff --git a/packages/rocketchat-oembed/server/index.js b/app/oembed/server/index.js
similarity index 100%
rename from packages/rocketchat-oembed/server/index.js
rename to app/oembed/server/index.js
diff --git a/packages/rocketchat-oembed/server/jumpToMessage.js b/app/oembed/server/jumpToMessage.js
similarity index 100%
rename from packages/rocketchat-oembed/server/jumpToMessage.js
rename to app/oembed/server/jumpToMessage.js
diff --git a/packages/rocketchat-oembed/server/providers.js b/app/oembed/server/providers.js
similarity index 100%
rename from packages/rocketchat-oembed/server/providers.js
rename to app/oembed/server/providers.js
diff --git a/packages/rocketchat-oembed/server/server.js b/app/oembed/server/server.js
similarity index 100%
rename from packages/rocketchat-oembed/server/server.js
rename to app/oembed/server/server.js
diff --git a/packages/rocketchat-otr/client/index.js b/app/otr/client/index.js
similarity index 100%
rename from packages/rocketchat-otr/client/index.js
rename to app/otr/client/index.js
diff --git a/packages/rocketchat-otr/client/rocketchat.otr.js b/app/otr/client/rocketchat.otr.js
similarity index 100%
rename from packages/rocketchat-otr/client/rocketchat.otr.js
rename to app/otr/client/rocketchat.otr.js
diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/app/otr/client/rocketchat.otr.room.js
similarity index 100%
rename from packages/rocketchat-otr/client/rocketchat.otr.room.js
rename to app/otr/client/rocketchat.otr.room.js
diff --git a/packages/rocketchat-otr/client/stylesheets/otr.css b/app/otr/client/stylesheets/otr.css
similarity index 100%
rename from packages/rocketchat-otr/client/stylesheets/otr.css
rename to app/otr/client/stylesheets/otr.css
diff --git a/packages/rocketchat-otr/client/tabBar.js b/app/otr/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-otr/client/tabBar.js
rename to app/otr/client/tabBar.js
diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.html b/app/otr/client/views/otrFlexTab.html
similarity index 100%
rename from packages/rocketchat-otr/client/views/otrFlexTab.html
rename to app/otr/client/views/otrFlexTab.html
diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.js b/app/otr/client/views/otrFlexTab.js
similarity index 100%
rename from packages/rocketchat-otr/client/views/otrFlexTab.js
rename to app/otr/client/views/otrFlexTab.js
diff --git a/packages/rocketchat-otr/package.js b/app/otr/package.js
similarity index 100%
rename from packages/rocketchat-otr/package.js
rename to app/otr/package.js
diff --git a/packages/rocketchat-otr/server/index.js b/app/otr/server/index.js
similarity index 100%
rename from packages/rocketchat-otr/server/index.js
rename to app/otr/server/index.js
diff --git a/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js b/app/otr/server/methods/deleteOldOTRMessages.js
similarity index 100%
rename from packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js
rename to app/otr/server/methods/deleteOldOTRMessages.js
diff --git a/packages/rocketchat-otr/server/methods/updateOTRAck.js b/app/otr/server/methods/updateOTRAck.js
similarity index 100%
rename from packages/rocketchat-otr/server/methods/updateOTRAck.js
rename to app/otr/server/methods/updateOTRAck.js
diff --git a/packages/rocketchat-otr/server/settings.js b/app/otr/server/settings.js
similarity index 100%
rename from packages/rocketchat-otr/server/settings.js
rename to app/otr/server/settings.js
diff --git a/packages/rocketchat-promises/client/index.js b/app/promises/client/index.js
similarity index 100%
rename from packages/rocketchat-promises/client/index.js
rename to app/promises/client/index.js
diff --git a/packages/rocketchat-promises/lib/promises.js b/app/promises/lib/promises.js
similarity index 100%
rename from packages/rocketchat-promises/lib/promises.js
rename to app/promises/lib/promises.js
diff --git a/packages/rocketchat-promises/package.js b/app/promises/package.js
similarity index 100%
rename from packages/rocketchat-promises/package.js
rename to app/promises/package.js
diff --git a/packages/rocketchat-promises/server/index.js b/app/promises/server/index.js
similarity index 100%
rename from packages/rocketchat-promises/server/index.js
rename to app/promises/server/index.js
diff --git a/packages/rocketchat-push-notifications/client/index.js b/app/push-notifications/client/index.js
similarity index 100%
rename from packages/rocketchat-push-notifications/client/index.js
rename to app/push-notifications/client/index.js
diff --git a/packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.css b/app/push-notifications/client/stylesheets/pushNotifications.css
similarity index 100%
rename from packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.css
rename to app/push-notifications/client/stylesheets/pushNotifications.css
diff --git a/packages/rocketchat-push-notifications/client/tabBar.js b/app/push-notifications/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-push-notifications/client/tabBar.js
rename to app/push-notifications/client/tabBar.js
diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html b/app/push-notifications/client/views/pushNotificationsFlexTab.html
similarity index 100%
rename from packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html
rename to app/push-notifications/client/views/pushNotificationsFlexTab.html
diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js b/app/push-notifications/client/views/pushNotificationsFlexTab.js
similarity index 100%
rename from packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
rename to app/push-notifications/client/views/pushNotificationsFlexTab.js
diff --git a/packages/rocketchat-push-notifications/package.js b/app/push-notifications/package.js
similarity index 100%
rename from packages/rocketchat-push-notifications/package.js
rename to app/push-notifications/package.js
diff --git a/packages/rocketchat-push-notifications/server/index.js b/app/push-notifications/server/index.js
similarity index 100%
rename from packages/rocketchat-push-notifications/server/index.js
rename to app/push-notifications/server/index.js
diff --git a/packages/rocketchat-push-notifications/server/lib/PushNotification.js b/app/push-notifications/server/lib/PushNotification.js
similarity index 100%
rename from packages/rocketchat-push-notifications/server/lib/PushNotification.js
rename to app/push-notifications/server/lib/PushNotification.js
diff --git a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js b/app/push-notifications/server/methods/saveNotificationSettings.js
similarity index 100%
rename from packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
rename to app/push-notifications/server/methods/saveNotificationSettings.js
diff --git a/packages/rocketchat-reactions/README.md b/app/reactions/README.md
similarity index 100%
rename from packages/rocketchat-reactions/README.md
rename to app/reactions/README.md
diff --git a/packages/rocketchat-reactions/client/index.js b/app/reactions/client/index.js
similarity index 100%
rename from packages/rocketchat-reactions/client/index.js
rename to app/reactions/client/index.js
diff --git a/packages/rocketchat-reactions/client/init.js b/app/reactions/client/init.js
similarity index 100%
rename from packages/rocketchat-reactions/client/init.js
rename to app/reactions/client/init.js
diff --git a/packages/rocketchat-reactions/client/methods/setReaction.js b/app/reactions/client/methods/setReaction.js
similarity index 100%
rename from packages/rocketchat-reactions/client/methods/setReaction.js
rename to app/reactions/client/methods/setReaction.js
diff --git a/packages/rocketchat-reactions/client/stylesheets/reaction.css b/app/reactions/client/stylesheets/reaction.css
similarity index 100%
rename from packages/rocketchat-reactions/client/stylesheets/reaction.css
rename to app/reactions/client/stylesheets/reaction.css
diff --git a/packages/rocketchat-reactions/package.js b/app/reactions/package.js
similarity index 100%
rename from packages/rocketchat-reactions/package.js
rename to app/reactions/package.js
diff --git a/packages/rocketchat-reactions/server/index.js b/app/reactions/server/index.js
similarity index 100%
rename from packages/rocketchat-reactions/server/index.js
rename to app/reactions/server/index.js
diff --git a/packages/rocketchat-reactions/server/setReaction.js b/app/reactions/server/setReaction.js
similarity index 100%
rename from packages/rocketchat-reactions/server/setReaction.js
rename to app/reactions/server/setReaction.js
diff --git a/packages/rocketchat-retention-policy/README.md b/app/retention-policy/README.md
similarity index 100%
rename from packages/rocketchat-retention-policy/README.md
rename to app/retention-policy/README.md
diff --git a/packages/rocketchat-retention-policy/package.js b/app/retention-policy/package.js
similarity index 100%
rename from packages/rocketchat-retention-policy/package.js
rename to app/retention-policy/package.js
diff --git a/packages/rocketchat-retention-policy/server/cronPruneMessages.js b/app/retention-policy/server/cronPruneMessages.js
similarity index 100%
rename from packages/rocketchat-retention-policy/server/cronPruneMessages.js
rename to app/retention-policy/server/cronPruneMessages.js
diff --git a/packages/rocketchat-retention-policy/server/index.js b/app/retention-policy/server/index.js
similarity index 100%
rename from packages/rocketchat-retention-policy/server/index.js
rename to app/retention-policy/server/index.js
diff --git a/packages/rocketchat-retention-policy/server/startup/settings.js b/app/retention-policy/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-retention-policy/server/startup/settings.js
rename to app/retention-policy/server/startup/settings.js
diff --git a/packages/rocketchat-sandstorm/client/index.js b/app/sandstorm/client/index.js
similarity index 100%
rename from packages/rocketchat-sandstorm/client/index.js
rename to app/sandstorm/client/index.js
diff --git a/packages/rocketchat-sandstorm/client/powerboxListener.js b/app/sandstorm/client/powerboxListener.js
similarity index 100%
rename from packages/rocketchat-sandstorm/client/powerboxListener.js
rename to app/sandstorm/client/powerboxListener.js
diff --git a/packages/rocketchat-sandstorm/client/setPath.js b/app/sandstorm/client/setPath.js
similarity index 100%
rename from packages/rocketchat-sandstorm/client/setPath.js
rename to app/sandstorm/client/setPath.js
diff --git a/packages/rocketchat-sandstorm/package.js b/app/sandstorm/package.js
similarity index 100%
rename from packages/rocketchat-sandstorm/package.js
rename to app/sandstorm/package.js
diff --git a/packages/rocketchat-sandstorm/server/events.js b/app/sandstorm/server/events.js
similarity index 100%
rename from packages/rocketchat-sandstorm/server/events.js
rename to app/sandstorm/server/events.js
diff --git a/packages/rocketchat-sandstorm/server/index.js b/app/sandstorm/server/index.js
similarity index 100%
rename from packages/rocketchat-sandstorm/server/index.js
rename to app/sandstorm/server/index.js
diff --git a/packages/rocketchat-sandstorm/server/lib.js b/app/sandstorm/server/lib.js
similarity index 100%
rename from packages/rocketchat-sandstorm/server/lib.js
rename to app/sandstorm/server/lib.js
diff --git a/packages/rocketchat-sandstorm/server/powerbox.js b/app/sandstorm/server/powerbox.js
similarity index 100%
rename from packages/rocketchat-sandstorm/server/powerbox.js
rename to app/sandstorm/server/powerbox.js
diff --git a/packages/rocketchat-search/README.md b/app/search/README.md
similarity index 100%
rename from packages/rocketchat-search/README.md
rename to app/search/README.md
diff --git a/packages/rocketchat-search/client/index.js b/app/search/client/index.js
similarity index 100%
rename from packages/rocketchat-search/client/index.js
rename to app/search/client/index.js
diff --git a/packages/rocketchat-search/client/provider/result.html b/app/search/client/provider/result.html
similarity index 100%
rename from packages/rocketchat-search/client/provider/result.html
rename to app/search/client/provider/result.html
diff --git a/packages/rocketchat-search/client/provider/result.js b/app/search/client/provider/result.js
similarity index 100%
rename from packages/rocketchat-search/client/provider/result.js
rename to app/search/client/provider/result.js
diff --git a/packages/rocketchat-search/client/provider/suggestion.html b/app/search/client/provider/suggestion.html
similarity index 100%
rename from packages/rocketchat-search/client/provider/suggestion.html
rename to app/search/client/provider/suggestion.html
diff --git a/packages/rocketchat-search/client/search/search.html b/app/search/client/search/search.html
similarity index 100%
rename from packages/rocketchat-search/client/search/search.html
rename to app/search/client/search/search.html
diff --git a/packages/rocketchat-search/client/search/search.js b/app/search/client/search/search.js
similarity index 100%
rename from packages/rocketchat-search/client/search/search.js
rename to app/search/client/search/search.js
diff --git a/packages/rocketchat-search/client/style/style.css b/app/search/client/style/style.css
similarity index 100%
rename from packages/rocketchat-search/client/style/style.css
rename to app/search/client/style/style.css
diff --git a/packages/rocketchat-search/package.js b/app/search/package.js
similarity index 100%
rename from packages/rocketchat-search/package.js
rename to app/search/package.js
diff --git a/packages/rocketchat-search/server/events/events.js b/app/search/server/events/events.js
similarity index 100%
rename from packages/rocketchat-search/server/events/events.js
rename to app/search/server/events/events.js
diff --git a/packages/rocketchat-search/server/index.js b/app/search/server/index.js
similarity index 100%
rename from packages/rocketchat-search/server/index.js
rename to app/search/server/index.js
diff --git a/packages/rocketchat-search/server/logger/logger.js b/app/search/server/logger/logger.js
similarity index 100%
rename from packages/rocketchat-search/server/logger/logger.js
rename to app/search/server/logger/logger.js
diff --git a/packages/rocketchat-search/server/model/provider.js b/app/search/server/model/provider.js
similarity index 100%
rename from packages/rocketchat-search/server/model/provider.js
rename to app/search/server/model/provider.js
diff --git a/packages/rocketchat-search/server/provider/defaultProvider.js b/app/search/server/provider/defaultProvider.js
similarity index 100%
rename from packages/rocketchat-search/server/provider/defaultProvider.js
rename to app/search/server/provider/defaultProvider.js
diff --git a/packages/rocketchat-search/server/service/providerService.js b/app/search/server/service/providerService.js
similarity index 100%
rename from packages/rocketchat-search/server/service/providerService.js
rename to app/search/server/service/providerService.js
diff --git a/packages/rocketchat-search/server/service/validationService.js b/app/search/server/service/validationService.js
similarity index 100%
rename from packages/rocketchat-search/server/service/validationService.js
rename to app/search/server/service/validationService.js
diff --git a/packages/rocketchat-settings/client/index.js b/app/settings/client/index.js
similarity index 100%
rename from packages/rocketchat-settings/client/index.js
rename to app/settings/client/index.js
diff --git a/packages/rocketchat-settings/client/lib/settings.js b/app/settings/client/lib/settings.js
similarity index 100%
rename from packages/rocketchat-settings/client/lib/settings.js
rename to app/settings/client/lib/settings.js
diff --git a/packages/rocketchat-settings/lib/settings.js b/app/settings/lib/settings.js
similarity index 100%
rename from packages/rocketchat-settings/lib/settings.js
rename to app/settings/lib/settings.js
diff --git a/packages/rocketchat-settings/package.js b/app/settings/package.js
similarity index 100%
rename from packages/rocketchat-settings/package.js
rename to app/settings/package.js
diff --git a/packages/rocketchat-settings/server/functions/settings.js b/app/settings/server/functions/settings.js
similarity index 100%
rename from packages/rocketchat-settings/server/functions/settings.js
rename to app/settings/server/functions/settings.js
diff --git a/packages/rocketchat-settings/server/index.js b/app/settings/server/index.js
similarity index 100%
rename from packages/rocketchat-settings/server/index.js
rename to app/settings/server/index.js
diff --git a/packages/rocketchat-setup-wizard/client/final.html b/app/setup-wizard/client/final.html
similarity index 100%
rename from packages/rocketchat-setup-wizard/client/final.html
rename to app/setup-wizard/client/final.html
diff --git a/packages/rocketchat-setup-wizard/client/final.js b/app/setup-wizard/client/final.js
similarity index 100%
rename from packages/rocketchat-setup-wizard/client/final.js
rename to app/setup-wizard/client/final.js
diff --git a/packages/rocketchat-setup-wizard/client/index.js b/app/setup-wizard/client/index.js
similarity index 100%
rename from packages/rocketchat-setup-wizard/client/index.js
rename to app/setup-wizard/client/index.js
diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.html b/app/setup-wizard/client/setupWizard.html
similarity index 100%
rename from packages/rocketchat-setup-wizard/client/setupWizard.html
rename to app/setup-wizard/client/setupWizard.html
diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/app/setup-wizard/client/setupWizard.js
similarity index 100%
rename from packages/rocketchat-setup-wizard/client/setupWizard.js
rename to app/setup-wizard/client/setupWizard.js
diff --git a/packages/rocketchat-setup-wizard/package.js b/app/setup-wizard/package.js
similarity index 100%
rename from packages/rocketchat-setup-wizard/package.js
rename to app/setup-wizard/package.js
diff --git a/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js b/app/setup-wizard/server/getSetupWizardParameters.js
similarity index 100%
rename from packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js
rename to app/setup-wizard/server/getSetupWizardParameters.js
diff --git a/packages/rocketchat-setup-wizard/server/index.js b/app/setup-wizard/server/index.js
similarity index 100%
rename from packages/rocketchat-setup-wizard/server/index.js
rename to app/setup-wizard/server/index.js
diff --git a/packages/rocketchat-slackbridge/README.md b/app/slackbridge/README.md
similarity index 100%
rename from packages/rocketchat-slackbridge/README.md
rename to app/slackbridge/README.md
diff --git a/packages/rocketchat-slackbridge/client/index.js b/app/slackbridge/client/index.js
similarity index 100%
rename from packages/rocketchat-slackbridge/client/index.js
rename to app/slackbridge/client/index.js
diff --git a/packages/rocketchat-slackbridge/client/slackbridge_import.client.js b/app/slackbridge/client/slackbridge_import.client.js
similarity index 100%
rename from packages/rocketchat-slackbridge/client/slackbridge_import.client.js
rename to app/slackbridge/client/slackbridge_import.client.js
diff --git a/packages/rocketchat-slackbridge/package.js b/app/slackbridge/package.js
similarity index 100%
rename from packages/rocketchat-slackbridge/package.js
rename to app/slackbridge/package.js
diff --git a/packages/rocketchat-slackbridge/server/RocketAdapter.js b/app/slackbridge/server/RocketAdapter.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/RocketAdapter.js
rename to app/slackbridge/server/RocketAdapter.js
diff --git a/packages/rocketchat-slackbridge/server/SlackAdapter.js b/app/slackbridge/server/SlackAdapter.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/SlackAdapter.js
rename to app/slackbridge/server/SlackAdapter.js
diff --git a/packages/rocketchat-slackbridge/server/index.js b/app/slackbridge/server/index.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/index.js
rename to app/slackbridge/server/index.js
diff --git a/packages/rocketchat-slackbridge/server/logger.js b/app/slackbridge/server/logger.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/logger.js
rename to app/slackbridge/server/logger.js
diff --git a/packages/rocketchat-slackbridge/server/settings.js b/app/slackbridge/server/settings.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/settings.js
rename to app/slackbridge/server/settings.js
diff --git a/packages/rocketchat-slackbridge/server/slackbridge.js b/app/slackbridge/server/slackbridge.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/slackbridge.js
rename to app/slackbridge/server/slackbridge.js
diff --git a/packages/rocketchat-slackbridge/server/slackbridge_import.server.js b/app/slackbridge/server/slackbridge_import.server.js
similarity index 100%
rename from packages/rocketchat-slackbridge/server/slackbridge_import.server.js
rename to app/slackbridge/server/slackbridge_import.server.js
diff --git a/packages/rocketchat-slackbridge/tests/manual-tests.txt b/app/slackbridge/tests/manual-tests.txt
similarity index 100%
rename from packages/rocketchat-slackbridge/tests/manual-tests.txt
rename to app/slackbridge/tests/manual-tests.txt
diff --git a/packages/rocketchat-slashcommand-asciiarts/client/index.js b/app/slashcommand-asciiarts/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/client/index.js
rename to app/slashcommand-asciiarts/client/index.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/lib/gimme.js b/app/slashcommand-asciiarts/lib/gimme.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/lib/gimme.js
rename to app/slashcommand-asciiarts/lib/gimme.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/lib/lenny.js b/app/slashcommand-asciiarts/lib/lenny.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/lib/lenny.js
rename to app/slashcommand-asciiarts/lib/lenny.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/lib/shrug.js b/app/slashcommand-asciiarts/lib/shrug.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/lib/shrug.js
rename to app/slashcommand-asciiarts/lib/shrug.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/lib/tableflip.js b/app/slashcommand-asciiarts/lib/tableflip.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/lib/tableflip.js
rename to app/slashcommand-asciiarts/lib/tableflip.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/lib/unflip.js b/app/slashcommand-asciiarts/lib/unflip.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/lib/unflip.js
rename to app/slashcommand-asciiarts/lib/unflip.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/package.js b/app/slashcommand-asciiarts/package.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/package.js
rename to app/slashcommand-asciiarts/package.js
diff --git a/packages/rocketchat-slashcommand-asciiarts/server/index.js b/app/slashcommand-asciiarts/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommand-asciiarts/server/index.js
rename to app/slashcommand-asciiarts/server/index.js
diff --git a/packages/rocketchat-slashcommands-archiveroom/client/client.js b/app/slashcommands-archiveroom/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-archiveroom/client/client.js
rename to app/slashcommands-archiveroom/client/client.js
diff --git a/packages/rocketchat-slashcommands-archiveroom/client/index.js b/app/slashcommands-archiveroom/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-archiveroom/client/index.js
rename to app/slashcommands-archiveroom/client/index.js
diff --git a/packages/rocketchat-slashcommands-archiveroom/package.js b/app/slashcommands-archiveroom/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-archiveroom/package.js
rename to app/slashcommands-archiveroom/package.js
diff --git a/packages/rocketchat-slashcommands-archiveroom/server/index.js b/app/slashcommands-archiveroom/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-archiveroom/server/index.js
rename to app/slashcommands-archiveroom/server/index.js
diff --git a/packages/rocketchat-slashcommands-archiveroom/server/server.js b/app/slashcommands-archiveroom/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-archiveroom/server/server.js
rename to app/slashcommands-archiveroom/server/server.js
diff --git a/packages/rocketchat-slashcommands-create/client/client.js b/app/slashcommands-create/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-create/client/client.js
rename to app/slashcommands-create/client/client.js
diff --git a/packages/rocketchat-slashcommands-create/client/index.js b/app/slashcommands-create/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-create/client/index.js
rename to app/slashcommands-create/client/index.js
diff --git a/packages/rocketchat-slashcommands-create/package.js b/app/slashcommands-create/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-create/package.js
rename to app/slashcommands-create/package.js
diff --git a/packages/rocketchat-slashcommands-create/server/index.js b/app/slashcommands-create/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-create/server/index.js
rename to app/slashcommands-create/server/index.js
diff --git a/packages/rocketchat-slashcommands-create/server/server.js b/app/slashcommands-create/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-create/server/server.js
rename to app/slashcommands-create/server/server.js
diff --git a/packages/rocketchat-slashcommands-help/package.js b/app/slashcommands-help/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-help/package.js
rename to app/slashcommands-help/package.js
diff --git a/packages/rocketchat-slashcommands-help/server/index.js b/app/slashcommands-help/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-help/server/index.js
rename to app/slashcommands-help/server/index.js
diff --git a/packages/rocketchat-slashcommands-help/server/server.js b/app/slashcommands-help/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-help/server/server.js
rename to app/slashcommands-help/server/server.js
diff --git a/packages/rocketchat-slashcommands-hide/client/hide.js b/app/slashcommands-hide/client/hide.js
similarity index 100%
rename from packages/rocketchat-slashcommands-hide/client/hide.js
rename to app/slashcommands-hide/client/hide.js
diff --git a/packages/rocketchat-slashcommands-hide/client/index.js b/app/slashcommands-hide/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-hide/client/index.js
rename to app/slashcommands-hide/client/index.js
diff --git a/packages/rocketchat-slashcommands-hide/package.js b/app/slashcommands-hide/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-hide/package.js
rename to app/slashcommands-hide/package.js
diff --git a/packages/rocketchat-slashcommands-hide/server/hide.js b/app/slashcommands-hide/server/hide.js
similarity index 100%
rename from packages/rocketchat-slashcommands-hide/server/hide.js
rename to app/slashcommands-hide/server/hide.js
diff --git a/packages/rocketchat-slashcommands-hide/server/index.js b/app/slashcommands-hide/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-hide/server/index.js
rename to app/slashcommands-hide/server/index.js
diff --git a/packages/rocketchat-slashcommands-invite/client/client.js b/app/slashcommands-invite/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-invite/client/client.js
rename to app/slashcommands-invite/client/client.js
diff --git a/packages/rocketchat-slashcommands-invite/client/index.js b/app/slashcommands-invite/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-invite/client/index.js
rename to app/slashcommands-invite/client/index.js
diff --git a/packages/rocketchat-slashcommands-invite/package.js b/app/slashcommands-invite/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-invite/package.js
rename to app/slashcommands-invite/package.js
diff --git a/packages/rocketchat-slashcommands-invite/server/index.js b/app/slashcommands-invite/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-invite/server/index.js
rename to app/slashcommands-invite/server/index.js
diff --git a/packages/rocketchat-slashcommands-invite/server/server.js b/app/slashcommands-invite/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-invite/server/server.js
rename to app/slashcommands-invite/server/server.js
diff --git a/packages/rocketchat-slashcommands-inviteall/client/client.js b/app/slashcommands-inviteall/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-inviteall/client/client.js
rename to app/slashcommands-inviteall/client/client.js
diff --git a/packages/rocketchat-slashcommands-inviteall/client/index.js b/app/slashcommands-inviteall/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-inviteall/client/index.js
rename to app/slashcommands-inviteall/client/index.js
diff --git a/packages/rocketchat-slashcommands-inviteall/package.js b/app/slashcommands-inviteall/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-inviteall/package.js
rename to app/slashcommands-inviteall/package.js
diff --git a/packages/rocketchat-slashcommands-inviteall/server/index.js b/app/slashcommands-inviteall/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-inviteall/server/index.js
rename to app/slashcommands-inviteall/server/index.js
diff --git a/packages/rocketchat-slashcommands-inviteall/server/server.js b/app/slashcommands-inviteall/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-inviteall/server/server.js
rename to app/slashcommands-inviteall/server/server.js
diff --git a/packages/rocketchat-slashcommands-join/client/client.js b/app/slashcommands-join/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-join/client/client.js
rename to app/slashcommands-join/client/client.js
diff --git a/packages/rocketchat-slashcommands-join/client/index.js b/app/slashcommands-join/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-join/client/index.js
rename to app/slashcommands-join/client/index.js
diff --git a/packages/rocketchat-slashcommands-join/package.js b/app/slashcommands-join/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-join/package.js
rename to app/slashcommands-join/package.js
diff --git a/packages/rocketchat-slashcommands-join/server/index.js b/app/slashcommands-join/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-join/server/index.js
rename to app/slashcommands-join/server/index.js
diff --git a/packages/rocketchat-slashcommands-join/server/server.js b/app/slashcommands-join/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-join/server/server.js
rename to app/slashcommands-join/server/server.js
diff --git a/packages/rocketchat-slashcommands-kick/client/client.js b/app/slashcommands-kick/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-kick/client/client.js
rename to app/slashcommands-kick/client/client.js
diff --git a/packages/rocketchat-slashcommands-kick/client/index.js b/app/slashcommands-kick/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-kick/client/index.js
rename to app/slashcommands-kick/client/index.js
diff --git a/packages/rocketchat-slashcommands-kick/package.js b/app/slashcommands-kick/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-kick/package.js
rename to app/slashcommands-kick/package.js
diff --git a/packages/rocketchat-slashcommands-kick/server/index.js b/app/slashcommands-kick/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-kick/server/index.js
rename to app/slashcommands-kick/server/index.js
diff --git a/packages/rocketchat-slashcommands-kick/server/server.js b/app/slashcommands-kick/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-kick/server/server.js
rename to app/slashcommands-kick/server/server.js
diff --git a/packages/rocketchat-slashcommands-leave/package.js b/app/slashcommands-leave/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-leave/package.js
rename to app/slashcommands-leave/package.js
diff --git a/packages/rocketchat-slashcommands-leave/server/index.js b/app/slashcommands-leave/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-leave/server/index.js
rename to app/slashcommands-leave/server/index.js
diff --git a/packages/rocketchat-slashcommands-leave/server/leave.js b/app/slashcommands-leave/server/leave.js
similarity index 100%
rename from packages/rocketchat-slashcommands-leave/server/leave.js
rename to app/slashcommands-leave/server/leave.js
diff --git a/packages/rocketchat-slashcommands-me/package.js b/app/slashcommands-me/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-me/package.js
rename to app/slashcommands-me/package.js
diff --git a/packages/rocketchat-slashcommands-me/server/index.js b/app/slashcommands-me/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-me/server/index.js
rename to app/slashcommands-me/server/index.js
diff --git a/packages/rocketchat-slashcommands-me/server/me.js b/app/slashcommands-me/server/me.js
similarity index 100%
rename from packages/rocketchat-slashcommands-me/server/me.js
rename to app/slashcommands-me/server/me.js
diff --git a/packages/rocketchat-slashcommands-msg/package.js b/app/slashcommands-msg/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-msg/package.js
rename to app/slashcommands-msg/package.js
diff --git a/packages/rocketchat-slashcommands-msg/server/index.js b/app/slashcommands-msg/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-msg/server/index.js
rename to app/slashcommands-msg/server/index.js
diff --git a/packages/rocketchat-slashcommands-msg/server/server.js b/app/slashcommands-msg/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-msg/server/server.js
rename to app/slashcommands-msg/server/server.js
diff --git a/packages/rocketchat-slashcommands-mute/package.js b/app/slashcommands-mute/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-mute/package.js
rename to app/slashcommands-mute/package.js
diff --git a/packages/rocketchat-slashcommands-mute/server/index.js b/app/slashcommands-mute/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-mute/server/index.js
rename to app/slashcommands-mute/server/index.js
diff --git a/packages/rocketchat-slashcommands-mute/server/mute.js b/app/slashcommands-mute/server/mute.js
similarity index 100%
rename from packages/rocketchat-slashcommands-mute/server/mute.js
rename to app/slashcommands-mute/server/mute.js
diff --git a/packages/rocketchat-slashcommands-mute/server/unmute.js b/app/slashcommands-mute/server/unmute.js
similarity index 100%
rename from packages/rocketchat-slashcommands-mute/server/unmute.js
rename to app/slashcommands-mute/server/unmute.js
diff --git a/packages/rocketchat-slashcommands-open/client/client.js b/app/slashcommands-open/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-open/client/client.js
rename to app/slashcommands-open/client/client.js
diff --git a/packages/rocketchat-slashcommands-open/client/index.js b/app/slashcommands-open/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-open/client/index.js
rename to app/slashcommands-open/client/index.js
diff --git a/packages/rocketchat-slashcommands-open/package.js b/app/slashcommands-open/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-open/package.js
rename to app/slashcommands-open/package.js
diff --git a/packages/rocketchat-slashcommands-topic/client/index.js b/app/slashcommands-topic/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-topic/client/index.js
rename to app/slashcommands-topic/client/index.js
diff --git a/packages/rocketchat-slashcommands-topic/lib/topic.js b/app/slashcommands-topic/lib/topic.js
similarity index 100%
rename from packages/rocketchat-slashcommands-topic/lib/topic.js
rename to app/slashcommands-topic/lib/topic.js
diff --git a/packages/rocketchat-slashcommands-topic/package.js b/app/slashcommands-topic/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-topic/package.js
rename to app/slashcommands-topic/package.js
diff --git a/packages/rocketchat-slashcommands-topic/server/index.js b/app/slashcommands-topic/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-topic/server/index.js
rename to app/slashcommands-topic/server/index.js
diff --git a/packages/rocketchat-slashcommands-unarchiveroom/client/client.js b/app/slashcommands-unarchiveroom/client/client.js
similarity index 100%
rename from packages/rocketchat-slashcommands-unarchiveroom/client/client.js
rename to app/slashcommands-unarchiveroom/client/client.js
diff --git a/packages/rocketchat-slashcommands-unarchiveroom/client/index.js b/app/slashcommands-unarchiveroom/client/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-unarchiveroom/client/index.js
rename to app/slashcommands-unarchiveroom/client/index.js
diff --git a/packages/rocketchat-slashcommands-unarchiveroom/package.js b/app/slashcommands-unarchiveroom/package.js
similarity index 100%
rename from packages/rocketchat-slashcommands-unarchiveroom/package.js
rename to app/slashcommands-unarchiveroom/package.js
diff --git a/packages/rocketchat-slashcommands-unarchiveroom/server/index.js b/app/slashcommands-unarchiveroom/server/index.js
similarity index 100%
rename from packages/rocketchat-slashcommands-unarchiveroom/server/index.js
rename to app/slashcommands-unarchiveroom/server/index.js
diff --git a/packages/rocketchat-slashcommands-unarchiveroom/server/server.js b/app/slashcommands-unarchiveroom/server/server.js
similarity index 100%
rename from packages/rocketchat-slashcommands-unarchiveroom/server/server.js
rename to app/slashcommands-unarchiveroom/server/server.js
diff --git a/packages/rocketchat-slider/README.md b/app/slider/README.md
similarity index 100%
rename from packages/rocketchat-slider/README.md
rename to app/slider/README.md
diff --git a/packages/rocketchat-slider/client/index.js b/app/slider/client/index.js
similarity index 100%
rename from packages/rocketchat-slider/client/index.js
rename to app/slider/client/index.js
diff --git a/packages/rocketchat-slider/client/rocketchat-slider.html b/app/slider/client/rocketchat-slider.html
similarity index 100%
rename from packages/rocketchat-slider/client/rocketchat-slider.html
rename to app/slider/client/rocketchat-slider.html
diff --git a/packages/rocketchat-slider/client/rocketchat-slider.js b/app/slider/client/rocketchat-slider.js
similarity index 100%
rename from packages/rocketchat-slider/client/rocketchat-slider.js
rename to app/slider/client/rocketchat-slider.js
diff --git a/packages/rocketchat-slider/package.js b/app/slider/package.js
similarity index 100%
rename from packages/rocketchat-slider/package.js
rename to app/slider/package.js
diff --git a/packages/rocketchat-smarsh-connector/package.js b/app/smarsh-connector/package.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/package.js
rename to app/smarsh-connector/package.js
diff --git a/packages/rocketchat-smarsh-connector/server/functions/generateEml.js b/app/smarsh-connector/server/functions/generateEml.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/server/functions/generateEml.js
rename to app/smarsh-connector/server/functions/generateEml.js
diff --git a/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js b/app/smarsh-connector/server/functions/sendEmail.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/server/functions/sendEmail.js
rename to app/smarsh-connector/server/functions/sendEmail.js
diff --git a/packages/rocketchat-smarsh-connector/server/index.js b/app/smarsh-connector/server/index.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/server/index.js
rename to app/smarsh-connector/server/index.js
diff --git a/packages/rocketchat-smarsh-connector/server/lib/rocketchat.js b/app/smarsh-connector/server/lib/rocketchat.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/server/lib/rocketchat.js
rename to app/smarsh-connector/server/lib/rocketchat.js
diff --git a/packages/rocketchat-smarsh-connector/server/settings.js b/app/smarsh-connector/server/settings.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/server/settings.js
rename to app/smarsh-connector/server/settings.js
diff --git a/packages/rocketchat-smarsh-connector/server/startup.js b/app/smarsh-connector/server/startup.js
similarity index 100%
rename from packages/rocketchat-smarsh-connector/server/startup.js
rename to app/smarsh-connector/server/startup.js
diff --git a/packages/rocketchat-sms/README.md b/app/sms/README.md
similarity index 100%
rename from packages/rocketchat-sms/README.md
rename to app/sms/README.md
diff --git a/packages/rocketchat-sms/package.js b/app/sms/package.js
similarity index 100%
rename from packages/rocketchat-sms/package.js
rename to app/sms/package.js
diff --git a/packages/rocketchat-sms/server/SMS.js b/app/sms/server/SMS.js
similarity index 100%
rename from packages/rocketchat-sms/server/SMS.js
rename to app/sms/server/SMS.js
diff --git a/packages/rocketchat-sms/server/index.js b/app/sms/server/index.js
similarity index 100%
rename from packages/rocketchat-sms/server/index.js
rename to app/sms/server/index.js
diff --git a/packages/rocketchat-sms/server/services/twilio.js b/app/sms/server/services/twilio.js
similarity index 100%
rename from packages/rocketchat-sms/server/services/twilio.js
rename to app/sms/server/services/twilio.js
diff --git a/packages/rocketchat-sms/server/settings.js b/app/sms/server/settings.js
similarity index 100%
rename from packages/rocketchat-sms/server/settings.js
rename to app/sms/server/settings.js
diff --git a/packages/rocketchat-spotify/client/index.js b/app/spotify/client/index.js
similarity index 100%
rename from packages/rocketchat-spotify/client/index.js
rename to app/spotify/client/index.js
diff --git a/packages/rocketchat-spotify/lib/client/oembedSpotifyWidget.html b/app/spotify/lib/client/oembedSpotifyWidget.html
similarity index 100%
rename from packages/rocketchat-spotify/lib/client/oembedSpotifyWidget.html
rename to app/spotify/lib/client/oembedSpotifyWidget.html
diff --git a/packages/rocketchat-spotify/lib/client/widget.js b/app/spotify/lib/client/widget.js
similarity index 100%
rename from packages/rocketchat-spotify/lib/client/widget.js
rename to app/spotify/lib/client/widget.js
diff --git a/packages/rocketchat-spotify/lib/spotify.js b/app/spotify/lib/spotify.js
similarity index 100%
rename from packages/rocketchat-spotify/lib/spotify.js
rename to app/spotify/lib/spotify.js
diff --git a/packages/rocketchat-spotify/package.js b/app/spotify/package.js
similarity index 100%
rename from packages/rocketchat-spotify/package.js
rename to app/spotify/package.js
diff --git a/packages/rocketchat-spotify/server/index.js b/app/spotify/server/index.js
similarity index 100%
rename from packages/rocketchat-spotify/server/index.js
rename to app/spotify/server/index.js
diff --git a/packages/rocketchat-statistics/client/index.js b/app/statistics/client/index.js
similarity index 100%
rename from packages/rocketchat-statistics/client/index.js
rename to app/statistics/client/index.js
diff --git a/packages/rocketchat-statistics/lib/rocketchat.js b/app/statistics/lib/rocketchat.js
similarity index 100%
rename from packages/rocketchat-statistics/lib/rocketchat.js
rename to app/statistics/lib/rocketchat.js
diff --git a/packages/rocketchat-statistics/package.js b/app/statistics/package.js
similarity index 100%
rename from packages/rocketchat-statistics/package.js
rename to app/statistics/package.js
diff --git a/packages/rocketchat-statistics/server/functions/get.js b/app/statistics/server/functions/get.js
similarity index 100%
rename from packages/rocketchat-statistics/server/functions/get.js
rename to app/statistics/server/functions/get.js
diff --git a/packages/rocketchat-statistics/server/functions/save.js b/app/statistics/server/functions/save.js
similarity index 100%
rename from packages/rocketchat-statistics/server/functions/save.js
rename to app/statistics/server/functions/save.js
diff --git a/packages/rocketchat-statistics/server/index.js b/app/statistics/server/index.js
similarity index 100%
rename from packages/rocketchat-statistics/server/index.js
rename to app/statistics/server/index.js
diff --git a/packages/rocketchat-statistics/server/lib/SAUMonitor.js b/app/statistics/server/lib/SAUMonitor.js
similarity index 100%
rename from packages/rocketchat-statistics/server/lib/SAUMonitor.js
rename to app/statistics/server/lib/SAUMonitor.js
diff --git a/packages/rocketchat-statistics/server/lib/UAParserMobile.js b/app/statistics/server/lib/UAParserMobile.js
similarity index 100%
rename from packages/rocketchat-statistics/server/lib/UAParserMobile.js
rename to app/statistics/server/lib/UAParserMobile.js
diff --git a/packages/rocketchat-statistics/server/methods/getStatistics.js b/app/statistics/server/methods/getStatistics.js
similarity index 100%
rename from packages/rocketchat-statistics/server/methods/getStatistics.js
rename to app/statistics/server/methods/getStatistics.js
diff --git a/packages/rocketchat-statistics/server/startup/monitor.js b/app/statistics/server/startup/monitor.js
similarity index 100%
rename from packages/rocketchat-statistics/server/startup/monitor.js
rename to app/statistics/server/startup/monitor.js
diff --git a/packages/rocketchat_theme/client/imports/components/alerts.css b/app/theme/client/imports/components/alerts.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/alerts.css
rename to app/theme/client/imports/components/alerts.css
diff --git a/packages/rocketchat_theme/client/imports/components/avatar.css b/app/theme/client/imports/components/avatar.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/avatar.css
rename to app/theme/client/imports/components/avatar.css
diff --git a/packages/rocketchat_theme/client/imports/components/badge.css b/app/theme/client/imports/components/badge.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/badge.css
rename to app/theme/client/imports/components/badge.css
diff --git a/packages/rocketchat_theme/client/imports/components/chip.css b/app/theme/client/imports/components/chip.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/chip.css
rename to app/theme/client/imports/components/chip.css
diff --git a/packages/rocketchat_theme/client/imports/components/contextual-bar.css b/app/theme/client/imports/components/contextual-bar.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/contextual-bar.css
rename to app/theme/client/imports/components/contextual-bar.css
diff --git a/packages/rocketchat_theme/client/imports/components/emojiPicker.css b/app/theme/client/imports/components/emojiPicker.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/emojiPicker.css
rename to app/theme/client/imports/components/emojiPicker.css
diff --git a/packages/rocketchat_theme/client/imports/components/flex-nav.css b/app/theme/client/imports/components/flex-nav.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/flex-nav.css
rename to app/theme/client/imports/components/flex-nav.css
diff --git a/packages/rocketchat_theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/header.css
rename to app/theme/client/imports/components/header.css
diff --git a/packages/rocketchat_theme/client/imports/components/main-content.css b/app/theme/client/imports/components/main-content.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/main-content.css
rename to app/theme/client/imports/components/main-content.css
diff --git a/packages/rocketchat_theme/client/imports/components/memberlist.css b/app/theme/client/imports/components/memberlist.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/memberlist.css
rename to app/theme/client/imports/components/memberlist.css
diff --git a/packages/rocketchat_theme/client/imports/components/message-box.css b/app/theme/client/imports/components/message-box.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/message-box.css
rename to app/theme/client/imports/components/message-box.css
diff --git a/packages/rocketchat_theme/client/imports/components/messages.css b/app/theme/client/imports/components/messages.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/messages.css
rename to app/theme/client/imports/components/messages.css
diff --git a/packages/rocketchat_theme/client/imports/components/modal.css b/app/theme/client/imports/components/modal.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/modal.css
rename to app/theme/client/imports/components/modal.css
diff --git a/packages/rocketchat_theme/client/imports/components/modal/create-channel.css b/app/theme/client/imports/components/modal/create-channel.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/modal/create-channel.css
rename to app/theme/client/imports/components/modal/create-channel.css
diff --git a/packages/rocketchat_theme/client/imports/components/modal/directory.css b/app/theme/client/imports/components/modal/directory.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/modal/directory.css
rename to app/theme/client/imports/components/modal/directory.css
diff --git a/packages/rocketchat_theme/client/imports/components/modal/full-modal.css b/app/theme/client/imports/components/modal/full-modal.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/modal/full-modal.css
rename to app/theme/client/imports/components/modal/full-modal.css
diff --git a/packages/rocketchat_theme/client/imports/components/popout.css b/app/theme/client/imports/components/popout.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/popout.css
rename to app/theme/client/imports/components/popout.css
diff --git a/packages/rocketchat_theme/client/imports/components/popover.css b/app/theme/client/imports/components/popover.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/popover.css
rename to app/theme/client/imports/components/popover.css
diff --git a/packages/rocketchat_theme/client/imports/components/setup-wizard.css b/app/theme/client/imports/components/setup-wizard.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/setup-wizard.css
rename to app/theme/client/imports/components/setup-wizard.css
diff --git a/packages/rocketchat_theme/client/imports/components/sidebar/rooms-list.css b/app/theme/client/imports/components/sidebar/rooms-list.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/sidebar/rooms-list.css
rename to app/theme/client/imports/components/sidebar/rooms-list.css
diff --git a/packages/rocketchat_theme/client/imports/components/sidebar/sidebar-flex.css b/app/theme/client/imports/components/sidebar/sidebar-flex.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/sidebar/sidebar-flex.css
rename to app/theme/client/imports/components/sidebar/sidebar-flex.css
diff --git a/packages/rocketchat_theme/client/imports/components/sidebar/sidebar-header.css b/app/theme/client/imports/components/sidebar/sidebar-header.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/sidebar/sidebar-header.css
rename to app/theme/client/imports/components/sidebar/sidebar-header.css
diff --git a/packages/rocketchat_theme/client/imports/components/sidebar/sidebar-item.css b/app/theme/client/imports/components/sidebar/sidebar-item.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/sidebar/sidebar-item.css
rename to app/theme/client/imports/components/sidebar/sidebar-item.css
diff --git a/packages/rocketchat_theme/client/imports/components/sidebar/sidebar.css b/app/theme/client/imports/components/sidebar/sidebar.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/sidebar/sidebar.css
rename to app/theme/client/imports/components/sidebar/sidebar.css
diff --git a/packages/rocketchat_theme/client/imports/components/sidebar/toolbar.css b/app/theme/client/imports/components/sidebar/toolbar.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/sidebar/toolbar.css
rename to app/theme/client/imports/components/sidebar/toolbar.css
diff --git a/packages/rocketchat_theme/client/imports/components/slider.css b/app/theme/client/imports/components/slider.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/slider.css
rename to app/theme/client/imports/components/slider.css
diff --git a/packages/rocketchat_theme/client/imports/components/table.css b/app/theme/client/imports/components/table.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/table.css
rename to app/theme/client/imports/components/table.css
diff --git a/packages/rocketchat_theme/client/imports/components/tabs.css b/app/theme/client/imports/components/tabs.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/tabs.css
rename to app/theme/client/imports/components/tabs.css
diff --git a/packages/rocketchat_theme/client/imports/components/tooltip.css b/app/theme/client/imports/components/tooltip.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/tooltip.css
rename to app/theme/client/imports/components/tooltip.css
diff --git a/packages/rocketchat_theme/client/imports/components/userInfo.css b/app/theme/client/imports/components/userInfo.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/components/userInfo.css
rename to app/theme/client/imports/components/userInfo.css
diff --git a/packages/rocketchat_theme/client/imports/forms/button.css b/app/theme/client/imports/forms/button.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/button.css
rename to app/theme/client/imports/forms/button.css
diff --git a/packages/rocketchat_theme/client/imports/forms/checkbox.css b/app/theme/client/imports/forms/checkbox.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/checkbox.css
rename to app/theme/client/imports/forms/checkbox.css
diff --git a/packages/rocketchat_theme/client/imports/forms/input.css b/app/theme/client/imports/forms/input.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/input.css
rename to app/theme/client/imports/forms/input.css
diff --git a/packages/rocketchat_theme/client/imports/forms/popup-list.css b/app/theme/client/imports/forms/popup-list.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/popup-list.css
rename to app/theme/client/imports/forms/popup-list.css
diff --git a/packages/rocketchat_theme/client/imports/forms/select-avatar.css b/app/theme/client/imports/forms/select-avatar.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/select-avatar.css
rename to app/theme/client/imports/forms/select-avatar.css
diff --git a/packages/rocketchat_theme/client/imports/forms/select.css b/app/theme/client/imports/forms/select.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/select.css
rename to app/theme/client/imports/forms/select.css
diff --git a/packages/rocketchat_theme/client/imports/forms/switch.css b/app/theme/client/imports/forms/switch.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/switch.css
rename to app/theme/client/imports/forms/switch.css
diff --git a/packages/rocketchat_theme/client/imports/forms/tags.css b/app/theme/client/imports/forms/tags.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/forms/tags.css
rename to app/theme/client/imports/forms/tags.css
diff --git a/packages/rocketchat_theme/client/imports/general/animations.css b/app/theme/client/imports/general/animations.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/animations.css
rename to app/theme/client/imports/general/animations.css
diff --git a/packages/rocketchat_theme/client/imports/general/apps.css b/app/theme/client/imports/general/apps.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/apps.css
rename to app/theme/client/imports/general/apps.css
diff --git a/packages/rocketchat_theme/client/imports/general/base.css b/app/theme/client/imports/general/base.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/base.css
rename to app/theme/client/imports/general/base.css
diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/base_old.css
rename to app/theme/client/imports/general/base_old.css
diff --git a/packages/rocketchat_theme/client/imports/general/forms.css b/app/theme/client/imports/general/forms.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/forms.css
rename to app/theme/client/imports/general/forms.css
diff --git a/packages/rocketchat_theme/client/imports/general/reset.css b/app/theme/client/imports/general/reset.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/reset.css
rename to app/theme/client/imports/general/reset.css
diff --git a/packages/rocketchat_theme/client/imports/general/rtl.css b/app/theme/client/imports/general/rtl.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/rtl.css
rename to app/theme/client/imports/general/rtl.css
diff --git a/packages/rocketchat_theme/client/imports/general/typography.css b/app/theme/client/imports/general/typography.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/typography.css
rename to app/theme/client/imports/general/typography.css
diff --git a/packages/rocketchat_theme/client/imports/general/variables.css b/app/theme/client/imports/general/variables.css
similarity index 100%
rename from packages/rocketchat_theme/client/imports/general/variables.css
rename to app/theme/client/imports/general/variables.css
diff --git a/packages/rocketchat_theme/client/index.js b/app/theme/client/index.js
similarity index 100%
rename from packages/rocketchat_theme/client/index.js
rename to app/theme/client/index.js
diff --git a/packages/rocketchat_theme/client/main.css b/app/theme/client/main.css
similarity index 100%
rename from packages/rocketchat_theme/client/main.css
rename to app/theme/client/main.css
diff --git a/packages/rocketchat_theme/client/vendor/fontello/config.json b/app/theme/client/vendor/fontello/config.json
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/config.json
rename to app/theme/client/vendor/fontello/config.json
diff --git a/packages/rocketchat_theme/client/vendor/fontello/css/fontello.css b/app/theme/client/vendor/fontello/css/fontello.css
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/css/fontello.css
rename to app/theme/client/vendor/fontello/css/fontello.css
diff --git a/packages/rocketchat_theme/client/vendor/jscolor.js b/app/theme/client/vendor/jscolor.js
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/jscolor.js
rename to app/theme/client/vendor/jscolor.js
diff --git a/packages/rocketchat_theme/client/vendor/photoswipe.css b/app/theme/client/vendor/photoswipe.css
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/photoswipe.css
rename to app/theme/client/vendor/photoswipe.css
diff --git a/packages/rocketchat_theme/package.js b/app/theme/package.js
similarity index 100%
rename from packages/rocketchat_theme/package.js
rename to app/theme/package.js
diff --git a/packages/rocketchat_theme/server/index.js b/app/theme/server/index.js
similarity index 100%
rename from packages/rocketchat_theme/server/index.js
rename to app/theme/server/index.js
diff --git a/packages/rocketchat_theme/server/server.js b/app/theme/server/server.js
similarity index 100%
rename from packages/rocketchat_theme/server/server.js
rename to app/theme/server/server.js
diff --git a/packages/rocketchat_theme/server/variables.js b/app/theme/server/variables.js
similarity index 100%
rename from packages/rocketchat_theme/server/variables.js
rename to app/theme/server/variables.js
diff --git a/packages/assistify-threading/client/createThreadMessageAction.js b/app/threading/client/createThreadMessageAction.js
similarity index 100%
rename from packages/assistify-threading/client/createThreadMessageAction.js
rename to app/threading/client/createThreadMessageAction.js
diff --git a/packages/assistify-threading/client/index.js b/app/threading/client/index.js
similarity index 100%
rename from packages/assistify-threading/client/index.js
rename to app/threading/client/index.js
diff --git a/packages/assistify-threading/client/lib/messageTypes/threadMessage.js b/app/threading/client/lib/messageTypes/threadMessage.js
similarity index 100%
rename from packages/assistify-threading/client/lib/messageTypes/threadMessage.js
rename to app/threading/client/lib/messageTypes/threadMessage.js
diff --git a/packages/assistify-threading/client/lib/threadsOfRoom.js b/app/threading/client/lib/threadsOfRoom.js
similarity index 100%
rename from packages/assistify-threading/client/lib/threadsOfRoom.js
rename to app/threading/client/lib/threadsOfRoom.js
diff --git a/packages/assistify-threading/client/public/stylesheets/threading.css b/app/threading/client/public/stylesheets/threading.css
similarity index 100%
rename from packages/assistify-threading/client/public/stylesheets/threading.css
rename to app/threading/client/public/stylesheets/threading.css
diff --git a/packages/assistify-threading/client/tabBar.js b/app/threading/client/tabBar.js
similarity index 100%
rename from packages/assistify-threading/client/tabBar.js
rename to app/threading/client/tabBar.js
diff --git a/packages/assistify-threading/client/threadFromMessageBox.js b/app/threading/client/threadFromMessageBox.js
similarity index 100%
rename from packages/assistify-threading/client/threadFromMessageBox.js
rename to app/threading/client/threadFromMessageBox.js
diff --git a/packages/assistify-threading/client/views/ThreadList.html b/app/threading/client/views/ThreadList.html
similarity index 100%
rename from packages/assistify-threading/client/views/ThreadList.html
rename to app/threading/client/views/ThreadList.html
diff --git a/packages/assistify-threading/client/views/ThreadList.js b/app/threading/client/views/ThreadList.js
similarity index 100%
rename from packages/assistify-threading/client/views/ThreadList.js
rename to app/threading/client/views/ThreadList.js
diff --git a/packages/assistify-threading/client/views/ThreadsTabbar.html b/app/threading/client/views/ThreadsTabbar.html
similarity index 100%
rename from packages/assistify-threading/client/views/ThreadsTabbar.html
rename to app/threading/client/views/ThreadsTabbar.html
diff --git a/packages/assistify-threading/client/views/ThreadsTabbar.js b/app/threading/client/views/ThreadsTabbar.js
similarity index 100%
rename from packages/assistify-threading/client/views/ThreadsTabbar.js
rename to app/threading/client/views/ThreadsTabbar.js
diff --git a/packages/assistify-threading/client/views/creationDialog/CreateThread.html b/app/threading/client/views/creationDialog/CreateThread.html
similarity index 100%
rename from packages/assistify-threading/client/views/creationDialog/CreateThread.html
rename to app/threading/client/views/creationDialog/CreateThread.html
diff --git a/packages/assistify-threading/client/views/creationDialog/CreateThread.js b/app/threading/client/views/creationDialog/CreateThread.js
similarity index 100%
rename from packages/assistify-threading/client/views/creationDialog/CreateThread.js
rename to app/threading/client/views/creationDialog/CreateThread.js
diff --git a/packages/assistify-threading/client/views/fieldTypeThreadLastMessageAge.html b/app/threading/client/views/fieldTypeThreadLastMessageAge.html
similarity index 100%
rename from packages/assistify-threading/client/views/fieldTypeThreadLastMessageAge.html
rename to app/threading/client/views/fieldTypeThreadLastMessageAge.html
diff --git a/packages/assistify-threading/client/views/fieldTypeThreadLastMessageAge.js b/app/threading/client/views/fieldTypeThreadLastMessageAge.js
similarity index 100%
rename from packages/assistify-threading/client/views/fieldTypeThreadLastMessageAge.js
rename to app/threading/client/views/fieldTypeThreadLastMessageAge.js
diff --git a/packages/assistify-threading/client/views/fieldTypeThreadReplyCounter.html b/app/threading/client/views/fieldTypeThreadReplyCounter.html
similarity index 100%
rename from packages/assistify-threading/client/views/fieldTypeThreadReplyCounter.html
rename to app/threading/client/views/fieldTypeThreadReplyCounter.html
diff --git a/packages/assistify-threading/client/views/fieldTypeThreadReplyCounter.js b/app/threading/client/views/fieldTypeThreadReplyCounter.js
similarity index 100%
rename from packages/assistify-threading/client/views/fieldTypeThreadReplyCounter.js
rename to app/threading/client/views/fieldTypeThreadReplyCounter.js
diff --git a/packages/assistify-threading/lib/threadRoomType.js b/app/threading/lib/threadRoomType.js
similarity index 100%
rename from packages/assistify-threading/lib/threadRoomType.js
rename to app/threading/lib/threadRoomType.js
diff --git a/packages/assistify-threading/package.js b/app/threading/package.js
similarity index 100%
rename from packages/assistify-threading/package.js
rename to app/threading/package.js
diff --git a/packages/assistify-threading/server/authorization.js b/app/threading/server/authorization.js
similarity index 100%
rename from packages/assistify-threading/server/authorization.js
rename to app/threading/server/authorization.js
diff --git a/packages/assistify-threading/server/config.js b/app/threading/server/config.js
similarity index 100%
rename from packages/assistify-threading/server/config.js
rename to app/threading/server/config.js
diff --git a/packages/assistify-threading/server/hooks/joinThreadOnMessage.js b/app/threading/server/hooks/joinThreadOnMessage.js
similarity index 100%
rename from packages/assistify-threading/server/hooks/joinThreadOnMessage.js
rename to app/threading/server/hooks/joinThreadOnMessage.js
diff --git a/packages/assistify-threading/server/hooks/propagateThreadMetadata.js b/app/threading/server/hooks/propagateThreadMetadata.js
similarity index 100%
rename from packages/assistify-threading/server/hooks/propagateThreadMetadata.js
rename to app/threading/server/hooks/propagateThreadMetadata.js
diff --git a/packages/assistify-threading/server/index.js b/app/threading/server/index.js
similarity index 100%
rename from packages/assistify-threading/server/index.js
rename to app/threading/server/index.js
diff --git a/packages/assistify-threading/server/methods/createThread.js b/app/threading/server/methods/createThread.js
similarity index 100%
rename from packages/assistify-threading/server/methods/createThread.js
rename to app/threading/server/methods/createThread.js
diff --git a/packages/assistify-threading/server/permissions.js b/app/threading/server/permissions.js
similarity index 100%
rename from packages/assistify-threading/server/permissions.js
rename to app/threading/server/permissions.js
diff --git a/packages/assistify-threading/server/publications/threadParentAutocomplete.js b/app/threading/server/publications/threadParentAutocomplete.js
similarity index 100%
rename from packages/assistify-threading/server/publications/threadParentAutocomplete.js
rename to app/threading/server/publications/threadParentAutocomplete.js
diff --git a/packages/assistify-threading/server/publications/threadsOfRoom.js b/app/threading/server/publications/threadsOfRoom.js
similarity index 100%
rename from packages/assistify-threading/server/publications/threadsOfRoom.js
rename to app/threading/server/publications/threadsOfRoom.js
diff --git a/packages/rocketchat-token-login/client/index.js b/app/token-login/client/index.js
similarity index 100%
rename from packages/rocketchat-token-login/client/index.js
rename to app/token-login/client/index.js
diff --git a/packages/rocketchat-token-login/client/login_token_client.js b/app/token-login/client/login_token_client.js
similarity index 100%
rename from packages/rocketchat-token-login/client/login_token_client.js
rename to app/token-login/client/login_token_client.js
diff --git a/packages/rocketchat-token-login/package.js b/app/token-login/package.js
similarity index 100%
rename from packages/rocketchat-token-login/package.js
rename to app/token-login/package.js
diff --git a/packages/rocketchat-token-login/server/index.js b/app/token-login/server/index.js
similarity index 100%
rename from packages/rocketchat-token-login/server/index.js
rename to app/token-login/server/index.js
diff --git a/packages/rocketchat-token-login/server/login_token_server.js b/app/token-login/server/login_token_server.js
similarity index 100%
rename from packages/rocketchat-token-login/server/login_token_server.js
rename to app/token-login/server/login_token_server.js
diff --git a/packages/rocketchat-tokenpass/README.md b/app/tokenpass/README.md
similarity index 100%
rename from packages/rocketchat-tokenpass/README.md
rename to app/tokenpass/README.md
diff --git a/packages/rocketchat-tokenpass/client/channelSettings.css b/app/tokenpass/client/channelSettings.css
similarity index 100%
rename from packages/rocketchat-tokenpass/client/channelSettings.css
rename to app/tokenpass/client/channelSettings.css
diff --git a/packages/rocketchat-tokenpass/client/index.js b/app/tokenpass/client/index.js
similarity index 100%
rename from packages/rocketchat-tokenpass/client/index.js
rename to app/tokenpass/client/index.js
diff --git a/packages/rocketchat-tokenpass/client/login-button.css b/app/tokenpass/client/login-button.css
similarity index 100%
rename from packages/rocketchat-tokenpass/client/login-button.css
rename to app/tokenpass/client/login-button.css
diff --git a/packages/rocketchat-tokenpass/client/roomType.js b/app/tokenpass/client/roomType.js
similarity index 100%
rename from packages/rocketchat-tokenpass/client/roomType.js
rename to app/tokenpass/client/roomType.js
diff --git a/packages/rocketchat-tokenpass/client/startup.js b/app/tokenpass/client/startup.js
similarity index 100%
rename from packages/rocketchat-tokenpass/client/startup.js
rename to app/tokenpass/client/startup.js
diff --git a/packages/rocketchat-tokenpass/client/styles.css b/app/tokenpass/client/styles.css
similarity index 100%
rename from packages/rocketchat-tokenpass/client/styles.css
rename to app/tokenpass/client/styles.css
diff --git a/packages/rocketchat-tokenpass/client/tokenChannelsList.html b/app/tokenpass/client/tokenChannelsList.html
similarity index 100%
rename from packages/rocketchat-tokenpass/client/tokenChannelsList.html
rename to app/tokenpass/client/tokenChannelsList.html
diff --git a/packages/rocketchat-tokenpass/client/tokenChannelsList.js b/app/tokenpass/client/tokenChannelsList.js
similarity index 100%
rename from packages/rocketchat-tokenpass/client/tokenChannelsList.js
rename to app/tokenpass/client/tokenChannelsList.js
diff --git a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.html b/app/tokenpass/client/tokenpassChannelSettings.html
similarity index 100%
rename from packages/rocketchat-tokenpass/client/tokenpassChannelSettings.html
rename to app/tokenpass/client/tokenpassChannelSettings.html
diff --git a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js b/app/tokenpass/client/tokenpassChannelSettings.js
similarity index 100%
rename from packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js
rename to app/tokenpass/client/tokenpassChannelSettings.js
diff --git a/packages/rocketchat-tokenpass/lib/common.js b/app/tokenpass/lib/common.js
similarity index 100%
rename from packages/rocketchat-tokenpass/lib/common.js
rename to app/tokenpass/lib/common.js
diff --git a/packages/rocketchat-tokenpass/package.js b/app/tokenpass/package.js
similarity index 100%
rename from packages/rocketchat-tokenpass/package.js
rename to app/tokenpass/package.js
diff --git a/packages/rocketchat-tokenpass/server/Tokenpass.js b/app/tokenpass/server/Tokenpass.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/Tokenpass.js
rename to app/tokenpass/server/Tokenpass.js
diff --git a/packages/rocketchat-tokenpass/server/cronRemoveUsers.js b/app/tokenpass/server/cronRemoveUsers.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/cronRemoveUsers.js
rename to app/tokenpass/server/cronRemoveUsers.js
diff --git a/packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js b/app/tokenpass/server/functions/getProtectedTokenpassBalances.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js
rename to app/tokenpass/server/functions/getProtectedTokenpassBalances.js
diff --git a/packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js b/app/tokenpass/server/functions/getPublicTokenpassBalances.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js
rename to app/tokenpass/server/functions/getPublicTokenpassBalances.js
diff --git a/packages/rocketchat-tokenpass/server/functions/saveRoomTokensMinimumBalance.js b/app/tokenpass/server/functions/saveRoomTokensMinimumBalance.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/functions/saveRoomTokensMinimumBalance.js
rename to app/tokenpass/server/functions/saveRoomTokensMinimumBalance.js
diff --git a/packages/rocketchat-tokenpass/server/functions/updateUserTokenpassBalances.js b/app/tokenpass/server/functions/updateUserTokenpassBalances.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/functions/updateUserTokenpassBalances.js
rename to app/tokenpass/server/functions/updateUserTokenpassBalances.js
diff --git a/packages/rocketchat-tokenpass/server/index.js b/app/tokenpass/server/index.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/index.js
rename to app/tokenpass/server/index.js
diff --git a/packages/rocketchat-tokenpass/server/methods/findTokenChannels.js b/app/tokenpass/server/methods/findTokenChannels.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/methods/findTokenChannels.js
rename to app/tokenpass/server/methods/findTokenChannels.js
diff --git a/packages/rocketchat-tokenpass/server/methods/getChannelTokenpass.js b/app/tokenpass/server/methods/getChannelTokenpass.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/methods/getChannelTokenpass.js
rename to app/tokenpass/server/methods/getChannelTokenpass.js
diff --git a/packages/rocketchat-tokenpass/server/startup.js b/app/tokenpass/server/startup.js
similarity index 100%
rename from packages/rocketchat-tokenpass/server/startup.js
rename to app/tokenpass/server/startup.js
diff --git a/packages/rocketchat-tooltip/README.md b/app/tooltip/README.md
similarity index 100%
rename from packages/rocketchat-tooltip/README.md
rename to app/tooltip/README.md
diff --git a/packages/rocketchat-tooltip/client/index.js b/app/tooltip/client/index.js
similarity index 100%
rename from packages/rocketchat-tooltip/client/index.js
rename to app/tooltip/client/index.js
diff --git a/packages/rocketchat-tooltip/client/rocketchat-tooltip.html b/app/tooltip/client/rocketchat-tooltip.html
similarity index 100%
rename from packages/rocketchat-tooltip/client/rocketchat-tooltip.html
rename to app/tooltip/client/rocketchat-tooltip.html
diff --git a/packages/rocketchat-tooltip/client/rocketchat-tooltip.js b/app/tooltip/client/rocketchat-tooltip.js
similarity index 100%
rename from packages/rocketchat-tooltip/client/rocketchat-tooltip.js
rename to app/tooltip/client/rocketchat-tooltip.js
diff --git a/packages/rocketchat-tooltip/client/tooltip.css b/app/tooltip/client/tooltip.css
similarity index 100%
rename from packages/rocketchat-tooltip/client/tooltip.css
rename to app/tooltip/client/tooltip.css
diff --git a/packages/rocketchat-tooltip/package.js b/app/tooltip/package.js
similarity index 100%
rename from packages/rocketchat-tooltip/package.js
rename to app/tooltip/package.js
diff --git a/packages/rocketchat-ui-account/README.md b/app/ui-account/README.md
similarity index 100%
rename from packages/rocketchat-ui-account/README.md
rename to app/ui-account/README.md
diff --git a/packages/rocketchat-ui-account/client/account.html b/app/ui-account/client/account.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/account.html
rename to app/ui-account/client/account.html
diff --git a/packages/rocketchat-ui-account/client/account.js b/app/ui-account/client/account.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/account.js
rename to app/ui-account/client/account.js
diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/app/ui-account/client/accountFlex.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountFlex.html
rename to app/ui-account/client/accountFlex.html
diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/app/ui-account/client/accountFlex.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountFlex.js
rename to app/ui-account/client/accountFlex.js
diff --git a/packages/rocketchat-ui-account/client/accountIntegrations.html b/app/ui-account/client/accountIntegrations.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountIntegrations.html
rename to app/ui-account/client/accountIntegrations.html
diff --git a/packages/rocketchat-ui-account/client/accountIntegrations.js b/app/ui-account/client/accountIntegrations.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountIntegrations.js
rename to app/ui-account/client/accountIntegrations.js
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.html b/app/ui-account/client/accountPreferences.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountPreferences.html
rename to app/ui-account/client/accountPreferences.html
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/app/ui-account/client/accountPreferences.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountPreferences.js
rename to app/ui-account/client/accountPreferences.js
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/app/ui-account/client/accountProfile.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountProfile.html
rename to app/ui-account/client/accountProfile.html
diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/app/ui-account/client/accountProfile.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/accountProfile.js
rename to app/ui-account/client/accountProfile.js
diff --git a/packages/rocketchat-ui-account/client/avatar/avatar.html b/app/ui-account/client/avatar/avatar.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/avatar/avatar.html
rename to app/ui-account/client/avatar/avatar.html
diff --git a/packages/rocketchat-ui-account/client/avatar/avatar.js b/app/ui-account/client/avatar/avatar.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/avatar/avatar.js
rename to app/ui-account/client/avatar/avatar.js
diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.html b/app/ui-account/client/avatar/prompt.html
similarity index 100%
rename from packages/rocketchat-ui-account/client/avatar/prompt.html
rename to app/ui-account/client/avatar/prompt.html
diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.js b/app/ui-account/client/avatar/prompt.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/avatar/prompt.js
rename to app/ui-account/client/avatar/prompt.js
diff --git a/packages/rocketchat-ui-account/client/index.js b/app/ui-account/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-account/client/index.js
rename to app/ui-account/client/index.js
diff --git a/packages/rocketchat-ui-account/package.js b/app/ui-account/package.js
similarity index 100%
rename from packages/rocketchat-ui-account/package.js
rename to app/ui-account/package.js
diff --git a/packages/rocketchat-ui-admin/README.md b/app/ui-admin/README.md
similarity index 100%
rename from packages/rocketchat-ui-admin/README.md
rename to app/ui-admin/README.md
diff --git a/packages/rocketchat-ui-admin/client/admin.html b/app/ui-admin/client/admin.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/admin.html
rename to app/ui-admin/client/admin.html
diff --git a/packages/rocketchat-ui-admin/client/admin.js b/app/ui-admin/client/admin.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/admin.js
rename to app/ui-admin/client/admin.js
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.html b/app/ui-admin/client/adminFlex.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/adminFlex.html
rename to app/ui-admin/client/adminFlex.html
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/app/ui-admin/client/adminFlex.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/adminFlex.js
rename to app/ui-admin/client/adminFlex.js
diff --git a/packages/rocketchat-ui-admin/client/adminInfo.html b/app/ui-admin/client/adminInfo.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/adminInfo.html
rename to app/ui-admin/client/adminInfo.html
diff --git a/packages/rocketchat-ui-admin/client/adminInfo.js b/app/ui-admin/client/adminInfo.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/adminInfo.js
rename to app/ui-admin/client/adminInfo.js
diff --git a/packages/rocketchat-ui-admin/client/index.js b/app/ui-admin/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/index.js
rename to app/ui-admin/client/index.js
diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.html b/app/ui-admin/client/rooms/adminRoomInfo.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.html
rename to app/ui-admin/client/rooms/adminRoomInfo.html
diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js b/app/ui-admin/client/rooms/adminRoomInfo.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js
rename to app/ui-admin/client/rooms/adminRoomInfo.js
diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.html b/app/ui-admin/client/rooms/adminRooms.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/rooms/adminRooms.html
rename to app/ui-admin/client/rooms/adminRooms.html
diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js b/app/ui-admin/client/rooms/adminRooms.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/rooms/adminRooms.js
rename to app/ui-admin/client/rooms/adminRooms.js
diff --git a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.html b/app/ui-admin/client/rooms/channelSettingsDefault.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.html
rename to app/ui-admin/client/rooms/channelSettingsDefault.html
diff --git a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js b/app/ui-admin/client/rooms/channelSettingsDefault.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js
rename to app/ui-admin/client/rooms/channelSettingsDefault.js
diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.html b/app/ui-admin/client/users/adminInviteUser.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminInviteUser.html
rename to app/ui-admin/client/users/adminInviteUser.html
diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/app/ui-admin/client/users/adminInviteUser.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminInviteUser.js
rename to app/ui-admin/client/users/adminInviteUser.js
diff --git a/packages/rocketchat-ui-admin/client/users/adminUserChannels.html b/app/ui-admin/client/users/adminUserChannels.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminUserChannels.html
rename to app/ui-admin/client/users/adminUserChannels.html
diff --git a/packages/rocketchat-ui-admin/client/users/adminUserChannels.js b/app/ui-admin/client/users/adminUserChannels.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminUserChannels.js
rename to app/ui-admin/client/users/adminUserChannels.js
diff --git a/packages/rocketchat-ui-admin/client/users/adminUserEdit.html b/app/ui-admin/client/users/adminUserEdit.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminUserEdit.html
rename to app/ui-admin/client/users/adminUserEdit.html
diff --git a/packages/rocketchat-ui-admin/client/users/adminUserInfo.html b/app/ui-admin/client/users/adminUserInfo.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminUserInfo.html
rename to app/ui-admin/client/users/adminUserInfo.html
diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.html b/app/ui-admin/client/users/adminUsers.html
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminUsers.html
rename to app/ui-admin/client/users/adminUsers.html
diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.js b/app/ui-admin/client/users/adminUsers.js
similarity index 100%
rename from packages/rocketchat-ui-admin/client/users/adminUsers.js
rename to app/ui-admin/client/users/adminUsers.js
diff --git a/packages/rocketchat-ui-admin/package.js b/app/ui-admin/package.js
similarity index 100%
rename from packages/rocketchat-ui-admin/package.js
rename to app/ui-admin/package.js
diff --git a/packages/rocketchat-ui-admin/server/index.js b/app/ui-admin/server/index.js
similarity index 100%
rename from packages/rocketchat-ui-admin/server/index.js
rename to app/ui-admin/server/index.js
diff --git a/packages/rocketchat-ui-admin/server/publications/adminRooms.js b/app/ui-admin/server/publications/adminRooms.js
similarity index 100%
rename from packages/rocketchat-ui-admin/server/publications/adminRooms.js
rename to app/ui-admin/server/publications/adminRooms.js
diff --git a/packages/rocketchat-ui-cached-collection/client/index.js b/app/ui-cached-collection/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-cached-collection/client/index.js
rename to app/ui-cached-collection/client/index.js
diff --git a/packages/rocketchat-ui-cached-collection/client/models/CachedCollection.js b/app/ui-cached-collection/client/models/CachedCollection.js
similarity index 100%
rename from packages/rocketchat-ui-cached-collection/client/models/CachedCollection.js
rename to app/ui-cached-collection/client/models/CachedCollection.js
diff --git a/packages/rocketchat-ui-cached-collection/package.js b/app/ui-cached-collection/package.js
similarity index 100%
rename from packages/rocketchat-ui-cached-collection/package.js
rename to app/ui-cached-collection/package.js
diff --git a/packages/rocketchat-ui-clean-history/README.md b/app/ui-clean-history/README.md
similarity index 100%
rename from packages/rocketchat-ui-clean-history/README.md
rename to app/ui-clean-history/README.md
diff --git a/packages/rocketchat-ui-clean-history/client/index.js b/app/ui-clean-history/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-clean-history/client/index.js
rename to app/ui-clean-history/client/index.js
diff --git a/packages/rocketchat-ui-clean-history/client/lib/startup.js b/app/ui-clean-history/client/lib/startup.js
similarity index 100%
rename from packages/rocketchat-ui-clean-history/client/lib/startup.js
rename to app/ui-clean-history/client/lib/startup.js
diff --git a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.html b/app/ui-clean-history/client/views/cleanHistory.html
similarity index 100%
rename from packages/rocketchat-ui-clean-history/client/views/cleanHistory.html
rename to app/ui-clean-history/client/views/cleanHistory.html
diff --git a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js b/app/ui-clean-history/client/views/cleanHistory.js
similarity index 100%
rename from packages/rocketchat-ui-clean-history/client/views/cleanHistory.js
rename to app/ui-clean-history/client/views/cleanHistory.js
diff --git a/packages/rocketchat-ui-clean-history/client/views/stylesheets/cleanHistory.css b/app/ui-clean-history/client/views/stylesheets/cleanHistory.css
similarity index 100%
rename from packages/rocketchat-ui-clean-history/client/views/stylesheets/cleanHistory.css
rename to app/ui-clean-history/client/views/stylesheets/cleanHistory.css
diff --git a/packages/rocketchat-ui-clean-history/package.js b/app/ui-clean-history/package.js
similarity index 100%
rename from packages/rocketchat-ui-clean-history/package.js
rename to app/ui-clean-history/package.js
diff --git a/packages/rocketchat-ui-flextab/README.md b/app/ui-flextab/README.md
similarity index 100%
rename from packages/rocketchat-ui-flextab/README.md
rename to app/ui-flextab/README.md
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.html b/app/ui-flextab/client/flexTabBar.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/flexTabBar.html
rename to app/ui-flextab/client/flexTabBar.html
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/app/ui-flextab/client/flexTabBar.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/flexTabBar.js
rename to app/ui-flextab/client/flexTabBar.js
diff --git a/packages/rocketchat-ui-flextab/client/index.js b/app/ui-flextab/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/index.js
rename to app/ui-flextab/client/index.js
diff --git a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.html b/app/ui-flextab/client/tabs/inviteUsers.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/inviteUsers.html
rename to app/ui-flextab/client/tabs/inviteUsers.html
diff --git a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js b/app/ui-flextab/client/tabs/inviteUsers.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js
rename to app/ui-flextab/client/tabs/inviteUsers.js
diff --git a/packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html b/app/ui-flextab/client/tabs/keyboardShortcuts.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html
rename to app/ui-flextab/client/tabs/keyboardShortcuts.html
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.html b/app/ui-flextab/client/tabs/membersList.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/membersList.html
rename to app/ui-flextab/client/tabs/membersList.html
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/membersList.js
rename to app/ui-flextab/client/tabs/membersList.js
diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.html b/app/ui-flextab/client/tabs/uploadedFilesList.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.html
rename to app/ui-flextab/client/tabs/uploadedFilesList.html
diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js b/app/ui-flextab/client/tabs/uploadedFilesList.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
rename to app/ui-flextab/client/tabs/uploadedFilesList.js
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/app/ui-flextab/client/tabs/userActions.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/userActions.js
rename to app/ui-flextab/client/tabs/userActions.js
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.html b/app/ui-flextab/client/tabs/userEdit.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/userEdit.html
rename to app/ui-flextab/client/tabs/userEdit.html
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js b/app/ui-flextab/client/tabs/userEdit.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/userEdit.js
rename to app/ui-flextab/client/tabs/userEdit.js
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.html b/app/ui-flextab/client/tabs/userInfo.html
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/userInfo.html
rename to app/ui-flextab/client/tabs/userInfo.html
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/app/ui-flextab/client/tabs/userInfo.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/client/tabs/userInfo.js
rename to app/ui-flextab/client/tabs/userInfo.js
diff --git a/packages/rocketchat-ui-flextab/package.js b/app/ui-flextab/package.js
similarity index 100%
rename from packages/rocketchat-ui-flextab/package.js
rename to app/ui-flextab/package.js
diff --git a/packages/rocketchat-ui-login/README.md b/app/ui-login/README.md
similarity index 100%
rename from packages/rocketchat-ui-login/README.md
rename to app/ui-login/README.md
diff --git a/packages/rocketchat-ui-login/client/index.js b/app/ui-login/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/index.js
rename to app/ui-login/client/index.js
diff --git a/packages/rocketchat-ui-login/client/login/footer.html b/app/ui-login/client/login/footer.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/footer.html
rename to app/ui-login/client/login/footer.html
diff --git a/packages/rocketchat-ui-login/client/login/footer.js b/app/ui-login/client/login/footer.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/footer.js
rename to app/ui-login/client/login/footer.js
diff --git a/packages/rocketchat-ui-login/client/login/form.html b/app/ui-login/client/login/form.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/form.html
rename to app/ui-login/client/login/form.html
diff --git a/packages/rocketchat-ui-login/client/login/form.js b/app/ui-login/client/login/form.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/form.js
rename to app/ui-login/client/login/form.js
diff --git a/packages/rocketchat-ui-login/client/login/header.html b/app/ui-login/client/login/header.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/header.html
rename to app/ui-login/client/login/header.html
diff --git a/packages/rocketchat-ui-login/client/login/header.js b/app/ui-login/client/login/header.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/header.js
rename to app/ui-login/client/login/header.js
diff --git a/packages/rocketchat-ui-login/client/login/layout.html b/app/ui-login/client/login/layout.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/layout.html
rename to app/ui-login/client/login/layout.html
diff --git a/packages/rocketchat-ui-login/client/login/layout.js b/app/ui-login/client/login/layout.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/layout.js
rename to app/ui-login/client/login/layout.js
diff --git a/packages/rocketchat-ui-login/client/login/services.html b/app/ui-login/client/login/services.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/services.html
rename to app/ui-login/client/login/services.html
diff --git a/packages/rocketchat-ui-login/client/login/services.js b/app/ui-login/client/login/services.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/services.js
rename to app/ui-login/client/login/services.js
diff --git a/packages/rocketchat-ui-login/client/login/social.html b/app/ui-login/client/login/social.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/social.html
rename to app/ui-login/client/login/social.html
diff --git a/packages/rocketchat-ui-login/client/login/social.js b/app/ui-login/client/login/social.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/login/social.js
rename to app/ui-login/client/login/social.js
diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.html b/app/ui-login/client/reset-password/resetPassword.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/reset-password/resetPassword.html
rename to app/ui-login/client/reset-password/resetPassword.html
diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/app/ui-login/client/reset-password/resetPassword.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/reset-password/resetPassword.js
rename to app/ui-login/client/reset-password/resetPassword.js
diff --git a/packages/rocketchat-ui-login/client/routes.js b/app/ui-login/client/routes.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/routes.js
rename to app/ui-login/client/routes.js
diff --git a/packages/rocketchat-ui-login/client/username/layout.html b/app/ui-login/client/username/layout.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/username/layout.html
rename to app/ui-login/client/username/layout.html
diff --git a/packages/rocketchat-ui-login/client/username/layout.js b/app/ui-login/client/username/layout.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/username/layout.js
rename to app/ui-login/client/username/layout.js
diff --git a/packages/rocketchat-ui-login/client/username/username.html b/app/ui-login/client/username/username.html
similarity index 100%
rename from packages/rocketchat-ui-login/client/username/username.html
rename to app/ui-login/client/username/username.html
diff --git a/packages/rocketchat-ui-login/client/username/username.js b/app/ui-login/client/username/username.js
similarity index 100%
rename from packages/rocketchat-ui-login/client/username/username.js
rename to app/ui-login/client/username/username.js
diff --git a/packages/rocketchat-ui-login/package.js b/app/ui-login/package.js
similarity index 100%
rename from packages/rocketchat-ui-login/package.js
rename to app/ui-login/package.js
diff --git a/packages/rocketchat-ui-master/.eslintrc b/app/ui-master/.eslintrc
similarity index 100%
rename from packages/rocketchat-ui-master/.eslintrc
rename to app/ui-master/.eslintrc
diff --git a/packages/rocketchat-ui-master/README.md b/app/ui-master/README.md
similarity index 100%
rename from packages/rocketchat-ui-master/README.md
rename to app/ui-master/README.md
diff --git a/packages/rocketchat-ui-master/client/error.html b/app/ui-master/client/error.html
similarity index 100%
rename from packages/rocketchat-ui-master/client/error.html
rename to app/ui-master/client/error.html
diff --git a/packages/rocketchat-ui-master/client/index.js b/app/ui-master/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-master/client/index.js
rename to app/ui-master/client/index.js
diff --git a/packages/rocketchat-ui-master/client/loading.html b/app/ui-master/client/loading.html
similarity index 100%
rename from packages/rocketchat-ui-master/client/loading.html
rename to app/ui-master/client/loading.html
diff --git a/packages/rocketchat-ui-master/client/logoLayout.html b/app/ui-master/client/logoLayout.html
similarity index 100%
rename from packages/rocketchat-ui-master/client/logoLayout.html
rename to app/ui-master/client/logoLayout.html
diff --git a/packages/rocketchat-ui-master/client/main.html b/app/ui-master/client/main.html
similarity index 100%
rename from packages/rocketchat-ui-master/client/main.html
rename to app/ui-master/client/main.html
diff --git a/packages/rocketchat-ui-master/client/main.js b/app/ui-master/client/main.js
similarity index 100%
rename from packages/rocketchat-ui-master/client/main.js
rename to app/ui-master/client/main.js
diff --git a/packages/rocketchat-ui-master/package.js b/app/ui-master/package.js
similarity index 100%
rename from packages/rocketchat-ui-master/package.js
rename to app/ui-master/package.js
diff --git a/packages/rocketchat-ui-master/public/README.md b/app/ui-master/public/README.md
similarity index 100%
rename from packages/rocketchat-ui-master/public/README.md
rename to app/ui-master/public/README.md
diff --git a/packages/rocketchat-ui-master/public/generateHTML.js b/app/ui-master/public/generateHTML.js
similarity index 100%
rename from packages/rocketchat-ui-master/public/generateHTML.js
rename to app/ui-master/public/generateHTML.js
diff --git a/packages/rocketchat-ui-master/public/generateSprite.js b/app/ui-master/public/generateSprite.js
similarity index 100%
rename from packages/rocketchat-ui-master/public/generateSprite.js
rename to app/ui-master/public/generateSprite.js
diff --git a/packages/rocketchat-ui-master/public/icons/Bell-off.svg b/app/ui-master/public/icons/Bell-off.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Bell-off.svg
rename to app/ui-master/public/icons/Bell-off.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Download.svg b/app/ui-master/public/icons/Download.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Download.svg
rename to app/ui-master/public/icons/Download.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Eye.svg b/app/ui-master/public/icons/Eye.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Eye.svg
rename to app/ui-master/public/icons/Eye.svg
diff --git a/packages/rocketchat-ui-master/public/icons/File-google-drive.svg b/app/ui-master/public/icons/File-google-drive.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/File-google-drive.svg
rename to app/ui-master/public/icons/File-google-drive.svg
diff --git a/packages/rocketchat-ui-master/public/icons/File-keynote.svg b/app/ui-master/public/icons/File-keynote.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/File-keynote.svg
rename to app/ui-master/public/icons/File-keynote.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Files-audio.svg b/app/ui-master/public/icons/Files-audio.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Files-audio.svg
rename to app/ui-master/public/icons/Files-audio.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Files-video.svg b/app/ui-master/public/icons/Files-video.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Files-video.svg
rename to app/ui-master/public/icons/Files-video.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Files-zip.svg b/app/ui-master/public/icons/Files-zip.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Files-zip.svg
rename to app/ui-master/public/icons/Files-zip.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Multiline.svg b/app/ui-master/public/icons/Multiline.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Multiline.svg
rename to app/ui-master/public/icons/Multiline.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Send-active.svg b/app/ui-master/public/icons/Send-active.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Send-active.svg
rename to app/ui-master/public/icons/Send-active.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Star-filled.svg b/app/ui-master/public/icons/Star-filled.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Star-filled.svg
rename to app/ui-master/public/icons/Star-filled.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Video-off.svg b/app/ui-master/public/icons/Video-off.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Video-off.svg
rename to app/ui-master/public/icons/Video-off.svg
diff --git a/packages/rocketchat-ui-master/public/icons/Volume-disable.svg b/app/ui-master/public/icons/Volume-disable.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/Volume-disable.svg
rename to app/ui-master/public/icons/Volume-disable.svg
diff --git a/packages/rocketchat-ui-master/public/icons/add-reaction.svg b/app/ui-master/public/icons/add-reaction.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/add-reaction.svg
rename to app/ui-master/public/icons/add-reaction.svg
diff --git a/packages/rocketchat-ui-master/public/icons/arrow-down.svg b/app/ui-master/public/icons/arrow-down.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/arrow-down.svg
rename to app/ui-master/public/icons/arrow-down.svg
diff --git a/packages/rocketchat-ui-master/public/icons/at.svg b/app/ui-master/public/icons/at.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/at.svg
rename to app/ui-master/public/icons/at.svg
diff --git a/packages/rocketchat-ui-master/public/icons/back.svg b/app/ui-master/public/icons/back.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/back.svg
rename to app/ui-master/public/icons/back.svg
diff --git a/packages/rocketchat-ui-master/public/icons/ban.svg b/app/ui-master/public/icons/ban.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/ban.svg
rename to app/ui-master/public/icons/ban.svg
diff --git a/packages/rocketchat-ui-master/public/icons/bell.svg b/app/ui-master/public/icons/bell.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/bell.svg
rename to app/ui-master/public/icons/bell.svg
diff --git a/packages/rocketchat-ui-master/public/icons/bold.svg b/app/ui-master/public/icons/bold.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/bold.svg
rename to app/ui-master/public/icons/bold.svg
diff --git a/packages/rocketchat-ui-master/public/icons/calendar.svg b/app/ui-master/public/icons/calendar.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/calendar.svg
rename to app/ui-master/public/icons/calendar.svg
diff --git a/packages/rocketchat-ui-master/public/icons/chat.svg b/app/ui-master/public/icons/chat.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/chat.svg
rename to app/ui-master/public/icons/chat.svg
diff --git a/packages/rocketchat-ui-master/public/icons/check.svg b/app/ui-master/public/icons/check.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/check.svg
rename to app/ui-master/public/icons/check.svg
diff --git a/packages/rocketchat-ui-master/public/icons/checkmark-circled.svg b/app/ui-master/public/icons/checkmark-circled.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/checkmark-circled.svg
rename to app/ui-master/public/icons/checkmark-circled.svg
diff --git a/packages/rocketchat-ui-master/public/icons/circle-cross.svg b/app/ui-master/public/icons/circle-cross.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/circle-cross.svg
rename to app/ui-master/public/icons/circle-cross.svg
diff --git a/packages/rocketchat-ui-master/public/icons/circle.svg b/app/ui-master/public/icons/circle.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/circle.svg
rename to app/ui-master/public/icons/circle.svg
diff --git a/packages/rocketchat-ui-master/public/icons/circled-arrow-down.svg b/app/ui-master/public/icons/circled-arrow-down.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/circled-arrow-down.svg
rename to app/ui-master/public/icons/circled-arrow-down.svg
diff --git a/packages/rocketchat-ui-master/public/icons/clip.svg b/app/ui-master/public/icons/clip.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/clip.svg
rename to app/ui-master/public/icons/clip.svg
diff --git a/packages/rocketchat-ui-master/public/icons/clipboard.svg b/app/ui-master/public/icons/clipboard.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/clipboard.svg
rename to app/ui-master/public/icons/clipboard.svg
diff --git a/packages/rocketchat-ui-master/public/icons/clock.svg b/app/ui-master/public/icons/clock.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/clock.svg
rename to app/ui-master/public/icons/clock.svg
diff --git a/packages/rocketchat-ui-master/public/icons/cloud-plus.svg b/app/ui-master/public/icons/cloud-plus.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/cloud-plus.svg
rename to app/ui-master/public/icons/cloud-plus.svg
diff --git a/packages/rocketchat-ui-master/public/icons/code.svg b/app/ui-master/public/icons/code.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/code.svg
rename to app/ui-master/public/icons/code.svg
diff --git a/packages/rocketchat-ui-master/public/icons/cog.svg b/app/ui-master/public/icons/cog.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/cog.svg
rename to app/ui-master/public/icons/cog.svg
diff --git a/packages/rocketchat-ui-master/public/icons/computer.svg b/app/ui-master/public/icons/computer.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/computer.svg
rename to app/ui-master/public/icons/computer.svg
diff --git a/packages/rocketchat-ui-master/public/icons/copy.svg b/app/ui-master/public/icons/copy.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/copy.svg
rename to app/ui-master/public/icons/copy.svg
diff --git a/packages/rocketchat-ui-master/public/icons/cross.svg b/app/ui-master/public/icons/cross.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/cross.svg
rename to app/ui-master/public/icons/cross.svg
diff --git a/packages/rocketchat-ui-master/public/icons/cube.svg b/app/ui-master/public/icons/cube.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/cube.svg
rename to app/ui-master/public/icons/cube.svg
diff --git a/packages/rocketchat-ui-master/public/icons/customize.svg b/app/ui-master/public/icons/customize.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/customize.svg
rename to app/ui-master/public/icons/customize.svg
diff --git a/packages/rocketchat-ui-master/public/icons/discover.svg b/app/ui-master/public/icons/discover.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/discover.svg
rename to app/ui-master/public/icons/discover.svg
diff --git a/packages/rocketchat-ui-master/public/icons/edit-rounded.svg b/app/ui-master/public/icons/edit-rounded.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/edit-rounded.svg
rename to app/ui-master/public/icons/edit-rounded.svg
diff --git a/packages/rocketchat-ui-master/public/icons/edit.svg b/app/ui-master/public/icons/edit.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/edit.svg
rename to app/ui-master/public/icons/edit.svg
diff --git a/packages/rocketchat-ui-master/public/icons/emoji.svg b/app/ui-master/public/icons/emoji.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/emoji.svg
rename to app/ui-master/public/icons/emoji.svg
diff --git a/packages/rocketchat-ui-master/public/icons/eraser.svg b/app/ui-master/public/icons/eraser.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/eraser.svg
rename to app/ui-master/public/icons/eraser.svg
diff --git a/packages/rocketchat-ui-master/public/icons/eye-off.svg b/app/ui-master/public/icons/eye-off.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/eye-off.svg
rename to app/ui-master/public/icons/eye-off.svg
diff --git a/packages/rocketchat-ui-master/public/icons/facebook.svg b/app/ui-master/public/icons/facebook.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/facebook.svg
rename to app/ui-master/public/icons/facebook.svg
diff --git a/packages/rocketchat-ui-master/public/icons/file-document.svg b/app/ui-master/public/icons/file-document.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/file-document.svg
rename to app/ui-master/public/icons/file-document.svg
diff --git a/packages/rocketchat-ui-master/public/icons/file-generic.svg b/app/ui-master/public/icons/file-generic.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/file-generic.svg
rename to app/ui-master/public/icons/file-generic.svg
diff --git a/packages/rocketchat-ui-master/public/icons/file-pdf.svg b/app/ui-master/public/icons/file-pdf.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/file-pdf.svg
rename to app/ui-master/public/icons/file-pdf.svg
diff --git a/packages/rocketchat-ui-master/public/icons/file-sheets.svg b/app/ui-master/public/icons/file-sheets.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/file-sheets.svg
rename to app/ui-master/public/icons/file-sheets.svg
diff --git a/packages/rocketchat-ui-master/public/icons/flag.svg b/app/ui-master/public/icons/flag.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/flag.svg
rename to app/ui-master/public/icons/flag.svg
diff --git a/packages/rocketchat-ui-master/public/icons/folder.svg b/app/ui-master/public/icons/folder.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/folder.svg
rename to app/ui-master/public/icons/folder.svg
diff --git a/packages/rocketchat-ui-master/public/icons/github.svg b/app/ui-master/public/icons/github.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/github.svg
rename to app/ui-master/public/icons/github.svg
diff --git a/packages/rocketchat-ui-master/public/icons/gitlab.svg b/app/ui-master/public/icons/gitlab.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/gitlab.svg
rename to app/ui-master/public/icons/gitlab.svg
diff --git a/packages/rocketchat-ui-master/public/icons/google.svg b/app/ui-master/public/icons/google.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/google.svg
rename to app/ui-master/public/icons/google.svg
diff --git a/packages/rocketchat-ui-master/public/icons/hand-pointer.svg b/app/ui-master/public/icons/hand-pointer.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/hand-pointer.svg
rename to app/ui-master/public/icons/hand-pointer.svg
diff --git a/packages/rocketchat-ui-master/public/icons/hashtag.svg b/app/ui-master/public/icons/hashtag.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/hashtag.svg
rename to app/ui-master/public/icons/hashtag.svg
diff --git a/packages/rocketchat-ui-master/public/icons/help.svg b/app/ui-master/public/icons/help.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/help.svg
rename to app/ui-master/public/icons/help.svg
diff --git a/packages/rocketchat-ui-master/public/icons/hubot.svg b/app/ui-master/public/icons/hubot.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/hubot.svg
rename to app/ui-master/public/icons/hubot.svg
diff --git a/packages/rocketchat-ui-master/public/icons/import.svg b/app/ui-master/public/icons/import.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/import.svg
rename to app/ui-master/public/icons/import.svg
diff --git a/packages/rocketchat-ui-master/public/icons/info-circled.svg b/app/ui-master/public/icons/info-circled.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/info-circled.svg
rename to app/ui-master/public/icons/info-circled.svg
diff --git a/packages/rocketchat-ui-master/public/icons/italic.svg b/app/ui-master/public/icons/italic.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/italic.svg
rename to app/ui-master/public/icons/italic.svg
diff --git a/packages/rocketchat-ui-master/public/icons/jump.svg b/app/ui-master/public/icons/jump.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/jump.svg
rename to app/ui-master/public/icons/jump.svg
diff --git a/packages/rocketchat-ui-master/public/icons/key.svg b/app/ui-master/public/icons/key.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/key.svg
rename to app/ui-master/public/icons/key.svg
diff --git a/packages/rocketchat-ui-master/public/icons/keyboard.svg b/app/ui-master/public/icons/keyboard.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/keyboard.svg
rename to app/ui-master/public/icons/keyboard.svg
diff --git a/packages/rocketchat-ui-master/public/icons/language.svg b/app/ui-master/public/icons/language.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/language.svg
rename to app/ui-master/public/icons/language.svg
diff --git a/packages/rocketchat-ui-master/public/icons/linkedin.svg b/app/ui-master/public/icons/linkedin.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/linkedin.svg
rename to app/ui-master/public/icons/linkedin.svg
diff --git a/packages/rocketchat-ui-master/public/icons/list-alt.svg b/app/ui-master/public/icons/list-alt.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/list-alt.svg
rename to app/ui-master/public/icons/list-alt.svg
diff --git a/packages/rocketchat-ui-master/public/icons/list.svg b/app/ui-master/public/icons/list.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/list.svg
rename to app/ui-master/public/icons/list.svg
diff --git a/packages/rocketchat-ui-master/public/icons/livechat.svg b/app/ui-master/public/icons/livechat.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/livechat.svg
rename to app/ui-master/public/icons/livechat.svg
diff --git a/packages/rocketchat-ui-master/public/icons/loading.svg b/app/ui-master/public/icons/loading.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/loading.svg
rename to app/ui-master/public/icons/loading.svg
diff --git a/packages/rocketchat-ui-master/public/icons/lock.svg b/app/ui-master/public/icons/lock.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/lock.svg
rename to app/ui-master/public/icons/lock.svg
diff --git a/packages/rocketchat-ui-master/public/icons/magnifier.svg b/app/ui-master/public/icons/magnifier.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/magnifier.svg
rename to app/ui-master/public/icons/magnifier.svg
diff --git a/packages/rocketchat-ui-master/public/icons/mail.svg b/app/ui-master/public/icons/mail.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/mail.svg
rename to app/ui-master/public/icons/mail.svg
diff --git a/packages/rocketchat-ui-master/public/icons/map-pin.svg b/app/ui-master/public/icons/map-pin.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/map-pin.svg
rename to app/ui-master/public/icons/map-pin.svg
diff --git a/packages/rocketchat-ui-master/public/icons/menu.svg b/app/ui-master/public/icons/menu.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/menu.svg
rename to app/ui-master/public/icons/menu.svg
diff --git a/packages/rocketchat-ui-master/public/icons/message.svg b/app/ui-master/public/icons/message.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/message.svg
rename to app/ui-master/public/icons/message.svg
diff --git a/packages/rocketchat-ui-master/public/icons/mic.svg b/app/ui-master/public/icons/mic.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/mic.svg
rename to app/ui-master/public/icons/mic.svg
diff --git a/packages/rocketchat-ui-master/public/icons/mobile.svg b/app/ui-master/public/icons/mobile.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/mobile.svg
rename to app/ui-master/public/icons/mobile.svg
diff --git a/packages/rocketchat-ui-master/public/icons/modal-warning.svg b/app/ui-master/public/icons/modal-warning.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/modal-warning.svg
rename to app/ui-master/public/icons/modal-warning.svg
diff --git a/packages/rocketchat-ui-master/public/icons/mute.svg b/app/ui-master/public/icons/mute.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/mute.svg
rename to app/ui-master/public/icons/mute.svg
diff --git a/packages/rocketchat-ui-master/public/icons/pause.svg b/app/ui-master/public/icons/pause.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/pause.svg
rename to app/ui-master/public/icons/pause.svg
diff --git a/packages/rocketchat-ui-master/public/icons/permalink.svg b/app/ui-master/public/icons/permalink.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/permalink.svg
rename to app/ui-master/public/icons/permalink.svg
diff --git a/packages/rocketchat-ui-master/public/icons/pin.svg b/app/ui-master/public/icons/pin.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/pin.svg
rename to app/ui-master/public/icons/pin.svg
diff --git a/packages/rocketchat-ui-master/public/icons/play-solid.svg b/app/ui-master/public/icons/play-solid.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/play-solid.svg
rename to app/ui-master/public/icons/play-solid.svg
diff --git a/packages/rocketchat-ui-master/public/icons/play.svg b/app/ui-master/public/icons/play.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/play.svg
rename to app/ui-master/public/icons/play.svg
diff --git a/packages/rocketchat-ui-master/public/icons/plus.svg b/app/ui-master/public/icons/plus.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/plus.svg
rename to app/ui-master/public/icons/plus.svg
diff --git a/packages/rocketchat-ui-master/public/icons/podcast.svg b/app/ui-master/public/icons/podcast.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/podcast.svg
rename to app/ui-master/public/icons/podcast.svg
diff --git a/packages/rocketchat-ui-master/public/icons/post.svg b/app/ui-master/public/icons/post.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/post.svg
rename to app/ui-master/public/icons/post.svg
diff --git a/packages/rocketchat-ui-master/public/icons/queue.svg b/app/ui-master/public/icons/queue.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/queue.svg
rename to app/ui-master/public/icons/queue.svg
diff --git a/packages/rocketchat-ui-master/public/icons/quote.svg b/app/ui-master/public/icons/quote.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/quote.svg
rename to app/ui-master/public/icons/quote.svg
diff --git a/packages/rocketchat-ui-master/public/icons/reload.svg b/app/ui-master/public/icons/reload.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/reload.svg
rename to app/ui-master/public/icons/reload.svg
diff --git a/packages/rocketchat-ui-master/public/icons/reply.svg b/app/ui-master/public/icons/reply.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/reply.svg
rename to app/ui-master/public/icons/reply.svg
diff --git a/packages/rocketchat-ui-master/public/icons/send.svg b/app/ui-master/public/icons/send.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/send.svg
rename to app/ui-master/public/icons/send.svg
diff --git a/packages/rocketchat-ui-master/public/icons/share.svg b/app/ui-master/public/icons/share.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/share.svg
rename to app/ui-master/public/icons/share.svg
diff --git a/packages/rocketchat-ui-master/public/icons/shield-alt.svg b/app/ui-master/public/icons/shield-alt.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/shield-alt.svg
rename to app/ui-master/public/icons/shield-alt.svg
diff --git a/packages/rocketchat-ui-master/public/icons/shield-check.svg b/app/ui-master/public/icons/shield-check.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/shield-check.svg
rename to app/ui-master/public/icons/shield-check.svg
diff --git a/packages/rocketchat-ui-master/public/icons/shield.svg b/app/ui-master/public/icons/shield.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/shield.svg
rename to app/ui-master/public/icons/shield.svg
diff --git a/packages/rocketchat-ui-master/public/icons/sign-out.svg b/app/ui-master/public/icons/sign-out.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/sign-out.svg
rename to app/ui-master/public/icons/sign-out.svg
diff --git a/packages/rocketchat-ui-master/public/icons/sort-amount-down.svg b/app/ui-master/public/icons/sort-amount-down.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/sort-amount-down.svg
rename to app/ui-master/public/icons/sort-amount-down.svg
diff --git a/packages/rocketchat-ui-master/public/icons/sort-down.svg b/app/ui-master/public/icons/sort-down.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/sort-down.svg
rename to app/ui-master/public/icons/sort-down.svg
diff --git a/packages/rocketchat-ui-master/public/icons/sort-up.svg b/app/ui-master/public/icons/sort-up.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/sort-up.svg
rename to app/ui-master/public/icons/sort-up.svg
diff --git a/packages/rocketchat-ui-master/public/icons/sort.svg b/app/ui-master/public/icons/sort.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/sort.svg
rename to app/ui-master/public/icons/sort.svg
diff --git a/packages/rocketchat-ui-master/public/icons/star.svg b/app/ui-master/public/icons/star.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/star.svg
rename to app/ui-master/public/icons/star.svg
diff --git a/packages/rocketchat-ui-master/public/icons/strike.svg b/app/ui-master/public/icons/strike.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/strike.svg
rename to app/ui-master/public/icons/strike.svg
diff --git a/packages/rocketchat-ui-master/public/icons/team.svg b/app/ui-master/public/icons/team.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/team.svg
rename to app/ui-master/public/icons/team.svg
diff --git a/packages/rocketchat-ui-master/public/icons/th-list.svg b/app/ui-master/public/icons/th-list.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/th-list.svg
rename to app/ui-master/public/icons/th-list.svg
diff --git a/packages/rocketchat-ui-master/public/icons/thread.svg b/app/ui-master/public/icons/thread.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/thread.svg
rename to app/ui-master/public/icons/thread.svg
diff --git a/packages/rocketchat-ui-master/public/icons/trash.svg b/app/ui-master/public/icons/trash.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/trash.svg
rename to app/ui-master/public/icons/trash.svg
diff --git a/packages/rocketchat-ui-master/public/icons/twitter.svg b/app/ui-master/public/icons/twitter.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/twitter.svg
rename to app/ui-master/public/icons/twitter.svg
diff --git a/packages/rocketchat-ui-master/public/icons/upload.svg b/app/ui-master/public/icons/upload.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/upload.svg
rename to app/ui-master/public/icons/upload.svg
diff --git a/packages/rocketchat-ui-master/public/icons/user-plus.svg b/app/ui-master/public/icons/user-plus.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/user-plus.svg
rename to app/ui-master/public/icons/user-plus.svg
diff --git a/packages/rocketchat-ui-master/public/icons/user-rounded.svg b/app/ui-master/public/icons/user-rounded.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/user-rounded.svg
rename to app/ui-master/public/icons/user-rounded.svg
diff --git a/packages/rocketchat-ui-master/public/icons/user.svg b/app/ui-master/public/icons/user.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/user.svg
rename to app/ui-master/public/icons/user.svg
diff --git a/packages/rocketchat-ui-master/public/icons/video.svg b/app/ui-master/public/icons/video.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/video.svg
rename to app/ui-master/public/icons/video.svg
diff --git a/packages/rocketchat-ui-master/public/icons/volume-mute.svg b/app/ui-master/public/icons/volume-mute.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/volume-mute.svg
rename to app/ui-master/public/icons/volume-mute.svg
diff --git a/packages/rocketchat-ui-master/public/icons/volume.svg b/app/ui-master/public/icons/volume.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/volume.svg
rename to app/ui-master/public/icons/volume.svg
diff --git a/packages/rocketchat-ui-master/public/icons/warning.svg b/app/ui-master/public/icons/warning.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons/warning.svg
rename to app/ui-master/public/icons/warning.svg
diff --git a/packages/rocketchat-ui-master/server/index.js b/app/ui-master/server/index.js
similarity index 100%
rename from packages/rocketchat-ui-master/server/index.js
rename to app/ui-master/server/index.js
diff --git a/packages/rocketchat-ui-master/server/inject.js b/app/ui-master/server/inject.js
similarity index 100%
rename from packages/rocketchat-ui-master/server/inject.js
rename to app/ui-master/server/inject.js
diff --git a/packages/rocketchat-ui-message/README.md b/app/ui-message/README.md
similarity index 100%
rename from packages/rocketchat-ui-message/README.md
rename to app/ui-message/README.md
diff --git a/packages/rocketchat-ui-message/client/index.js b/app/ui-message/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/index.js
rename to app/ui-message/client/index.js
diff --git a/packages/rocketchat-ui-message/client/message.html b/app/ui-message/client/message.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/message.html
rename to app/ui-message/client/message.html
diff --git a/packages/rocketchat-ui-message/client/message.js b/app/ui-message/client/message.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/message.js
rename to app/ui-message/client/message.js
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/app/ui-message/client/messageBox.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBox.html
rename to app/ui-message/client/messageBox.html
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBox.js
rename to app/ui-message/client/messageBox.js
diff --git a/packages/rocketchat-ui-message/client/messageBoxAudioMessage.html b/app/ui-message/client/messageBoxAudioMessage.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxAudioMessage.html
rename to app/ui-message/client/messageBoxAudioMessage.html
diff --git a/packages/rocketchat-ui-message/client/messageBoxAudioMessage.js b/app/ui-message/client/messageBoxAudioMessage.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxAudioMessage.js
rename to app/ui-message/client/messageBoxAudioMessage.js
diff --git a/packages/rocketchat-ui-message/client/messageBoxNotSubscribed.html b/app/ui-message/client/messageBoxNotSubscribed.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxNotSubscribed.html
rename to app/ui-message/client/messageBoxNotSubscribed.html
diff --git a/packages/rocketchat-ui-message/client/messageBoxNotSubscribed.js b/app/ui-message/client/messageBoxNotSubscribed.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxNotSubscribed.js
rename to app/ui-message/client/messageBoxNotSubscribed.js
diff --git a/packages/rocketchat-ui-message/client/messageBoxReplyPreview.html b/app/ui-message/client/messageBoxReplyPreview.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxReplyPreview.html
rename to app/ui-message/client/messageBoxReplyPreview.html
diff --git a/packages/rocketchat-ui-message/client/messageBoxReplyPreview.js b/app/ui-message/client/messageBoxReplyPreview.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxReplyPreview.js
rename to app/ui-message/client/messageBoxReplyPreview.js
diff --git a/packages/rocketchat-ui-message/client/messageBoxTyping.html b/app/ui-message/client/messageBoxTyping.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxTyping.html
rename to app/ui-message/client/messageBoxTyping.html
diff --git a/packages/rocketchat-ui-message/client/messageBoxTyping.js b/app/ui-message/client/messageBoxTyping.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageBoxTyping.js
rename to app/ui-message/client/messageBoxTyping.js
diff --git a/packages/rocketchat-ui-message/client/messageDropdown.html b/app/ui-message/client/messageDropdown.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/messageDropdown.html
rename to app/ui-message/client/messageDropdown.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.html b/app/ui-message/client/popup/messagePopup.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopup.html
rename to app/ui-message/client/popup/messagePopup.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/app/ui-message/client/popup/messagePopup.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopup.js
rename to app/ui-message/client/popup/messagePopup.js
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupChannel.html b/app/ui-message/client/popup/messagePopupChannel.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupChannel.html
rename to app/ui-message/client/popup/messagePopupChannel.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupChannel.js b/app/ui-message/client/popup/messagePopupChannel.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupChannel.js
rename to app/ui-message/client/popup/messagePopupChannel.js
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.html b/app/ui-message/client/popup/messagePopupConfig.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupConfig.html
rename to app/ui-message/client/popup/messagePopupConfig.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/app/ui-message/client/popup/messagePopupConfig.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
rename to app/ui-message/client/popup/messagePopupConfig.js
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.html b/app/ui-message/client/popup/messagePopupEmoji.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupEmoji.html
rename to app/ui-message/client/popup/messagePopupEmoji.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupEmoji.js b/app/ui-message/client/popup/messagePopupEmoji.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupEmoji.js
rename to app/ui-message/client/popup/messagePopupEmoji.js
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommand.html b/app/ui-message/client/popup/messagePopupSlashCommand.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupSlashCommand.html
rename to app/ui-message/client/popup/messagePopupSlashCommand.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.html b/app/ui-message/client/popup/messagePopupSlashCommandPreview.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.html
rename to app/ui-message/client/popup/messagePopupSlashCommandPreview.html
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js b/app/ui-message/client/popup/messagePopupSlashCommandPreview.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js
rename to app/ui-message/client/popup/messagePopupSlashCommandPreview.js
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupUser.html b/app/ui-message/client/popup/messagePopupUser.html
similarity index 100%
rename from packages/rocketchat-ui-message/client/popup/messagePopupUser.html
rename to app/ui-message/client/popup/messagePopupUser.html
diff --git a/packages/rocketchat-ui-message/client/startup/index.js b/app/ui-message/client/startup/index.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/startup/index.js
rename to app/ui-message/client/startup/index.js
diff --git a/packages/rocketchat-ui-message/client/startup/messageBoxActions.js b/app/ui-message/client/startup/messageBoxActions.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/startup/messageBoxActions.js
rename to app/ui-message/client/startup/messageBoxActions.js
diff --git a/packages/rocketchat-ui-message/client/startup/restoreText.js b/app/ui-message/client/startup/restoreText.js
similarity index 100%
rename from packages/rocketchat-ui-message/client/startup/restoreText.js
rename to app/ui-message/client/startup/restoreText.js
diff --git a/packages/rocketchat-ui-message/package.js b/app/ui-message/package.js
similarity index 100%
rename from packages/rocketchat-ui-message/package.js
rename to app/ui-message/package.js
diff --git a/packages/rocketchat-ui-sidenav/README.md b/app/ui-sidenav/README.md
similarity index 100%
rename from packages/rocketchat-ui-sidenav/README.md
rename to app/ui-sidenav/README.md
diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.html b/app/ui-sidenav/client/chatRoomItem.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/chatRoomItem.html
rename to app/ui-sidenav/client/chatRoomItem.html
diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/chatRoomItem.js
rename to app/ui-sidenav/client/chatRoomItem.js
diff --git a/packages/rocketchat-ui-sidenav/client/index.js b/app/ui-sidenav/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/index.js
rename to app/ui-sidenav/client/index.js
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.html b/app/ui-sidenav/client/roomList.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/roomList.html
rename to app/ui-sidenav/client/roomList.html
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/roomList.js
rename to app/ui-sidenav/client/roomList.js
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.html b/app/ui-sidenav/client/sideNav.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sideNav.html
rename to app/ui-sidenav/client/sideNav.html
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/app/ui-sidenav/client/sideNav.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sideNav.js
rename to app/ui-sidenav/client/sideNav.js
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.html b/app/ui-sidenav/client/sidebarHeader.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sidebarHeader.html
rename to app/ui-sidenav/client/sidebarHeader.html
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sidebarHeader.js
rename to app/ui-sidenav/client/sidebarHeader.js
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/app/ui-sidenav/client/sidebarItem.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sidebarItem.html
rename to app/ui-sidenav/client/sidebarItem.html
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sidebarItem.js
rename to app/ui-sidenav/client/sidebarItem.js
diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.html b/app/ui-sidenav/client/sortlist.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sortlist.html
rename to app/ui-sidenav/client/sortlist.html
diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.js b/app/ui-sidenav/client/sortlist.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/sortlist.js
rename to app/ui-sidenav/client/sortlist.js
diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.html b/app/ui-sidenav/client/toolbar.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/toolbar.html
rename to app/ui-sidenav/client/toolbar.html
diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.js b/app/ui-sidenav/client/toolbar.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/toolbar.js
rename to app/ui-sidenav/client/toolbar.js
diff --git a/packages/rocketchat-ui-sidenav/client/userStatus.html b/app/ui-sidenav/client/userStatus.html
similarity index 100%
rename from packages/rocketchat-ui-sidenav/client/userStatus.html
rename to app/ui-sidenav/client/userStatus.html
diff --git a/packages/rocketchat-ui-sidenav/package.js b/app/ui-sidenav/package.js
similarity index 100%
rename from packages/rocketchat-ui-sidenav/package.js
rename to app/ui-sidenav/package.js
diff --git a/packages/rocketchat-ui-utils/client/index.js b/app/ui-utils/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/index.js
rename to app/ui-utils/client/index.js
diff --git a/packages/rocketchat-ui-utils/client/lib/AccountBox.js b/app/ui-utils/client/lib/AccountBox.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/AccountBox.js
rename to app/ui-utils/client/lib/AccountBox.js
diff --git a/packages/rocketchat-ui-utils/client/lib/AdminBox.js b/app/ui-utils/client/lib/AdminBox.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/AdminBox.js
rename to app/ui-utils/client/lib/AdminBox.js
diff --git a/packages/rocketchat-ui-utils/client/lib/ChannelActions.js b/app/ui-utils/client/lib/ChannelActions.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/ChannelActions.js
rename to app/ui-utils/client/lib/ChannelActions.js
diff --git a/packages/rocketchat-ui-utils/client/lib/IframeLogin.js b/app/ui-utils/client/lib/IframeLogin.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/IframeLogin.js
rename to app/ui-utils/client/lib/IframeLogin.js
diff --git a/packages/rocketchat-ui-utils/client/lib/Layout.js b/app/ui-utils/client/lib/Layout.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/Layout.js
rename to app/ui-utils/client/lib/Layout.js
diff --git a/packages/rocketchat-ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/MessageAction.js
rename to app/ui-utils/client/lib/MessageAction.js
diff --git a/packages/rocketchat-ui-utils/client/lib/RocketChatTabBar.js b/app/ui-utils/client/lib/RocketChatTabBar.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/RocketChatTabBar.js
rename to app/ui-utils/client/lib/RocketChatTabBar.js
diff --git a/packages/rocketchat-ui-utils/client/lib/RoomHistoryManager.js b/app/ui-utils/client/lib/RoomHistoryManager.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/RoomHistoryManager.js
rename to app/ui-utils/client/lib/RoomHistoryManager.js
diff --git a/packages/rocketchat-ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/RoomManager.js
rename to app/ui-utils/client/lib/RoomManager.js
diff --git a/packages/rocketchat-ui-utils/client/lib/SideNav.js b/app/ui-utils/client/lib/SideNav.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/SideNav.js
rename to app/ui-utils/client/lib/SideNav.js
diff --git a/packages/rocketchat-ui-utils/client/lib/TabBar.js b/app/ui-utils/client/lib/TabBar.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/TabBar.js
rename to app/ui-utils/client/lib/TabBar.js
diff --git a/packages/rocketchat-ui-utils/client/lib/alerts.html b/app/ui-utils/client/lib/alerts.html
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/alerts.html
rename to app/ui-utils/client/lib/alerts.html
diff --git a/packages/rocketchat-ui-utils/client/lib/alerts.js b/app/ui-utils/client/lib/alerts.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/alerts.js
rename to app/ui-utils/client/lib/alerts.js
diff --git a/packages/rocketchat-ui-utils/client/lib/avatar.js b/app/ui-utils/client/lib/avatar.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/avatar.js
rename to app/ui-utils/client/lib/avatar.js
diff --git a/packages/rocketchat-ui-utils/client/lib/callMethod.js b/app/ui-utils/client/lib/callMethod.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/callMethod.js
rename to app/ui-utils/client/lib/callMethod.js
diff --git a/packages/rocketchat-ui-utils/client/lib/fireGlobalEvent.js b/app/ui-utils/client/lib/fireGlobalEvent.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/fireGlobalEvent.js
rename to app/ui-utils/client/lib/fireGlobalEvent.js
diff --git a/packages/rocketchat-ui-utils/client/lib/mainReady.js b/app/ui-utils/client/lib/mainReady.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/mainReady.js
rename to app/ui-utils/client/lib/mainReady.js
diff --git a/packages/rocketchat-ui-utils/client/lib/menu.js b/app/ui-utils/client/lib/menu.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/menu.js
rename to app/ui-utils/client/lib/menu.js
diff --git a/packages/rocketchat-ui-utils/client/lib/messageBox.js b/app/ui-utils/client/lib/messageBox.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/messageBox.js
rename to app/ui-utils/client/lib/messageBox.js
diff --git a/packages/rocketchat-ui-utils/client/lib/modal.html b/app/ui-utils/client/lib/modal.html
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/modal.html
rename to app/ui-utils/client/lib/modal.html
diff --git a/packages/rocketchat-ui-utils/client/lib/modal.js b/app/ui-utils/client/lib/modal.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/modal.js
rename to app/ui-utils/client/lib/modal.js
diff --git a/packages/rocketchat-ui-utils/client/lib/openRoom.js b/app/ui-utils/client/lib/openRoom.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/openRoom.js
rename to app/ui-utils/client/lib/openRoom.js
diff --git a/packages/rocketchat-ui-utils/client/lib/popout.html b/app/ui-utils/client/lib/popout.html
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/popout.html
rename to app/ui-utils/client/lib/popout.html
diff --git a/packages/rocketchat-ui-utils/client/lib/popout.js b/app/ui-utils/client/lib/popout.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/popout.js
rename to app/ui-utils/client/lib/popout.js
diff --git a/packages/rocketchat-ui-utils/client/lib/popover.html b/app/ui-utils/client/lib/popover.html
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/popover.html
rename to app/ui-utils/client/lib/popover.html
diff --git a/packages/rocketchat-ui-utils/client/lib/popover.js b/app/ui-utils/client/lib/popover.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/popover.js
rename to app/ui-utils/client/lib/popover.js
diff --git a/packages/rocketchat-ui-utils/client/lib/readMessages.js b/app/ui-utils/client/lib/readMessages.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/readMessages.js
rename to app/ui-utils/client/lib/readMessages.js
diff --git a/packages/rocketchat-ui-utils/client/lib/renderMessageBody.js b/app/ui-utils/client/lib/renderMessageBody.js
similarity index 100%
rename from packages/rocketchat-ui-utils/client/lib/renderMessageBody.js
rename to app/ui-utils/client/lib/renderMessageBody.js
diff --git a/packages/rocketchat-ui-utils/lib/Message.js b/app/ui-utils/lib/Message.js
similarity index 100%
rename from packages/rocketchat-ui-utils/lib/Message.js
rename to app/ui-utils/lib/Message.js
diff --git a/packages/rocketchat-ui-utils/lib/MessageProperties.js b/app/ui-utils/lib/MessageProperties.js
similarity index 100%
rename from packages/rocketchat-ui-utils/lib/MessageProperties.js
rename to app/ui-utils/lib/MessageProperties.js
diff --git a/packages/rocketchat-ui-utils/lib/MessageTypes.js b/app/ui-utils/lib/MessageTypes.js
similarity index 100%
rename from packages/rocketchat-ui-utils/lib/MessageTypes.js
rename to app/ui-utils/lib/MessageTypes.js
diff --git a/packages/rocketchat-ui-utils/package.js b/app/ui-utils/package.js
similarity index 100%
rename from packages/rocketchat-ui-utils/package.js
rename to app/ui-utils/package.js
diff --git a/packages/rocketchat-ui-utils/server/index.js b/app/ui-utils/server/index.js
similarity index 100%
rename from packages/rocketchat-ui-utils/server/index.js
rename to app/ui-utils/server/index.js
diff --git a/packages/rocketchat-ui-utils/tests/server.mocks.js b/app/ui-utils/tests/server.mocks.js
similarity index 100%
rename from packages/rocketchat-ui-utils/tests/server.mocks.js
rename to app/ui-utils/tests/server.mocks.js
diff --git a/packages/rocketchat-ui-utils/tests/server.tests.js b/app/ui-utils/tests/server.tests.js
similarity index 100%
rename from packages/rocketchat-ui-utils/tests/server.tests.js
rename to app/ui-utils/tests/server.tests.js
diff --git a/packages/rocketchat-ui-vrecord/README.md b/app/ui-vrecord/README.md
similarity index 100%
rename from packages/rocketchat-ui-vrecord/README.md
rename to app/ui-vrecord/README.md
diff --git a/packages/rocketchat-ui-vrecord/client/VRecDialog.js b/app/ui-vrecord/client/VRecDialog.js
similarity index 100%
rename from packages/rocketchat-ui-vrecord/client/VRecDialog.js
rename to app/ui-vrecord/client/VRecDialog.js
diff --git a/packages/rocketchat-ui-vrecord/client/index.js b/app/ui-vrecord/client/index.js
similarity index 100%
rename from packages/rocketchat-ui-vrecord/client/index.js
rename to app/ui-vrecord/client/index.js
diff --git a/packages/rocketchat-ui-vrecord/client/vrecord.css b/app/ui-vrecord/client/vrecord.css
similarity index 100%
rename from packages/rocketchat-ui-vrecord/client/vrecord.css
rename to app/ui-vrecord/client/vrecord.css
diff --git a/packages/rocketchat-ui-vrecord/client/vrecord.html b/app/ui-vrecord/client/vrecord.html
similarity index 100%
rename from packages/rocketchat-ui-vrecord/client/vrecord.html
rename to app/ui-vrecord/client/vrecord.html
diff --git a/packages/rocketchat-ui-vrecord/client/vrecord.js b/app/ui-vrecord/client/vrecord.js
similarity index 100%
rename from packages/rocketchat-ui-vrecord/client/vrecord.js
rename to app/ui-vrecord/client/vrecord.js
diff --git a/packages/rocketchat-ui-vrecord/package.js b/app/ui-vrecord/package.js
similarity index 100%
rename from packages/rocketchat-ui-vrecord/package.js
rename to app/ui-vrecord/package.js
diff --git a/packages/rocketchat-ui-vrecord/server/index.js b/app/ui-vrecord/server/index.js
similarity index 100%
rename from packages/rocketchat-ui-vrecord/server/index.js
rename to app/ui-vrecord/server/index.js
diff --git a/packages/rocketchat-ui-vrecord/server/settings.js b/app/ui-vrecord/server/settings.js
similarity index 100%
rename from packages/rocketchat-ui-vrecord/server/settings.js
rename to app/ui-vrecord/server/settings.js
diff --git a/packages/rocketchat-ui/README.md b/app/ui/README.md
similarity index 100%
rename from packages/rocketchat-ui/README.md
rename to app/ui/README.md
diff --git a/packages/rocketchat-ui/client/components/contextualBar.html b/app/ui/client/components/contextualBar.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/contextualBar.html
rename to app/ui/client/components/contextualBar.html
diff --git a/packages/rocketchat-ui/client/components/contextualBar.js b/app/ui/client/components/contextualBar.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/contextualBar.js
rename to app/ui/client/components/contextualBar.js
diff --git a/packages/rocketchat-ui/client/components/header/header.html b/app/ui/client/components/header/header.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/header/header.html
rename to app/ui/client/components/header/header.html
diff --git a/packages/rocketchat-ui/client/components/header/header.js b/app/ui/client/components/header/header.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/header/header.js
rename to app/ui/client/components/header/header.js
diff --git a/packages/rocketchat-ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/header/headerRoom.html
rename to app/ui/client/components/header/headerRoom.html
diff --git a/packages/rocketchat-ui/client/components/header/headerRoom.js b/app/ui/client/components/header/headerRoom.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/header/headerRoom.js
rename to app/ui/client/components/header/headerRoom.js
diff --git a/packages/rocketchat-ui/client/components/icon.html b/app/ui/client/components/icon.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/icon.html
rename to app/ui/client/components/icon.html
diff --git a/packages/rocketchat-ui/client/components/icon.js b/app/ui/client/components/icon.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/icon.js
rename to app/ui/client/components/icon.js
diff --git a/packages/rocketchat-ui/client/components/popupList.html b/app/ui/client/components/popupList.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/popupList.html
rename to app/ui/client/components/popupList.html
diff --git a/packages/rocketchat-ui/client/components/popupList.js b/app/ui/client/components/popupList.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/popupList.js
rename to app/ui/client/components/popupList.js
diff --git a/packages/rocketchat-ui/client/components/selectDropdown.html b/app/ui/client/components/selectDropdown.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/selectDropdown.html
rename to app/ui/client/components/selectDropdown.html
diff --git a/packages/rocketchat-ui/client/components/selectDropdown.js b/app/ui/client/components/selectDropdown.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/selectDropdown.js
rename to app/ui/client/components/selectDropdown.js
diff --git a/packages/rocketchat-ui/client/components/table.html b/app/ui/client/components/table.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/table.html
rename to app/ui/client/components/table.html
diff --git a/packages/rocketchat-ui/client/components/table.js b/app/ui/client/components/table.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/table.js
rename to app/ui/client/components/table.js
diff --git a/packages/rocketchat-ui/client/components/tabs.html b/app/ui/client/components/tabs.html
similarity index 100%
rename from packages/rocketchat-ui/client/components/tabs.html
rename to app/ui/client/components/tabs.html
diff --git a/packages/rocketchat-ui/client/components/tabs.js b/app/ui/client/components/tabs.js
similarity index 100%
rename from packages/rocketchat-ui/client/components/tabs.js
rename to app/ui/client/components/tabs.js
diff --git a/packages/rocketchat-ui/client/index.js b/app/ui/client/index.js
similarity index 100%
rename from packages/rocketchat-ui/client/index.js
rename to app/ui/client/index.js
diff --git a/packages/rocketchat-ui/client/lib/Modernizr.js b/app/ui/client/lib/Modernizr.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/Modernizr.js
rename to app/ui/client/lib/Modernizr.js
diff --git a/packages/rocketchat-ui/client/lib/accounts.js b/app/ui/client/lib/accounts.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/accounts.js
rename to app/ui/client/lib/accounts.js
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/chatMessages.js
rename to app/ui/client/lib/chatMessages.js
diff --git a/packages/rocketchat-ui/client/lib/codeMirror/codeMirror.js b/app/ui/client/lib/codeMirror/codeMirror.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/codeMirror/codeMirror.js
rename to app/ui/client/lib/codeMirror/codeMirror.js
diff --git a/packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.html b/app/ui/client/lib/codeMirror/codeMirrorComponent.html
similarity index 100%
rename from packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.html
rename to app/ui/client/lib/codeMirror/codeMirrorComponent.html
diff --git a/packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.js b/app/ui/client/lib/codeMirror/codeMirrorComponent.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/codeMirror/codeMirrorComponent.js
rename to app/ui/client/lib/codeMirror/codeMirrorComponent.js
diff --git a/packages/rocketchat-ui/client/lib/collections.js b/app/ui/client/lib/collections.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/collections.js
rename to app/ui/client/lib/collections.js
diff --git a/packages/rocketchat-ui/client/lib/customEventPolyfill.js b/app/ui/client/lib/customEventPolyfill.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/customEventPolyfill.js
rename to app/ui/client/lib/customEventPolyfill.js
diff --git a/packages/rocketchat-ui/client/lib/esc.js b/app/ui/client/lib/esc.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/esc.js
rename to app/ui/client/lib/esc.js
diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/fileUpload.js
rename to app/ui/client/lib/fileUpload.js
diff --git a/packages/rocketchat-ui/client/lib/iframeCommands.js b/app/ui/client/lib/iframeCommands.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/iframeCommands.js
rename to app/ui/client/lib/iframeCommands.js
diff --git a/packages/rocketchat-ui/client/lib/menu.js b/app/ui/client/lib/menu.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/menu.js
rename to app/ui/client/lib/menu.js
diff --git a/packages/rocketchat-ui/client/lib/msgTyping.js b/app/ui/client/lib/msgTyping.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/msgTyping.js
rename to app/ui/client/lib/msgTyping.js
diff --git a/packages/rocketchat-ui/client/lib/notification.js b/app/ui/client/lib/notification.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/notification.js
rename to app/ui/client/lib/notification.js
diff --git a/packages/rocketchat-ui/client/lib/parentTemplate.js b/app/ui/client/lib/parentTemplate.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/parentTemplate.js
rename to app/ui/client/lib/parentTemplate.js
diff --git a/packages/rocketchat-ui/client/lib/recorderjs/audioEncoder.js b/app/ui/client/lib/recorderjs/audioEncoder.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/recorderjs/audioEncoder.js
rename to app/ui/client/lib/recorderjs/audioEncoder.js
diff --git a/packages/rocketchat-ui/client/lib/recorderjs/audioRecorder.js b/app/ui/client/lib/recorderjs/audioRecorder.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/recorderjs/audioRecorder.js
rename to app/ui/client/lib/recorderjs/audioRecorder.js
diff --git a/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js b/app/ui/client/lib/recorderjs/videoRecorder.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js
rename to app/ui/client/lib/recorderjs/videoRecorder.js
diff --git a/packages/rocketchat-ui/client/lib/rocket.js b/app/ui/client/lib/rocket.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/rocket.js
rename to app/ui/client/lib/rocket.js
diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/app/ui/client/lib/textarea-autogrow.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/textarea-autogrow.js
rename to app/ui/client/lib/textarea-autogrow.js
diff --git a/packages/rocketchat-ui/client/lib/textarea-cursor/set-cursor-position.js b/app/ui/client/lib/textarea-cursor/set-cursor-position.js
similarity index 100%
rename from packages/rocketchat-ui/client/lib/textarea-cursor/set-cursor-position.js
rename to app/ui/client/lib/textarea-cursor/set-cursor-position.js
diff --git a/packages/rocketchat-ui/client/views/404/invalidSecretURL.html b/app/ui/client/views/404/invalidSecretURL.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/404/invalidSecretURL.html
rename to app/ui/client/views/404/invalidSecretURL.html
diff --git a/packages/rocketchat-ui/client/views/404/roomNotFound.html b/app/ui/client/views/404/roomNotFound.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/404/roomNotFound.html
rename to app/ui/client/views/404/roomNotFound.html
diff --git a/packages/rocketchat-ui/client/views/404/roomNotFound.js b/app/ui/client/views/404/roomNotFound.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/404/roomNotFound.js
rename to app/ui/client/views/404/roomNotFound.js
diff --git a/packages/rocketchat-ui/client/views/app/alerts.js b/app/ui/client/views/app/alerts.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/alerts.js
rename to app/ui/client/views/app/alerts.js
diff --git a/packages/rocketchat-ui/client/views/app/audioNotification.html b/app/ui/client/views/app/audioNotification.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/audioNotification.html
rename to app/ui/client/views/app/audioNotification.html
diff --git a/packages/rocketchat-ui/client/views/app/burger.html b/app/ui/client/views/app/burger.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/burger.html
rename to app/ui/client/views/app/burger.html
diff --git a/packages/rocketchat-ui/client/views/app/burger.js b/app/ui/client/views/app/burger.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/burger.js
rename to app/ui/client/views/app/burger.js
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/app/ui/client/views/app/createChannel.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/createChannel.html
rename to app/ui/client/views/app/createChannel.html
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/app/ui/client/views/app/createChannel.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/createChannel.js
rename to app/ui/client/views/app/createChannel.js
diff --git a/packages/rocketchat-ui/client/views/app/directory.html b/app/ui/client/views/app/directory.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/directory.html
rename to app/ui/client/views/app/directory.html
diff --git a/packages/rocketchat-ui/client/views/app/directory.js b/app/ui/client/views/app/directory.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/directory.js
rename to app/ui/client/views/app/directory.js
diff --git a/packages/rocketchat-ui/client/views/app/fullModal.html b/app/ui/client/views/app/fullModal.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/fullModal.html
rename to app/ui/client/views/app/fullModal.html
diff --git a/packages/rocketchat-ui/client/views/app/fullModal.js b/app/ui/client/views/app/fullModal.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/fullModal.js
rename to app/ui/client/views/app/fullModal.js
diff --git a/packages/rocketchat-ui/client/views/app/helpers.js b/app/ui/client/views/app/helpers.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/helpers.js
rename to app/ui/client/views/app/helpers.js
diff --git a/packages/rocketchat-ui/client/views/app/home.html b/app/ui/client/views/app/home.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/home.html
rename to app/ui/client/views/app/home.html
diff --git a/packages/rocketchat-ui/client/views/app/home.js b/app/ui/client/views/app/home.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/home.js
rename to app/ui/client/views/app/home.js
diff --git a/packages/rocketchat-ui/client/views/app/notAuthorized.html b/app/ui/client/views/app/notAuthorized.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/notAuthorized.html
rename to app/ui/client/views/app/notAuthorized.html
diff --git a/packages/rocketchat-ui/client/views/app/pageContainer.html b/app/ui/client/views/app/pageContainer.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/pageContainer.html
rename to app/ui/client/views/app/pageContainer.html
diff --git a/packages/rocketchat-ui/client/views/app/pageSettingsContainer.html b/app/ui/client/views/app/pageSettingsContainer.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/pageSettingsContainer.html
rename to app/ui/client/views/app/pageSettingsContainer.html
diff --git a/packages/rocketchat-ui/client/views/app/photoswipe.html b/app/ui/client/views/app/photoswipe.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/photoswipe.html
rename to app/ui/client/views/app/photoswipe.html
diff --git a/packages/rocketchat-ui/client/views/app/photoswipe.js b/app/ui/client/views/app/photoswipe.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/photoswipe.js
rename to app/ui/client/views/app/photoswipe.js
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/app/ui/client/views/app/room.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/room.html
rename to app/ui/client/views/app/room.html
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/app/ui/client/views/app/room.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/room.js
rename to app/ui/client/views/app/room.js
diff --git a/packages/rocketchat-ui/client/views/app/roomSearch.html b/app/ui/client/views/app/roomSearch.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/roomSearch.html
rename to app/ui/client/views/app/roomSearch.html
diff --git a/packages/rocketchat-ui/client/views/app/roomSearch.js b/app/ui/client/views/app/roomSearch.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/roomSearch.js
rename to app/ui/client/views/app/roomSearch.js
diff --git a/packages/rocketchat-ui/client/views/app/secretURL.html b/app/ui/client/views/app/secretURL.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/secretURL.html
rename to app/ui/client/views/app/secretURL.html
diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/app/ui/client/views/app/secretURL.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/secretURL.js
rename to app/ui/client/views/app/secretURL.js
diff --git a/packages/rocketchat-ui/client/views/app/tests/helpers.tests.js b/app/ui/client/views/app/tests/helpers.tests.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/tests/helpers.tests.js
rename to app/ui/client/views/app/tests/helpers.tests.js
diff --git a/packages/rocketchat-ui/client/views/app/userSearch.html b/app/ui/client/views/app/userSearch.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/userSearch.html
rename to app/ui/client/views/app/userSearch.html
diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.html b/app/ui/client/views/app/videoCall/videoButtons.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/videoCall/videoButtons.html
rename to app/ui/client/views/app/videoCall/videoButtons.html
diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js b/app/ui/client/views/app/videoCall/videoButtons.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js
rename to app/ui/client/views/app/videoCall/videoButtons.js
diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.html b/app/ui/client/views/app/videoCall/videoCall.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/videoCall/videoCall.html
rename to app/ui/client/views/app/videoCall/videoCall.html
diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js b/app/ui/client/views/app/videoCall/videoCall.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/app/videoCall/videoCall.js
rename to app/ui/client/views/app/videoCall/videoCall.js
diff --git a/packages/rocketchat-ui/client/views/cmsPage.html b/app/ui/client/views/cmsPage.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/cmsPage.html
rename to app/ui/client/views/cmsPage.html
diff --git a/packages/rocketchat-ui/client/views/cmsPage.js b/app/ui/client/views/cmsPage.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/cmsPage.js
rename to app/ui/client/views/cmsPage.js
diff --git a/packages/rocketchat-ui/client/views/fxos.html b/app/ui/client/views/fxos.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/fxos.html
rename to app/ui/client/views/fxos.html
diff --git a/packages/rocketchat-ui/client/views/fxos.js b/app/ui/client/views/fxos.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/fxos.js
rename to app/ui/client/views/fxos.js
diff --git a/packages/rocketchat-ui/client/views/modal.html b/app/ui/client/views/modal.html
similarity index 100%
rename from packages/rocketchat-ui/client/views/modal.html
rename to app/ui/client/views/modal.html
diff --git a/packages/rocketchat-ui/client/views/modal.js b/app/ui/client/views/modal.js
similarity index 100%
rename from packages/rocketchat-ui/client/views/modal.js
rename to app/ui/client/views/modal.js
diff --git a/packages/rocketchat-ui/package.js b/app/ui/package.js
similarity index 100%
rename from packages/rocketchat-ui/package.js
rename to app/ui/package.js
diff --git a/packages/rocketchat-user-data-download/package.js b/app/user-data-download/package.js
similarity index 100%
rename from packages/rocketchat-user-data-download/package.js
rename to app/user-data-download/package.js
diff --git a/packages/rocketchat-user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
similarity index 100%
rename from packages/rocketchat-user-data-download/server/cronProcessDownloads.js
rename to app/user-data-download/server/cronProcessDownloads.js
diff --git a/packages/rocketchat-user-data-download/server/index.js b/app/user-data-download/server/index.js
similarity index 100%
rename from packages/rocketchat-user-data-download/server/index.js
rename to app/user-data-download/server/index.js
diff --git a/packages/rocketchat-user-data-download/server/startup/settings.js b/app/user-data-download/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-user-data-download/server/startup/settings.js
rename to app/user-data-download/server/startup/settings.js
diff --git a/packages/rocketchat-utils/client/index.js b/app/utils/client/index.js
similarity index 100%
rename from packages/rocketchat-utils/client/index.js
rename to app/utils/client/index.js
diff --git a/packages/rocketchat-utils/client/lib/CustomTranslations.js b/app/utils/client/lib/CustomTranslations.js
similarity index 100%
rename from packages/rocketchat-utils/client/lib/CustomTranslations.js
rename to app/utils/client/lib/CustomTranslations.js
diff --git a/packages/rocketchat-utils/client/lib/RestApiClient.js b/app/utils/client/lib/RestApiClient.js
similarity index 100%
rename from packages/rocketchat-utils/client/lib/RestApiClient.js
rename to app/utils/client/lib/RestApiClient.js
diff --git a/packages/rocketchat-utils/client/lib/browsers.js b/app/utils/client/lib/browsers.js
similarity index 100%
rename from packages/rocketchat-utils/client/lib/browsers.js
rename to app/utils/client/lib/browsers.js
diff --git a/packages/rocketchat-utils/client/lib/handleError.js b/app/utils/client/lib/handleError.js
similarity index 100%
rename from packages/rocketchat-utils/client/lib/handleError.js
rename to app/utils/client/lib/handleError.js
diff --git a/packages/rocketchat-utils/client/lib/roomTypes.js b/app/utils/client/lib/roomTypes.js
similarity index 100%
rename from packages/rocketchat-utils/client/lib/roomTypes.js
rename to app/utils/client/lib/roomTypes.js
diff --git a/packages/rocketchat-utils/lib/RoomTypeConfig.js b/app/utils/lib/RoomTypeConfig.js
similarity index 100%
rename from packages/rocketchat-utils/lib/RoomTypeConfig.js
rename to app/utils/lib/RoomTypeConfig.js
diff --git a/packages/rocketchat-utils/lib/RoomTypesCommon.js b/app/utils/lib/RoomTypesCommon.js
similarity index 100%
rename from packages/rocketchat-utils/lib/RoomTypesCommon.js
rename to app/utils/lib/RoomTypesCommon.js
diff --git a/packages/rocketchat-utils/lib/fileUploadRestrictions.js b/app/utils/lib/fileUploadRestrictions.js
similarity index 100%
rename from packages/rocketchat-utils/lib/fileUploadRestrictions.js
rename to app/utils/lib/fileUploadRestrictions.js
diff --git a/packages/rocketchat-utils/lib/getAvatarColor.js b/app/utils/lib/getAvatarColor.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getAvatarColor.js
rename to app/utils/lib/getAvatarColor.js
diff --git a/packages/rocketchat-utils/lib/getAvatarUrlFromUsername.js b/app/utils/lib/getAvatarUrlFromUsername.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getAvatarUrlFromUsername.js
rename to app/utils/lib/getAvatarUrlFromUsername.js
diff --git a/packages/rocketchat-utils/lib/getDefaultSubscriptionPref.js b/app/utils/lib/getDefaultSubscriptionPref.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getDefaultSubscriptionPref.js
rename to app/utils/lib/getDefaultSubscriptionPref.js
diff --git a/packages/rocketchat-utils/lib/getURL.js b/app/utils/lib/getURL.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getURL.js
rename to app/utils/lib/getURL.js
diff --git a/packages/rocketchat-utils/lib/getUserNotificationPreference.js b/app/utils/lib/getUserNotificationPreference.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getUserNotificationPreference.js
rename to app/utils/lib/getUserNotificationPreference.js
diff --git a/packages/rocketchat-utils/lib/getUserPreference.js b/app/utils/lib/getUserPreference.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getUserPreference.js
rename to app/utils/lib/getUserPreference.js
diff --git a/packages/rocketchat-utils/lib/getValidRoomName.js b/app/utils/lib/getValidRoomName.js
similarity index 100%
rename from packages/rocketchat-utils/lib/getValidRoomName.js
rename to app/utils/lib/getValidRoomName.js
diff --git a/packages/rocketchat-utils/lib/isEmail.js b/app/utils/lib/isEmail.js
similarity index 100%
rename from packages/rocketchat-utils/lib/isEmail.js
rename to app/utils/lib/isEmail.js
diff --git a/packages/rocketchat-utils/lib/placeholders.js b/app/utils/lib/placeholders.js
similarity index 100%
rename from packages/rocketchat-utils/lib/placeholders.js
rename to app/utils/lib/placeholders.js
diff --git a/packages/rocketchat-utils/lib/roomExit.js b/app/utils/lib/roomExit.js
similarity index 100%
rename from packages/rocketchat-utils/lib/roomExit.js
rename to app/utils/lib/roomExit.js
diff --git a/packages/rocketchat-utils/lib/slashCommand.js b/app/utils/lib/slashCommand.js
similarity index 100%
rename from packages/rocketchat-utils/lib/slashCommand.js
rename to app/utils/lib/slashCommand.js
diff --git a/packages/rocketchat-utils/lib/tapi18n.js b/app/utils/lib/tapi18n.js
similarity index 100%
rename from packages/rocketchat-utils/lib/tapi18n.js
rename to app/utils/lib/tapi18n.js
diff --git a/packages/rocketchat-utils/lib/templateVarHandler.js b/app/utils/lib/templateVarHandler.js
similarity index 100%
rename from packages/rocketchat-utils/lib/templateVarHandler.js
rename to app/utils/lib/templateVarHandler.js
diff --git a/packages/rocketchat-utils/package.js b/app/utils/package.js
similarity index 100%
rename from packages/rocketchat-utils/package.js
rename to app/utils/package.js
diff --git a/packages/rocketchat-utils/rocketchat.info b/app/utils/rocketchat.info
similarity index 100%
rename from packages/rocketchat-utils/rocketchat.info
rename to app/utils/rocketchat.info
diff --git a/packages/rocketchat-utils/server/functions/isDocker.js b/app/utils/server/functions/isDocker.js
similarity index 100%
rename from packages/rocketchat-utils/server/functions/isDocker.js
rename to app/utils/server/functions/isDocker.js
diff --git a/packages/rocketchat-utils/server/index.js b/app/utils/server/index.js
similarity index 100%
rename from packages/rocketchat-utils/server/index.js
rename to app/utils/server/index.js
diff --git a/packages/rocketchat-utils/server/lib/composeMessageObjectWithUser.js b/app/utils/server/lib/composeMessageObjectWithUser.js
similarity index 100%
rename from packages/rocketchat-utils/server/lib/composeMessageObjectWithUser.js
rename to app/utils/server/lib/composeMessageObjectWithUser.js
diff --git a/packages/rocketchat-utils/server/lib/roomTypes.js b/app/utils/server/lib/roomTypes.js
similarity index 100%
rename from packages/rocketchat-utils/server/lib/roomTypes.js
rename to app/utils/server/lib/roomTypes.js
diff --git a/packages/rocketchat-version-check/client/client.js b/app/version-check/client/client.js
similarity index 100%
rename from packages/rocketchat-version-check/client/client.js
rename to app/version-check/client/client.js
diff --git a/packages/rocketchat-version-check/package.js b/app/version-check/package.js
similarity index 100%
rename from packages/rocketchat-version-check/package.js
rename to app/version-check/package.js
diff --git a/packages/rocketchat-version-check/server/addSettings.js b/app/version-check/server/addSettings.js
similarity index 100%
rename from packages/rocketchat-version-check/server/addSettings.js
rename to app/version-check/server/addSettings.js
diff --git a/packages/rocketchat-version-check/server/functions/checkVersionUpdate.js b/app/version-check/server/functions/checkVersionUpdate.js
similarity index 100%
rename from packages/rocketchat-version-check/server/functions/checkVersionUpdate.js
rename to app/version-check/server/functions/checkVersionUpdate.js
diff --git a/packages/rocketchat-version-check/server/functions/getNewUpdates.js b/app/version-check/server/functions/getNewUpdates.js
similarity index 100%
rename from packages/rocketchat-version-check/server/functions/getNewUpdates.js
rename to app/version-check/server/functions/getNewUpdates.js
diff --git a/packages/rocketchat-version-check/server/logger.js b/app/version-check/server/logger.js
similarity index 100%
rename from packages/rocketchat-version-check/server/logger.js
rename to app/version-check/server/logger.js
diff --git a/packages/rocketchat-version-check/server/methods/banner_dismiss.js b/app/version-check/server/methods/banner_dismiss.js
similarity index 100%
rename from packages/rocketchat-version-check/server/methods/banner_dismiss.js
rename to app/version-check/server/methods/banner_dismiss.js
diff --git a/packages/rocketchat-version-check/server/sampleUpdateData.js b/app/version-check/server/sampleUpdateData.js
similarity index 100%
rename from packages/rocketchat-version-check/server/sampleUpdateData.js
rename to app/version-check/server/sampleUpdateData.js
diff --git a/packages/rocketchat-version-check/server/server.js b/app/version-check/server/server.js
similarity index 100%
rename from packages/rocketchat-version-check/server/server.js
rename to app/version-check/server/server.js
diff --git a/packages/rocketchat-videobridge/.eslintrc b/app/videobridge/.eslintrc
similarity index 100%
rename from packages/rocketchat-videobridge/.eslintrc
rename to app/videobridge/.eslintrc
diff --git a/packages/rocketchat-videobridge/client/actionLink.js b/app/videobridge/client/actionLink.js
similarity index 100%
rename from packages/rocketchat-videobridge/client/actionLink.js
rename to app/videobridge/client/actionLink.js
diff --git a/packages/rocketchat-videobridge/client/index.js b/app/videobridge/client/index.js
similarity index 100%
rename from packages/rocketchat-videobridge/client/index.js
rename to app/videobridge/client/index.js
diff --git a/packages/rocketchat-videobridge/client/stylesheets/video.less b/app/videobridge/client/stylesheets/video.less
similarity index 100%
rename from packages/rocketchat-videobridge/client/stylesheets/video.less
rename to app/videobridge/client/stylesheets/video.less
diff --git a/packages/rocketchat-videobridge/client/tabBar.js b/app/videobridge/client/tabBar.js
similarity index 100%
rename from packages/rocketchat-videobridge/client/tabBar.js
rename to app/videobridge/client/tabBar.js
diff --git a/packages/rocketchat-videobridge/client/views/bbbLiveView.html b/app/videobridge/client/views/bbbLiveView.html
similarity index 100%
rename from packages/rocketchat-videobridge/client/views/bbbLiveView.html
rename to app/videobridge/client/views/bbbLiveView.html
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.html b/app/videobridge/client/views/videoFlexTab.html
similarity index 100%
rename from packages/rocketchat-videobridge/client/views/videoFlexTab.html
rename to app/videobridge/client/views/videoFlexTab.html
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/app/videobridge/client/views/videoFlexTab.js
similarity index 100%
rename from packages/rocketchat-videobridge/client/views/videoFlexTab.js
rename to app/videobridge/client/views/videoFlexTab.js
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.html b/app/videobridge/client/views/videoFlexTabBbb.html
similarity index 100%
rename from packages/rocketchat-videobridge/client/views/videoFlexTabBbb.html
rename to app/videobridge/client/views/videoFlexTabBbb.html
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js b/app/videobridge/client/views/videoFlexTabBbb.js
similarity index 100%
rename from packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js
rename to app/videobridge/client/views/videoFlexTabBbb.js
diff --git a/packages/rocketchat-videobridge/lib/messageType.js b/app/videobridge/lib/messageType.js
similarity index 100%
rename from packages/rocketchat-videobridge/lib/messageType.js
rename to app/videobridge/lib/messageType.js
diff --git a/packages/rocketchat-videobridge/package.js b/app/videobridge/package.js
similarity index 100%
rename from packages/rocketchat-videobridge/package.js
rename to app/videobridge/package.js
diff --git a/packages/rocketchat-videobridge/server/actionLink.js b/app/videobridge/server/actionLink.js
similarity index 100%
rename from packages/rocketchat-videobridge/server/actionLink.js
rename to app/videobridge/server/actionLink.js
diff --git a/packages/rocketchat-videobridge/server/index.js b/app/videobridge/server/index.js
similarity index 100%
rename from packages/rocketchat-videobridge/server/index.js
rename to app/videobridge/server/index.js
diff --git a/packages/rocketchat-videobridge/server/methods/bbb.js b/app/videobridge/server/methods/bbb.js
similarity index 100%
rename from packages/rocketchat-videobridge/server/methods/bbb.js
rename to app/videobridge/server/methods/bbb.js
diff --git a/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js b/app/videobridge/server/methods/jitsiSetTimeout.js
similarity index 100%
rename from packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
rename to app/videobridge/server/methods/jitsiSetTimeout.js
diff --git a/packages/rocketchat-videobridge/server/settings.js b/app/videobridge/server/settings.js
similarity index 100%
rename from packages/rocketchat-videobridge/server/settings.js
rename to app/videobridge/server/settings.js
diff --git a/packages/rocketchat-webdav/README.md b/app/webdav/README.md
similarity index 100%
rename from packages/rocketchat-webdav/README.md
rename to app/webdav/README.md
diff --git a/packages/rocketchat-webdav/client/actionButton.js b/app/webdav/client/actionButton.js
similarity index 100%
rename from packages/rocketchat-webdav/client/actionButton.js
rename to app/webdav/client/actionButton.js
diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.html b/app/webdav/client/addWebdavAccount.html
similarity index 100%
rename from packages/rocketchat-webdav/client/addWebdavAccount.html
rename to app/webdav/client/addWebdavAccount.html
diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.js b/app/webdav/client/addWebdavAccount.js
similarity index 100%
rename from packages/rocketchat-webdav/client/addWebdavAccount.js
rename to app/webdav/client/addWebdavAccount.js
diff --git a/packages/rocketchat-webdav/client/index.js b/app/webdav/client/index.js
similarity index 100%
rename from packages/rocketchat-webdav/client/index.js
rename to app/webdav/client/index.js
diff --git a/packages/rocketchat-webdav/client/selectWebdavAccount.html b/app/webdav/client/selectWebdavAccount.html
similarity index 100%
rename from packages/rocketchat-webdav/client/selectWebdavAccount.html
rename to app/webdav/client/selectWebdavAccount.html
diff --git a/packages/rocketchat-webdav/client/selectWebdavAccount.js b/app/webdav/client/selectWebdavAccount.js
similarity index 100%
rename from packages/rocketchat-webdav/client/selectWebdavAccount.js
rename to app/webdav/client/selectWebdavAccount.js
diff --git a/packages/rocketchat-webdav/client/startup/messageBoxActions.js b/app/webdav/client/startup/messageBoxActions.js
similarity index 100%
rename from packages/rocketchat-webdav/client/startup/messageBoxActions.js
rename to app/webdav/client/startup/messageBoxActions.js
diff --git a/packages/rocketchat-webdav/client/startup/subscription.js b/app/webdav/client/startup/subscription.js
similarity index 100%
rename from packages/rocketchat-webdav/client/startup/subscription.js
rename to app/webdav/client/startup/subscription.js
diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.html b/app/webdav/client/webdavFilePicker.html
similarity index 100%
rename from packages/rocketchat-webdav/client/webdavFilePicker.html
rename to app/webdav/client/webdavFilePicker.html
diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.js b/app/webdav/client/webdavFilePicker.js
similarity index 100%
rename from packages/rocketchat-webdav/client/webdavFilePicker.js
rename to app/webdav/client/webdavFilePicker.js
diff --git a/packages/rocketchat-webdav/package.js b/app/webdav/package.js
similarity index 100%
rename from packages/rocketchat-webdav/package.js
rename to app/webdav/package.js
diff --git a/packages/rocketchat-webdav/server/index.js b/app/webdav/server/index.js
similarity index 100%
rename from packages/rocketchat-webdav/server/index.js
rename to app/webdav/server/index.js
diff --git a/packages/rocketchat-webdav/server/methods/addWebdavAccount.js b/app/webdav/server/methods/addWebdavAccount.js
similarity index 100%
rename from packages/rocketchat-webdav/server/methods/addWebdavAccount.js
rename to app/webdav/server/methods/addWebdavAccount.js
diff --git a/packages/rocketchat-webdav/server/methods/getFileFromWebdav.js b/app/webdav/server/methods/getFileFromWebdav.js
similarity index 100%
rename from packages/rocketchat-webdav/server/methods/getFileFromWebdav.js
rename to app/webdav/server/methods/getFileFromWebdav.js
diff --git a/packages/rocketchat-webdav/server/methods/getWebdavFileList.js b/app/webdav/server/methods/getWebdavFileList.js
similarity index 100%
rename from packages/rocketchat-webdav/server/methods/getWebdavFileList.js
rename to app/webdav/server/methods/getWebdavFileList.js
diff --git a/packages/rocketchat-webdav/server/methods/removeWebdavAccount.js b/app/webdav/server/methods/removeWebdavAccount.js
similarity index 100%
rename from packages/rocketchat-webdav/server/methods/removeWebdavAccount.js
rename to app/webdav/server/methods/removeWebdavAccount.js
diff --git a/packages/rocketchat-webdav/server/methods/uploadFileToWebdav.js b/app/webdav/server/methods/uploadFileToWebdav.js
similarity index 100%
rename from packages/rocketchat-webdav/server/methods/uploadFileToWebdav.js
rename to app/webdav/server/methods/uploadFileToWebdav.js
diff --git a/packages/rocketchat-webdav/server/publications/webdavAccounts.js b/app/webdav/server/publications/webdavAccounts.js
similarity index 100%
rename from packages/rocketchat-webdav/server/publications/webdavAccounts.js
rename to app/webdav/server/publications/webdavAccounts.js
diff --git a/packages/rocketchat-webdav/server/startup/settings.js b/app/webdav/server/startup/settings.js
similarity index 100%
rename from packages/rocketchat-webdav/server/startup/settings.js
rename to app/webdav/server/startup/settings.js
diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/app/webrtc/client/WebRTCClass.js
similarity index 100%
rename from packages/rocketchat-webrtc/client/WebRTCClass.js
rename to app/webrtc/client/WebRTCClass.js
diff --git a/packages/rocketchat-webrtc/client/adapter.js b/app/webrtc/client/adapter.js
similarity index 100%
rename from packages/rocketchat-webrtc/client/adapter.js
rename to app/webrtc/client/adapter.js
diff --git a/packages/rocketchat-webrtc/client/index.js b/app/webrtc/client/index.js
similarity index 100%
rename from packages/rocketchat-webrtc/client/index.js
rename to app/webrtc/client/index.js
diff --git a/packages/rocketchat-webrtc/client/screenShare.js b/app/webrtc/client/screenShare.js
similarity index 100%
rename from packages/rocketchat-webrtc/client/screenShare.js
rename to app/webrtc/client/screenShare.js
diff --git a/packages/rocketchat-webrtc/package.js b/app/webrtc/package.js
similarity index 100%
rename from packages/rocketchat-webrtc/package.js
rename to app/webrtc/package.js
diff --git a/packages/rocketchat-webrtc/server/index.js b/app/webrtc/server/index.js
similarity index 100%
rename from packages/rocketchat-webrtc/server/index.js
rename to app/webrtc/server/index.js
diff --git a/packages/rocketchat-webrtc/server/settings.js b/app/webrtc/server/settings.js
similarity index 100%
rename from packages/rocketchat-webrtc/server/settings.js
rename to app/webrtc/server/settings.js
diff --git a/packages/rocketchat-wordpress/client/index.js b/app/wordpress/client/index.js
similarity index 100%
rename from packages/rocketchat-wordpress/client/index.js
rename to app/wordpress/client/index.js
diff --git a/packages/rocketchat-wordpress/client/wordpress-login-button.css b/app/wordpress/client/wordpress-login-button.css
similarity index 100%
rename from packages/rocketchat-wordpress/client/wordpress-login-button.css
rename to app/wordpress/client/wordpress-login-button.css
diff --git a/packages/rocketchat-wordpress/lib/common.js b/app/wordpress/lib/common.js
similarity index 100%
rename from packages/rocketchat-wordpress/lib/common.js
rename to app/wordpress/lib/common.js
diff --git a/packages/rocketchat-wordpress/package.js b/app/wordpress/package.js
similarity index 100%
rename from packages/rocketchat-wordpress/package.js
rename to app/wordpress/package.js
diff --git a/packages/rocketchat-wordpress/server/index.js b/app/wordpress/server/index.js
similarity index 100%
rename from packages/rocketchat-wordpress/server/index.js
rename to app/wordpress/server/index.js
diff --git a/packages/rocketchat-wordpress/server/startup.js b/app/wordpress/server/startup.js
similarity index 100%
rename from packages/rocketchat-wordpress/server/startup.js
rename to app/wordpress/server/startup.js
diff --git a/private/client/imports/general/variables.css b/private/client/imports/general/variables.css
new file mode 100644
index 0000000000000000000000000000000000000000..f707553c41851d12ed2d7789c67274612e30e856
--- /dev/null
+++ b/private/client/imports/general/variables.css
@@ -0,0 +1,330 @@
+:root {
+	/*
+	* General Colors
+	*/
+	--color-darkest: #1f2329;
+	--color-dark: #2f343d;
+	--color-dark-medium: #414852;
+	--color-dark-light: #6c727a;
+	--color-gray: #9ea2a8;
+	--color-gray-medium: #cbced1;
+	--color-gray-light: #e1e5e8;
+	--color-gray-lightest: #f2f3f5;
+	--color-black: #000000;
+	--color-white: #ffffff;
+	--rc-color-error: #f5455c;
+	--rc-color-error-light: #e1364c;
+	--rc-color-alert: #ffd21f;
+	--rc-color-alert-light: #f6c502;
+	--rc-color-success: #2de0a5;
+	--rc-color-success-light: #25d198;
+	--rc-color-button-primary: #1d74f5;
+	--rc-color-button-primary-light: #175cc4;
+	--rc-color-alert-message-primary: var(--rc-color-button-primary);
+	--rc-color-alert-message-primary-background: #f1f6ff;
+	--rc-color-alert-message-secondary: #7ca52b;
+	--rc-color-alert-message-secondary-background: #fafff1;
+	--rc-color-alert-message-warning: #d52d24;
+	--rc-color-alert-message-warning-background: #fff3f3;
+	--rc-color-primary: var(--color-dark);
+	--rc-color-primary-darkest: var(--color-darkest);
+	--rc-color-primary-dark: var(--color-dark-medium);
+	--rc-color-primary-light: var(--color-gray);
+	--rc-color-primary-light-medium: var(--color-gray-medium);
+	--rc-color-primary-lightest: var(--color-gray-lightest);
+	--rc-color-content: var(--color-white);
+	--rc-color-link-active: var(--rc-color-button-primary);
+
+	/*
+	* General
+	*/
+	--text-size: 0.875rem;
+	--header-min-height: 60px;
+	--toolbar-height: 55px;
+	--footer-min-height: 70px;
+	--rooms-box-width: 280px;
+	--flex-tab-width: 400px;
+	--flex-tab-webrtc-width: 400px;
+	--flex-tab-webrtc-2-width: 850px;
+	--user-image-square: 20px;
+	--border: 2px;
+	--border-radius: 2px;
+	--status-online: var(--rc-color-success);
+	--status-away: var(--rc-color-alert);
+	--status-busy: var(--rc-color-error);
+	--status-invisible: var(--color-gray-medium);
+	--status-invisible-sidebar: var(--rc-color-primary-darkest);
+	--default-padding: 1.5rem;
+	--default-small-padding: 1rem;
+	--status-bullet-size: 10px;
+	--status-bullet-radius: 50%;
+	--account-username-weight: 700;
+	--status-name-weight: 400;
+
+	/*
+	* General Typography
+	*/
+	--text-default-size: 1rem;
+	--text-default-weight: 500;
+	--text-small-size: 0.875rem;
+	--text-small-weight: 500;
+	--text-heading-size: 1.375rem;
+	--text-heading-weight: 700;
+	--text-label-size: 075rem;
+	--text-label-weight: 600;
+	--text-tiny-size: 075rem;
+	--text-tiny-weight: 400;
+	--text-micro-size: 0.625rem;
+	--text-micro-weight: 700;
+
+	/*
+	* Forms
+	*/
+	--gap-between-elements: 2.5rem;
+	--label-margin-bottom: 1rem;
+
+	/*
+	* Forms - Button
+	*/
+	--button-square-size: 36px;
+	--button-padding: 0.782rem;
+	--button-padding-small: 0.5rem;
+	--button-text-size: var(--input-font-size);
+	--button-border-width: var(--border);
+	--button-border-radius: var(--border-radius);
+	--button-disabled-background: var(--color-gray-light);
+	--button-disabled-text-color: var(--color-white);
+	--button-primary-background: var(--rc-color-button-primary);
+	--button-primary-text-color: var(--color-white);
+	--button-cancel-color: var(--rc-color-error);
+	--button-secondary-background: var(--color-gray-medium);
+	--button-secondary-text-color: var(--color-dark-medium);
+
+	/*
+	* Forms - Input
+	*/
+	--input-font-size: 0.875rem;
+	--input-title-text-size: var(--input-font-size);
+	--input-title-color: #2d343d;
+	--input-text-color: var(--color-dark-medium);
+	--input-placeholder-color: var(--color-gray-medium);
+	--input-icon-color: var(--color-dark);
+	--input-border-color: var(--color-gray-light);
+	--input-border-width: var(--border);
+	--input-border-radius: var(--border-radius);
+	--input-description-text-color: var(--color-gray);
+	--input-description-text-size: var(--input-font-size);
+	--input-error-color: var(--rc-color-error);
+
+	/*
+	* Forms - popup list
+	*/
+	--popup-list-border-radius: var(--border-radius);
+	--popup-list-background: var(--color-white);
+	--popup-list-background-hover: var(--color-gray-lightest);
+	--popup-list-selected-background: var(--color-gray-lightest);
+	--popup-list-name-color: #2d343d;
+	--popup-list-name-size: 1rem;
+
+	/*
+	* Forms - tags
+	*/
+	--tags-border-width: var(--border);
+	--tags-border-radius: var(--border-radius);
+	--tags-border-color: var(--color-gray-light);
+	--tags-text-color: var(--rc-color-primary);
+	--tags-background: #f2f3f5;
+	--tags-avatar-size: 20px;
+
+	/*
+	* Forms - select avatar
+	*/
+	--select-avatar-size: 48px;
+	--select-avatar-preview-size: 150px;
+	--select-avatar-upload-background: var(--color-gray-light);
+	--select-avatar-upload-color: #2d343d;
+
+	/*
+	* Sidebar
+	*/
+	--sidebar-width: 280px;
+	--sidebar-small-width: 90%;
+	--sidebar-background: var(--rc-color-primary);
+	--sidebar-background-hover: var(--rc-color-primary-dark);
+	--sidebar-background-light: var(--rc-color-primary-lightest);
+	--sidebar-background-light-hover: var(--rc-color-primary-light);
+	--sidebar-default-padding: 24px;
+	--sidebar-small-default-padding: 16px;
+	--sidebar-extra-small-default-padding: 12px;
+	--sidebar-footer-height: 48px;
+	--sidebar-small-header-padding: var(--sidebar-small-default-padding);
+
+	/*
+	* Sidebar flex
+	*/
+	--sidebar-flex-search-background: var(--color-white);
+	--sidebar-flex-search-placeholder-color: var(--color-gray);
+
+	/*
+	* Sidebar Account
+	*/
+	--sidebar-account-thumb-size: 23px;
+	--sidebar-small-account-thumb-size: 40px;
+	--sidebar-account-status-bullet-size: 10px;
+	--sidebar-small-account-status-bullet-size: 8px;
+	--sidebar-account-status-bullet-radius: 50%;
+	--sidebar-account-username-size: 1rem;
+	--sidebar-account-username-weight: 700;
+	--sidebar-small-account-username-weight: 400;
+	--sidebar-account-username-color: var(--color-white);
+	--sidebar-account-username-color-darker: var(--color-dark);
+	--sidebar-account-status-font-size: 0.875rem;
+	--sidebar-account-status-color: var(--color-gray);
+
+	/*
+	* Sidebar Item
+	*/
+	--sidebar-item-radius: 2px;
+	--sidebar-item-height: 24px;
+	--sidebar-item-height-medium: 34px;
+	--sidebar-item-height-extended: 52px;
+	--sidebar-item-thumb-size: 18px;
+	--sidebar-item-thumb-size-medium: 27px;
+	--sidebar-item-thumb-size-extended: 36px;
+	--sidebar-item-text-color: var(--color-gray);
+	--sidebar-item-background: inherit;
+	--sidebar-item-hover-background: var(--rc-color-primary-darkest);
+	--sidebar-item-active-background: var(--rc-color-primary-dark);
+	--sidebar-item-active-color: var(--sidebar-item-text-color);
+	--sidebar-item-unread-color: var(--color-white);
+	--sidebar-item-unread-font-weight: 600;
+	--sidebar-item-popup-background: var(--color-dark-medium);
+	--sidebar-item-user-status-size: 6px;
+	--sidebar-item-user-status-radius: 50%;
+	--sidebar-item-text-size: 0.875rem;
+
+	/*
+	* Modal
+	*/
+	--modal-wrapper-width: 650px;
+	--modal-wrapper-margin: 3rem;
+	--modal-back-button-color: var(--color-gray);
+
+	/*
+	* Modal - Create Channel
+	*/
+	--create-channel-gap-between-elements: 2.5rem;
+	--create-channel-title-color: var(--color-darkest);
+	--create-channel-title-text-size: 1.375rem;
+	--create-channel-description-color: var(--color-gray);
+	--create-channel-description-text-size: 0.875rem;
+
+	/*
+	* Toolbar
+	*/
+	--toolbar-placeholder-color: var(--color-gray);
+
+	/*
+	* Rooms list
+	*/
+	--rooms-list-title-color: var(--color-gray);
+	--rooms-list-title-text-size: 0.75rem;
+	--rooms-list-empty-text-color: var(--color-gray);
+	--rooms-list-empty-text-size: 0.75rem;
+	--rooms-list-padding: var(--sidebar-default-padding);
+	--rooms-list-small-padding: var(--sidebar-small-default-padding);
+
+	/*
+	* Chip
+	*/
+	--chip-background: #dddddd;
+
+	/*
+	* Avatar
+	*/
+	--avatar-radius: var(--border-radius);
+	--avatar-initials-text-size: 22px;
+	--avatar-initials-text-weight: 700;
+
+	/*
+	* Badge
+	*/
+	--badge-text-color: var(--color-white);
+	--badge-radius: var(--border-radius);
+	--badge-text-size: 0.75rem;
+	--badge-background: var(--rc-color-primary-dark);
+	--badge-unread-background: var(--rc-color-button-primary);
+
+	/*
+	* Message box
+	*/
+	--message-box-text-size: var(--input-font-size);
+	--message-box-placeholder-color: var(--color-gray-medium);
+	--message-box-markdown-color: var(--color-gray);
+	--message-box-markdown-hover-color: var(--color-dark);
+	--message-box-user-typing-color: var(--color-gray);
+	--message-box-user-typing-text-size: 0.75rem;
+	--message-box-user-typing-user-color: var(--color-dark);
+	--message-box-container-border-color: var(--color-gray-medium);
+	--message-box-container-border-width: var(--border);
+	--message-box-container-border-radius: var(--border-radius);
+	--message-box-editing-color: #fff5df;
+	--message-box-popover-title-text-color: var(--color-gray);
+	--message-box-popover-title-text-size: 0.75rem;
+
+	/*
+	* Header
+	*/
+	--header-height: 77px;
+	--header-padding: 16px;
+	--header-toggle-favorite-color: var(--color-gray-medium);
+	--header-toggle-favorite-star-color: var(--rc-color-alert-light);
+	--header-title-username-color-darker: var(--color-dark);
+	--header-title-font-size: var(--text-default-size);
+	--header-title-font-size--subtitle: var(--text-small-size);
+	--header-title-status-color: var(--color-gray);
+	--header-title-username-weight: 400;
+	--header-title-status-name-weight: 400;
+	--header-title-status-bullet-radius: var(--status-bullet-radius);
+	--header-title-status-bullet-size: var(--status-bullet-size);
+	--header-background-color: var(--color-white);
+
+	/*
+	* Flex nav
+	*/
+	--flex-nav-background: var(--color-gray-lightest);
+
+	/*
+	* Popover
+	*/
+	--popover-padding: 1rem;
+	--popover-radius: var(--border-radius);
+	--popover-background: var(--color-white);
+	--popover-column-min-width: 130px;
+	--popover-column-padding: 1rem;
+	--popover-title-color: var(--color-dark);
+	--popover-title-text-size: 0.75rem;
+	--popover-item-color: var(--color-dark);
+	--popover-item-text-size: 0.875rem;
+	--popover-divider-height: 2px;
+	--popover-divider-color: var(--color-gray-light);
+
+	/*
+	* Tooltip
+	*/
+	--tooltip-background: var(--color-darkest);
+	--tooltip-text-color: var(--color-white);
+	--tooltip-text-size: 0.75rem;
+	--tooltip-radius: var(--border-radius);
+
+	/*
+	* alert
+	*/
+	--alerts-padding: var(--sidebar-default-padding);
+	--alerts-padding-vertical: 10px;
+	--alerts-padding-vertical-large: 20px;
+	--alerts-background: #1d73f5;
+	--alerts-color: var(--color-white);
+	--alerts-font-size: var(--text-default-size);
+	--content-page-padding: 2.5rem;
+}
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/private/public/icons.svg
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons.svg
rename to private/public/icons.svg
diff --git a/packages/chatpal-search/server/asset/chatpal-enter.svg b/private/server/asset/chatpal-enter.svg
similarity index 100%
rename from packages/chatpal-search/server/asset/chatpal-enter.svg
rename to private/server/asset/chatpal-enter.svg
diff --git a/packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg b/private/server/asset/chatpal-logo-icon-darkblue.svg
similarity index 100%
rename from packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg
rename to private/server/asset/chatpal-logo-icon-darkblue.svg
diff --git a/packages/rocketchat_theme/server/colors.less b/private/server/colors.less
similarity index 100%
rename from packages/rocketchat_theme/server/colors.less
rename to private/server/colors.less
diff --git a/packages/rocketchat-ui-master/server/dynamic-css.js b/private/server/dynamic-css.js
similarity index 100%
rename from packages/rocketchat-ui-master/server/dynamic-css.js
rename to private/server/dynamic-css.js
diff --git a/packages/rocketchat_theme/client/vendor/fontello/demo.html b/public/client/vendor/fontello/demo.html
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/demo.html
rename to public/client/vendor/fontello/demo.html
diff --git a/packages/rocketchat_theme/client/vendor/fontello/utf8-rtl.html b/public/client/vendor/fontello/utf8-rtl.html
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/utf8-rtl.html
rename to public/client/vendor/fontello/utf8-rtl.html
diff --git a/packages/rocketchat_theme/client/vendor/fontello/font/fontello.eot b/public/font/fontello.eot
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/font/fontello.eot
rename to public/font/fontello.eot
diff --git a/packages/rocketchat_theme/client/vendor/fontello/font/fontello.svg b/public/font/fontello.svg
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/font/fontello.svg
rename to public/font/fontello.svg
diff --git a/packages/rocketchat_theme/client/vendor/fontello/font/fontello.ttf b/public/font/fontello.ttf
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/font/fontello.ttf
rename to public/font/fontello.ttf
diff --git a/packages/rocketchat_theme/client/vendor/fontello/font/fontello.woff b/public/font/fontello.woff
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/font/fontello.woff
rename to public/font/fontello.woff
diff --git a/packages/rocketchat_theme/client/vendor/fontello/font/fontello.woff2 b/public/font/fontello.woff2
similarity index 100%
rename from packages/rocketchat_theme/client/vendor/fontello/font/fontello.woff2
rename to public/font/fontello.woff2
diff --git a/packages/rocketchat-ui/client/public/lame.min.js b/public/lame.min.js
similarity index 100%
rename from packages/rocketchat-ui/client/public/lame.min.js
rename to public/lame.min.js
diff --git a/packages/rocketchat-ui/client/public/mp3-realtime-worker.js b/public/mp3-realtime-worker.js
similarity index 100%
rename from packages/rocketchat-ui/client/public/mp3-realtime-worker.js
rename to public/mp3-realtime-worker.js
diff --git a/packages/rocketchat-videobridge/client/public/external_api.js b/public/packages/rocketchat_videobridge/client/public/external_api.js
similarity index 100%
rename from packages/rocketchat-videobridge/client/public/external_api.js
rename to public/packages/rocketchat_videobridge/client/public/external_api.js
diff --git a/packages/rocketchat-ui-master/public/icons.html b/public/public/icons.html
similarity index 100%
rename from packages/rocketchat-ui-master/public/icons.html
rename to public/public/icons.html