diff --git a/app/src/main/java/org/cutem/cutecalendar/presenter/NewTodoItemStage.java b/app/src/main/java/org/cutem/cutecalendar/presenter/NewTodoItemStage.java
index a167170..34934ea 100644
--- a/app/src/main/java/org/cutem/cutecalendar/presenter/NewTodoItemStage.java
+++ b/app/src/main/java/org/cutem/cutecalendar/presenter/NewTodoItemStage.java
@@ -32,7 +32,7 @@ public class NewTodoItemStage implements Initializable {
     Stage addStage;
 
 
-    private static final String FXML_FILE = "res/addTodoItemStage.fxml";
+    private static final String FXML_FILE = "fxml/addTodoItemStage.fxml";
     private ClassLoader mClassLoader = getClass().getClassLoader();
 
     public void showNewTodoItemStage(){
diff --git a/app/src/main/resources/fxml/addTodoItemStage.fxml b/app/src/main/resources/fxml/addTodoItemStage.fxml
new file mode 100644
index 0000000..e3f9f8c
--- /dev/null
+++ b/app/src/main/resources/fxml/addTodoItemStage.fxml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml/1" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="459.0" prefWidth="433.0" xmlns="http://javafx.com/javafx/8">
+    <columnConstraints>
+        <ColumnConstraints hgrow="SOMETIMES" maxWidth="212.0" minWidth="10.0" prefWidth="124.0"/>
+        <ColumnConstraints hgrow="SOMETIMES" maxWidth="319.0" minWidth="10.0" prefWidth="309.0"/>
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="46.0" minHeight="10.0" prefHeight="26.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="75.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="104.0" minHeight="10.0" prefHeight="36.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="107.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="94.0" minHeight="0.0" prefHeight="43.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="185.0" minHeight="10.0" prefHeight="151.0" vgrow="SOMETIMES"/>
+        <RowConstraints maxHeight="94.0" minHeight="10.0" prefHeight="70.0" vgrow="SOMETIMES"/>
+    </rowConstraints>
+    <children>
+        <Label text="Title" GridPane.halignment="CENTER"/>
+        <Label text="Begin" GridPane.halignment="CENTER" GridPane.rowIndex="1"/>
+        <Label text="End" GridPane.halignment="CENTER" GridPane.rowIndex="2"/>
+        <Label text="Type" GridPane.halignment="CENTER" GridPane.rowIndex="3"/>
+        <Label text="Location" GridPane.halignment="CENTER" GridPane.rowIndex="4"/>
+        <Label text="Personnel" GridPane.halignment="CENTER" GridPane.rowIndex="5"/>
+        <Label text="Description" GridPane.halignment="CENTER" GridPane.rowIndex="6" GridPane.valignment="TOP"/>
+        <TextField fx:id="titleInput" prefHeight="23.0" prefWidth="274.0" promptText="titile of the item"
+                   GridPane.columnIndex="1">
+            <GridPane.margin>
+                <Insets right="20.0"/>
+            </GridPane.margin>
+        </TextField>
+        <TextField fx:id="bgnInput" promptText="YYYY-MM-DD/HH:MM" GridPane.columnIndex="1" GridPane.rowIndex="1">
+            <GridPane.margin>
+                <Insets right="20.0"/>
+            </GridPane.margin>
+        </TextField>
+        <TextField fx:id="endInput" promptText="YYYY-MM-DD/HH:MM" GridPane.columnIndex="1" GridPane.rowIndex="2">
+            <GridPane.margin>
+                <Insets right="20.0"/>
+            </GridPane.margin>
+        </TextField>
+        <TextField fx:id="personnelInput" promptText="XX,XXX,.....,XXX" GridPane.columnIndex="1" GridPane.rowIndex="5">
+            <GridPane.margin>
+                <Insets right="20.0"/>
+            </GridPane.margin>
+        </TextField>
+        <TextField fx:id="locationInput" promptText="the location of the todo Item" GridPane.columnIndex="1"
+                   GridPane.rowIndex="4">
+            <GridPane.margin>
+                <Insets right="20.0"/>
+            </GridPane.margin>
+        </TextField>
+        <TextArea fx:id="descriptionInput" prefHeight="89.0" prefWidth="309.0"
+                  promptText="the description of the todo item" GridPane.columnIndex="1" GridPane.rowIndex="6">
+            <GridPane.margin>
+                <Insets right="20.0"/>
+            </GridPane.margin>
+        </TextArea>
+        <ChoiceBox fx:id="typeChoicebox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+        <Button fx:id="finish" mnemonicParsing="false" text="Finish" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+        <Button fx:id="cancel" mnemonicParsing="false" text="Cancel" GridPane.columnIndex="1"
+                GridPane.halignment="CENTER" GridPane.rowIndex="7"/>
+    </children>
+</GridPane>
diff --git a/app/src/main/resources/res/addTodoItemStage.fxml b/app/src/main/resources/res/addTodoItemStage.fxml
deleted file mode 100644
index 2967f23..0000000
--- a/app/src/main/resources/res/addTodoItemStage.fxml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="459.0" prefWidth="433.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" >
-  <columnConstraints>
-    <ColumnConstraints hgrow="SOMETIMES" maxWidth="212.0" minWidth="10.0" prefWidth="124.0" />
-    <ColumnConstraints hgrow="SOMETIMES" maxWidth="319.0" minWidth="10.0" prefWidth="309.0" />
-  </columnConstraints>
-  <rowConstraints>
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    <RowConstraints maxHeight="46.0" minHeight="10.0" prefHeight="26.0" vgrow="SOMETIMES" />
-    <RowConstraints maxHeight="75.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="104.0" minHeight="10.0" prefHeight="36.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="107.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="94.0" minHeight="0.0" prefHeight="43.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="185.0" minHeight="10.0" prefHeight="151.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="94.0" minHeight="10.0" prefHeight="70.0" vgrow="SOMETIMES" />
-  </rowConstraints>
-   <children>
-      <Label text="Title" GridPane.halignment="CENTER" />
-      <Label text="Begin" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
-      <Label text="End" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-      <Label text="Type" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
-      <Label text="Location" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
-      <Label text="Personnel" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
-      <Label text="Description" GridPane.halignment="CENTER" GridPane.rowIndex="6" GridPane.valignment="TOP" />
-      <TextField fx:id="titleInput" prefHeight="23.0" prefWidth="274.0" promptText="titile of the item" GridPane.columnIndex="1">
-         <GridPane.margin>
-            <Insets right="20.0" />
-         </GridPane.margin>
-      </TextField>
-      <TextField fx:id="bgnInput" promptText="YYYY-MM-DD/HH:MM" GridPane.columnIndex="1" GridPane.rowIndex="1">
-         <GridPane.margin>
-            <Insets right="20.0" />
-         </GridPane.margin>
-      </TextField>
-      <TextField fx:id="endInput" promptText="YYYY-MM-DD/HH:MM" GridPane.columnIndex="1" GridPane.rowIndex="2">
-         <GridPane.margin>
-            <Insets right="20.0" />
-         </GridPane.margin>
-      </TextField>
-      <TextField fx:id="personnelInput" promptText="XX,XXX,.....,XXX" GridPane.columnIndex="1" GridPane.rowIndex="5">
-         <GridPane.margin>
-            <Insets right="20.0" />
-         </GridPane.margin>
-      </TextField>
-      <TextField fx:id="locationInput" promptText="the location of the todo Item" GridPane.columnIndex="1" GridPane.rowIndex="4">
-         <GridPane.margin>
-            <Insets right="20.0" />
-         </GridPane.margin>
-      </TextField>
-      <TextArea fx:id="descriptionInput" prefHeight="89.0" prefWidth="309.0" promptText="the description of the todo item" GridPane.columnIndex="1" GridPane.rowIndex="6">
-         <GridPane.margin>
-            <Insets right="20.0" />
-         </GridPane.margin>
-      </TextArea>
-      <ChoiceBox fx:id="typeChoicebox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-      <Button fx:id="finish" mnemonicParsing="false" text="Finish" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-      <Button fx:id="cancel" mnemonicParsing="false" text="Cancel" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="7" />
-   </children>
-</GridPane>