diff --git a/react/features/conference/components/DisplayNameLabel.web.js b/react/features/conference/components/DisplayNameLabel.web.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/react/features/conference/components/Notice.naive.js b/react/features/conference/components/Notice.naive.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/react/features/conference/components/index.native.js b/react/features/conference/components/index.native.js
new file mode 100644
index 000000000..a32ec6061
--- /dev/null
+++ b/react/features/conference/components/index.native.js
@@ -0,0 +1,3 @@
+// @flow
+
+export * from './native';
diff --git a/react/features/conference/components/index.web.js b/react/features/conference/components/index.web.js
new file mode 100644
index 000000000..40d5f4652
--- /dev/null
+++ b/react/features/conference/components/index.web.js
@@ -0,0 +1,3 @@
+// @flow
+
+export * from './web';
diff --git a/react/features/conference/components/Conference.native.js b/react/features/conference/components/native/Conference.js
similarity index 94%
rename from react/features/conference/components/Conference.native.js
rename to react/features/conference/components/native/Conference.js
index bc9695d0a..76df73d0b 100644
--- a/react/features/conference/components/Conference.native.js
+++ b/react/features/conference/components/native/Conference.js
@@ -5,27 +5,27 @@ import React, { Component } from 'react';
 import { BackHandler, StatusBar, View } from 'react-native';
 import { connect as reactReduxConnect } from 'react-redux';
 
-import { appNavigate } from '../../app';
-import { connect, disconnect } from '../../base/connection';
-import { getParticipantCount } from '../../base/participants';
-import { Container, LoadingIndicator, TintedView } from '../../base/react';
+import { appNavigate } from '../../../app';
+import { connect, disconnect } from '../../../base/connection';
+import { getParticipantCount } from '../../../base/participants';
+import { Container, LoadingIndicator, TintedView } from '../../../base/react';
 import {
     makeAspectRatioAware
-} from '../../base/responsive-ui';
-import { TestConnectionInfo } from '../../base/testing';
-import { createDesiredLocalTracks } from '../../base/tracks';
-import { ConferenceNotification } from '../../calendar-sync';
-import { Chat } from '../../chat';
+} from '../../../base/responsive-ui';
+import { TestConnectionInfo } from '../../../base/testing';
+import { createDesiredLocalTracks } from '../../../base/tracks';
+import { ConferenceNotification } from '../../../calendar-sync';
+import { Chat } from '../../../chat';
 import {
     Filmstrip,
     isFilmstripVisible,
     TileView
-} from '../../filmstrip';
-import { LargeVideo } from '../../large-video';
-import { CalleeInfoContainer } from '../../invite';
-import { Captions } from '../../subtitles';
-import { setToolboxVisible, Toolbox } from '../../toolbox';
-import { shouldDisplayTileView } from '../../video-layout';
+} from '../../../filmstrip';
+import { LargeVideo } from '../../../large-video';
+import { CalleeInfoContainer } from '../../../invite';
+import { Captions } from '../../../subtitles';
+import { setToolboxVisible, Toolbox } from '../../../toolbox';
+import { shouldDisplayTileView } from '../../../video-layout';
 
 import DisplayNameLabel from './DisplayNameLabel';
 import styles from './styles';
diff --git a/react/features/conference/components/DisplayNameLabel.native.js b/react/features/conference/components/native/DisplayNameLabel.js
similarity index 95%
rename from react/features/conference/components/DisplayNameLabel.native.js
rename to react/features/conference/components/native/DisplayNameLabel.js
index bb40328b0..939a337ce 100644
--- a/react/features/conference/components/DisplayNameLabel.native.js
+++ b/react/features/conference/components/native/DisplayNameLabel.js
@@ -8,9 +8,9 @@ import {
     getLocalParticipant,
     getParticipantDisplayName,
     shouldRenderParticipantVideo
-} from '../../base/participants';
+} from '../../../base/participants';
 
-import { shouldDisplayTileView } from '../../video-layout';
+import { shouldDisplayTileView } from '../../../video-layout';
 
 import styles from './styles';
 
diff --git a/react/features/conference/components/index.js b/react/features/conference/components/native/index.js
similarity index 100%
rename from react/features/conference/components/index.js
rename to react/features/conference/components/native/index.js
diff --git a/react/features/conference/components/styles.js b/react/features/conference/components/native/styles.js
similarity index 97%
rename from react/features/conference/components/styles.js
rename to react/features/conference/components/native/styles.js
index 2eebaaaac..1a9da1c0b 100644
--- a/react/features/conference/components/styles.js
+++ b/react/features/conference/components/native/styles.js
@@ -3,7 +3,7 @@ import {
     ColorPalette,
     createStyleSheet,
     fixAndroidViewClipping
-} from '../../base/styles';
+} from '../../../base/styles';
 
 /**
  * The styles of the feature conference.
diff --git a/react/features/conference/components/Conference.web.js b/react/features/conference/components/web/Conference.js
similarity index 92%
rename from react/features/conference/components/Conference.web.js
rename to react/features/conference/components/web/Conference.js
index b36b83823..8d6d1920d 100644
--- a/react/features/conference/components/Conference.web.js
+++ b/react/features/conference/components/web/Conference.js
@@ -4,31 +4,32 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 import { connect as reactReduxConnect } from 'react-redux';
 
-import VideoLayout from '../../../../modules/UI/videolayout/VideoLayout';
+import VideoLayout from '../../../../../modules/UI/videolayout/VideoLayout';
 
-import { obtainConfig } from '../../base/config';
-import { connect, disconnect } from '../../base/connection';
-import { translate } from '../../base/i18n';
-import { Chat } from '../../chat';
-import { Filmstrip } from '../../filmstrip';
-import { CalleeInfoContainer } from '../../invite';
-import { LargeVideo } from '../../large-video';
-import { NotificationsContainer } from '../../notifications';
+import { obtainConfig } from '../../../base/config';
+import { connect, disconnect } from '../../../base/connection';
+import { translate } from '../../../base/i18n';
+import { Chat } from '../../../chat';
+import { Filmstrip } from '../../../filmstrip';
+import { CalleeInfoContainer } from '../../../invite';
+import { LargeVideo } from '../../../large-video';
+import { NotificationsContainer } from '../../../notifications';
 import {
     LAYOUTS,
     getCurrentLayout,
     shouldDisplayTileView
-} from '../../video-layout';
+} from '../../../video-layout';
 
-import { default as Notice } from './Notice';
 import {
     Toolbox,
     fullScreenChanged,
     setToolboxAlwaysVisible,
     showToolbox
-} from '../../toolbox';
+} from '../../../toolbox';
 
-import { maybeShowSuboptimalExperienceNotification } from '../functions';
+import { maybeShowSuboptimalExperienceNotification } from '../../functions';
+
+import { default as Notice } from './Notice';
 
 declare var APP: Object;
 declare var config: Object;
diff --git a/react/features/conference/components/Notice.web.js b/react/features/conference/components/web/Notice.js
similarity index 95%
rename from react/features/conference/components/Notice.web.js
rename to react/features/conference/components/web/Notice.js
index acaee877b..77620e22a 100644
--- a/react/features/conference/components/Notice.web.js
+++ b/react/features/conference/components/web/Notice.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../../base/i18n';
 
 declare var config: Object;
 
diff --git a/react/features/conference/components/web/index.js b/react/features/conference/components/web/index.js
new file mode 100644
index 000000000..0910dcaff
--- /dev/null
+++ b/react/features/conference/components/web/index.js
@@ -0,0 +1,3 @@
+// @flow
+
+export { default as Conference } from './Conference';