diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0f8e7ab..e5d6295 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/src/main/java/fabrik/simulator/pic16f84/FileSelect.java b/src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java
similarity index 97%
rename from src/main/java/fabrik/simulator/pic16f84/FileSelect.java
rename to src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java
index a9e2250..884df5b 100644
--- a/src/main/java/fabrik/simulator/pic16f84/FileSelect.java
+++ b/src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java
@@ -11,7 +11,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 
-public class FileSelect {
+public class Controller_FileSelect {
     @FXML
     protected void selectFileLST(ActionEvent event) throws IOException {
         FileChooser fileChooser = new FileChooser();
diff --git a/src/main/java/fabrik/simulator/pic16f84/MainBody.java b/src/main/java/fabrik/simulator/pic16f84/Controller_MainBody.java
similarity index 52%
rename from src/main/java/fabrik/simulator/pic16f84/MainBody.java
rename to src/main/java/fabrik/simulator/pic16f84/Controller_MainBody.java
index 1903648..6c51e72 100644
--- a/src/main/java/fabrik/simulator/pic16f84/MainBody.java
+++ b/src/main/java/fabrik/simulator/pic16f84/Controller_MainBody.java
@@ -1,4 +1,4 @@
 package fabrik.simulator.pic16f84;
 
-public class MainBody {
+public class Controller_MainBody {
 }
diff --git a/src/main/java/fabrik/simulator/pic16f84/HelloController.java b/src/main/java/fabrik/simulator/pic16f84/HelloController.java
deleted file mode 100644
index 3d8fd68..0000000
--- a/src/main/java/fabrik/simulator/pic16f84/HelloController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package fabrik.simulator.pic16f84;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-
-public class HelloController {
-    @FXML
-    private Label welcomeText;
-
-    @FXML
-    protected void onHelloButtonClick() {
-        welcomeText.setText("Welcome to JavaFX Application!");
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/fabrik/simulator/pic16f84/FileSelector.fxml b/src/main/resources/fabrik/simulator/pic16f84/FileSelector.fxml
index 7055104..9730826 100644
--- a/src/main/resources/fabrik/simulator/pic16f84/FileSelector.fxml
+++ b/src/main/resources/fabrik/simulator/pic16f84/FileSelector.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.*?>
 
 <AnchorPane prefHeight="500.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/17.0.2-ea"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="fabrik.simulator.pic16f84.FileSelect">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="fabrik.simulator.pic16f84.Controller_FileSelect">
    <VBox alignment="CENTER" prefHeight="500.0" prefWidth="500.0" AnchorPane.bottomAnchor="0.0"
          AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
       <Label text="Willkommen beim PIC-Simulator!" textAlignment="CENTER">
diff --git a/src/main/resources/fabrik/simulator/pic16f84/MainBody.fxml b/src/main/resources/fabrik/simulator/pic16f84/MainBody.fxml
index 8925dc1..684e44a 100644
--- a/src/main/resources/fabrik/simulator/pic16f84/MainBody.fxml
+++ b/src/main/resources/fabrik/simulator/pic16f84/MainBody.fxml
@@ -4,12 +4,10 @@
 <?import javafx.scene.text.*?>
 
 
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fabrik.simulator.pic16f84.MainBody">
-   <children>
-      <VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <children>
-            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Hauptseite" />
-         </children>
-      </VBox>
-   </children>
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="fabrik.simulator.pic16f84.Controller_MainBody">
+   <VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0"
+         AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Hauptseite"/>
+   </VBox>
 </AnchorPane>