diff --git a/superset-frontend/spec/javascripts/components/TableSelector_spec.jsx b/superset-frontend/src/components/TableSelector/TableSelector.test.jsx
similarity index 99%
rename from superset-frontend/spec/javascripts/components/TableSelector_spec.jsx
rename to superset-frontend/src/components/TableSelector/TableSelector.test.jsx
index 320e4f528037..e1fa66b70709 100644
--- a/superset-frontend/spec/javascripts/components/TableSelector_spec.jsx
+++ b/superset-frontend/src/components/TableSelector/TableSelector.test.jsx
@@ -29,7 +29,7 @@ import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 
 import DatabaseSelector from 'src/components/DatabaseSelector';
 import TableSelector from 'src/components/TableSelector';
-import { initialState, tables } from '../sqllab/fixtures';
+import { initialState, tables } from 'spec/javascripts/sqllab/fixtures';
 
 const mockStore = configureStore([thunk]);
 const store = mockStore(initialState);
diff --git a/superset-frontend/src/components/TableSelector.tsx b/superset-frontend/src/components/TableSelector/index.tsx
similarity index 98%
rename from superset-frontend/src/components/TableSelector.tsx
rename to superset-frontend/src/components/TableSelector/index.tsx
index 875c0627bf42..f45e30c2627d 100644
--- a/superset-frontend/src/components/TableSelector.tsx
+++ b/superset-frontend/src/components/TableSelector/index.tsx
@@ -27,9 +27,9 @@ import { AsyncSelect, CreatableSelect, Select } from 'src/components/Select';
 
 import FormLabel from 'src/components/FormLabel';
 
-import DatabaseSelector from './DatabaseSelector';
-import RefreshLabel from './RefreshLabel';
-import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';
+import DatabaseSelector from 'src/components/DatabaseSelector';
+import RefreshLabel from 'src/components/RefreshLabel';
+import CertifiedIconWithTooltip from 'src/components/CertifiedIconWithTooltip';
 
 const FieldTitle = styled.p`
   color: ${({ theme }) => theme.colors.secondary.light2};