diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCard.js b/packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js
similarity index 93%
rename from packages/core/upload/admin/src/components/FolderCard/FolderCard.js
rename to packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js
index a297ffa2ba..462412cd6d 100644
--- a/packages/core/upload/admin/src/components/FolderCard/FolderCard.js
+++ b/packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js
@@ -7,8 +7,8 @@ import { Box } from '@strapi/design-system/Box';
 import { Stack } from '@strapi/design-system/Stack';
 import Folder from '@strapi/icons/Folder';
 
-import { FolderCardContext } from './FolderCardContext';
-import useId from './utils/useId';
+import { FolderCardContext } from '../contexts/FolderCard';
+import useId from '../hooks/useId';
 
 const FauxClickWrapper = styled.button`
   height: 100%;
@@ -31,7 +31,7 @@ const StyledFolder = styled(Folder)`
 `;
 
 export const FolderCard = ({ children, id, startAction, ariaLabel, onDoubleClick, ...props }) => {
-  const generatedId = useId(id);
+  const generatedId = useId('folder', id);
 
   return (
     <FolderCardContext.Provider value={{ id: generatedId }}>
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCard/index.js b/packages/core/upload/admin/src/components/FolderCard/FolderCard/index.js
new file mode 100644
index 0000000000..1aad1f19f4
--- /dev/null
+++ b/packages/core/upload/admin/src/components/FolderCard/FolderCard/index.js
@@ -0,0 +1 @@
+export * from './FolderCard';
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardBody.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js
similarity index 88%
rename from packages/core/upload/admin/src/components/FolderCard/FolderCardBody.js
rename to packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js
index bd7ecb5cb5..41a9d1d3da 100644
--- a/packages/core/upload/admin/src/components/FolderCard/FolderCardBody.js
+++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 import { Flex } from '@strapi/design-system/Flex';
 
-import { useFolderCard } from './FolderCardContext';
+import { useFolderCard } from '../contexts/FolderCard';
 
 const StyledBox = styled(Flex)`
   user-select: none;
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/index.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/index.js
new file mode 100644
index 0000000000..0368e72b9c
--- /dev/null
+++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/index.js
@@ -0,0 +1 @@
+export * from './FolderCardBody';
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js
similarity index 86%
rename from packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox.js
rename to packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js
index ced28a17cc..8e0102f5da 100644
--- a/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox.js
+++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Box } from '@strapi/design-system/Box';
 import { BaseCheckbox } from '@strapi/design-system/BaseCheckbox';
-import { useFolderCard } from './FolderCardContext';
+import { useFolderCard } from '../contexts/FolderCard';
 
 export const FolderCardCheckbox = props => {
   const { id } = useFolderCard();
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/index.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/index.js
new file mode 100644
index 0000000000..90201eab84
--- /dev/null
+++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/index.js
@@ -0,0 +1 @@
+export * from './FolderCardCheckbox';
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardContext.js b/packages/core/upload/admin/src/components/FolderCard/contexts/FolderCard.js
similarity index 71%
rename from packages/core/upload/admin/src/components/FolderCard/FolderCardContext.js
rename to packages/core/upload/admin/src/components/FolderCard/contexts/FolderCard.js
index 985ae836d9..27aaa7dc0b 100644
--- a/packages/core/upload/admin/src/components/FolderCard/FolderCardContext.js
+++ b/packages/core/upload/admin/src/components/FolderCard/contexts/FolderCard.js
@@ -1,6 +1,6 @@
 import { createContext, useContext } from 'react';
 
-export const FolderCardContext = createContext();
+export const FolderCardContext = createContext({});
 
 export function useFolderCard() {
   return useContext(FolderCardContext);
diff --git a/packages/core/upload/admin/src/components/FolderCard/utils/tests/useId.test.js b/packages/core/upload/admin/src/components/FolderCard/hooks/tests/useId.test.js
similarity index 100%
rename from packages/core/upload/admin/src/components/FolderCard/utils/tests/useId.test.js
rename to packages/core/upload/admin/src/components/FolderCard/hooks/tests/useId.test.js
diff --git a/packages/core/upload/admin/src/components/FolderCard/utils/useId.js b/packages/core/upload/admin/src/components/FolderCard/hooks/useId.js
similarity index 55%
rename from packages/core/upload/admin/src/components/FolderCard/utils/useId.js
rename to packages/core/upload/admin/src/components/FolderCard/hooks/useId.js
index 91b8b43377..aeef81cfb7 100644
--- a/packages/core/upload/admin/src/components/FolderCard/utils/useId.js
+++ b/packages/core/upload/admin/src/components/FolderCard/hooks/useId.js
@@ -4,8 +4,8 @@ let id = 0;
 
 const genId = () => ++id;
 
-const useId = (prefix, initialId) => {
-  const idRef = useRef(initialId || `${prefix}-${genId()}`);
+const useId = initialId => {
+  const idRef = useRef(`${initialId}-${genId()}`);
 
   return idRef.current;
 };
diff --git a/packages/core/upload/admin/src/components/FolderCard/index.js b/packages/core/upload/admin/src/components/FolderCard/index.js
index 4da01d2615..0d973c3898 100644
--- a/packages/core/upload/admin/src/components/FolderCard/index.js
+++ b/packages/core/upload/admin/src/components/FolderCard/index.js
@@ -1,4 +1,5 @@
 export { FolderCard } from './FolderCard';
 export { FolderCardBody } from './FolderCardBody';
 export { FolderCardCheckbox } from './FolderCardCheckbox';
-export { FolderCardLink } from './FolderCardLink';
+
+export { FolderCardLink } from './styled';
diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardLink.js b/packages/core/upload/admin/src/components/FolderCard/styled.js
similarity index 100%
rename from packages/core/upload/admin/src/components/FolderCard/FolderCardLink.js
rename to packages/core/upload/admin/src/components/FolderCard/styled.js
diff --git a/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js b/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js
index a46955a338..8fcf24e54e 100644
--- a/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js
+++ b/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js
@@ -9,7 +9,7 @@ import { FolderCard } from '../FolderCard';
 import { FolderCardBody } from '../FolderCardBody';
 import { FolderCardCheckbox } from '../FolderCardCheckbox';
 
-const ID_FIXTURE = 'folder-1';
+const ID_FIXTURE = 'folder';
 
 // eslint-disable-next-line react/prop-types
 const ComponentFixture = props => {
@@ -18,7 +18,6 @@ const ComponentFixture = props => {
       <FolderCard
         id={ID_FIXTURE}
         ariaLabel="Folder 1"
-        href="/"
         startAction={<></>}
         onDoubleClick={() => {}}
         {...props}
diff --git a/packages/core/upload/admin/src/components/FolderCard/tests/__snapshots__/FolderCard.test.js.snap b/packages/core/upload/admin/src/components/FolderCard/tests/__snapshots__/FolderCard.test.js.snap
index 33208d3da0..f8c8111206 100644
--- a/packages/core/upload/admin/src/components/FolderCard/tests/__snapshots__/FolderCard.test.js.snap
+++ b/packages/core/upload/admin/src/components/FolderCard/tests/__snapshots__/FolderCard.test.js.snap
@@ -194,7 +194,6 @@ exports[`FolderCard has all required ids set when rendering a start action 1`] =
 <div>
   <div
     class="c0"
-    href="/"
   >
     <button
       aria-hidden="true"
@@ -212,7 +211,7 @@ exports[`FolderCard has all required ids set when rendering a start action 1`] =
         class="c5"
       >
         <input
-          aria-labelledby="folder-1-3-title"
+          aria-labelledby="folder-3-title"
           class="c6"
           type="checkbox"
         />
@@ -236,7 +235,7 @@ exports[`FolderCard has all required ids set when rendering a start action 1`] =
       </div>
       <h2
         class="c9 c10 c11"
-        id="folder-1-3-title"
+        id="folder-3-title"
       >
         <a
           class="c12"
@@ -403,7 +402,6 @@ exports[`FolderCard renders and matches the snapshot 1`] = `
 <div>
   <div
     class="c0"
-    href="/"
   >
     <button
       aria-hidden="true"
@@ -436,7 +434,7 @@ exports[`FolderCard renders and matches the snapshot 1`] = `
       </div>
       <h2
         class="c7 c8 c9"
-        id="folder-1-1-title"
+        id="folder-1-title"
       >
         <a
           class="c10"