diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
index f90d1f6..45a4b0d 100644
Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and b/.gradle/7.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 46c3158..0a00c1c 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index 831d491..af04e72 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -1,108 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <center>
-       <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
-           <children>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="20.0" />
-                           </VBox.margin>
-                       </Label>
-                       <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets />
-                           </VBox.margin>
-                       </ListView>
-                       <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin>
-                       </Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets left="40.0" />
-                   </HBox.margin>
-               </VBox>
-               <Separator orientation="VERTICAL" prefHeight="200.0">
-                   <HBox.margin>
-                       <Insets left="10.0" right="10.0" />
-                   </HBox.margin>
-               </Separator>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="40.0" />
-                           </VBox.margin></Label>
-                       <Separator prefWidth="200.0" />
-                       <GridPane fx:id="grid" prefHeight="200.0">
-                           <columnConstraints>
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           </columnConstraints>
-                           <rowConstraints>
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                           </rowConstraints>
-                           <children>
-                               <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </TextField>
-                               <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                           </children>
-                       </GridPane>
-                       <Separator prefWidth="200.0" />
-                       <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin></Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets right="40.0" />
-                   </HBox.margin>
-               </VBox>
-           </children>
-       </HBox>
-   </center>
    <top>
       <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
similarity index 98%
rename from app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
rename to app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
index c64bf07..df5040e 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular.participantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
new file mode 100644
index 0000000..9a52479
--- /dev/null
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.tournamentListController">
+    <children>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="20.0" />
+                    </VBox.margin>
+                </Label>
+                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets />
+                    </VBox.margin>
+                </ListView>
+                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin>
+                </Button>
+            </children>
+            <HBox.margin>
+                <Insets left="40.0" />
+            </HBox.margin>
+        </VBox>
+        <Separator orientation="VERTICAL" prefHeight="200.0">
+            <HBox.margin>
+                <Insets left="10.0" right="10.0" />
+            </HBox.margin>
+        </Separator>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="40.0" />
+                    </VBox.margin></Label>
+                <Separator prefWidth="200.0" />
+                <GridPane fx:id="grid" prefHeight="200.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                    <children>
+                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </TextField>
+                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                    </children>
+                </GridPane>
+                <Separator prefWidth="200.0" />
+                <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin></Button>
+            </children>
+            <HBox.margin>
+                <Insets right="40.0" />
+            </HBox.margin>
+        </VBox>
+    </children>
+
+
+</HBox>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
deleted file mode 100644
index 2372a7f..0000000
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ch.zhaw.projekt2.turnierverwaltung.tournamentList.tournamentListController"
-            prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>
diff --git a/app/build/tmp/compileJava/previous-compilation-data.bin b/app/build/tmp/compileJava/previous-compilation-data.bin
index 840f5c6..611f7c9 100644
Binary files a/app/build/tmp/compileJava/previous-compilation-data.bin and b/app/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
index f3e735c..c124308 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
@@ -3,22 +3,27 @@ package ch.zhaw.projekt2.turnierverwaltung.main;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
+import java.awt.*;
 import java.io.IOException;
 
 public class MainWindow extends Application {
 
-
-
     @Override
     public void start(Stage primaryStage) throws Exception {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
-        Pane pane = loader.load();
+        BorderPane pane = loader.load();
+
+        //test add center pane
+        loader = new FXMLLoader(getClass().getResource("tournamentList/tournamentList.fxml"));
+        pane.setCenter(loader.load());
+
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
-        primaryStage.setFullScreen(true);
+        primaryStage.setMaximized(true);
         primaryStage.setResizable(false);
         primaryStage.show();
     }
@@ -26,7 +31,7 @@ public class MainWindow extends Application {
     //Can be used to Open new Scene in same Stage.
     //This way possible to later give object to Controller
     public void startParticipand(Stage stage) {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("../participandAddFormular/participandFormular.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("participandAddFormular/participandFormular.fxml"));
         try {
             Pane pane = loader.load();
             Scene scene = new Scene(pane);
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
index 84c410d..577a538 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -2,55 +2,9 @@ package ch.zhaw.projekt2.turnierverwaltung.main;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.control.MenuItem;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.VBox;
 
 public class MainWindowController {
 
-    @FXML
-    private MenuItem closeBtn;
-
-    @FXML
-    private Button createBtn;
-
-    @FXML
-    private MenuItem germanSelect;
-
-    @FXML
-    private GridPane grid;
-
-    @FXML
-    private VBox mainContainer;
-
-    @FXML
-    private Label mainTitle;
-
-    @FXML
-    private ChoiceBox<?> modusChoiceBox;
-
-    @FXML
-    private Label newTournamentFormularTitle;
-
-    @FXML
-    private Button openBtn;
-
-    @FXML
-    private Label tournierListTitle;
-
-    @FXML
-    private ListView<?> tournierListView;
-
-    @FXML
-    private Label tournierModLabel;
-
-    @FXML
-    private Label turnierNameLabel;
-
     @FXML
     void changeLangToGerman(ActionEvent event) {
 
@@ -60,15 +14,4 @@ public class MainWindowController {
     void closeApplication(ActionEvent event) {
 
     }
-
-    @FXML
-    void createTournament(ActionEvent event) {
-
-    }
-
-    @FXML
-    void openTournier(ActionEvent event) {
-
-    }
-
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
similarity index 76%
rename from app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
rename to app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
index a80622b..adc2c20 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
@@ -1,11 +1,10 @@
-package ch.zhaw.projekt2.turnierverwaltung.participandAddFormular;
+package ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
-import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.GridPane;
@@ -25,27 +24,15 @@ public class participantFormularController {
     @FXML
     private VBox changeBtn;
 
-    @FXML
-    private MenuItem closeBtn;
-
     @FXML
     private Label firstNameLabel;
 
     @FXML
     private TextField firstNameTextField;
 
-    @FXML
-    private MenuItem germanSelect;
-
     @FXML
     private GridPane grid;
 
-    @FXML
-    private VBox mainContainer;
-
-    @FXML
-    private Label mainTitle;
-
     @FXML
     private Label newParticipantFormularTitle;
 
@@ -78,21 +65,11 @@ public class participantFormularController {
 
     }
 
-    @FXML
-    void changeLangToGerman(ActionEvent event) {
-
-    }
-
     @FXML
     void changeParticipant(MouseEvent event) {
 
     }
 
-    @FXML
-    void closeApplication(ActionEvent event) {
-
-    }
-
     @FXML
     void save(ActionEvent event) {
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java
new file mode 100644
index 0000000..916b5d6
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java
@@ -0,0 +1,51 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.GridPane;
+
+public class tournamentListController {
+
+    @FXML
+    private Button createBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ChoiceBox<?> modusChoiceBox;
+
+    @FXML
+    private Label newTournamentFormularTitle;
+
+    @FXML
+    private Button openBtn;
+
+    @FXML
+    private Label tournierListTitle;
+
+    @FXML
+    private ListView<?> tournierListView;
+
+    @FXML
+    private Label tournierModLabel;
+
+    @FXML
+    private Label turnierNameLabel;
+
+    @FXML
+    void createTournament(ActionEvent event) {
+
+    }
+
+    @FXML
+    void openTournier(ActionEvent event) {
+
+    }
+
+}
+
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
deleted file mode 100644
index adbfb59..0000000
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ch.zhaw.projekt2.turnierverwaltung.tournamentList;
-
-public class tournamentListController {
-}
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index 831d491..af04e72 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -1,108 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <center>
-       <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
-           <children>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="20.0" />
-                           </VBox.margin>
-                       </Label>
-                       <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets />
-                           </VBox.margin>
-                       </ListView>
-                       <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin>
-                       </Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets left="40.0" />
-                   </HBox.margin>
-               </VBox>
-               <Separator orientation="VERTICAL" prefHeight="200.0">
-                   <HBox.margin>
-                       <Insets left="10.0" right="10.0" />
-                   </HBox.margin>
-               </Separator>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="40.0" />
-                           </VBox.margin></Label>
-                       <Separator prefWidth="200.0" />
-                       <GridPane fx:id="grid" prefHeight="200.0">
-                           <columnConstraints>
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           </columnConstraints>
-                           <rowConstraints>
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                           </rowConstraints>
-                           <children>
-                               <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </TextField>
-                               <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                           </children>
-                       </GridPane>
-                       <Separator prefWidth="200.0" />
-                       <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin></Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets right="40.0" />
-                   </HBox.margin>
-               </VBox>
-           </children>
-       </HBox>
-   </center>
    <top>
       <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
similarity index 98%
rename from app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
index c64bf07..df5040e 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular.participantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
new file mode 100644
index 0000000..9a52479
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.tournamentListController">
+    <children>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="20.0" />
+                    </VBox.margin>
+                </Label>
+                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets />
+                    </VBox.margin>
+                </ListView>
+                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin>
+                </Button>
+            </children>
+            <HBox.margin>
+                <Insets left="40.0" />
+            </HBox.margin>
+        </VBox>
+        <Separator orientation="VERTICAL" prefHeight="200.0">
+            <HBox.margin>
+                <Insets left="10.0" right="10.0" />
+            </HBox.margin>
+        </Separator>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="40.0" />
+                    </VBox.margin></Label>
+                <Separator prefWidth="200.0" />
+                <GridPane fx:id="grid" prefHeight="200.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                    <children>
+                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </TextField>
+                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                    </children>
+                </GridPane>
+                <Separator prefWidth="200.0" />
+                <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin></Button>
+            </children>
+            <HBox.margin>
+                <Insets right="40.0" />
+            </HBox.margin>
+        </VBox>
+    </children>
+
+
+</HBox>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
deleted file mode 100644
index 2372a7f..0000000
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ch.zhaw.projekt2.turnierverwaltung.tournamentList.tournamentListController"
-            prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>