diff --git a/superset-frontend/src/CRUD/CollectionTable.test.jsx b/superset-frontend/src/components/Datasource/CollectionTable.test.jsx
similarity index 96%
rename from superset-frontend/src/CRUD/CollectionTable.test.jsx
rename to superset-frontend/src/components/Datasource/CollectionTable.test.jsx
index 3500a81ec706d..a5982e252af1a 100644
--- a/superset-frontend/src/CRUD/CollectionTable.test.jsx
+++ b/superset-frontend/src/components/Datasource/CollectionTable.test.jsx
@@ -19,8 +19,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import CollectionTable from 'src/CRUD/CollectionTable';
 import mockDatasource from 'spec/fixtures/mockDatasource';
+import CollectionTable from './CollectionTable';
 
 const props = {
   collection: mockDatasource['7__table'].columns,
diff --git a/superset-frontend/src/CRUD/CollectionTable.tsx b/superset-frontend/src/components/Datasource/CollectionTable.tsx
similarity index 100%
rename from superset-frontend/src/CRUD/CollectionTable.tsx
rename to superset-frontend/src/components/Datasource/CollectionTable.tsx
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
index 723d4971de28f..1b6de1c7a90df 100644
--- a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -36,21 +36,17 @@ import Label from 'src/components/Label';
 import Loading from 'src/components/Loading';
 import TableSelector from 'src/components/TableSelector';
 import EditableTitle from 'src/components/EditableTitle';
-
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
-
 import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
 import TextControl from 'src/explore/components/controls/TextControl';
 import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
 import SpatialControl from 'src/explore/components/controls/SpatialControl';
-
-import CollectionTable from 'src/CRUD/CollectionTable';
-import Fieldset from 'src/CRUD/Fieldset';
-import Field from 'src/CRUD/Field';
-
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import Icons from 'src/components/Icons';
+import CollectionTable from './CollectionTable';
+import Fieldset from './Fieldset';
+import Field from './Field';
 
 const DatasourceContainer = styled.div`
   .change-warning {
diff --git a/superset-frontend/src/CRUD/Field.test.tsx b/superset-frontend/src/components/Datasource/Field.test.tsx
similarity index 100%
rename from superset-frontend/src/CRUD/Field.test.tsx
rename to superset-frontend/src/components/Datasource/Field.test.tsx
diff --git a/superset-frontend/src/CRUD/Field.tsx b/superset-frontend/src/components/Datasource/Field.tsx
similarity index 100%
rename from superset-frontend/src/CRUD/Field.tsx
rename to superset-frontend/src/components/Datasource/Field.tsx
diff --git a/superset-frontend/src/CRUD/Fieldset.tsx b/superset-frontend/src/components/Datasource/Fieldset.tsx
similarity index 100%
rename from superset-frontend/src/CRUD/Fieldset.tsx
rename to superset-frontend/src/components/Datasource/Fieldset.tsx
diff --git a/superset-frontend/src/CRUD/crud.less b/superset-frontend/src/components/Datasource/crud.less
similarity index 95%
rename from superset-frontend/src/CRUD/crud.less
rename to superset-frontend/src/components/Datasource/crud.less
index a12df7f4324a3..da9f2470da716 100644
--- a/superset-frontend/src/CRUD/crud.less
+++ b/superset-frontend/src/components/Datasource/crud.less
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@import '../assets/stylesheets/less/variables.less';
+@import '../../assets/stylesheets/less/variables.less';
 
 .CRUD {
   .text-right {
diff --git a/superset-frontend/src/CRUD/utils.js b/superset-frontend/src/components/Datasource/utils.js
similarity index 100%
rename from superset-frontend/src/CRUD/utils.js
rename to superset-frontend/src/components/Datasource/utils.js