diff --git a/src/components/Header/UserSearch.jsx b/src/components/Header/components/UserStep/Body.jsx
similarity index 98%
rename from src/components/Header/UserSearch.jsx
rename to src/components/Header/components/UserStep/Body.jsx
index 78ad566..c2b0d86 100644
--- a/src/components/Header/UserSearch.jsx
+++ b/src/components/Header/components/UserStep/Body.jsx
@@ -61,7 +61,7 @@ const TopHeader = (
   </ListSubheader>
 );
 
-const UserSearch = () => {
+const Body = () => {
   const dispatch = useDispatch();
   const inputRef = useRef();
   const [search, setSearch] = useState('');
@@ -171,4 +171,4 @@ const UserSearch = () => {
   );
 };
 
-export default UserSearch;
+export default Body;
diff --git a/src/components/Header/FetchTopUser.js b/src/components/Header/components/UserStep/FetchTopUser.js
similarity index 100%
rename from src/components/Header/FetchTopUser.js
rename to src/components/Header/components/UserStep/FetchTopUser.js
diff --git a/src/components/Header/User.jsx b/src/components/Header/components/UserStep/Header.jsx
similarity index 96%
rename from src/components/Header/User.jsx
rename to src/components/Header/components/UserStep/Header.jsx
index c9c23e1..bf58ca7 100644
--- a/src/components/Header/User.jsx
+++ b/src/components/Header/components/UserStep/Header.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import slice from '@/redux/modules/profiles';
 import { Avatar } from "@material-ui/core";
-import { default as LinkOrigin } from "@material-ui/core/Link";
+import LinkOrigin from "@material-ui/core/Link";
 import GithubIcon from "mdi-react/GithubIcon";
 import LinkVariantIcon from "mdi-react/LinkVariantIcon";
 import SourceRepositoriesIcon from "mdi-react/SourceRepositoriesIcon";
@@ -79,7 +79,7 @@ const PropertyValue = styled.div`
   margin-left: 2px;
 `;
 
-const User = (props) => {
+const Header = (props) => {
   const { profile } = useSelector(slice.selectors.getState);
 
   return (
@@ -119,4 +119,4 @@ const User = (props) => {
   );
 };
 
-export default User;
+export default Header;
diff --git a/src/components/Header/index.jsx b/src/components/Header/index.jsx
index 68e6218..727eeaf 100644
--- a/src/components/Header/index.jsx
+++ b/src/components/Header/index.jsx
@@ -1,7 +1,4 @@
 import React, { useCallback, useState } from 'react';
-import FetchTopUser from "@/components/Header/FetchTopUser";
-import User from "@/components/Header/User";
-import UserSearch from "@/components/Header/UserSearch";
 import { StageTypes } from "@/models/StageTypes";
 import { useUIProperty } from "@/shared/hooks";
 import Collapse from "@material-ui/core/Collapse";
@@ -10,6 +7,9 @@ import Paper from "@material-ui/core/Paper";
 import { withStyles } from "@material-ui/core/styles";
 import Tab from "@material-ui/core/Tab";
 import Tabs from "@material-ui/core/Tabs";
+import UserStepBody from "./components/UserStep/Body";
+import FetchTopUser from "./components/UserStep/FetchTopUser";
+import UserStepHeader from "./components/UserStep/Header";
 
 const PaperStyled = withStyles(() => ({
   root: {
@@ -21,7 +21,7 @@ const PaperStyled = withStyles(() => ({
 }))(Paper);
 
 const StepBodies = {
-  [StageTypes.user]: UserSearch,
+  [StageTypes.user]: UserStepBody,
 };
 
 const Header = () => {
@@ -59,7 +59,7 @@ const Header = () => {
         <Tab label="Show" />
       </Tabs>
       <Grid container>
-        <User onClick={onClick(StageTypes.user)} />
+        <UserStepHeader onClick={onClick(StageTypes.user)} />
         <div>
           Repository
         </div>
diff --git a/src/components/Main.jsx b/src/components/Main.jsx
index 5e15a45..a64bd04 100644
--- a/src/components/Main.jsx
+++ b/src/components/Main.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { default as ContainerOriginal } from '@material-ui/core/Container';
+import ContainerOriginal from '@material-ui/core/Container';
 import { withStyles } from '@material-ui/core/styles';
 
 const Container = withStyles({