diff --git a/src/common/Base.tsx b/src/common/Base.tsx
index 6d63d5b9..630f5417 100644
--- a/src/common/Base.tsx
+++ b/src/common/Base.tsx
@@ -1,7 +1,5 @@
 import { CSSProperties, DetailedHTMLProps, FC, HTMLAttributes, LegacyRef, useMemo } from 'react';
-import { ColorVariantType } from './types/ColorVariantType';
-import { OverflowType } from './types/OverflowType';
-import { PositionType } from './types/PositionType';
+import { ColorVariantType, OverflowType, PositionType } from './types';
 
 export interface BaseProps<T = HTMLElement> extends DetailedHTMLProps<HTMLAttributes<T>, T>
 {
diff --git a/src/common/Button.tsx b/src/common/Button.tsx
index 8f65d7b3..e93039d2 100644
--- a/src/common/Button.tsx
+++ b/src/common/Button.tsx
@@ -1,7 +1,6 @@
 import { FC, useMemo } from 'react';
 import { Flex, FlexProps } from './Flex';
-import { ButtonSizeType } from './types/ButtonSizeType';
-import { ColorVariantType } from './types/ColorVariantType';
+import { ButtonSizeType, ColorVariantType } from './types';
 
 export interface ButtonProps extends FlexProps
 {
diff --git a/src/common/Column.tsx b/src/common/Column.tsx
index e66d29cb..4b60915f 100644
--- a/src/common/Column.tsx
+++ b/src/common/Column.tsx
@@ -1,7 +1,7 @@
 import { FC, useMemo } from 'react';
-import { useGridContext } from './context/GridContext';
 import { Flex, FlexProps } from './Flex';
-import { ColumnSizesType } from './types/ColumnSizesType';
+import { useGridContext } from './GridContext';
+import { ColumnSizesType } from './types';
 
 export interface ColumnProps extends FlexProps
 {
diff --git a/src/common/Flex.tsx b/src/common/Flex.tsx
index 42d32f80..95239134 100644
--- a/src/common/Flex.tsx
+++ b/src/common/Flex.tsx
@@ -1,9 +1,6 @@
 import { FC, useMemo } from 'react';
 import { Base, BaseProps } from './Base';
-import { AlignItemType } from './types/AlignItemType';
-import { AlignSelfType } from './types/AlignSelfType';
-import { JustifyContentType } from './types/JustifyContentType';
-import { SpacingType } from './types/SpacingType';
+import { AlignItemType, AlignSelfType, JustifyContentType, SpacingType } from './types';
 
 export interface FlexProps extends BaseProps<HTMLDivElement>
 {
diff --git a/src/common/Grid.tsx b/src/common/Grid.tsx
index 799dd555..3062e0e6 100644
--- a/src/common/Grid.tsx
+++ b/src/common/Grid.tsx
@@ -1,7 +1,7 @@
 import { CSSProperties, FC, useMemo } from 'react';
 import { Base, BaseProps } from './Base';
-import { GridContextProvider } from './context/GridContext';
-import { SpacingType } from './types/SpacingType';
+import { GridContextProvider } from './GridContext';
+import { SpacingType } from './types';
 
 export interface GridProps extends BaseProps<HTMLDivElement>
 {
diff --git a/src/common/context/GridContext.tsx b/src/common/GridContext.tsx
similarity index 100%
rename from src/common/context/GridContext.tsx
rename to src/common/GridContext.tsx
diff --git a/src/common/Text.tsx b/src/common/Text.tsx
index 6be5c21f..d81b5f76 100644
--- a/src/common/Text.tsx
+++ b/src/common/Text.tsx
@@ -1,8 +1,6 @@
 import { FC, useMemo } from 'react';
 import { Base, BaseProps } from './Base';
-import { ColorVariantType } from './types/ColorVariantType';
-import { FontSizeType } from './types/FontSizeType';
-import { FontWeightType } from './types/FontWeightType';
+import { ColorVariantType, FontSizeType, FontWeightType } from './types';
 
 export interface TextProps extends BaseProps<HTMLDivElement>
 {
diff --git a/src/common/index.ts b/src/common/index.ts
new file mode 100644
index 00000000..9f96f004
--- /dev/null
+++ b/src/common/index.ts
@@ -0,0 +1,12 @@
+export * from './Base';
+export * from './Button';
+export * from './ButtonGroup';
+export * from './Column';
+export * from './Flex';
+export * from './FormGroup';
+export * from './Grid';
+export * from './GridContext';
+export * from './layout';
+export * from './Text';
+export * from './types';
+export * from './utils';
diff --git a/src/common/layout/index.ts b/src/common/layout/index.ts
new file mode 100644
index 00000000..4a267e3b
--- /dev/null
+++ b/src/common/layout/index.ts
@@ -0,0 +1,2 @@
+export * from './LayoutGridItem';
+export * from './LayoutImage';
diff --git a/src/common/types/index.ts b/src/common/types/index.ts
new file mode 100644
index 00000000..011ab11e
--- /dev/null
+++ b/src/common/types/index.ts
@@ -0,0 +1,11 @@
+export * from './AlignItemType';
+export * from './AlignSelfType';
+export * from './ButtonSizeType';
+export * from './ColorVariantType';
+export * from './ColumnSizesType';
+export * from './FontSizeType';
+export * from './FontWeightType';
+export * from './JustifyContentType';
+export * from './OverflowType';
+export * from './PositionType';
+export * from './SpacingType';
diff --git a/src/common/utils/index.ts b/src/common/utils/index.ts
new file mode 100644
index 00000000..68182b4c
--- /dev/null
+++ b/src/common/utils/index.ts
@@ -0,0 +1 @@
+export * from './CreateTransitionToIcon';