Remove some index.js files routing for server/client files (#13772)

* Wave 1: Remove some index.js files routing for server/client files

* Wave 2: Remove some index.js files routing for server/client files

* Wave 3: Remove some index.js files routing for server/client files

* Change some missing files

* Remove unused files

app/2fa/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/accounts/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/analytics/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/api/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/apps/client/admin/appManage.js

@@ -6,7 +6,7 @@ import { TAPi18n } from 'meteor/tap:i18n';
 import { TAPi18next } from 'meteor/tap:i18n';
 import { isEmail, Info, APIClient } from '../../../utils';
 import { settings } from '../../../settings';
-import { Markdown } from '../../../markdown';
+import { Markdown } from '../../../markdown/client';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

app/apps/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/assets/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/autolinker/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/autotranslate/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/autotranslate/server/autotranslate.js

@@ -3,7 +3,7 @@ import { HTTP } from 'meteor/http';
 import { settings } from '../../settings';
 import { callbacks } from '../../callbacks';
 import { Subscriptions, Messages } from '../../models';
-import { Markdown } from '../../markdown';
+import { Markdown } from '../../markdown/server';
 import _ from 'underscore';
 import s from 'underscore.string';
 

app/bigbluebutton/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/bigbluebutton-api.js');
-}
+export * from './server/bigbluebutton-api';

app/blockstack/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/main.js');
-}
-if (Meteor.isClient) {
-	module.exports = require('./client/main.js');
-}

app/bot-helpers/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/cas/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/channel-settings-mail-messages/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/chatpal-search/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/chatpal-search/server/provider/provider.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { searchProviderService, SearchProvider } from '../../../search';
+import { searchProviderService, SearchProvider } from '../../../search/server';
 import Index from './index';
 import ChatpalLogger from '../utils/logger';
 import { Subscriptions } from '../../../models';

app/cloud/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/colors/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/cors/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/crowd/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/custom-sounds/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/discussion/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/dolphin/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/drupal/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/e2e/client/index.js

@@ -0,0 +1 @@
+export * from './rocketchat.e2e';

app/e2e/client/rocketchat.e2e.js

@@ -5,7 +5,7 @@ import { Tracker } from 'meteor/tracker';
 import { EJSON } from 'meteor/ejson';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Rooms, Subscriptions, Messages } from '../../models';
-import { promises } from '../../promises';
+import { promises } from '../../promises/client';
 import { settings } from '../../settings';
 import { Notifications } from '../../notifications';
 import { Layout, call, modal, alerts } from '../../ui-utils';

app/e2e/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/rocketchat.e2e.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/emoji-custom/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/emoji-emojione/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/error-handler/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/favico/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';

app/federation/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/main.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/main.js');
-}

app/federation/server/index.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { _ } from 'meteor/underscore';
 import { settings } from '../../settings';
 import { FederationKeys } from '../../models';
-import { getWorkspaceAccessToken } from '../../cloud';
+import { getWorkspaceAccessToken } from '../../cloud/server';
 
 import './federation-settings';
 import './methods';

app/federation/server/peerClient.js

@@ -4,7 +4,7 @@ import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '../../models';
 
-import { Federation } from './main';
+import { Federation } from '.';
 import peerDNS from './peerDNS';
 import peerHTTP from './peerHTTP';
 import { updateStatus } from './settingsUpdater';

app/federation/server/peerServer/peerServer.js

@@ -1,5 +1,5 @@
 import { callbacks } from '../../../callbacks';
-import { setReaction } from '../../../reactions';
+import { setReaction } from '../../../reactions/server';
 import { addUserToRoom, removeUserFromRoom, deleteMessage } from '../../../lib';
 import { Rooms, Subscriptions } from '../../../models';
 

app/federation/server/peerServer/routes/events.js

@@ -1,7 +1,7 @@
 import { API } from '../../../../api';
 import { FederationKeys } from '../../../../models';
 
-import { Federation } from '../../main';
+import { Federation } from '../..';
 
 import peerDNS from '../../peerDNS';
 import peerServer from '../peerServer';

app/file/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/github-enterprise/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/gitlab/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/google-vision/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/grant-facebook/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/grant-github/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/grant-google/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/grant/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/graphql/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/highlight-words/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';

app/iframe-login/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer-csv/client/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { CsvImporterInfo } from '../lib/info';
 
 Importers.add(new CsvImporterInfo());

app/importer-csv/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer-csv/lib/info.js

@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class CsvImporterInfo extends ImporterInfo {
 	constructor() {

app/importer-csv/server/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { CsvImporterInfo } from '../lib/info';
 import { CsvImporter } from './importer';
 

app/importer-csv/server/importer.js

@@ -6,7 +6,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { Users, Rooms } from '../../models';
 import { sendMessage } from '../../lib';

app/importer-hipchat-enterprise/client/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { HipChatEnterpriseImporterInfo } from '../lib/info';
 
 Importers.add(new HipChatEnterpriseImporterInfo());

app/importer-hipchat-enterprise/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer-hipchat-enterprise/lib/info.js

@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class HipChatEnterpriseImporterInfo extends ImporterInfo {
 	constructor() {

app/importer-hipchat-enterprise/server/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { HipChatEnterpriseImporterInfo } from '../lib/info';
 import { HipChatEnterpriseImporter } from './importer';
 

app/importer-hipchat-enterprise/server/importer.js

@@ -9,7 +9,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 	Imports,
-} from '../../importer';
+} from '../../importer/server';
 import { Messages, Users, Subscriptions, Rooms } from '../../models';
 import { insertMessage } from '../../lib';
 import { Readable } from 'stream';

app/importer-hipchat/client/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { HipChatImporterInfo } from '../lib/info';
 
 Importers.add(new HipChatImporterInfo());

app/importer-hipchat/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer-hipchat/lib/info.js

@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class HipChatImporterInfo extends ImporterInfo {
 	constructor() {

app/importer-hipchat/server/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { HipChatImporterInfo } from '../lib/info';
 import { HipChatImporter } from './importer';
 

app/importer-hipchat/server/importer.js

@@ -7,7 +7,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { Users, Rooms } from '../../models';
 import { sendMessage } from '../../lib';

app/importer-slack-users/client/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { SlackUsersImporterInfo } from '../lib/info';
 
 Importers.add(new SlackUsersImporterInfo());

app/importer-slack-users/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer-slack-users/lib/info.js

@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class SlackUsersImporterInfo extends ImporterInfo {
 	constructor() {

app/importer-slack-users/server/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { SlackUsersImporterInfo } from '../lib/info';
 import { SlackUsersImporter } from './importer';
 

app/importer-slack-users/server/importer.js

@@ -6,7 +6,7 @@ import {
 	ProgressStep,
 	Selection,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { Users } from '../../models';
 

app/importer-slack/client/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { SlackImporterInfo } from '../lib/info';
 
 Importers.add(new SlackImporterInfo());

app/importer-slack/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer-slack/lib/info.js

@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class SlackImporterInfo extends ImporterInfo {
 	constructor() {

app/importer-slack/server/adder.js

@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { SlackImporterInfo } from '../lib/info';
 import { SlackImporter } from './importer';
 

app/importer-slack/server/importer.js

@@ -6,7 +6,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { getAvatarUrlFromUsername } from '../../utils';
 import { Users, Rooms, Messages } from '../../models';

app/importer/client/admin/adminImport.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';

app/importer/client/admin/adminImportHistory.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { Template } from 'meteor/templating';
 import { hasRole } from '../../../authorization';
 import { t, APIClient } from '../../../utils';

app/importer/client/admin/adminImportPrepare.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';

app/importer/client/admin/adminImportProgress.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { Importers, ImporterWebsocketReceiver, ProgressStep } from '../..';
+import { Importers, ImporterWebsocketReceiver, ProgressStep } from '..';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { t, handleError } from '../../../utils';

app/importer/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/importer/server/methods/downloadPublicImportFile.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { RocketChatImportFileInstance } from '../startup/store';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
 import { hasRole } from '../../../authorization';

app/importer/server/methods/getImportFileData.js

@@ -1,6 +1,6 @@
 import { RocketChatImportFileInstance } from '../startup/store';
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasRole } from '../../../authorization';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
 import path from 'path';

app/importer/server/methods/getImportProgress.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({

app/importer/server/methods/getSelectionData.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import {
 	Importers,
 	ProgressStep,
-} from '../..';
+} from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({

app/importer/server/methods/prepareImport.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({

app/importer/server/methods/restartImport.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import {
 	Importers,
 	ProgressStep,
-} from '../..';
+} from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({

app/importer/server/methods/setupImporter.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({

app/importer/server/methods/startImport.js

@@ -4,7 +4,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../..';
+} from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({

app/importer/server/methods/uploadImportFile.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { RocketChatFile } from '../../../file';
 import { RocketChatImportFileInstance } from '../startup/store';
 import { hasRole } from '../../../authorization';

app/integrations/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/irc/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';

app/issuelinks/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/katex/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/lazy-load/index.js

@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';

app/ldap/index.js

@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}

app/lib/client/methods/sendMessage.js

@@ -3,7 +3,7 @@ import { TimeSync } from 'meteor/mizzao:timesync';
 import { ChatMessage } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
-import { promises } from '../../../promises';
+import { promises } from '../../../promises/client';
 import s from 'underscore.string';
 
 Meteor.methods({

app/lib/server/functions/createRoom.js

@@ -3,7 +3,7 @@ import { Users, Rooms, Subscriptions } from '../../../models';
 import { callbacks } from '../../../callbacks';
 import { hasPermission, addUserRoles } from '../../../authorization';
 import { getValidRoomName } from '../../../utils';
-import { Apps } from '../../../apps';
+import { Apps } from '../../../apps/server';
 import _ from 'underscore';
 import s from 'underscore.string';
 

app/lib/server/functions/deleteMessage.js

@@ -4,7 +4,7 @@ import { settings } from '../../../settings';
 import { Messages, Uploads, Rooms } from '../../../models';
 import { Notifications } from '../../../notifications';
 import { callbacks } from '../../../callbacks';
-import { Apps } from '../../../apps';
+import { Apps } from '../../../apps/server';
 
 export const deleteMessage = function(message, user) {
 	const keepHistory = settings.get('Message_KeepHistory');