diff --git a/packages/react-component-library/src/components/Checkbox/Checkbox.tsx b/packages/react-component-library/src/components/Checkbox/Checkbox.tsx
index 20efb905f4..67fa5d8522 100644
--- a/packages/react-component-library/src/components/Checkbox/Checkbox.tsx
+++ b/packages/react-component-library/src/components/Checkbox/Checkbox.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
 
-import { CheckboxRadioBase, CheckboxRadioBaseProps } from '../CheckboxRadioBase'
+import { CheckboxRadioBase } from '../CheckboxRadioBase/CheckboxRadioBase'
+import { CheckboxRadioBaseProps } from '../CheckboxRadioBase/CheckboxRadioBaseProps'
 import { StyledCheckbox } from './partials/StyledCheckbox'
 import { StyledCheckmark } from './partials/StyledCheckmark'
 import { StyledCheckmarkWrapper } from './partials/StyledCheckmarkWrapper'
diff --git a/packages/react-component-library/src/components/Checkbox/partials/StyledCheckbox.tsx b/packages/react-component-library/src/components/Checkbox/partials/StyledCheckbox.tsx
index 100180d1a7..28e44d683d 100644
--- a/packages/react-component-library/src/components/Checkbox/partials/StyledCheckbox.tsx
+++ b/packages/react-component-library/src/components/Checkbox/partials/StyledCheckbox.tsx
@@ -1,7 +1,7 @@
 import { selectors } from '@defencedigital/design-tokens'
 import styled, { css } from 'styled-components'
 
-import { CheckboxRootProps } from '../../CheckboxRadioBase'
+import { CheckboxRootProps } from '../../CheckboxRadioBase/CheckboxRadioBaseProps'
 
 const { color, fontSize, spacing } = selectors
 
diff --git a/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmark.tsx b/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmark.tsx
index 438f5038fa..2803cde7e0 100644
--- a/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmark.tsx
+++ b/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmark.tsx
@@ -3,7 +3,7 @@ import styled, { css } from 'styled-components'
 import { selectors } from '@defencedigital/design-tokens'
 
 import { StyledCheckbox } from './StyledCheckbox'
-import { CheckmarkProps } from '../../CheckboxRadioBase'
+import { CheckmarkProps } from '../../CheckboxRadioBase/CheckboxRadioBaseProps'
 
 const { color } = selectors
 
diff --git a/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmarkWrapper.tsx b/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmarkWrapper.tsx
index b5e885c7f7..6fe52225aa 100644
--- a/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmarkWrapper.tsx
+++ b/packages/react-component-library/src/components/Checkbox/partials/StyledCheckmarkWrapper.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components'
 
-import { CheckmarkWrapperProps } from '../../CheckboxRadioBase'
+import { CheckmarkWrapperProps } from '../../CheckboxRadioBase/CheckboxRadioBaseProps'
 
 export const StyledCheckmarkWrapper = styled.span<CheckmarkWrapperProps>`
   display: block;
diff --git a/packages/react-component-library/src/components/CheckboxRadioBase/index.ts b/packages/react-component-library/src/components/CheckboxRadioBase/index.ts
index 146c1075c7..c9f6f047dc 100644
--- a/packages/react-component-library/src/components/CheckboxRadioBase/index.ts
+++ b/packages/react-component-library/src/components/CheckboxRadioBase/index.ts
@@ -1,3 +1 @@
-export * from './CheckboxRadioBase'
-export * from './CheckboxRadioBaseProps'
 export * from './types'
diff --git a/packages/react-component-library/src/components/Radio/Radio.tsx b/packages/react-component-library/src/components/Radio/Radio.tsx
index 1c88fd2f34..fa7c053a00 100644
--- a/packages/react-component-library/src/components/Radio/Radio.tsx
+++ b/packages/react-component-library/src/components/Radio/Radio.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
 
-import { CheckboxRadioBase, CheckboxRadioBaseProps } from '../CheckboxRadioBase'
+import { CheckboxRadioBase } from '../CheckboxRadioBase/CheckboxRadioBase'
+import { CheckboxRadioBaseProps } from '../CheckboxRadioBase/CheckboxRadioBaseProps'
 import { StyledRadio } from './partials/StyledRadio'
 import { StyledCheckmark } from './partials/StyledCheckmark'
 import { StyledCheckmarkWrapper } from './partials/StyledCheckmarkWrapper'
diff --git a/packages/react-component-library/src/components/Radio/partials/StyledCheckmark.tsx b/packages/react-component-library/src/components/Radio/partials/StyledCheckmark.tsx
index f2e28bfd45..fadf918197 100644
--- a/packages/react-component-library/src/components/Radio/partials/StyledCheckmark.tsx
+++ b/packages/react-component-library/src/components/Radio/partials/StyledCheckmark.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 import { selectors } from '@defencedigital/design-tokens'
 
-import { CheckmarkProps } from '../../CheckboxRadioBase'
+import { CheckmarkProps } from '../../CheckboxRadioBase/CheckboxRadioBaseProps'
 
 const { color } = selectors
 
diff --git a/packages/react-component-library/src/components/Radio/partials/StyledCheckmarkWrapper.tsx b/packages/react-component-library/src/components/Radio/partials/StyledCheckmarkWrapper.tsx
index 8d275421b6..2b95ae9a67 100644
--- a/packages/react-component-library/src/components/Radio/partials/StyledCheckmarkWrapper.tsx
+++ b/packages/react-component-library/src/components/Radio/partials/StyledCheckmarkWrapper.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components'
 
-import { CheckmarkWrapperProps } from '../../CheckboxRadioBase'
+import { CheckmarkWrapperProps } from '../../CheckboxRadioBase/CheckboxRadioBaseProps'
 
 export const StyledCheckmarkWrapper = styled.span<CheckmarkWrapperProps>`
   display: block;
diff --git a/packages/react-component-library/src/components/Radio/partials/StyledRadio.tsx b/packages/react-component-library/src/components/Radio/partials/StyledRadio.tsx
index 541ec7d7e7..8eaef6bc9f 100644
--- a/packages/react-component-library/src/components/Radio/partials/StyledRadio.tsx
+++ b/packages/react-component-library/src/components/Radio/partials/StyledRadio.tsx
@@ -1,7 +1,7 @@
 import styled, { css } from 'styled-components'
 import { selectors } from '@defencedigital/design-tokens'
 
-import { CheckboxRootProps } from '../../CheckboxRadioBase'
+import { CheckboxRootProps } from '../../CheckboxRadioBase/CheckboxRadioBaseProps'
 import { StyledCheckmark } from './StyledCheckmark'
 import { StyledInput } from '../../CheckboxRadioBase/partials/StyledInput'
 
diff --git a/packages/react-component-library/src/index.ts b/packages/react-component-library/src/index.ts
index 34aa9a862d..b14f236537 100755
--- a/packages/react-component-library/src/index.ts
+++ b/packages/react-component-library/src/index.ts
@@ -18,6 +18,7 @@ export * from './components/Button'
 export * from './components/ButtonGroup'
 export * from './components/CardFrame'
 export * from './components/Checkbox'
+export * from './components/CheckboxRadioBase'
 export * from './components/ContextMenu'
 export * from './components/DatePicker'
 export * from './components/DescriptionList'