diff --git a/lib/data.txt b/lib/data.txt
new file mode 100644
index 0000000000..95e35f5bfa
--- /dev/null
+++ b/lib/data.txt
@@ -0,0 +1,4 @@
+todo eat
+false
+event drink /at home
+false
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6e864153e8
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: duke.Duke
+
diff --git a/src/main/java/duke/Data.java b/src/main/java/duke/Data.java
index 1b4a70a94b..f6a1c77d68 100644
--- a/src/main/java/duke/Data.java
+++ b/src/main/java/duke/Data.java
@@ -18,7 +18,7 @@ public class Data {
 
     public Data() throws FileNotFoundException {
         this.todos = new ArrayList<Todo>();
-        File f = new File("src/main/java/duke/data.txt");
+        File f = new File("lib/data.txt");
 
 
         // Adapted from https://nus-cs2113-ay1920s2.github.io/website/schedule/week6/topics.html
@@ -59,10 +59,10 @@ public static void newTask(String cmd) throws DukeException {
         if (cmd.isEmpty()) {
             throw new DukeException("Please type something.");
         }
-        if (cmd.substring(0, 6).equals("delete")) {
-            todos.remove(Integer.parseInt(cmd.substring(cmd.indexOf(" ")+1))-1);
+        if (cmd.contains("delete")) {
             System.out.println("  Noted. I've removed this task:");
             System.out.println("     " + todos.get(getSize() - 1));
+            todos.remove(Integer.parseInt(cmd.substring(cmd.indexOf(" ")+1))-1);
             System.out.println("  Now you have " + getSize() + " tasks in the list.");
         } else {
             if (!cmd.contains(" ") && cmd.length() > 0) {
@@ -124,7 +124,7 @@ public String getDescription(int i) {
         return todos.get(i).getDescription();
     }
     public void saveToFile() throws IOException {
-        FileWriter fw = new FileWriter("src/main/java/duke/data.txt");
+        FileWriter fw = new FileWriter("lib/data.txt");
         for (Todo todo : todos) {
             String description = todo.getDescription();
             boolean isDone = todo.isItDone();