diff --git a/src/components/Button/index.js b/src/components/Button/index.js
index f7960939a..28fb263e6 100644
--- a/src/components/Button/index.js
+++ b/src/components/Button/index.js
@@ -1,3 +1 @@
-
-
 export * from './ButtonLink';
\ No newline at end of file
diff --git a/src/components/Customers/CustomerDrawerLink.js b/src/components/Customers/CustomerDrawerLink.js
index e99c20244..a5b075fa9 100644
--- a/src/components/Customers/CustomerDrawerLink.js
+++ b/src/components/Customers/CustomerDrawerLink.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import * as R from 'ramda';
 
-import { ButtonLink } from 'components';
+import { ButtonLink } from '../Button';
 import withDrawerActions from 'containers/Drawer/withDrawerActions';
 
 function CustomerDrawerLinkComponent({
diff --git a/src/components/FinancialSheet/FinancialSheet.js b/src/components/FinancialSheet/FinancialSheet.js
index f7eb905ec..951e06a85 100644
--- a/src/components/FinancialSheet/FinancialSheet.js
+++ b/src/components/FinancialSheet/FinancialSheet.js
@@ -2,7 +2,8 @@ import React, { useMemo, useCallback } from 'react';
 import moment from 'moment';
 import intl from 'react-intl-universal';
 
-import { If, FormattedMessage as T } from 'components';
+import If from '../Utils/If';
+import { FormattedMessage as T } from '../FormattedMessage';
 import {
   FinancialSheetRoot,
   FinancialSheetFooterCurrentTime,
diff --git a/src/components/FinancialSheet/FinancialSheetSkeleton.js b/src/components/FinancialSheet/FinancialSheetSkeleton.js
index 8feb034b5..d542ceb73 100644
--- a/src/components/FinancialSheet/FinancialSheetSkeleton.js
+++ b/src/components/FinancialSheet/FinancialSheetSkeleton.js
@@ -2,7 +2,8 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Align } from 'common';
-import { SkeletonText, DataTable } from 'components';
+import { SkeletonText } from 'components';
+import DataTable from '../../components/DataTable'
 
 import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
 import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
diff --git a/src/components/FinancialSheet/ReportDataTable.js b/src/components/FinancialSheet/ReportDataTable.js
index b242ae8e7..2d8677cf4 100644
--- a/src/components/FinancialSheet/ReportDataTable.js
+++ b/src/components/FinancialSheet/ReportDataTable.js
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import { DataTable } from 'components';
+import DataTable from '../DataTable';
 
 export const ReportDataTable = styled(DataTable)`
   .table .tbody .tr.no-results:last-of-type .td {
diff --git a/src/components/Vendors/VendorDrawerLink.js b/src/components/Vendors/VendorDrawerLink.js
index 91b528e6f..de5dbcf50 100644
--- a/src/components/Vendors/VendorDrawerLink.js
+++ b/src/components/Vendors/VendorDrawerLink.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import * as R from 'ramda';
 
-import { ButtonLink } from 'components';
+import { ButtonLink } from '../Button';
 import withDrawerActions from 'containers/Drawer/withDrawerActions';
 
 function VendorDrawerLinkComponent({