diff --git a/src/__tests__/BorderBox.test.tsx b/src/__tests__/BorderBox.test.tsx
index 428ff7f4f82..241a39bc18c 100644
--- a/src/__tests__/BorderBox.test.tsx
+++ b/src/__tests__/BorderBox.test.tsx
@@ -10,7 +10,7 @@ expect.extend(toHaveNoViolations)
 describe('BorderBox', () => {
   behavesAsComponent({Component: BorderBox})
 
-  checkExports('BorderBox', {
+  checkExports('deprecated/BorderBox', {
     default: BorderBox
   })
 
diff --git a/src/__tests__/Dropdown.test.tsx b/src/__tests__/Dropdown.test.tsx
index a327c620e51..21cf5a72f02 100644
--- a/src/__tests__/Dropdown.test.tsx
+++ b/src/__tests__/Dropdown.test.tsx
@@ -9,7 +9,7 @@ expect.extend(toHaveNoViolations)
 describe('Dropdown', () => {
   behavesAsComponent({Component: Dropdown, toRender: () => <Dropdown>Hello!</Dropdown>})
 
-  checkExports('Dropdown', {
+  checkExports('deprecated/Dropdown', {
     default: Dropdown
   })
 
diff --git a/src/__tests__/Dropdown.types.test.tsx b/src/__tests__/Dropdown.types.test.tsx
index 93d40b5053c..06402f96573 100644
--- a/src/__tests__/Dropdown.types.test.tsx
+++ b/src/__tests__/Dropdown.types.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import Dropdown from '../Dropdown'
+import Dropdown from '../deprecated/Dropdown'
 
 export function shouldAcceptCallWithNoProps() {
   return <Dropdown />
diff --git a/src/__tests__/Flex.test.tsx b/src/__tests__/Flex.test.tsx
index 7f7cd93828f..d1e17a2c471 100644
--- a/src/__tests__/Flex.test.tsx
+++ b/src/__tests__/Flex.test.tsx
@@ -9,7 +9,7 @@ expect.extend(toHaveNoViolations)
 describe('Flex', () => {
   behavesAsComponent({Component: Flex})
 
-  checkExports('Flex', {
+  checkExports('deprecated/Flex', {
     default: Flex
   })
 
diff --git a/src/__tests__/Grid.test.tsx b/src/__tests__/Grid.test.tsx
index dc05ddf0b66..cfb8ddeefb6 100644
--- a/src/__tests__/Grid.test.tsx
+++ b/src/__tests__/Grid.test.tsx
@@ -9,7 +9,7 @@ expect.extend(toHaveNoViolations)
 describe('Grid', () => {
   behavesAsComponent({Component: Grid})
 
-  checkExports('Grid', {
+  checkExports('deprecated/Grid', {
     default: Grid
   })
 
diff --git a/src/__tests__/Position.test.tsx b/src/__tests__/Position.test.tsx
index 629bd09b478..484c04d0b56 100644
--- a/src/__tests__/Position.test.tsx
+++ b/src/__tests__/Position.test.tsx
@@ -11,7 +11,7 @@ describe('position components', () => {
   describe('Absolute', () => {
     behavesAsComponent({Component: Absolute})
 
-    checkExports('Position', {
+    checkExports('deprecated/Position', {
       default: Position,
       Absolute,
       Fixed,
diff --git a/src/__tests__/SelectMenu.test.tsx b/src/__tests__/SelectMenu.test.tsx
index 366b245e512..18b9944bce9 100644
--- a/src/__tests__/SelectMenu.test.tsx
+++ b/src/__tests__/SelectMenu.test.tsx
@@ -4,7 +4,7 @@ import {mount, render, renderRoot, COMPONENT_DISPLAY_NAME_REGEX, checkExports} f
 import {render as HTMLRender, cleanup} from '@testing-library/react'
 import {axe, toHaveNoViolations} from 'jest-axe'
 import 'babel-polyfill'
-import {SelectMenuModalProps, SelectMenuItemProps, SelectMenuTabProps} from '../SelectMenu'
+import {SelectMenuModalProps, SelectMenuItemProps, SelectMenuTabProps} from '../deprecated/SelectMenu'
 expect.extend(toHaveNoViolations)
 
 const BasicSelectMenu = ({
@@ -63,7 +63,7 @@ const MenuWithTabs = ({onClick}: {onClick?: SelectMenuTabProps['onClick']}) => {
 }
 
 describe('SelectMenu', () => {
-  checkExports('SelectMenu', {
+  checkExports('deprecated/SelectMenu', {
     default: SelectMenu
   })
 
diff --git a/src/__tests__/SelectMenu.types.test.tsx b/src/__tests__/SelectMenu.types.test.tsx
index 8f9acfeed6a..c927bbc8798 100644
--- a/src/__tests__/SelectMenu.types.test.tsx
+++ b/src/__tests__/SelectMenu.types.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import SelectMenu from '../SelectMenu'
+import SelectMenu from '../deprecated/SelectMenu'
 
 export function shouldAcceptCallWithNoProps() {
   return <SelectMenu />
diff --git a/src/BorderBox.tsx b/src/deprecated/BorderBox.tsx
similarity index 92%
rename from src/BorderBox.tsx
rename to src/deprecated/BorderBox.tsx
index 9d40a7e47c2..56183fbc455 100644
--- a/src/BorderBox.tsx
+++ b/src/deprecated/BorderBox.tsx
@@ -1,5 +1,5 @@
 import styled from 'styled-components'
-import Box, {BoxProps} from './Box'
+import Box, {BoxProps} from '../Box'
 
 export type BorderBoxProps = BoxProps
 
diff --git a/src/Dropdown.tsx b/src/deprecated/Dropdown.tsx
similarity index 92%
rename from src/Dropdown.tsx
rename to src/deprecated/Dropdown.tsx
index 34778895ac3..dadd7833548 100644
--- a/src/Dropdown.tsx
+++ b/src/deprecated/Dropdown.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import styled from 'styled-components'
-import Button, {ButtonProps} from './deprecated/Button'
-import {get} from './constants'
-import Details, {DetailsProps} from './Details'
-import getDirectionStyles from './DropdownStyles'
-import useDetails from './hooks/useDetails'
-import sx, {SxProp} from './sx'
-import {ComponentProps} from './utils/types'
+import Button, {ButtonProps} from './Button'
+import {get} from '../constants'
+import Details, {DetailsProps} from '../Details'
+import getDirectionStyles from '../DropdownStyles'
+import useDetails from '../hooks/useDetails'
+import sx, {SxProp} from '../sx'
+import {ComponentProps} from '../utils/types'
 
 const StyledDetails = styled(Details)`
   position: relative;
diff --git a/src/Flex.tsx b/src/deprecated/Flex.tsx
similarity index 87%
rename from src/Flex.tsx
rename to src/deprecated/Flex.tsx
index 853a0ba8ead..e4444ab2b26 100644
--- a/src/Flex.tsx
+++ b/src/deprecated/Flex.tsx
@@ -1,5 +1,5 @@
 import styled from 'styled-components'
-import Box, {BoxProps} from './Box'
+import Box, {BoxProps} from '../Box'
 
 export type FlexProps = BoxProps
 
diff --git a/src/Grid.tsx b/src/deprecated/Grid.tsx
similarity index 87%
rename from src/Grid.tsx
rename to src/deprecated/Grid.tsx
index 69046fd9873..eb476b43d1b 100644
--- a/src/Grid.tsx
+++ b/src/deprecated/Grid.tsx
@@ -1,5 +1,5 @@
 import styled from 'styled-components'
-import Box, {BoxProps} from './Box'
+import Box, {BoxProps} from '../Box'
 
 export type GridProps = BoxProps
 
diff --git a/src/Position.tsx b/src/deprecated/Position.tsx
similarity index 96%
rename from src/Position.tsx
rename to src/deprecated/Position.tsx
index 8a4b518d956..7805af67ba5 100644
--- a/src/Position.tsx
+++ b/src/deprecated/Position.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import styled from 'styled-components'
-import Box from './Box'
-import {ComponentProps} from './utils/types'
+import Box from '../Box'
+import {ComponentProps} from '../utils/types'
 
 type StyledPositionProps = {as?: React.ElementType}
 
diff --git a/src/SelectMenu/SelectMenu.tsx b/src/deprecated/SelectMenu/SelectMenu.tsx
similarity index 97%
rename from src/SelectMenu/SelectMenu.tsx
rename to src/deprecated/SelectMenu/SelectMenu.tsx
index 5436a2215f1..51a6ff16186 100644
--- a/src/SelectMenu/SelectMenu.tsx
+++ b/src/deprecated/SelectMenu/SelectMenu.tsx
@@ -1,7 +1,7 @@
 import React, {useCallback, useEffect, useRef, useState} from 'react'
 import styled from 'styled-components'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 import useKeyboardNav from './hooks/useKeyboardNav'
 import {MenuContext} from './SelectMenuContext'
 import SelectMenuDivider from './SelectMenuDivider'
diff --git a/src/SelectMenu/SelectMenuContext.tsx b/src/deprecated/SelectMenu/SelectMenuContext.tsx
similarity index 100%
rename from src/SelectMenu/SelectMenuContext.tsx
rename to src/deprecated/SelectMenu/SelectMenuContext.tsx
diff --git a/src/SelectMenu/SelectMenuDivider.tsx b/src/deprecated/SelectMenu/SelectMenuDivider.tsx
similarity index 83%
rename from src/SelectMenu/SelectMenuDivider.tsx
rename to src/deprecated/SelectMenu/SelectMenuDivider.tsx
index e437ed1ea89..1b978dfc5bb 100644
--- a/src/SelectMenu/SelectMenuDivider.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuDivider.tsx
@@ -1,7 +1,7 @@
 import styled, {css} from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 const dividerStyles = css`
   padding: ${get('space.1')} ${get('space.3')};
diff --git a/src/SelectMenu/SelectMenuFilter.tsx b/src/deprecated/SelectMenu/SelectMenuFilter.tsx
similarity index 88%
rename from src/SelectMenu/SelectMenuFilter.tsx
rename to src/deprecated/SelectMenu/SelectMenuFilter.tsx
index 5e96a9edc27..2d6e4d36667 100644
--- a/src/SelectMenu/SelectMenuFilter.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuFilter.tsx
@@ -1,9 +1,9 @@
 import React, {forwardRef, useContext, useEffect, useRef} from 'react'
 import styled from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import TextInput, {TextInputProps} from '../TextInput'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import TextInput, {TextInputProps} from '../../TextInput'
+import {ComponentProps} from '../../utils/types'
 import {MenuContext} from './SelectMenuContext'
 
 const StyledForm = styled.form<SxProp>`
diff --git a/src/SelectMenu/SelectMenuFooter.tsx b/src/deprecated/SelectMenu/SelectMenuFooter.tsx
similarity index 84%
rename from src/SelectMenu/SelectMenuFooter.tsx
rename to src/deprecated/SelectMenu/SelectMenuFooter.tsx
index 0765979fbf9..30d0c8d201c 100644
--- a/src/SelectMenu/SelectMenuFooter.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuFooter.tsx
@@ -1,7 +1,7 @@
 import styled, {css} from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 const footerStyles = css`
   margin-top: -1px;
diff --git a/src/SelectMenu/SelectMenuHeader.tsx b/src/deprecated/SelectMenu/SelectMenuHeader.tsx
similarity index 90%
rename from src/SelectMenu/SelectMenuHeader.tsx
rename to src/deprecated/SelectMenu/SelectMenuHeader.tsx
index ab255e5ffb4..f29e69872b3 100644
--- a/src/SelectMenu/SelectMenuHeader.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuHeader.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
 import styled from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 // SelectMenu.Header is intentionally not exported, it's an internal component used in
 // SelectMenu.Modal
diff --git a/src/SelectMenu/SelectMenuItem.tsx b/src/deprecated/SelectMenu/SelectMenuItem.tsx
similarity index 95%
rename from src/SelectMenu/SelectMenuItem.tsx
rename to src/deprecated/SelectMenu/SelectMenuItem.tsx
index 725c30bfe63..c8a043309e0 100644
--- a/src/SelectMenu/SelectMenuItem.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuItem.tsx
@@ -1,10 +1,10 @@
 import {CheckIcon} from '@primer/octicons-react'
 import React, {forwardRef, useContext, useRef} from 'react'
 import styled, {css} from 'styled-components'
-import {get} from '../constants'
-import StyledOcticon from '../StyledOcticon'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import StyledOcticon from '../../StyledOcticon'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 import {MenuContext} from './SelectMenuContext'
 
 export const listItemStyles = css`
diff --git a/src/SelectMenu/SelectMenuList.tsx b/src/deprecated/SelectMenu/SelectMenuList.tsx
similarity index 88%
rename from src/SelectMenu/SelectMenuList.tsx
rename to src/deprecated/SelectMenu/SelectMenuList.tsx
index 587409b13ed..b765a705ae8 100644
--- a/src/SelectMenu/SelectMenuList.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuList.tsx
@@ -1,7 +1,7 @@
 import styled, {css} from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 const listStyles = css`
   position: relative;
diff --git a/src/SelectMenu/SelectMenuLoadingAnimation.tsx b/src/deprecated/SelectMenu/SelectMenuLoadingAnimation.tsx
similarity index 76%
rename from src/SelectMenu/SelectMenuLoadingAnimation.tsx
rename to src/deprecated/SelectMenu/SelectMenuLoadingAnimation.tsx
index a719e0d3716..b5efa3ce1cf 100644
--- a/src/SelectMenu/SelectMenuLoadingAnimation.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuLoadingAnimation.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import styled from 'styled-components'
-import {get} from '../constants'
-import Spinner from '../Spinner'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import Spinner from '../../Spinner'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 const Animation = styled.div<SxProp>`
   padding: ${get('space.6')} ${get('space.4')};
diff --git a/src/SelectMenu/SelectMenuModal.tsx b/src/deprecated/SelectMenu/SelectMenuModal.tsx
similarity index 96%
rename from src/SelectMenu/SelectMenuModal.tsx
rename to src/deprecated/SelectMenu/SelectMenuModal.tsx
index d845620f3ad..6fe36dd3ffe 100644
--- a/src/SelectMenu/SelectMenuModal.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuModal.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import styled, {css, keyframes} from 'styled-components'
 import {width, WidthProps} from 'styled-system'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 type StyledModalProps = {
   filter?: boolean
diff --git a/src/SelectMenu/SelectMenuTab.tsx b/src/deprecated/SelectMenu/SelectMenuTab.tsx
similarity index 95%
rename from src/SelectMenu/SelectMenuTab.tsx
rename to src/deprecated/SelectMenu/SelectMenuTab.tsx
index 177a3a0a859..4803bd57c32 100644
--- a/src/SelectMenu/SelectMenuTab.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuTab.tsx
@@ -1,9 +1,9 @@
 import classnames from 'classnames'
 import React, {useContext, useEffect} from 'react'
 import styled, {css} from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 import {MenuContext} from './SelectMenuContext'
 
 const tabStyles = css`
diff --git a/src/SelectMenu/SelectMenuTabPanel.tsx b/src/deprecated/SelectMenu/SelectMenuTabPanel.tsx
similarity index 86%
rename from src/SelectMenu/SelectMenuTabPanel.tsx
rename to src/deprecated/SelectMenu/SelectMenuTabPanel.tsx
index 593c3c1d7ae..d9537d51db7 100644
--- a/src/SelectMenu/SelectMenuTabPanel.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuTabPanel.tsx
@@ -1,8 +1,8 @@
 import React, {useContext} from 'react'
 import styled from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 import {MenuContext} from './SelectMenuContext'
 import SelectMenuList from './SelectMenuList'
 
diff --git a/src/SelectMenu/SelectMenuTabs.tsx b/src/deprecated/SelectMenu/SelectMenuTabs.tsx
similarity index 88%
rename from src/SelectMenu/SelectMenuTabs.tsx
rename to src/deprecated/SelectMenu/SelectMenuTabs.tsx
index 06e978b32e3..1a23525f759 100644
--- a/src/SelectMenu/SelectMenuTabs.tsx
+++ b/src/deprecated/SelectMenu/SelectMenuTabs.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
 import styled, {css} from 'styled-components'
-import {get} from '../constants'
-import sx, {SxProp} from '../sx'
-import {ComponentProps} from '../utils/types'
+import {get} from '../../constants'
+import sx, {SxProp} from '../../sx'
+import {ComponentProps} from '../../utils/types'
 
 const tabWrapperStyles = css`
   display: flex;
diff --git a/src/SelectMenu/hooks/useKeyboardNav.js b/src/deprecated/SelectMenu/hooks/useKeyboardNav.js
similarity index 100%
rename from src/SelectMenu/hooks/useKeyboardNav.js
rename to src/deprecated/SelectMenu/hooks/useKeyboardNav.js
diff --git a/src/SelectMenu/index.ts b/src/deprecated/SelectMenu/index.ts
similarity index 100%
rename from src/SelectMenu/index.ts
rename to src/deprecated/SelectMenu/index.ts
diff --git a/src/deprecated/index.ts b/src/deprecated/index.ts
index 1d47daa6001..e52d8869b1c 100644
--- a/src/deprecated/index.ts
+++ b/src/deprecated/index.ts
@@ -6,30 +6,30 @@
  *  example: import {FormGroup} from '@primer/react/deprecated
  */
 
-export {default as BorderBox} from '../BorderBox'
-export type {BorderBoxProps} from '../BorderBox'
+export {default as BorderBox} from './BorderBox'
+export type {BorderBoxProps} from './BorderBox'
 export {default as ChoiceFieldset, Item} from './ChoiceFieldset'
 export {default as ChoiceInputField} from './ChoiceInputField'
-export {default as Flex} from '../Flex'
-export type {FlexProps} from '../Flex'
-export {default as Grid} from '../Grid'
-export type {GridProps} from '../Grid'
-export {default as Position, Absolute, Fixed, Relative, Sticky} from '../Position'
-export type {PositionProps, AbsoluteProps, FixedProps, RelativeProps, StickyProps} from '../Position'
-export {default as Dropdown} from '../Dropdown'
+export {default as Flex} from './Flex'
+export type {FlexProps} from './Flex'
+export {default as Grid} from './Grid'
+export type {GridProps} from './Grid'
+export {default as Position, Absolute, Fixed, Relative, Sticky} from './Position'
+export type {PositionProps, AbsoluteProps, FixedProps, RelativeProps, StickyProps} from './Position'
+export {default as Dropdown} from './Dropdown'
 export type {
   DropdownProps,
   DropdownCaretProps,
   DropdownButtonProps,
   DropdownItemProps,
   DropdownMenuProps
-} from '../Dropdown'
+} from './Dropdown'
 export {default as FormGroup} from './FormGroup'
 export type {FormGroupProps, FormGroupLabelProps} from './FormGroup'
 export {default as InputField} from './InputField'
 export {default as Label} from './Label'
 export type {LabelProps} from './Label'
-export {default as SelectMenu} from '../SelectMenu'
+export {default as SelectMenu} from './SelectMenu'
 export type {
   SelectMenuProps,
   SelectMenuDividerProps,
@@ -43,7 +43,7 @@ export type {
   SelectMenuTabProps,
   SelectMenuTabPanelProps,
   SelectMenuLoadingAnimationProps
-} from '../SelectMenu'
+} from './SelectMenu'
 export {ActionList} from './ActionList'
 export type {ActionListProps} from './ActionList'
 export {ActionMenu} from './ActionMenu'