diff --git a/packages/core/src/components/HorizontalScrollGrid.stories.tsx b/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx
similarity index 100%
rename from packages/core/src/components/HorizontalScrollGrid.stories.tsx
rename to packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx
diff --git a/packages/core/src/components/HorizontalScrollGrid.test.js b/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.test.js
similarity index 100%
rename from packages/core/src/components/HorizontalScrollGrid.test.js
rename to packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.test.js
diff --git a/packages/core/src/components/HorizontalScrollGrid.tsx b/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
similarity index 100%
rename from packages/core/src/components/HorizontalScrollGrid.tsx
rename to packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
diff --git a/packages/core/src/components/HorizontalScrollGrid/index.tsx b/packages/core/src/components/HorizontalScrollGrid/index.tsx
new file mode 100644
index 0000000000..2b44fe1955
--- /dev/null
+++ b/packages/core/src/components/HorizontalScrollGrid/index.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { default } from './HorizontalScrollGrid';
diff --git a/packages/core/src/components/SortableTable.js b/packages/core/src/components/SortableTable/SortableTable.js
similarity index 100%
rename from packages/core/src/components/SortableTable.js
rename to packages/core/src/components/SortableTable/SortableTable.js
diff --git a/packages/core/src/components/SortableTable.stories.tsx b/packages/core/src/components/SortableTable/SortableTable.stories.tsx
similarity index 95%
rename from packages/core/src/components/SortableTable.stories.tsx
rename to packages/core/src/components/SortableTable/SortableTable.stories.tsx
index c534457d53..3938916156 100644
--- a/packages/core/src/components/SortableTable.stories.tsx
+++ b/packages/core/src/components/SortableTable/SortableTable.stories.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { StatusError, StatusOK, StatusWarning } from './Status';
+import { StatusError, StatusOK, StatusWarning } from 'components/Status';
 import SortableTable from './SortableTable';
 
 export default {
diff --git a/packages/core/src/components/SortableTable/index.tsx b/packages/core/src/components/SortableTable/index.tsx
new file mode 100644
index 0000000000..718f582b8f
--- /dev/null
+++ b/packages/core/src/components/SortableTable/index.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { default } from './SortableTable';