diff --git a/components/elements/argument/index.tsx b/components/elements/command/elements/argument/index.tsx
similarity index 93%
rename from components/elements/argument/index.tsx
rename to components/elements/command/elements/argument/index.tsx
index 14285b5..bd0a4b9 100644
--- a/components/elements/argument/index.tsx
+++ b/components/elements/command/elements/argument/index.tsx
@@ -1,6 +1,6 @@
 import styles from './styles.module.css'
 import {useContext, useEffect, useState} from "react";
-import Context, {ContextInterface} from "../command/context";
+import Context, {ContextInterface} from "../../context";
 
 export interface ArgumentInterface {
     name: string,
diff --git a/components/elements/argument/styles.module.css b/components/elements/command/elements/argument/styles.module.css
similarity index 100%
rename from components/elements/argument/styles.module.css
rename to components/elements/command/elements/argument/styles.module.css
diff --git a/components/elements/arguments/index.tsx b/components/elements/command/elements/arguments/index.tsx
similarity index 94%
rename from components/elements/arguments/index.tsx
rename to components/elements/command/elements/arguments/index.tsx
index 19c13c6..743b027 100644
--- a/components/elements/arguments/index.tsx
+++ b/components/elements/command/elements/arguments/index.tsx
@@ -1,7 +1,7 @@
 import styles from './styles.module.css'
 import {useContext, useEffect, useState} from "react";
 import Argument, {ArgumentInterface} from "../argument";
-import Context, {ContextInterface} from "../command/context";
+import Context, {ContextInterface} from "../../context";
 
 interface ArgumentsInterface {
     argumentList: ArgumentInterface[]
diff --git a/components/elements/arguments/styles.module.css b/components/elements/command/elements/arguments/styles.module.css
similarity index 100%
rename from components/elements/arguments/styles.module.css
rename to components/elements/command/elements/arguments/styles.module.css
diff --git a/components/elements/option/index.tsx b/components/elements/command/elements/option/index.tsx
similarity index 93%
rename from components/elements/option/index.tsx
rename to components/elements/command/elements/option/index.tsx
index 9482095..be19aeb 100644
--- a/components/elements/option/index.tsx
+++ b/components/elements/command/elements/option/index.tsx
@@ -1,6 +1,6 @@
 import styles from './styles.module.css'
 import {useContext} from "react";
-import Context, {ContextInterface} from "../command/context";
+import Context, {ContextInterface} from "../../context";
 
 export interface OptionInterface {
     name: string,
diff --git a/components/elements/option/styles.module.css b/components/elements/command/elements/option/styles.module.css
similarity index 100%
rename from components/elements/option/styles.module.css
rename to components/elements/command/elements/option/styles.module.css
diff --git a/components/elements/options/index.tsx b/components/elements/command/elements/options/index.tsx
similarity index 96%
rename from components/elements/options/index.tsx
rename to components/elements/command/elements/options/index.tsx
index 6a6ea84..429f99a 100644
--- a/components/elements/options/index.tsx
+++ b/components/elements/command/elements/options/index.tsx
@@ -1,7 +1,7 @@
 import styles from './styles.module.css'
 import Option, {OptionInterface} from '../option'
 import {useContext, useEffect, useState} from "react";
-import Context, {ContextInterface} from "../command/context";
+import Context, {ContextInterface} from "../../context";
 
 interface OptionsInterface {
     optionList: OptionInterface[]
diff --git a/components/elements/options/styles.module.css b/components/elements/command/elements/options/styles.module.css
similarity index 100%
rename from components/elements/options/styles.module.css
rename to components/elements/command/elements/options/styles.module.css
diff --git a/components/elements/command/index.tsx b/components/elements/command/index.tsx
index 5060ef0..3b15deb 100644
--- a/components/elements/command/index.tsx
+++ b/components/elements/command/index.tsx
@@ -1,8 +1,8 @@
 import styles from './styles.module.css'
-import Options from "../options";
-import Arguments from "../arguments";
-import {OptionInterface} from "../option";
-import {ArgumentInterface} from "../argument";
+import Options from "./elements/options";
+import Arguments from "./elements/arguments";
+import {OptionInterface} from "./elements/option";
+import {ArgumentInterface} from "./elements/argument";
 import {Provider} from "./context";
 import {useState} from "react";
 
diff --git a/pages/index.tsx b/pages/index.tsx
index 334248a..55f844b 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,7 +1,7 @@
 import Head from 'next/head'
 import styles from '../styles/Home.module.css'
-import {OptionInterface} from "../components/elements/option";
-import {ArgumentInterface} from "../components/elements/argument";
+import {OptionInterface} from "../components/elements/command/elements/option";
+import {ArgumentInterface} from "../components/elements/command/elements/argument";
 import Command from "../components/elements/command";
 
 interface CommandInterface {