diff --git a/public/css/index.css b/public/css/index.css
index 828a0ef..4c70d82 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -28,12 +28,12 @@ header h2 {
   cursor: pointer;
 }
 
-.app {
+.game-container {
   display: flex;
   justify-content: space-around;
   margin-top: 2vh;
 }
-.app .column-2 {
+.game-container .column-2 {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
diff --git a/public/css/index.css.map b/public/css/index.css.map
index 43a6338..a1155e1 100644
--- a/public/css/index.css.map
+++ b/public/css/index.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../sass/index.scss","../sass/_header.scss","../sass/_app.scss","../sass/_hangman.scss","../sass/_puzzleWord.scss","../sass/_current-score.scss","../sass/_categories.scss","../sass/_defeat-victory.scss","../sass/_loading.scss"],"names":[],"mappings":";AAAA;EACI;EACA;;;ACFJ;EACI;EAEA;EAEA;EACA;EACA;EACA;;AAEA;EDHA;EACA;EAIA;EACA;;ACGA;EDTA;EACA;EAIA;EACA;ECMI;EACA;EAEA;;;ACtBR;EAEI;EACA;EAEA;;AAMA;EACI;EACA;EAEA;;;ACfR;EAEI;;AAEA;EACI;;;ACLR;EJkBI;EACA;EIhBA;EAEA;EACA;EAEA;EAEA;EACA;;AAEA;EACI;EACA;EACA;EAEA;EAEA;EACA;EACA;;AAGJ;EACI;EAEA;EAEA;;;AC9BR;EAEI;EAEA;ELGA;EACA;EKAA;EAEA;;AAEA;EACI;;;ACbR;EAEI;;AAEA;EAEI;EAEA;EACA;EAEA;EACA;EAEA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;;AAEA;EACI;EACA;EAEA;EACA;EAEA;EACA;EAEA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACI;EACA;;AA0BJ;EArBI,OAFuD;EAIvD,kBAoBc;EAnBd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAYZ;EA3BI,OAFuD;EAIvD,kBA0Bc;EAzBd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAkBZ;EAjCI,OAFuD;EAIvD,kBAgCc;EA/Bd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAwBZ;EAvCI,OAyCY;EAvCZ,kBAsCc;EArCd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AA+BZ;EA9CI,OAFuD;EAIvD,kBA6Cc;EA5Cd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAqCZ;EApDI,OAsDY;EApDZ,kBAmDc;EAlDd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AA4CZ;EA3DI,OAFuD;EAIvD,kBA0Dc;EAzDd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAmDhB;EACI;EAEA;EACA;;AAEA;EAEI;;AAIR;EACI;;AAIJ;EACI;EACA;;AAEA;EAEI;;AAGJ;EAEI;;;ACnJhB;EACI;EACA;EACA;EAEA;EACA;EAEA;EAEA;EACA;EAEA;EAEA;EAEA;;AAEA;EACI;EACA;;;AAIR;EACI;;;AAGJ;EACI;;;AC9BJ;EACI;EACA;EACA;EAEA;EACA;EAEA;EAEA;EACA;EACA;;AAEA;EACI;EACA","file":"index.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../sass/index.scss","../sass/_header.scss","../sass/_game-container.scss","../sass/_hangman.scss","../sass/_puzzleWord.scss","../sass/_current-score.scss","../sass/_categories.scss","../sass/_defeat-victory.scss","../sass/_loading.scss"],"names":[],"mappings":";AAAA;EACI;EACA;;;ACFJ;EACI;EAEA;EAEA;EACA;EACA;EACA;;AAEA;EDHA;EACA;EAIA;EACA;;ACGA;EDTA;EACA;EAIA;EACA;ECMI;EACA;EAEA;;;ACtBR;EAEI;EACA;EAEA;;AAMA;EACI;EACA;EAEA;;;ACfR;EAEI;;AAEA;EACI;;;ACLR;EJkBI;EACA;EIhBA;EAEA;EACA;EAEA;EAEA;EACA;;AAEA;EACI;EACA;EACA;EAEA;EAEA;EACA;EACA;;AAGJ;EACI;EAEA;EAEA;;;AC9BR;EAEI;EAEA;ELGA;EACA;EKAA;EAEA;;AAEA;EACI;;;ACbR;EAEI;;AAEA;EAEI;EAEA;EACA;EAEA;EACA;EAEA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;;AAEA;EACI;EACA;EAEA;EACA;EAEA;EACA;EAEA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACI;EACA;;AA0BJ;EArBI,OAFuD;EAIvD,kBAoBc;EAnBd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAYZ;EA3BI,OAFuD;EAIvD,kBA0Bc;EAzBd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAkBZ;EAjCI,OAFuD;EAIvD,kBAgCc;EA/Bd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAwBZ;EAvCI,OAyCY;EAvCZ,kBAsCc;EArCd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AA+BZ;EA9CI,OAFuD;EAIvD,kBA6Cc;EA5Cd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAqCZ;EApDI,OAsDY;EApDZ,kBAmDc;EAlDd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AA4CZ;EA3DI,OAFuD;EAIvD,kBA0Dc;EAzDd;EAEA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAmDhB;EACI;EAEA;EACA;;AAEA;EAEI;;AAIR;EACI;;AAIJ;EACI;EACA;;AAEA;EAEI;;AAGJ;EAEI;;;ACnJhB;EACI;EACA;EACA;EAEA;EACA;EAEA;EAEA;EACA;EAEA;EAEA;EAEA;;AAEA;EACI;EACA;;;AAIR;EACI;;;AAGJ;EACI;;;AC9BJ;EACI;EACA;EACA;EAEA;EACA;EAEA;EAEA;EACA;EACA;;AAEA;EACI;EACA","file":"index.css"}
\ No newline at end of file
diff --git a/public/sass/_app.scss b/public/sass/_game-container.scss
similarity index 94%
rename from public/sass/_app.scss
rename to public/sass/_game-container.scss
index 73c5687..650b278 100644
--- a/public/sass/_app.scss
+++ b/public/sass/_game-container.scss
@@ -1,4 +1,4 @@
-.app {
+.game-container {
     
     display: flex;
     justify-content: space-around;
diff --git a/public/sass/index.scss b/public/sass/index.scss
index 6c55dd8..0850e32 100644
--- a/public/sass/index.scss
+++ b/public/sass/index.scss
@@ -21,6 +21,6 @@ html, body {
 }
 
 @import 'header';
-@import 'app';
+@import 'game-container';
 @import 'defeat-victory';
 @import 'loading';
\ No newline at end of file
diff --git a/src/App.js b/src/App.js
index 4b2d09e..a74147e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,11 +1,11 @@
 import React, {useState} from "react";
-import CurrentScore from "./components/CurrentScore";
+import CurrentScore from "./components/CurrentScore/CurrentScore";
 import Hangman from "./components/Hangman/Hangman";
-import Header from "./components/Header";
+import Header from "./components/Header/Header";
 //import PuzzleWord from "./components/Hangman/PuzzleWord/PuzzleWord";
-import Victory from "./components/Hangman/PuzzleWord/Victory";
-import Defeat from "./components/Hangman/PuzzleWord/Defeat";
-import Loading from "./components/Loading";
+import Victory from "./components/Victory && Defeat/Victory";
+import Defeat from "./components/Victory && Defeat/Defeat";
+import Loading from "./components/Loading/Loading";
 import AlmacenateCurrentScore from "./Storage Scripts/AlmacenateCurrentScore";
 import DetermineUserLanguage from "./General Scripts/DetermineUserLanguage";
 import Categories from "./components/Categories/Categories";
@@ -15,9 +15,12 @@ import { RecoveryCurrentScore } from "./Storage Scripts/RecoveryCurrentScore";
 import { RecoveryCurrentCategory } from "./Storage Scripts/RecoveryCurrentCategory";
 import { RecoveryCurrentLanguage } from "./Storage Scripts/RecoveryCurrentLanguage";
 import { AlmacenateLanguage } from "./Storage Scripts/AlmacenateLanguage";
+import WrongLetters from "./components/WrongLetters/WrongLetters";
+import Word from "./components/Word/Word";
 
 function App() {
-
+  const [displayApp, setDisplayApp] = useState(false)
+  
   const [language, setLanguage] = useState('english')
   const [languageIsReady, setLanguageIsReady] = useState(false)
 
@@ -28,10 +31,8 @@ function App() {
 
   const [hangmanFrame, setHangmanFrame] = useState(0)
 
-  const [isVictory, setIsVictory] = useState(false)
-  const [isDefeat, setIsDefeat] = useState(false)
+  const [endOfGame, setEndOfGame] = useState('')
 
-  const [displayApp, setDisplayApp] = useState(false)
   const [displayCategories, setDisplayCategories] = useState(false)
 
   React.useEffect(() => {
@@ -49,7 +50,7 @@ function App() {
 
   }, [])
 
-  if (isVictory || isDefeat) {
+  if (endOfGame) {
     
     
     setTimeout(() => {
@@ -70,7 +71,7 @@ function App() {
       setDisplayCategories={setDisplayCategories}
     />
     
-    <div className="app">
+    <div className="game-container">
       
       {
         languageIsReady ?
@@ -89,22 +90,25 @@ function App() {
       </div>
       
       <div className='column-2'>
-
-
         <CurrentScore
 
           currentScore={currentScore}
-
           language={language}
+
         />
 
-        {!displayApp ? <Loading /> : null }
-
-        {isVictory ? <Victory currentScore={currentScore} setCurrentScore={setCurrentScore} /> : null}
-        {isDefeat ? <Defeat /> : null}
+        <Word />
 
       </div>
 
+        <WrongLetters />
+
+        {
+          //!displayApp ? <Loading /> : null
+        }
+
+        {endOfGame === 'Victory' ? <Victory currentScore={currentScore} setCurrentScore={setCurrentScore} /> : null}
+        {endOfGame === 'Defeat'  ? <Defeat /> : null}
     </div>
    </>
   );
diff --git a/src/components/Hangman/PuzzleWord/alphabet.js b/src/General Scripts/alphabet.js
similarity index 100%
rename from src/components/Hangman/PuzzleWord/alphabet.js
rename to src/General Scripts/alphabet.js
diff --git a/src/components/CurrentScore.jsx b/src/components/CurrentScore/CurrentScore.jsx
similarity index 100%
rename from src/components/CurrentScore.jsx
rename to src/components/CurrentScore/CurrentScore.jsx
diff --git a/src/components/Header.jsx b/src/components/Header/Header.jsx
similarity index 100%
rename from src/components/Header.jsx
rename to src/components/Header/Header.jsx
diff --git a/src/components/Loading.jsx b/src/components/Loading/Loading.jsx
similarity index 74%
rename from src/components/Loading.jsx
rename to src/components/Loading/Loading.jsx
index 9b78f4e..00e25dc 100644
--- a/src/components/Loading.jsx
+++ b/src/components/Loading/Loading.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import loadingGifLightTheme from '../img/loading-light-theme.png'
+import loadingGifLightTheme from '../../img/loading-light-theme.png'
 
 const Loading = () => {
     return (
diff --git a/src/components/Hangman/PuzzleWord/Defeat.jsx b/src/components/Victory && Defeat/Defeat.jsx
similarity index 100%
rename from src/components/Hangman/PuzzleWord/Defeat.jsx
rename to src/components/Victory && Defeat/Defeat.jsx
diff --git a/src/components/Hangman/PuzzleWord/Victory.jsx b/src/components/Victory && Defeat/Victory.jsx
similarity index 100%
rename from src/components/Hangman/PuzzleWord/Victory.jsx
rename to src/components/Victory && Defeat/Victory.jsx
diff --git a/src/components/Hangman/PuzzleWord/Firebase Querys/BringTheWord.js b/src/components/Word/Firebase Querys/BringTheWord.js
similarity index 100%
rename from src/components/Hangman/PuzzleWord/Firebase Querys/BringTheWord.js
rename to src/components/Word/Firebase Querys/BringTheWord.js
diff --git a/src/components/Hangman/PuzzleWord/Firebase Querys/GetRandomCategory.js b/src/components/Word/Firebase Querys/GetRandomCategory.js
similarity index 100%
rename from src/components/Hangman/PuzzleWord/Firebase Querys/GetRandomCategory.js
rename to src/components/Word/Firebase Querys/GetRandomCategory.js
diff --git a/src/components/Word/Word.jsx b/src/components/Word/Word.jsx
new file mode 100644
index 0000000..4e53315
--- /dev/null
+++ b/src/components/Word/Word.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+const Word = () => {
+    return (
+        <div>
+            
+        </div>
+    )
+}
+
+export default Word
diff --git a/src/components/WrongLetters/WrongLetters.jsx b/src/components/WrongLetters/WrongLetters.jsx
new file mode 100644
index 0000000..7c2ea98
--- /dev/null
+++ b/src/components/WrongLetters/WrongLetters.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+const WrongLetters = () => {
+    return (
+        <div>
+            
+        </div>
+    )
+}
+
+export default WrongLetters