diff --git a/build.gradle b/build.gradle
index 8cf2a65b39..b8fa30093a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ test {
 }
 
 application {
-    mainClassName = "seedu.duke.Duke"
+    mainClassName = "duke.Launcher"
 }
 
 shadowJar {
diff --git a/data/duke.txt b/data/duke.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/main/java/duke/Command/AddCommand.java b/src/main/java/duke/Command/AddCommand.java
index 55009a50ee..7eeab84f8a 100644
--- a/src/main/java/duke/Command/AddCommand.java
+++ b/src/main/java/duke/Command/AddCommand.java
@@ -1,6 +1,10 @@
 package duke.Command;
 
-import duke.*;
+import duke.DukeException;
+import duke.Storage;
+import duke.Task;
+import duke.TaskList;
+import duke.Ui;
 
 public class AddCommand extends Command {
     private String type;
diff --git a/src/main/java/duke/Command/DeleteCommand.java b/src/main/java/duke/Command/DeleteCommand.java
index 6f0179ac77..7680312c29 100644
--- a/src/main/java/duke/Command/DeleteCommand.java
+++ b/src/main/java/duke/Command/DeleteCommand.java
@@ -1,6 +1,10 @@
 package duke.Command;
 
-import duke.*;
+import duke.DukeException;
+import duke.Storage;
+import duke.Task;
+import duke.TaskList;
+import duke.Ui;
 
 public class DeleteCommand extends Command {
     private int index;
diff --git a/src/main/java/duke/Command/DoneCommand.java b/src/main/java/duke/Command/DoneCommand.java
index f1c13374a7..1f14fab787 100644
--- a/src/main/java/duke/Command/DoneCommand.java
+++ b/src/main/java/duke/Command/DoneCommand.java
@@ -1,6 +1,10 @@
 package duke.Command;
 
-import duke.*;
+import duke.DukeException;
+import duke.Storage;
+import duke.Task;
+import duke.TaskList;
+import duke.Ui;
 
 public class DoneCommand extends Command {
 
diff --git a/src/main/java/duke/Command/FindCommand.java b/src/main/java/duke/Command/FindCommand.java
index 7bbd8cfd93..6a844c72c5 100644
--- a/src/main/java/duke/Command/FindCommand.java
+++ b/src/main/java/duke/Command/FindCommand.java
@@ -2,7 +2,11 @@
 
 import java.util.ArrayList;
 
-import duke.*;
+import duke.DukeException;
+import duke.Storage;
+import duke.Task;
+import duke.TaskList;
+import duke.Ui;
 
 
 public class FindCommand extends Command {
diff --git a/src/main/java/duke/MainWindow.java b/src/main/java/duke/MainWindow.java
index 84fef3cfc8..9b3e8d34d3 100644
--- a/src/main/java/duke/MainWindow.java
+++ b/src/main/java/duke/MainWindow.java
@@ -1,7 +1,5 @@
 package duke;
 
-import duke.DialogBox;
-import duke.Duke;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ScrollPane;
@@ -50,4 +48,4 @@ private void handleUserInput() {
         );
         userInput.clear();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index e00f1d18a9..2ad2268bea 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -1,6 +1,12 @@
 package duke;
 
-import duke.Command.*;
+import duke.Command.AddCommand;
+import duke.Command.Command;
+import duke.Command.DeleteCommand;
+import duke.Command.DoneCommand;
+import duke.Command.ExitCommand;
+import duke.Command.FindCommand;
+import duke.Command.ListCommand;
 
 
 public class Parser {
diff --git a/src/test/java/dukeTest/TaskListTest.java b/src/test/java/dukeTest/TaskListTest.java
index 2565e31054..8dbfb43822 100644
--- a/src/test/java/dukeTest/TaskListTest.java
+++ b/src/test/java/dukeTest/TaskListTest.java
@@ -1,13 +1,16 @@
 package dukeTest;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+
+import org.junit.jupiter.api.Test;
+
 import duke.DukeException;
 import duke.Task;
 import duke.TaskList;
-import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TaskListTest {
     @Test
@@ -20,7 +23,7 @@ public void addTaskTest() throws DukeException {
     }
 
     @Test
-    public void removeTaskTest() throws DukeException{
+    public void removeTaskTest() throws DukeException {
         Task task = new Task.Deadline("test", false, "2021-12-12");
         ArrayList<Task> temp = new ArrayList<>();
         temp.add(task);
diff --git a/src/test/java/dukeTest/TaskTest.java b/src/test/java/dukeTest/TaskTest.java
index eb8781b87b..e4e80da14b 100644
--- a/src/test/java/dukeTest/TaskTest.java
+++ b/src/test/java/dukeTest/TaskTest.java
@@ -1,9 +1,13 @@
 package dukeTest;
 
-import duke.Task;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import duke.Task;
+
+
+
 
 public class TaskTest {
     @Test