diff --git a/platform/ui/index.js b/platform/ui/index.js
index 02defd329..30facb8dd 100644
--- a/platform/ui/index.js
+++ b/platform/ui/index.js
@@ -1,7 +1,34 @@
+/** UTILS */
 import * as utils from './src/utils/';
-export * from './src/components';
-
 export { utils };
 
+/** CONTEXT/HOOKS */
+export {
+  ModalProvider,
+  ModalConsumer,
+  useModal,
+  withModal,
+} from './src/contextProviders';
+
+/** COMPONENTS */
+export {
+  Button,
+  ButtonGroup,
+  DateRange,
+  Icon,
+  IconButton,
+  Select,
+  Svg,
+  Input,
+  ThemeWrapper,
+  Table,
+  TableBody,
+  TableHead,
+  TableRow,
+  TableCell,
+  Typography,
+} from './src/components';
+
+/** VIEWS */
 export { StudyList } from './src/views';
 export { ModalProvider, ModalConsumer, useModal, withModal, utils };