diff --git a/src/features/Components/Arrows/index.tsx b/src/features/Common/Arrows/index.tsx
similarity index 100%
rename from src/features/Components/Arrows/index.tsx
rename to src/features/Common/Arrows/index.tsx
diff --git a/src/features/Components/Arrows/stories.tsx b/src/features/Common/Arrows/stories.tsx
similarity index 83%
rename from src/features/Components/Arrows/stories.tsx
rename to src/features/Common/Arrows/stories.tsx
index fa8af4b3..f2e61f8a 100644
--- a/src/features/Components/Arrows/stories.tsx
+++ b/src/features/Common/Arrows/stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { ArrowLeft, ArrowRight } from 'features/Components'
+import { ArrowLeft, ArrowRight } from 'features/Common'
 
 export default {
   component: ArrowLeft,
diff --git a/src/features/Components/Button/index.tsx b/src/features/Common/Button/index.tsx
similarity index 100%
rename from src/features/Components/Button/index.tsx
rename to src/features/Common/Button/index.tsx
diff --git a/src/features/Components/Button/stories.tsx b/src/features/Common/Button/stories.tsx
similarity index 83%
rename from src/features/Components/Button/stories.tsx
rename to src/features/Common/Button/stories.tsx
index aa3c756a..0c58bfca 100644
--- a/src/features/Components/Button/stories.tsx
+++ b/src/features/Common/Button/stories.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 
 import { action } from '@storybook/addon-actions'
 
-import { ButtonOutline, ButtonSolid } from 'features/Components'
+import { ButtonOutline, ButtonSolid } from 'features/Common'
 
 export default {
   title: 'Button',
diff --git a/src/features/Components/Button/styled.tsx b/src/features/Common/Button/styled.tsx
similarity index 100%
rename from src/features/Components/Button/styled.tsx
rename to src/features/Common/Button/styled.tsx
diff --git a/src/features/Components/Checkbox/index.tsx b/src/features/Common/Checkbox/index.tsx
similarity index 100%
rename from src/features/Components/Checkbox/index.tsx
rename to src/features/Common/Checkbox/index.tsx
diff --git a/src/features/Components/Checkbox/stories.tsx b/src/features/Common/Checkbox/stories.tsx
similarity index 90%
rename from src/features/Components/Checkbox/stories.tsx
rename to src/features/Common/Checkbox/stories.tsx
index 1675a0fe..0721257d 100644
--- a/src/features/Components/Checkbox/stories.tsx
+++ b/src/features/Common/Checkbox/stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { Checkbox } from 'features/Components'
+import { Checkbox } from 'features/Common'
 
 export default {
   component: Checkbox,
diff --git a/src/features/Components/Checkbox/styled.tsx b/src/features/Common/Checkbox/styled.tsx
similarity index 100%
rename from src/features/Components/Checkbox/styled.tsx
rename to src/features/Common/Checkbox/styled.tsx
diff --git a/src/features/Components/Input/index.tsx b/src/features/Common/Input/index.tsx
similarity index 96%
rename from src/features/Components/Input/index.tsx
rename to src/features/Common/Input/index.tsx
index 32c294ca..55bbbc6b 100644
--- a/src/features/Components/Input/index.tsx
+++ b/src/features/Common/Input/index.tsx
@@ -28,7 +28,7 @@ export const Input = ({
   labelWidth,
   maxLength,
   onChange,
-  px,
+  paddingX,
   required,
   type,
   value,
@@ -36,7 +36,7 @@ export const Input = ({
 }: TInput) => (
   <InputWrapper
     wrapperWidth={wrapperWidth}
-    px={px}
+    paddingX={paddingX}
   >
     <Label
       htmlFor={id}
diff --git a/src/features/Components/Input/stories.tsx b/src/features/Common/Input/stories.tsx
similarity index 92%
rename from src/features/Components/Input/stories.tsx
rename to src/features/Common/Input/stories.tsx
index 37fc23f6..51bb517e 100644
--- a/src/features/Components/Input/stories.tsx
+++ b/src/features/Common/Input/stories.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 
-import { Input } from 'features/Components'
+import { Input } from 'features/Common'
 
 export default {
   component: Input,
diff --git a/src/features/Components/Input/styled.tsx b/src/features/Common/Input/styled.tsx
similarity index 90%
rename from src/features/Components/Input/styled.tsx
rename to src/features/Common/Input/styled.tsx
index 5269fc46..708cd621 100644
--- a/src/features/Components/Input/styled.tsx
+++ b/src/features/Common/Input/styled.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components/macro'
 
 export type TInputWrapper = {
-  px?: number,
+  paddingX?: number,
   wrapperWidth?: number,
 }
 
@@ -9,8 +9,8 @@ export const InputWrapper = styled.div<TInputWrapper>`
   width: ${({ wrapperWidth }) => (wrapperWidth ? `${wrapperWidth}px` : '100%')};
   height: 48px;
   margin: 20px 0;
-  padding-left: ${({ px = 24 }) => (px ? `${px}px` : '')};
-  padding-right: ${({ px = 24 }) => (px ? `${px}px` : '')};
+  padding-left: ${({ paddingX = 24 }) => (paddingX ? `${paddingX}px` : '')};
+  padding-right: ${({ paddingX = 24 }) => (paddingX ? `${paddingX}px` : '')};
   padding-top: 13px;
   padding-bottom: 11px;
   display: flex;
diff --git a/src/features/Components/Radio/index.tsx b/src/features/Common/Radio/index.tsx
similarity index 100%
rename from src/features/Components/Radio/index.tsx
rename to src/features/Common/Radio/index.tsx
diff --git a/src/features/Components/Radio/stories.tsx b/src/features/Common/Radio/stories.tsx
similarity index 91%
rename from src/features/Components/Radio/stories.tsx
rename to src/features/Common/Radio/stories.tsx
index 71d3df58..12d9cc66 100644
--- a/src/features/Components/Radio/stories.tsx
+++ b/src/features/Common/Radio/stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { Radio } from 'features/Components'
+import { Radio } from 'features/Common'
 
 export default {
   component: Radio,
diff --git a/src/features/Components/Radio/styled.tsx b/src/features/Common/Radio/styled.tsx
similarity index 100%
rename from src/features/Components/Radio/styled.tsx
rename to src/features/Common/Radio/styled.tsx
diff --git a/src/features/Components/index.tsx b/src/features/Common/index.tsx
similarity index 100%
rename from src/features/Components/index.tsx
rename to src/features/Common/index.tsx