diff --git a/.gitignore b/.gitignore
index 823d175eb670..c8e31b0cdb8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ lib/*
 *.log
 *.log.*
 *.csv
-config.json
+/config.json
 src/test/data/sandbox/
 preferences.json
 .DS_Store
diff --git a/README.adoc b/README.adoc
index fa50028b99d0..270e525e6a03 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,39 +1,49 @@
-= Address Book (Level 4)
+= PlanWithEase
 ifdef::env-github,env-browser[:relfileprefix: docs/]
 
-https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
-https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
-https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
-https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
+https://travis-ci.org/CS2113-AY1819S2-T09-1/main[image:https://img.shields.io/travis/CS2113-AY1819S2-T09-1/main/master.svg?logo=travis-ci&logoColor=FFDC00&cacheSeconds=0[Travis CI Build Status]]
+https://ci.appveyor.com/project/Creastery/main[image:https://img.shields.io/appveyor/ci/Creastery/main/master.svg?logo=appveyor&logoColor=39CCCC&cacheSeconds=0[AppVeyor CI Build Status]]
+https://coveralls.io/github/CS2113-AY1819S2-T09-1/main?branch=master[image:https://img.shields.io/coveralls/github/CS2113-AY1819S2-T09-1/main.svg?logo=reverbnation&logoColor=FF851B&cacheSeconds=0[Coveralls Code Coverage Status]]
+https://www.codacy.com/app/cs2113-ay1819s2-t09-1/main[image:https://img.shields.io/codacy/grade/fb54572137f043de9b9913f791b4017f.svg?logo=codacy&logoColor=white&cacheSeconds=0[Codacy Code Quality Status]]
+https://app.netlify.com/sites/cs2113-ay1819s2-t09-1/deploys[image:https://img.shields.io/badge/dynamic/json.svg?url=https://api.netlify.com/api/v1/sites/cs2113-ay1819s2-t09-1.netlify.com/deploys&query=$%5B0%5D.state&label=deploy&color=blue&logo=netlify&cacheSeconds=0[Netlify Deploy Previews Status]]
+link:https://github.com/cs2113-ay1819s2-t09-1/main/blob/master/LICENSE[image:https://img.shields.io/badge/license-MIT-blue.svg?logo=github&logoColor=white[MIT License]]
 
 ifdef::env-github[]
-image::docs/images/Ui.png[width="600"]
+image::docs/images/Ui.png[width="800"]
 endif::[]
 
 ifndef::env-github[]
-image::images/Ui.png[width="600"]
+image::images/Ui.png[width="970"]
 endif::[]
 
-* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
-* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
-* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
-* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
-** A more sophisticated GUI that includes a list  panel and an in-built Browser.
-** More test cases, including automated GUI testing.
-** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
+* PlanWithEase (PWE) is a degree planner desktop application. It has a GUI but most of the user
+interactions happen
+using a CLI
+(Command Line Interface).
+* PWE is designed to help students in National University of Singapore (NUS) Information Security freshmen in creating a
+ comprehensive degree plan according to the degree requirements.
+* PWE is optimized for those who prefer using a CLI. The commands used to interact with PWE
+are designed to be simple and intuitive, so even those who are unfamiliar with CLI can use PWE with ease.
+
+* PWE allows users to:
+** plan their module quickly and more conveniently.
+** automate checking of module pre-requisites to avoid module conflicts. _(coming soon)_
+** provide an informed decision so that the user are able to decide which module to take at which semester.
 
 == Site Map
 
 * <<UserGuide#, User Guide>>
 * <<DeveloperGuide#, Developer Guide>>
-* <<LearningOutcomes#, Learning Outcomes>>
 * <<AboutUs#, About Us>>
 * <<ContactUs#, Contact Us>>
 
 == Acknowledgements
-
+* Original source: https://github.com/se-edu/addressbook-level4[AddressBook
+Level 4 project] created by https://github.com/se-edu/[SE-EDU initiative]
 * Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
 _Marco Jakob_.
-* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
+* Libraries used: https://github.com/TestFX/TestFX[TestFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
+* Modified icon from https://fontawesome.com[Font Awesome]
+* Modified CSS from https://bitbucket.org/agix-material-fx/materialfx-material-design-for-javafx[MaterialFX - Material design for javafx]
 
-== Licence : link:LICENSE[MIT]
+== Licence : link:https://github.com/cs2113-ay1819s2-t09-1/main/blob/master/LICENSE[MIT]
diff --git a/_reposense/config.json b/_reposense/config.json
new file mode 100644
index 000000000000..be9eee124ecc
--- /dev/null
+++ b/_reposense/config.json
@@ -0,0 +1,30 @@
+{
+  "authors":
+  [
+    {
+      "githubId": "truegitnovice",
+      "displayName": "AHN...GYU",
+      "authorNames": ["truegitnovice", "Ahn TaeGyu"]
+    },
+    {
+      "githubId": "WendyBaiYunwei",
+      "displayName": "BAI...WEI",
+      "authorNames": ["WendyBaiYunwei", "Bai Yunwei"]
+    },
+    {
+      "githubId": "lycjackie",
+      "displayName": "LEE...HOY",
+      "authorNames": ["lycjackie", "Jackie Lee"]
+    },
+    {
+      "githubId": "Creastery",
+      "displayName": "NGO...LIN",
+      "authorNames": ["Creastery", "Ngo Wei Lin"]
+    },
+    {
+      "githubId": "chyeo",
+      "displayName": "YEO...ONG",
+      "authorNames": ["chyeo", "CH YEO", "Yeo Cheng Hong"]
+    }
+  ]
+}
diff --git a/build.gradle b/build.gradle
index 4f2949b6e774..4c94d1864cac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,9 @@ plugins {
     id 'java'
     id 'jacoco'
     id 'checkstyle'
-    id 'com.github.kt3k.coveralls' version '2.4.0'
-    id 'com.github.johnrengelman.shadow' version '2.0.3'
-    id 'org.asciidoctor.convert' version '1.5.6'
+    id 'com.github.kt3k.coveralls' version '2.8.2'
+    id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id 'org.asciidoctor.convert' version '1.5.8'
     id 'application'
 }
 
@@ -28,7 +28,7 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_10
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.address.MainApp'
+mainClassName = 'pwe.planner.MainApp'
 
 sourceCompatibility = JavaVersion.VERSION_1_9
 targetCompatibility = JavaVersion.VERSION_1_9
@@ -55,12 +55,11 @@ test {
 }
 
 dependencies {
-    String testFxVersion = '4.0.12-alpha'
+    String testFxVersion = '4.0.15-alpha'
     String jUnitVersion = '5.1.0'
 
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
-    implementation group: 'com.google.guava', name: 'guava', version: '19.0'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.9.8'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion, {
@@ -70,15 +69,13 @@ dependencies {
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion
 
-    testRuntimeOnly group: 'org.testfx', name: 'testfx-internal-java9', version: testFxVersion
     testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-9+181'
     testRuntimeOnly group:'org.junit.vintage', name:'junit-vintage-engine', version: jUnitVersion
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
-
+    archiveName = 'PWE.jar'
     destinationDir = file("${buildDir}/jar/")
 }
 
@@ -152,16 +149,16 @@ test {
         }
 
         if (runNonGuiTests) {
-            test.include 'seedu/address/**'
+            test.include 'pwe/planner/**'
         }
 
         if (runGuiTests) {
             test.include 'systemtests/**'
-            test.include 'seedu/address/ui/**'
+            test.include 'pwe/planner/ui/**'
         }
 
         if (!runGuiTests) {
-            test.exclude 'seedu/address/ui/**'
+            test.exclude 'pwe/planner/ui/**'
         }
     }
 }
@@ -188,6 +185,8 @@ asciidoctor {
     sourceDir 'docs'
     outputDir "${buildDir}/docs"
 
+    dependsOn('copyStylesheets')
+
     options = [
         template_dirs: [file("${sourceDir}/templates")],
     ]
@@ -202,9 +201,8 @@ asciidoctor {
         idprefix: '',  // for compatibility with GitHub preview
         idseparator: '-',
         'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
-        'site-name': 'AddressBook-Level4',
-        'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
-        'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
+        'site-name': 'PlanWithEase',
+        'site-githuburl': 'https://github.com/cs2113-ay1819s2-t09-1/main',
     ]
 
     options['template_dirs'].each {
@@ -219,9 +217,10 @@ task copyStylesheets(type: Copy) {
     from "${asciidoctor.sourceDir}/stylesheets"
     into "${asciidoctor.outputDir}/html5/stylesheets"
 }
-asciidoctor.dependsOn copyStylesheets
 
 task deployOfflineDocs(type: Copy) {
+    dependsOn('asciidoctor')
+
     into('src/main/resources/docs')
 
     from ("${asciidoctor.outputDir}/html5") {
@@ -231,7 +230,22 @@ task deployOfflineDocs(type: Copy) {
     }
 }
 
-deployOfflineDocs.dependsOn asciidoctor
 processResources.dependsOn deployOfflineDocs
 
-defaultTasks 'clean', 'headless', 'allTests', 'coverage', 'asciidoctor'
+task buildJar(type: GradleBuild) {
+    tasks = ['clean', 'deployOfflineDocs', 'shadowJar']
+}
+
+compileJava {
+    options.warnings = true
+    options.deprecation = true
+    options.compilerArgs += [ "-Xlint:cast,deprecation,divzero,rawtypes,unchecked" ]
+}
+
+compileTestJava {
+    options.warnings = true
+    options.deprecation = true
+    options.compilerArgs += [ "-Xlint:cast,deprecation,divzero,rawtypes,unchecked" ]
+}
+
+defaultTasks 'clean', 'checkstyleMain', 'checkstyleTest', 'headless', 'allTests', 'coverage', 'asciidoctor'
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index a9671a144efd..c970943d6b40 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     This configuration file enforces rules for a modified version of the module's code standard at
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index b2e7fdbc3a00..dabcd1ff4e33 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE suppressions PUBLIC
-"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
   <suppress checks="JavadocType" files=".*Test\.java"/>
diff --git a/copyright.txt b/copyright.txt
index 93aa2a39ce25..f9a86025819f 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,8 +1,9 @@
 Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob
 
-Copyright by Susumu Yoshida - http://www.mcdodesign.com/
-- address_book_32.png
-- AddressApp.ico
+Some css adapted from https://bitbucket.org/agix-material-fx/materialfx-material-design-for-javafx by AGIX | Innovative Engineering
+
+Copyright by Font Awesome - https://fontawesome.com/
+- plan_with_ease_32.png
 
 Copyright by Jan Jan Kovařík - http://glyphicons.com/
 - calendar.png
diff --git a/docs/AboutUs.adoc b/docs/AboutUs.adoc
index e647ed1e715a..f827ab642ccc 100644
--- a/docs/AboutUs.adoc
+++ b/docs/AboutUs.adoc
@@ -4,53 +4,53 @@
 :imagesDir: images
 :stylesDir: stylesheets
 
-AddressBook - Level 4 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
-_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
-{empty} +
-We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
+PlanWithEase was developed by the
+https://github.com/cs2113-ay1819s2-t09-1[CS2113-AY1819S2-T09-1] team. +
+We are a team based in the https://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
 
 == Project Team
 
-=== John Doe
-image::damithc.jpg[width="150", align="left"]
-{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
+=== Ngo Wei Lin
+image::creastery.png[width="150", align="left"]
+{empty}[https://github.com/creastery[github]] [<<creastery#, portfolio>>]
 
-Role: Project Advisor
+Role: Team Lead +
+Responsibilities: Model
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Bai Yunwei
+image::wendybaiyunwei.png[width="150", align="left"]
+{empty}[https://github.com/wendybaiyunwei[github]] [<<wendybaiyunwei#, portfolio>>]
 
-Role: Team Lead +
-Responsibilities: UI
+Role: Developer +
+Responsibilities: Logic
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Lee Yu Choy
+image::lycjackie.png[width="150", align="left"]
+{empty}[https://github.com/lycjackie[github]] [<<lycjackie#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Data
+Responsibilities: Logic
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Ahn TaeGyu
+image::truegitnovice.png[width="150", align="left"]
+{empty}[https://github.com/truegitnovice[github]] [<<truegitnovice#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Dev Ops + Threading
+Responsibilities: Documentation + UI
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Yeo Cheng Hong
+image::chyeo.png[width="150", align="left"]
+{empty}[https://github.com/chyeo[github]] [<<chyeo#, portfolio>>]
 
 Role: Developer +
-Responsibilities: UI
+Responsibilities: Storage
 
 '''
diff --git a/docs/ContactUs.adoc b/docs/ContactUs.adoc
index 5de5363abffd..74f041b15e43 100644
--- a/docs/ContactUs.adoc
+++ b/docs/ContactUs.adoc
@@ -2,6 +2,5 @@
 :site-section: ContactUs
 :stylesDir: stylesheets
 
-* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
+* *Bug reports, Suggestions* : Post in our https://github.com/cs2113-ay1819s2-t09-1/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
 * *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
-* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
diff --git a/docs/DeveloperGuide.adoc b/docs/DeveloperGuide.adoc
index 8b92d5fb7e62..3c98643a4bdb 100644
--- a/docs/DeveloperGuide.adoc
+++ b/docs/DeveloperGuide.adoc
@@ -1,4 +1,4 @@
-= AddressBook Level 4 - Developer Guide
+= PlanWithEase - Developer Guide
 :site-section: DeveloperGuide
 :toc:
 :toc-title:
@@ -13,20 +13,18 @@ ifdef::env-github[]
 :warning-caption: :warning:
 :experimental:
 endif::[]
-:repoURL: https://github.com/se-edu/addressbook-level4/tree/master
+:repoURL: https://github.com/cs2113-ay1819s2-t09-1/main/tree/master
 
-By: `Team SE-EDU`      Since: `Jun 2016`      Licence: `MIT`
+By: `Team T09-1`      Since: `Feb 2019`      Licence: `MIT`
 
 == Setting up
 
 === Prerequisites
 
-. *JDK `9`* or later
+. *JDK `9`*
 +
-[WARNING]
-JDK `10` on Windows will fail to run tests in <<UsingGradle#Running-Tests, headless mode>> due to a https://github.com/javafxports/openjdk-jfx/issues/66[JavaFX bug].
-Windows developers are highly recommended to use JDK `9`.
-
+[NOTE]
+Only JDK 9 is officially supported
 . *IntelliJ* IDE
 +
 [NOTE]
@@ -47,14 +45,14 @@ Do not disable them. If you have disabled them, go to `File` > `Settings` > `Plu
 . Click `OK` to accept the default settings
 . Open a console and run the command `gradlew processResources` (Mac/Linux: `./gradlew processResources`). It should finish with the `BUILD SUCCESSFUL` message. +
 This will generate all resources required by the application and tests.
-. Open link:{repoURL}/src/main/java/seedu/address/ui/MainWindow.java[`MainWindow.java`] and check for any code errors
+. Open link:{repoURL}/src/main/java/pwe/planner/ui/MainWindow.java[`MainWindow.java`] and check for any code errors
 .. Due to an ongoing https://youtrack.jetbrains.com/issue/IDEA-189060[issue] with some of the newer versions of IntelliJ, code errors may be detected even if the project can be built and run successfully
 .. To resolve this, place your cursor over any of the code section highlighted in red. Press kbd:[ALT + ENTER], and select `Add '--add-modules=...' to module compiler options` for each error
-. Repeat this for the test folder as well (e.g. check link:{repoURL}/src/test/java/seedu/address/ui/HelpWindowTest.java[`HelpWindowTest.java`] for code errors, and if so, resolve it the same way)
+. Repeat this for the test folder as well (e.g. check link:{repoURL}/src/test/java/pwe/planner/ui/HelpWindowTest.java[`HelpWindowTest.java`] for code errors, and if so, resolve it the same way)
 
 === Verifying the setup
 
-. Run the `seedu.address.MainApp` and try a few commands
+. Run the `pwe.planner.MainApp` and try a few commands
 . <<Testing,Run the tests>> to ensure they all pass.
 
 === Configurations to do before writing code
@@ -101,7 +99,6 @@ Having both Travis and AppVeyor ensures your App works on both Unix-based platfo
 When you are ready to start coding,
 
 1. Get some sense of the overall design by reading <<Design-Architecture>>.
-2. Take a look at <<GetStartedProgramming>>.
 
 == Design
 
@@ -116,7 +113,8 @@ The *_Architecture Diagram_* given above explains the high-level design of the A
 [TIP]
 The `.pptx` files used to create diagrams in this document can be found in the link:{repoURL}/docs/diagrams/[diagrams] folder. To update a diagram, modify the diagram in the pptx file, select the objects of the diagram, and choose `Save as picture`.
 
-`Main` has only one class called link:{repoURL}/src/main/java/seedu/address/MainApp.java[`MainApp`]. It is responsible for,
+`Main` has only one class called link:{repoURL}/src/main/java/pwe/planner/MainApp.java[`MainApp`]. It is responsible
+for,
 
 * At app launch: Initializes the components in the correct sequence, and connects them up with each other.
 * At shut down: Shuts down the components and invokes cleanup method where necessary.
@@ -149,7 +147,7 @@ image::LogicClassDiagram.png[width="800"]
 The _Sequence Diagram_ below shows how the components interact with each other for the scenario where the user issues the command `delete 1`.
 
 .Component interactions for `delete 1` command
-image::SDforDeletePerson.png[width="800"]
+image::SDforDeleteModule.png[width="800"]
 
 The sections below give more details of each component.
 
@@ -159,11 +157,14 @@ The sections below give more details of each component.
 .Structure of the UI Component
 image::UiClassDiagram.png[width="800"]
 
-*API* : link:{repoURL}/src/main/java/seedu/address/ui/Ui.java[`Ui.java`]
+*API* : link:{repoURL}/src/main/java/pwe/planner/ui/Ui.java[`Ui.java`]
 
-The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter`, `BrowserPanel` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class.
+The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `ModuleListPanel`, `StatusBarFooter`, `BrowserPanel` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class.
 
-The `UI` component uses JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that are in the `src/main/resources/view` folder. For example, the layout of the link:{repoURL}/src/main/java/seedu/address/ui/MainWindow.java[`MainWindow`] is specified in link:{repoURL}/src/main/resources/view/MainWindow.fxml[`MainWindow.fxml`]
+The `UI` component uses JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that
+are in the `src/main/resources/view` folder. For example, the layout of the
+link:{repoURL}/src/main/java/pwe/planner/ui/MainWindow.java[`MainWindow`] is specified in
+link:{repoURL}/src/main/resources/view/MainWindow.fxml[`MainWindow.fxml`]
 
 The `UI` component,
 
@@ -178,18 +179,18 @@ The `UI` component,
 image::LogicClassDiagram.png[width="800"]
 
 *API* :
-link:{repoURL}/src/main/java/seedu/address/logic/Logic.java[`Logic.java`]
+link:{repoURL}/src/main/java/pwe/planner/logic/Logic.java[`Logic.java`]
 
-.  `Logic` uses the `AddressBookParser` class to parse the user command.
+.  `Logic` uses the `ApplicationParser` class to parse the user command.
 .  This results in a `Command` object which is executed by the `LogicManager`.
-.  The command execution can affect the `Model` (e.g. adding a person).
+.  The command execution can affect the `Model` (e.g. adding a module).
 .  The result of the command execution is encapsulated as a `CommandResult` object which is passed back to the `Ui`.
 .  In addition, the `CommandResult` object can also instruct the `Ui` to perform certain actions, such as displaying help to the user.
 
 Given below is the Sequence Diagram for interactions within the `Logic` component for the `execute("delete 1")` API call.
 
 .Interactions Inside the Logic Component for the `delete 1` Command
-image::DeletePersonSdForLogic.png[width="800"]
+image::DeleteModuleSdForLogic.png[width="800"]
 
 [[Design-Model]]
 === Model component
@@ -197,94 +198,99 @@ image::DeletePersonSdForLogic.png[width="800"]
 .Structure of the Model Component
 image::ModelClassDiagram.png[width="800"]
 
-*API* : link:{repoURL}/src/main/java/seedu/address/model/Model.java[`Model.java`]
+*API* : link:{repoURL}/src/main/java/pwe/planner/model/Model.java[`Model.java`]
 
 The `Model`,
 
 * stores a `UserPref` object that represents the user's preferences.
-* stores the Address Book data.
-* exposes an unmodifiable `ObservableList<Person>` that can be 'observed' e.g. the UI can be bound to this list so that the UI automatically updates when the data in the list change.
+* stores the Application data.
+* exposes an unmodifiable `ObservableList<Module>` that can be 'observed' e.g. the UI can be bound to this list so that the UI automatically updates when the data in the list change.
 * does not depend on any of the other three components.
 
-[NOTE]
-As a more OOP model, we can store a `Tag` list in `Address Book`, which `Person` can reference. This would allow `Address Book` to only require one `Tag` object per unique `Tag`, instead of each `Person` needing their own `Tag` object. An example of how such a model may look like is given below. +
- +
-image:ModelClassBetterOopDiagram.png[width="800"]
-
 [[Design-Storage]]
 === Storage component
 
 .Structure of the Storage Component
-image::StorageClassDiagram.png[width="800"]
+image::StorageComponentDiagram.png[width="800"]
 
-*API* : link:{repoURL}/src/main/java/seedu/address/storage/Storage.java[`Storage.java`]
+*API* : link:{repoURL}/src/main/java/pwe/planner/storage/Storage.java[`Storage.java`]
 
 The `Storage` component,
 
 * can save `UserPref` objects in json format and read it back.
-* can save the Address Book data in json format and read it back.
+* can save the Application data in json format and read it back.
 
 [[Design-Commons]]
 === Common classes
 
-Classes used by multiple components are in the `seedu.addressbook.commons` package.
+Classes used by multiple components are in the `pwe.planner.commons` package.
 
 == Implementation
 
 This section describes some noteworthy details on how certain features are implemented.
 
 // tag::undoredo[]
-=== Undo/Redo feature
+=== Undo/Redo Feature
 ==== Current Implementation
 
-The undo/redo mechanism is facilitated by `VersionedAddressBook`.
-It extends `AddressBook` with an undo/redo history, stored internally as an `addressBookStateList` and `currentStatePointer`.
+The undo/redo mechanism is facilitated by `VersionedApplication`.
+It extends `application` with an undo/redo history, stored internally as an `applicationStateList` and `currentStatePointer`.
 Additionally, it implements the following operations:
 
-* `VersionedAddressBook#commit()` -- Saves the current address book state in its history.
-* `VersionedAddressBook#undo()` -- Restores the previous address book state from its history.
-* `VersionedAddressBook#redo()` -- Restores a previously undone address book state from its history.
+* `VersionedApplication#commit()` -- Saves the current application state in its history.
+* `VersionedApplication#undo()` -- Restores the previous application state from its history.
+* `VersionedApplication#redo()` -- Restores a previously undone application state from its history.
 
-These operations are exposed in the `Model` interface as `Model#commitAddressBook()`, `Model#undoAddressBook()` and `Model#redoAddressBook()` respectively.
+These operations are exposed in the `Model` interface as `Model#commitApplication()`, `Model#undoApplication()` and
+`Model#redoApplication()` respectively.
 
 Given below is an example usage scenario and how the undo/redo mechanism behaves at each step.
 
-Step 1. The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the initial address book state, and the `currentStatePointer` pointing to that single address book state.
+Step 1. The user launches the application for the first time. The `VersionedApplication` will be initialized with the
+ initial application state, and the `currentStatePointer` pointing to that single application state.
 
 image::UndoRedoStartingStateListDiagram.png[width="800"]
 
-Step 2. The user executes `delete 5` command to delete the 5th person in the address book. The `delete` command calls `Model#commitAddressBook()`, causing the modified state of the address book after the `delete 5` command executes to be saved in the `addressBookStateList`, and the `currentStatePointer` is shifted to the newly inserted address book state.
+Step 2. The user executes `delete 5` command to delete the 5th module in the application. The `delete` command calls
+ `Model#commitApplication()`, causing the modified state of the application after the `delete 5` command executes to be saved in the `applicationStateList`, and the `currentStatePointer` is shifted to the newly inserted application state.
 
 image::UndoRedoNewCommand1StateListDiagram.png[width="800"]
 
-Step 3. The user executes `add n/David ...` to add a new person. The `add` command also calls `Model#commitAddressBook()`, causing another modified address book state to be saved into the `addressBookStateList`.
+Step 3. The user executes `add n/David ...` to add a new module. The `add` command also calls
+`Model#commitApplication()`, causing another modified application state to be saved into the `applicationStateList`.
 
 image::UndoRedoNewCommand2StateListDiagram.png[width="800"]
 
 [NOTE]
-If a command fails its execution, it will not call `Model#commitAddressBook()`, so the address book state will not be saved into the `addressBookStateList`.
+If a command fails its execution, it will not call `Model#commitApplication()`, so the application state will not be
+ saved into the `applicationStateList`.
 
-Step 4. The user now decides that adding the person was a mistake, and decides to undo that action by executing the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous address book state, and restores the address book to that state.
+Step 4. The user now decides that adding the module was a mistake, and decides to undo that action by executing the
+`undo` command. The `undo` command will call `Model#undoApplication()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous application state, and restores the application to that state.
 
 image::UndoRedoExecuteUndoStateListDiagram.png[width="800"]
 
 [NOTE]
-If the `currentStatePointer` is at index 0, pointing to the initial address book state, then there are no previous address book states to restore. The `undo` command uses `Model#canUndoAddressBook()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the undo.
+If the `currentStatePointer` is at index 0, pointing to the initial application state, then there are no previous
+application states to restore. The `undo` command uses `Model#canUndoApplication()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the undo.
 
 The following sequence diagram shows how the undo operation works:
 
 image::UndoRedoSequenceDiagram.png[width="800"]
 
-The `redo` command does the opposite -- it calls `Model#redoAddressBook()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state.
+The `redo` command does the opposite -- it calls `Model#redoApplication()`, which shifts the `currentStatePointer`
+once to the right, pointing to the previously undone state, and restores the application to that state.
 
 [NOTE]
-If the `currentStatePointer` is at index `addressBookStateList.size() - 1`, pointing to the latest address book state, then there are no undone address book states to restore. The `redo` command uses `Model#canRedoAddressBook()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the redo.
+If the `currentStatePointer` is at index `applicationStateList.size() - 1`, pointing to the latest application
+state, then there are no undone application states to restore. The `redo` command uses `Model#canRedoapplication()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the redo.
 
-Step 5. The user then decides to execute the command `list`. Commands that do not modify the address book, such as `list`, will usually not call `Model#commitAddressBook()`, `Model#undoAddressBook()` or `Model#redoAddressBook()`. Thus, the `addressBookStateList` remains unchanged.
+Step 5. The user then decides to execute the command `list`. Commands that do not modify the application, such as `list`, will usually not call `Model#commitapplication()`, `Model#undoapplication()` or `Model#redoapplication()`. Thus, the `applicationStateList` remains unchanged.
 
 image::UndoRedoNewCommand3StateListDiagram.png[width="800"]
 
-Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Since the `currentStatePointer` is not pointing at the end of the `addressBookStateList`, all address book states after the `currentStatePointer` will be purged. We designed it this way because it no longer makes sense to redo the `add n/David ...` command. This is the behavior that most modern desktop applications follow.
+Step 6. The user executes `clear`, which calls `Model#commitApplication()`. Since the `currentStatePointer` is not
+pointing at the end of the `applicationStateList`, all application states after the `currentStatePointer` will be purged. We designed it this way because it no longer makes sense to redo the `add n/David ...` command. This is the behavior that most modern desktop applications follow.
 
 image::UndoRedoNewCommand4StateListDiagram.png[width="800"]
 
@@ -296,624 +302,1714 @@ image::UndoRedoActivityDiagram.png[width="650"]
 
 ===== Aspect: How undo & redo executes
 
-* **Alternative 1 (current choice):** Saves the entire address book.
+* **Alternative 1 (current choice):** Saves the entire application.
 ** Pros: Easy to implement.
 ** Cons: May have performance issues in terms of memory usage.
 * **Alternative 2:** Individual command knows how to undo/redo by itself.
-** Pros: Will use less memory (e.g. for `delete`, just save the person being deleted).
+** Pros: Will use less memory (e.g. for `delete`, just save the module being deleted).
 ** Cons: We must ensure that the implementation of each individual command are correct.
 
 ===== Aspect: Data structure to support the undo/redo commands
 
-* **Alternative 1 (current choice):** Use a list to store the history of address book states.
+* **Alternative 1 (current choice):** Use a list to store the history of application states.
 ** Pros: Easy for new Computer Science student undergraduates to understand, who are likely to be the new incoming developers of our project.
-** Cons: Logic is duplicated twice. For example, when a new command is executed, we must remember to update both `HistoryManager` and `VersionedAddressBook`.
+** Cons: Logic is duplicated twice. For example, when a new command is executed, we must remember to update both
+`HistoryManager` and `VersionedApplication`.
 * **Alternative 2:** Use `HistoryManager` for undo/redo
 ** Pros: We do not need to maintain a separate list, and just reuse what is already in the codebase.
 ** Cons: Requires dealing with commands that have already been undone: We must remember to skip these commands. Violates Single Responsibility Principle and Separation of Concerns as `HistoryManager` now needs to do two different things.
 // end::undoredo[]
 
-// tag::dataencryption[]
-=== [Proposed] Data Encryption
+// tag::editing_module[]
+=== Edit Module Feature
+The `edit` feature aims to help users update module details in our application. When there are changes to be made to
+the module (e.g. semesters which modules are offered in have changed), users will want to be able to update the
+module details easily without going through the hassle of deleting and adding the new module.
 
-_{Explain here how the data encryption feature will be implemented}_
+This section describes the implementation and the design considerations of the `edit` feature, and how the `edit`
+feature is capable of cascading the updated module code from the module list to the requirement categories and degree
+ plan.
 
-// end::dataencryption[]
+==== Current Implementation
+When the user invokes the `edit` command, e.g. (`edit 1 code/CS1231`), the following steps are taken by the
+application.
 
-=== Logging
+. The `CommandParser` invokes the `EditCommandParser` class to parse the user input provided. The parsed data will
+then be used to create a `EditCommand` object and will be returned to `CommandParser` and subsequently `LogicManager`.
 
-We are using `java.util.logging` package for logging. The `LogsCenter` class is used to manage the logging levels and logging destinations.
+. `LogicManager` would then invoke the `EditCommand#execute(...)`, which performs the following validation checks to ensure that the edited module details are valid.
+* Ensures that the edited module does not exists in module list (non-duplicate module) +
+* Ensures that the edited module is not updated to be a co-requisite of itself (no self-referencing) +
+* Ensures that the edited module's co-requisite exists in the module list +
+* Ensures that the edited module's co-requisites can be taken in the same semester +
+* Ensures that the edited module can be taken in the same semester as the edited module's co-requisites +
+* Ensures that the updated semesters which the edited module is offered in allows the module to remain in the current semester of the degree plan.
 
-* The logging level can be controlled using the `logLevel` setting in the configuration file (See <<Implementation-Configuration>>)
-* The `Logger` for a class can be obtained using `LogsCenter.getLogger(Class)` which will log messages according to the specified logging level
-* Currently log messages are output through: `Console` and to a `.log` file.
+. Once the validation checks are complete, `EditCommand` will invoke `Model#editModule(...)`, which will be
+discussed later.
 
-*Logging Levels*
+. `EditCommand` will then invoke `Model#updateFilteredModuleList(...)` to display all modules in the filtered module list.
 
-* `SEVERE` : Critical problem detected which may possibly cause the termination of the application
-* `WARNING` : Can continue, but with caution
-* `INFO` : Information showing the noteworthy actions by the App
-* `FINE` : Details that is not usually noteworthy but may be useful in debugging e.g. print the actual list instead of just its size
+. Finally, a success message will be displayed to the user.
 
-[[Implementation-Configuration]]
-=== Configuration
+The high-level overview sequence diagram for the `edit` feature is shown below.
 
-Certain properties of the application can be controlled (e.g user prefs file location, logging level) through the configuration file (default: `config.json`).
+[NOTE]
+====
+`errorChecks(...)` does not actually exists in `EditCommand`. +
+It is used below as a representation of all the validation checks (discussed above) present in `EditCommand.execute(...)`.
+====
 
-== Documentation
+.High-level overview sequence diagram for `edit` feature
+ifdef::env-github[]
+image::SD_Edit_Overview.png[width="800"]
+endif::[]
 
-We use asciidoc for writing documentation.
+ifndef::env-github[]
+image::SD_Edit_Overview.png[width="970"]
+endif::[]
 
-[NOTE]
-We chose asciidoc over Markdown because asciidoc, although a bit more complex than Markdown, provides more flexibility in formatting.
+If there are any changes made to the module's code, `Model#editModule(...)` will cascade the edited module code to the rest of the Model objects (namely `UniqueModuleList`, `UniqueDegreePlannerList`, `UniqueRequirementCategoryList`) through `Application`.
 
-=== Editing Documentation
+. When `Model#editModule(...)` is invoked, `Application#editModule(...)` will be called.
+. `Application#setModule(...)` is invoked to replace the original module with the edited module in `UniqueModuleList`.
+. When setting the edited module in `UniqueModuleList`, `UniqueModuleList` will cascade the edited module code to all modules' co-requisites
+. The edited module code is cascaded to `UniqueDegreePlanner` as `Application#setModule(...)` checks if the original module code exists in the degree planner, and if so, updates it accordingly.
+. Similarly, `Application#setModule(...)` also checks if the original module code exists in the requirement categories, and if so, updates it accordingly.
 
-See <<UsingGradle#rendering-asciidoc-files, UsingGradle.adoc>> to learn how to render `.adoc` files locally to preview the end result of your edits.
-Alternatively, you can download the AsciiDoc plugin for IntelliJ, which allows you to preview the changes you have made to your `.adoc` files in real-time.
+.Sequence diagram for `edit` feature illustrating cascading of edited module code
+ifdef::env-github[]
+image::SD_Edit_Detailed.png[width="800"]
+endif::[]
 
-=== Publishing Documentation
+ifndef::env-github[]
+image::SD_Edit_Detailed.png[width="970"]
+endif::[]
 
-See <<UsingTravis#deploying-github-pages, UsingTravis.adoc>> to learn how to deploy GitHub Pages using Travis.
+==== Design Considerations
 
-=== Converting Documentation to PDF format
+===== Aspect: How should edited module code be cascaded down to other Model objects?
+
+The table below shows comparisons between the two approaches.
+
+[cols="30%,35%,35%"]
+|=====
+|*Approach* | *Pros* | *Cons*|
+*1.* Implement cascading of edited module code in `EditCommand` |
+It makes sense for a class in Logic component to handle logic-related matters.
+a|
+* It creates coupling between `EditCommand` and the various Model objects (i.e. `UniqueModuleList`,
+`UniqueDegreePlannerList` and `UniqueRequirementCategoryList`.|
+ *2.* Implement cascading of edited module code in `Application`
+ |It doesn't create additional coupling with other Model components
+a|
+* Implementing logic (cascading effect) in `Application` (a class in Model component) may contradict Separation of Concerns Principle.
+|=====
+
+After weighing the pros and cons, *approach 2* was chosen. +
+
+Firstly, doing so will reduce the need for additional coupling with other Model components (as compared to approach
+1). Although it may seem strange to implement logic checks to achieve the desired cascading effect of the edited module
+code in `Application` (a class in the Model component), implementing logic checks in Model can also be seen as a way
+of maintaining data integrity. One such example is Java's `Set` interface (Model), where each implementing class
+ensures that there are no duplicate elements in the collection of data (i.e. implementing logic in model).
+
+Similarly, implementing cascading of edited module code in `Application` is deemed to be similar to implement logic
+in model for maintaining data integrity. As such, *approach 2* is more suitable and was chosen.
+// end::editing_module[]
+
+// tag::corequisites[]
+=== Module co-requisites
+==== Current Implementation
 
-We use https://www.google.com/chrome/browser/desktop/[Google Chrome] for converting documentation to PDF format, as Chrome's PDF engine preserves hyperlinks used in webpages.
+Module co-requisites are stored internally as `Set<Code>` within `Module`.
 
-Here are the steps to convert the project documentation files to PDF format.
+A `Set<Code>` is used instead of a `List<Code>` to ensure uniqueness and prevents duplicate co-requisites module codes.
 
-.  Follow the instructions in <<UsingGradle#rendering-asciidoc-files, UsingGradle.adoc>> to convert the AsciiDoc files in the `docs/` directory to HTML format.
-.  Go to your generated HTML files in the `build/docs` folder, right click on them and select `Open with` -> `Google Chrome`.
-.  Within Chrome, click on the `Print` option in Chrome's menu.
-.  Set the destination to `Save as PDF`, then click `Save` to save a copy of the file in PDF format. For best results, use the settings indicated in the screenshot below.
+Notice that `Code` is used in place of `Module`. This is to prevent storage of duplicated information when serializing `UniqueModuleList`.
 
-.Saving documentation as PDF files in Chrome
-image::chrome_save_as_pdf.png[width="300"]
+`AddCommand` handles invalid cases by preventing adding a co-requisite module code that does not exists in the module list. +
+`EditCommand` handles invalid cases by ensuring that:
 
-[[Docs-SiteWideDocSettings]]
-=== Site-wide Documentation Settings
+* the edited co-requisite module code is not equivalent to the `Code` of the edited module +
+* the edited co-requisite module `Code` exists in the module listing
 
-The link:{repoURL}/build.gradle[`build.gradle`] file specifies some project-specific https://asciidoctor.org/docs/user-manual/#attributes[asciidoc attributes] which affects how all documentation files within this project are rendered.
+When a module is deleted, it is cascaded down to other modules, and is removed from other modules' co-requisites.
 
-[TIP]
-Attributes left unset in the `build.gradle` file will use their *default value*, if any.
+==== Design Considerations
 
-[cols="1,2a,1", options="header"]
-.List of site-wide attributes
-|===
-|Attribute name |Description |Default value
+===== Aspect: How should deletion of a module be cascaded down to other modules
 
-|`site-name`
-|The name of the website.
-If set, the name will be displayed near the top of the page.
-|_not set_
+The table below shows comparisons between the two approaches.
 
-|`site-githuburl`
-|URL to the site's repository on https://github.com[GitHub].
-Setting this will add a "View on GitHub" link in the navigation bar.
-|_not set_
+[cols="30%,35%,35%"]
+|=====
+|*Approach* | *Pros* | *Cons*|
+*1.* Delete module code from other modules' corequisites in `Application` class |
+Implementing the cascading effect in `Application#removeModule()` protects data
+a|
+* Requires extra overhead to obtain an immutable list of modules to update and modify existing modules in the `UniqueModuleList` +
+* `Application` class needs to handle logic checks to ensure data interity
+ |*2.* Delete module code from other modules' corequisites in `DeleteCommand` class
+ |Convenient to implement.
+a|
+* Deleting a module via `Application#removeModule()` does not have any cascading effect on other modules'
+  corequisites. The user will have to delete the invalid co-requisite manually afterwards.
+|=====
 
-|`site-seedu`
-|Define this attribute if the project is an official SE-EDU project.
-This will render the SE-EDU navigation bar at the top of the page, and add some SE-EDU-specific navigation items.
-|_not set_
+After weighing the pros and cons, *approach 1* was chosen. +
+As we are expecting many similar names between modules in the university curriculum, if the user could only search
+with an implicit logical `OR`, the user would not be able to find the desired modules effectively. This can drastically
+ reduce the effectiveness of the `find` command.
 
-|===
+// end::corequisites[]
 
-[[Docs-PerFileDocSettings]]
-=== Per-file Documentation Settings
+// tag::find[]
+===  Find Feature
 
-Each `.adoc` file may also specify some file-specific https://asciidoctor.org/docs/user-manual/#attributes[asciidoc attributes] which affects how the file is rendered.
+The `find` feature aims to help users to be able to easily locate any modules in our application. With a large number
+of modules available to our users, `find` feature is essential. Currently, the `find` feature only supports searching
+ of module's name, code, credits, tags and the semesters it is offered in.
 
-Asciidoctor's https://asciidoctor.org/docs/user-manual/#builtin-attributes[built-in attributes] may be specified and used as well.
+This section shares the implementation and the design considerations gone through while enhancing the find feature.
+Details on how the find feature is implemented and how it supports more search parameters are also shared.
 
-[TIP]
-Attributes left unset in `.adoc` files will use their *default value*, if any.
+==== Overview
 
-[cols="1,2a,1", options="header"]
-.List of per-file attributes, excluding Asciidoctor's built-in attributes
-|===
-|Attribute name |Description |Default value
+When a user invokes the `find` command. (e.g. find name/Programming || code/CS1231), the following steps are taken by
+the program.
 
-|`site-section`
-|Site section that the document belongs to.
-This will cause the associated item in the navigation bar to be highlighted.
-One of: `UserGuide`, `DeveloperGuide`, ``LearningOutcomes``{asterisk}, `AboutUs`, `ContactUs`
+1. Extract out the text related to `find` command
+2. Parse the text related to each `PREFIX` individually.
+3. Return a composite predicate for all attributes.
 
-_{asterisk} Official SE-EDU projects only_
-|_not set_
+Step 1 is performed by the `ApplicationParser` class, and no special actions is needed for the `find` feature.
 
-|`no-site-header`
-|Set this attribute to remove the site navigation bar.
-|_not set_
+Step 2 and 3 are performed by `BooleanExpressionParser#parse`
 
-|===
+The class diagram below shows the different components and constraints for `find` feature.
 
-=== Site Template
+.Class diagram for `find` feature
+ifdef::env-github[]
+image::FindCommandClassDiagram.png[width="800"]
+endif::[]
 
-The files in link:{repoURL}/docs/stylesheets[`docs/stylesheets`] are the https://developer.mozilla.org/en-US/docs/Web/CSS[CSS stylesheets] of the site.
-You can modify them to change some properties of the site's design.
+ifndef::env-github[]
+image::FindCommandClassDiagram.png[width="970"]
+endif::[]
 
-The files in link:{repoURL}/docs/templates[`docs/templates`] controls the rendering of `.adoc` files into HTML5.
-These template files are written in a mixture of https://www.ruby-lang.org[Ruby] and http://slim-lang.com[Slim].
 
-[WARNING]
-====
-Modifying the template files in link:{repoURL}/docs/templates[`docs/templates`] requires some knowledge and experience with Ruby and Asciidoctor's API.
-You should only modify them if you need greater control over the site's layout than what stylesheets can provide.
-The SE-EDU team does not provide support for modified template files.
-====
+==== Current Implementation
 
-[[Testing]]
-== Testing
+The `FindCommandParser` parses the strings of arguments provided by the user to retrieve a composite `Predicate`
+which is used by `FindCommand`. A `ParseException` is thrown in the case if the input provided by the user does not
+conform to the expected format.
 
-=== Running Tests
+The sequence diagram below shows the interaction within the `Logic` components.
 
-There are three ways to run tests.
+.Find component interactions
+ifdef::env-github[]
+image::FindCommandSequenceDiagram.png[width="800"]
+endif::[]
 
-[TIP]
-The most reliable way to run tests is the 3rd one. The first two methods might fail some GUI tests due to platform/resolution-specific idiosyncrasies.
+ifndef::env-github[]
+image::FindCommandSequenceDiagram.png[width="970"]
+endif::[]
 
-*Method 1: Using IntelliJ JUnit test runner*
 
-* To run all tests, right-click on the `src/test/java` folder and choose `Run 'All Tests'`
-* To run a subset of tests, you can right-click on a test package, test class, or a test and choose `Run 'ABC'`
+The main implementation of this feature is split into two components. The `Tokenizer` and `BooleanExpressionParser`
 
-*Method 2: Using Gradle*
+. `Tokenizer` helps to split the user provided argument into tokens which could be used by `BooleanExpressionParser`.
+. `BooleanExpressionParser` simply performs Shunting-Yard algorithm on the boolean expression tokens provided by the
+`Tokenizer`  and maps them into `Predicate` which could be used by `FindCommand`.
 
-* Open a console and run the command `gradlew clean allTests` (Mac/Linux: `./gradlew clean allTests`)
+`FindCommandParser` calls `BooleanExpressionParser#parse` which handles the evaluation of the expression. +
+This process is achieved by the code snippet shown below.
 
-[NOTE]
-See <<UsingGradle#, UsingGradle.adoc>> for more info on how to run tests using Gradle.
+```java
+String trimmedArgs = args.trim();
+if (trimmedArgs.isEmpty()) {
+    throw new ParseException(
+            String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+}
+Predicate<Module> predicate = BooleanExpressionParser.parse(args, PREFIXES);
+return new FindCommand(predicate);
+```
 
-*Method 3: Using Gradle (headless)*
 
-Thanks to the https://github.com/TestFX/TestFX[TestFX] library we use, our GUI tests can be run in the _headless_ mode. In the headless mode, GUI tests do not show up on the screen. That means the developer can do other things on the Computer while the tests are running.
 
-To run tests in headless mode, open a console and run the command `gradlew clean headless allTests` (Mac/Linux: `./gradlew clean headless allTests`)
+To support more parameters for our `find` feature. You can do the following steps.
 
-=== Types of tests
+. Create a new `Predicate` class (e.g. `NameContainsKeywordsPredicate`) and define your expected behaviour in it.
+. Ensure your `Predicate` class extends `KeywordsPredicate`.
+. Update `BooleanExpressionParser#getKeywordsPredicate` to handle the creation of the `Predicate`.
+. Update `CliSyntax` on the new prefix you would like for the new parameter.
+. Update `FindCommandParser` to take in the new `PREFIX`.
 
-We have two types of tests:
+Your new parameter will now be supported after the above steps!
 
-.  *GUI Tests* - These are tests involving the GUI. They include,
-.. _System Tests_ that test the entire App by simulating user actions on the GUI. These are in the `systemtests` package.
-.. _Unit tests_ that test the individual components. These are in `seedu.address.ui` package.
-.  *Non-GUI Tests* - These are tests not involving the GUI. They include,
-..  _Unit tests_ targeting the lowest level methods/classes. +
-e.g. `seedu.address.commons.StringUtilTest`
-..  _Integration tests_ that are checking the integration of multiple code units (those code units are assumed to be working). +
-e.g. `seedu.address.storage.StorageManagerTest`
-..  Hybrids of unit and integration tests. These test are checking multiple code units as well as how the are connected together. +
-e.g. `seedu.address.logic.LogicManagerTest`
+==== Tokenizer
 
+This is represented by the class `pwe.planner.logic.parser.BooleanExpressionTokenizer` and is designed to extract
+all argument with `PREFIX` and `OPERATOR` as a token.
 
-=== Troubleshooting Testing
-**Problem: `HelpWindowTest` fails with a `NullPointerException`.**
+This class is initialized with the input argument and prefixes and can be queried for token multiple times. +
+Each query will consume the previous token and returns the next available token. +
+This is similar to how `java.util.Scanner` works.
 
-* Reason: One of its dependencies, `HelpWindow.html` in `src/main/resources/docs` is missing.
-* Solution: Execute Gradle task `processResources`.
+===== Design Consideration
 
-== Dev Ops
+After many rounds of experiment with `StringTokenizer` that is provided by native Java and `ArgumentMultimap`. +
+We found three main issues which could not be satisfied by either `StringTokenizer` or `ArgumentMultimap`.
 
-=== Build Automation
+. `ArgumentMultimap` does not keep track of the order of each delimiter. They will only track if the delimiter exists.
+. `StringTokenizer` has a default delimiter as a whitespace, although we could change the delimiter and parse multiple
+delimiters. It does not suit our situation. +
+e.g. `find name/AAAA code/BBBB`. +
+This will return us 1 token. `name/AAAA code/BBBB`, which we cannot use to check due to the missing `operator`. +
+We need the tokenizer to return us 2 tokens `name/AAAA` and `code/BBBB` in order for us to know that the expression
+was invalid due to the missing `operator`.
+. `StringTokenizer` can take in `PREFIX` as delimiter, however, this will split the argument (i.e. `code/CS1231`) into
+two tokens, `code/` and `CS1231`. +
+Additional parsing is required before we are able to pass it to `BooleanExpressionParser`. This parsing creates more
+overhead as we have to ensure that the proper checks are done.
 
-See <<UsingGradle#, UsingGradle.adoc>> to learn how to use Gradle for build automation.
+As such, our custom `Tokenizer` aims to solve these three issues.
 
-=== Continuous Integration
+The table below shows the differences among our `Tokenizer`, `StringTokenizer` and `ArgumentMultimap`
+|====
+| *`Tokenizer`* | *`StringTokenizer`* | *`ArgumentMultimap`*
+| Respect the order of delimiters. | Respect the order of delimiters | Only keep track which delimiters are present.
+| Support multiple delimiters. | Support multiple delimiters. | Support multiple delimiters.
+| Splitting tokens is more flexible | Only split token based on delimiters | Does not split into token.
+|====
 
-We use https://travis-ci.org/[Travis CI] and https://www.appveyor.com/[AppVeyor] to perform _Continuous Integration_ on our projects. See <<UsingTravis#, UsingTravis.adoc>> and <<UsingAppVeyor#, UsingAppVeyor.adoc>> for more details.
+==== Operator
 
-=== Coverage Reporting
+This is represented by the class `pwe.planner.logic.parser.Operator` and defines all valid operators to be used in
+`BooleanExpressionParser`.
 
-We use https://coveralls.io/[Coveralls] to track the code coverage of our projects. See <<UsingCoveralls#, UsingCoveralls.adoc>> for more details.
+The table below shows the valid operators that our application currently supports.
 
-=== Documentation Previews
-When a pull request has changes to asciidoc files, you can use https://www.netlify.com/[Netlify] to see a preview of how the HTML version of those asciidoc files will look like when the pull request is merged. See <<UsingNetlify#, UsingNetlify.adoc>> for more details.
+|====
+| *Operator* | *Description* | *Precedence*
+| `&&` | Logical "AND" operation (both conditions A AND B must match) | Highest
+| `\|\|` | Logical "OR" operation (either conditions A OR B must match)| Lowest
+| `(` and `)` | Search term surrounded by parenthesis will always be evaluated first. If there is a tie, the logical
+operator precedence will be taken into consideration. | N.A
+|====
 
-=== Making a Release
+To support more operators for our `BooleanExpressionParser`. The following steps should be performed.
 
-Here are the steps to create a new release.
+. Add the operator and give it precedence.
+. Update the mapping between `String` and `Operator` in `Operator#getOperatorFromString`
+. Update the logic of the new operator in `Operator#applyOperator`
+. Update `CliSyntax.OPERATORS` to include the new operator.
 
-.  Update the version number in link:{repoURL}/src/main/java/seedu/address/MainApp.java[`MainApp.java`].
-.  Generate a JAR file <<UsingGradle#creating-the-jar-file, using Gradle>>.
-.  Tag the repo with the version number. e.g. `v0.1`
-.  https://help.github.com/articles/creating-releases/[Create a new release using GitHub] and upload the JAR file you created.
+==== Boolean Expression Parser
 
-=== Managing Dependencies
+This is represented by the class `pwe.planner.logic.parser.BooleanExpressionParser` and is designed to map user
+provided input into composite `Predicate<Module>`.
 
-A project often depends on third-party libraries. For example, Address Book depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
+The following table shows the operators currently supported by `BooleanExpressionParser`(Highest precedence
+first).
+|====
+| *Operators* | *Description*
+| `&&` | Logical AND of two predicates
+| `\|\|` | Logical OR of two predicates.
+|====
 
-[loweralpha]
-. Include those libraries in the repo (this bloats the repo size)
-. Require developers to download those libraries manually (this creates extra work for developers)
+Parentheses `(` and `)` are also recognized and respected, and they may be nested to arbitrary depth. This is handled by
+ https://en.wikipedia.org/wiki/Shunting-yard_algorithm[Shunting Yard] algorithm which respects the precedence of each
+ operators when parsing.
 
-[[GetStartedProgramming]]
-[appendix]
-== Suggested Programming Tasks to Get Started
+The sequence diagram below shows the interactions between `FindCommandParser` and `BooleanExpressionParser`.
+
+.Parser interactions
+.Find component interactions
+ifdef::env-github[]
+image::parserSequenceDiagram.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::parserSequenceDiagram.png[width="970"]
+endif::[]
 
-Suggested path for new programmers:
 
-1. First, add small local-impact (i.e. the impact of the change does not go beyond the component) enhancements to one component at a time. Some suggestions are given in <<GetStartedProgramming-EachComponent>>.
+When `FindCommandParser` receives the provided user argument, it will carry out checks and pass the argument to
+ `BooleanExpressionParser` which will initialize a new `Tokenizer` that extracts the arguments as tokens. +
+`BooleanExpressionParser` will create a `Predicate` based on the `Prefix` in each token. If the token is an `Operator`,
+`BooleanExpressionParser` will apply the operator on two `Predicate` to combine them into a composite `Predicate`.
 
-2. Next, add a feature that touches multiple components to learn how to implement an end-to-end feature across all components. <<GetStartedProgramming-RemarkCommand>> explains how to go about adding such a feature.
+[TIP]
+====
+See <<Tokenizer>> for more details regarding the tokenizer.
+====
 
-[[GetStartedProgramming-EachComponent]]
-=== Improving each component
 
-Each individual exercise in this section is component-based (i.e. you would not need to modify the other components to get it to work).
+The process of how the predicate for each prefix is created is shown in the code snippet below.
+
+```java
+ArgumentMultimap argMultimap =
+        ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_CODE, PREFIX_CREDITS);
+KeywordsPredicate predicate = null;
+if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
+    String nameKeyword = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()).toString();
+    predicate = new NameContainsKeywordsPredicate(List.of(nameKeyword));
+} else if (argMultimap.getValue(PREFIX_CODE).isPresent()) {
+    String codeKeyword = ParserUtil.parseCode(argMultimap.getValue(PREFIX_CODE).get()).toString();
+    predicate = new CodeContainsKeywordsPredicate(List.of(codeKeyword));
+} else if (argMultimap.getValue(PREFIX_CREDITS).isPresent()) {
+    String creditKeyword = ParserUtil.parseCredits(argMultimap.getValue(PREFIX_CREDITS).get()).toString();
+    predicate = new CreditsContainsKeywordsPredicate(List.of(creditKeyword));
+} else {
+    throw new ParseException(
+            String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+}
+return predicate;
+```
 
-[discrete]
-==== `Logic` component
+==== Design Considerations
 
-*Scenario:* You are in charge of `logic`. During dog-fooding, your team realize that it is troublesome for the user to type the whole command in order to execute a command. Your team devise some strategies to help cut down the amount of typing necessary, and one of the suggestions was to implement aliases for the command words. Your job is to implement such aliases.
+This section shares the design considerations we went through during the enhancing the existing `find` feature.
+
+===== Aspect: Parsing of composite predicate
+The table below shows comparisons between the two approaches.
+
+[cols="30%,35%,35%"]
+|=====
+|*Approach* | *Pros* | *Cons*|
+*1.* Implement an algorithm https://en.wikipedia.org/wiki/Shunting-yard_algorithm[Shunting Yard] that parses the complex
+boolean expression and returns a composite predicate. |
+Find command can be very flexible. It can work with multiple parameters to search for the specific modules that the
+user wants.
+a|
+* Requires many tests to ensure expected behaviours
+* Extra work is required to integrate a new logic parser into `FindCommandParser`. It may result in  build problems if
+ it is not implemented properly.
+ |*2.* Do an implicit logical `OR` for every predicate.
+ |Very easy to implement a|
+* Returns a very huge set of results when the number of keywords increase.
+* Find command will be restricted to logical `OR` results.
+|=====
+
+After weighing both pros and cons, we decided to go with *approach 1*. +
+As we are expecting many similar names between modules in the university curriculum, if the user could only search
+with an implicit logical `OR`, the user would not be able to find the desired modules effectively. This can drastically
+ reduce the effectiveness of the `find` command.
+//end::find[]
+
+// tag::requirement-add[]
+=== Requirement Add Feature
+The requirement add feature in the application aims to help users to keep track and check if they have fulfilled a
+particular degree requirement category by adding module code(s) to the specified requirement category.
+
+==== Current implementation
+
+When the user invokes the `requirement_add` command, e.g. (requirement_add name/Mathematics code/MA1531). +
+The following steps are taken by the application.
+
+*1.* The `CommandParser` invokes the `RequirementAddCommandParser` class to parse the user input provided.
+ The parsed data will then be used to create a `RequirementAddCommand` object and will be returned to
+ `LogicManager`.
 
-[TIP]
-Do take a look at <<Design-Logic>> before attempting to modify the `Logic` component.
+[NOTE]
+====
+* The input should only consist of the `name` of the requirement category and module `code`(s) to be added
+* `RequirementAddCommandParser` will throw an error if the user input does not match the command format
+====
 
-. Add a shorthand equivalent alias for each of the individual commands. For example, besides typing `clear`, the user can also type `c` to remove all persons in the list.
-+
-****
-* Hints
-** Just like we store each individual command word constant `COMMAND_WORD` inside `*Command.java` (e.g.  link:{repoURL}/src/main/java/seedu/address/logic/commands/FindCommand.java[`FindCommand#COMMAND_WORD`], link:{repoURL}/src/main/java/seedu/address/logic/commands/DeleteCommand.java[`DeleteCommand#COMMAND_WORD`]), you need a new constant for aliases as well (e.g. `FindCommand#COMMAND_ALIAS`).
-** link:{repoURL}/src/main/java/seedu/address/logic/parser/AddressBookParser.java[`AddressBookParser`] is responsible for analyzing command words.
-* Solution
-** Modify the switch statement in link:{repoURL}/src/main/java/seedu/address/logic/parser/AddressBookParser.java[`AddressBookParser#parseCommand(String)`] such that both the proper command word and alias can be used to execute the same intended command.
-** Add new tests for each of the aliases that you have added.
-** Update the user guide to document the new aliases.
-** See this https://github.com/se-edu/addressbook-level4/pull/785[PR] for the full solution.
-****
+*2.* Upon receiving the `RequirementAddCommand` object, `LogicManager` would then invoke the `RequirementAddCommand`
+ class to pass the object received.
 
-[discrete]
-==== `Model` component
+Once invoked, `RequirementAddCommand` will perform the following checks on the object received: +
+ * Check if the degree requirement category exists in the application through `getRequirementCategory` +
+ * Check if the module codes provided exists in the application through `model.hasModuleCode` +
+ * Check if the module codes have already been added to other degree requirement categories +
+ * Check if the module codes have already been added to the specified degree requirement category through
+   `RequirementCategory.hasModuleCode`
 
-*Scenario:* You are in charge of `model`. One day, the `logic`-in-charge approaches you for help. He wants to implement a command such that the user is able to remove a particular tag from everyone in the address book, but the model API does not support such a functionality at the moment. Your job is to implement an API method, so that your teammate can use your API to implement his command.
+[NOTE]
+====
+`RequirementAddCommand` will throw an error if any of the above checks fails.
+====
 
-[TIP]
-Do take a look at <<Design-Model>> before attempting to modify the `Model` component.
-
-. Add a `removeTag(Tag)` method. The specified tag will be removed from everyone in the address book.
-+
-****
-* Hints
-** The link:{repoURL}/src/main/java/seedu/address/model/Model.java[`Model`] and the link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] API need to be updated.
-** Think about how you can use SLAP to design the method. Where should we place the main logic of deleting tags?
-**  Find out which of the existing API methods in  link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] and link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`] classes can be used to implement the tag removal logic. link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] allows you to update a person, and link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`] allows you to update the tags.
-* Solution
-** Implement a `removeTag(Tag)` method in link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`]. Loop through each person, and remove the `tag` from each person.
-** Add a new API method `deleteTag(Tag)` in link:{repoURL}/src/main/java/seedu/address/model/ModelManager.java[`ModelManager`]. Your link:{repoURL}/src/main/java/seedu/address/model/ModelManager.java[`ModelManager`] should call `AddressBook#removeTag(Tag)`.
-** Add new tests for each of the new public methods that you have added.
-** See this https://github.com/se-edu/addressbook-level4/pull/790[PR] for the full solution.
-****
+*3.* After passing all of the above checks, `RequirementAddCommand` updates the context in `Model` through
+`setRequirementCategory`.
 
-[discrete]
-==== `Ui` component
+*4.* In addition to adding module code(s) to the specified degree requirement category, the `RequirementAddCommand`
+class also saves the current database state through `commitApplication` (for undo/redo functions).
 
-*Scenario:* You are in charge of `ui`. During a beta testing session, your team is observing how the users use your address book application. You realize that one of the users occasionally tries to delete non-existent tags from a contact, because the tags all look the same visually, and the user got confused. Another user made a typing mistake in his command, but did not realize he had done so because the error message wasn't prominent enough. A third user keeps scrolling down the list, because he keeps forgetting the index of the last person in the list. Your job is to implement improvements to the UI to solve all these problems.
+The sequence diagram below shows how this command interacts with the `Logic` components as described above.
 
 [TIP]
-Do take a look at <<Design-Ui>> before attempting to modify the `UI` component.
+====
+* You can click on the image below, so that it is enlarged in a new tab (only works on github)
+* The sequence diagram has been extracted into 2 sub-diagrams to better illustrate the component interactions
+====
 
-. Use different colors for different tags inside person cards. For example, `friends` tags can be all in brown, and `colleagues` tags can be all in yellow.
-+
-**Before**
-+
-image::getting-started-ui-tag-before.png[width="300"]
-+
-**After**
-+
-image::getting-started-ui-tag-after.png[width="300"]
-+
-****
-* Hints
-** The tag labels are created inside link:{repoURL}/src/main/java/seedu/address/ui/PersonCard.java[the `PersonCard` constructor] (`new Label(tag.tagName)`). https://docs.oracle.com/javase/8/javafx/api/javafx/scene/control/Label.html[JavaFX's `Label` class] allows you to modify the style of each Label, such as changing its color.
-** Use the .css attribute `-fx-background-color` to add a color.
-** You may wish to modify link:{repoURL}/src/main/resources/view/DarkTheme.css[`DarkTheme.css`] to include some pre-defined colors using css, especially if you have experience with web-based css.
-* Solution
-** You can modify the existing test methods for `PersonCard` 's to include testing the tag's color as well.
-** See this https://github.com/se-edu/addressbook-level4/pull/798[PR] for the full solution.
-*** The PR uses the hash code of the tag names to generate a color. This is deliberately designed to ensure consistent colors each time the application runs. You may wish to expand on this design to include additional features, such as allowing users to set their own tag colors, and directly saving the colors to storage, so that tags retain their colors even if the hash code algorithm changes.
-****
+.RequirementAddCommand component interactions
+image::RequirementAddCommandSequenceDiagram.png[width="650"]
 
-. Modify link:{repoURL}/src/main/java/seedu/address/commons/events/ui/NewResultAvailableEvent.java[`NewResultAvailableEvent`] such that link:{repoURL}/src/main/java/seedu/address/ui/ResultDisplay.java[`ResultDisplay`] can show a different style on error (currently it shows the same regardless of errors).
-+
-**Before**
-+
-image::getting-started-ui-result-before.png[width="200"]
-+
-**After**
-+
-image::getting-started-ui-result-after.png[width="200"]
-+
-****
-* Hints
-** link:{repoURL}/src/main/java/seedu/address/commons/events/ui/NewResultAvailableEvent.java[`NewResultAvailableEvent`] is raised by link:{repoURL}/src/main/java/seedu/address/ui/CommandBox.java[`CommandBox`] which also knows whether the result is a success or failure, and is caught by link:{repoURL}/src/main/java/seedu/address/ui/ResultDisplay.java[`ResultDisplay`] which is where we want to change the style to.
-** Refer to link:{repoURL}/src/main/java/seedu/address/ui/CommandBox.java[`CommandBox`] for an example on how to display an error.
-* Solution
-** Modify link:{repoURL}/src/main/java/seedu/address/commons/events/ui/NewResultAvailableEvent.java[`NewResultAvailableEvent`] 's constructor so that users of the event can indicate whether an error has occurred.
-** Modify link:{repoURL}/src/main/java/seedu/address/ui/ResultDisplay.java[`ResultDisplay#handleNewResultAvailableEvent(NewResultAvailableEvent)`] to react to this event appropriately.
-** You can write two different kinds of tests to ensure that the functionality works:
-*** The unit tests for `ResultDisplay` can be modified to include verification of the color.
-*** The system tests link:{repoURL}/src/test/java/systemtests/AddressBookSystemTest.java[`AddressBookSystemTest#assertCommandBoxShowsDefaultStyle() and AddressBookSystemTest#assertCommandBoxShowsErrorStyle()`] to include verification for `ResultDisplay` as well.
-** See this https://github.com/se-edu/addressbook-level4/pull/799[PR] for the full solution.
-*** Do read the commits one at a time if you feel overwhelmed.
-****
+.Component interactions of the checks performed by RequirementAddCommand class
+image::RequirementAddCommandSequenceDiagramExtracted.png[width="650"]
 
-. Modify the link:{repoURL}/src/main/java/seedu/address/ui/StatusBarFooter.java[`StatusBarFooter`] to show the total number of people in the address book.
-+
-**Before**
-+
-image::getting-started-ui-status-before.png[width="500"]
-+
-**After**
-+
-image::getting-started-ui-status-after.png[width="500"]
-+
-****
-* Hints
-** link:{repoURL}/src/main/resources/view/StatusBarFooter.fxml[`StatusBarFooter.fxml`] will need a new `StatusBar`. Be sure to set the `GridPane.columnIndex` properly for each `StatusBar` to avoid misalignment!
-** link:{repoURL}/src/main/java/seedu/address/ui/StatusBarFooter.java[`StatusBarFooter`] needs to initialize the status bar on application start, and to update it accordingly whenever the address book is updated.
-* Solution
-** Modify the constructor of link:{repoURL}/src/main/java/seedu/address/ui/StatusBarFooter.java[`StatusBarFooter`] to take in the number of persons when the application just started.
-** Use link:{repoURL}/src/main/java/seedu/address/ui/StatusBarFooter.java[`StatusBarFooter#handleAddressBookChangedEvent(AddressBookChangedEvent)`] to update the number of persons whenever there are new changes to the addressbook.
-** For tests, modify link:{repoURL}/src/test/java/guitests/guihandles/StatusBarFooterHandle.java[`StatusBarFooterHandle`] by adding a state-saving functionality for the total number of people status, just like what we did for save location and sync status.
-** For system tests, modify link:{repoURL}/src/test/java/systemtests/AddressBookSystemTest.java[`AddressBookSystemTest`] to also verify the new total number of persons status bar.
-** See this https://github.com/se-edu/addressbook-level4/pull/803[PR] for the full solution.
-****
+==== Design Considerations
 
-[discrete]
-==== `Storage` component
+This section describes the various design considerations the taken when implementing the `requirement_add`
+feature.
 
-*Scenario:* You are in charge of `storage`. For your next project milestone, your team plans to implement a new feature of saving the address book to the cloud. However, the current implementation of the application constantly saves the address book after the execution of each command, which is not ideal if the user is working on limited internet connection. Your team decided that the application should instead save the changes to a temporary local backup file first, and only upload to the cloud after the user closes the application. Your job is to implement a backup API for the address book storage.
+===== Aspect: Choice of what is stored in the requirement category storage file
 
-[TIP]
-Do take a look at <<Design-Storage>> before attempting to modify the `Storage` component.
+The table below shows a comparison between the two approaches that could have been implemented.
 
-. Add a new method `backupAddressBook(ReadOnlyAddressBook)`, so that the address book can be saved in a fixed temporary location.
-+
-****
-* Hint
-** Add the API method in link:{repoURL}/src/main/java/seedu/address/storage/AddressBookStorage.java[`AddressBookStorage`] interface.
-** Implement the logic in link:{repoURL}/src/main/java/seedu/address/storage/StorageManager.java[`StorageManager`] and link:{repoURL}/src/main/java/seedu/address/storage/JsonAddressBookStorage.java[`JsonAddressBookStorage`] class.
-* Solution
-** See this https://github.com/se-edu/addressbook-level4/pull/594[PR] for the full solution.
-****
+[cols="30%,35%,35%"]
+|=====
+|*Approach* | *Pros* | *Cons*|
+*1.* Storing only the module codes in the requirement category storage file
+ a|
+* Lesser storage space is required as only the module code is being stored
+* Easy to maintain, as only one information is being stored
+a|
+* Extra overhead is required when additional information related to the module is retrieved
+ |*2.* Storing all information related to the modules but only the module code is displayed
+a|
+* Any information related to the modules is easily retrievable
+a|
+* The module information is duplicated, additional storage space and processing time is needed to load the
+ entire requirement category
+* Hard to maintain and manage the stored information. If a module information is updated the information in the
+ requirement category storage needs to be updated as well.
+|=====
 
-[[GetStartedProgramming-RemarkCommand]]
-=== Creating a new command: `remark`
+After evaluating the pros and cons of both approaches, we have decided to implement *Approach 1*.
 
-By creating this command, you will get a chance to learn how to implement a feature end-to-end, touching all major components of the app.
+The main reason is that all module information would be duplicated again in the requirement category storage file.
+This would effectively make the module storage file redundant as the information can be found in the requirement
+category storage file.
 
-*Scenario:* You are a software maintainer for `addressbook`, as the former developer team has moved on to new projects. The current users of your application have a list of new feature requests that they hope the software will eventually have. The most popular request is to allow adding additional comments/notes about a particular contact, by providing a flexible `remark` field for each contact, rather than relying on tags alone. After designing the specification for the `remark` command, you are convinced that this feature is worth implementing. Your job is to implement the `remark` command.
+In addition, when a module information is updated, we have to ensure that the information in both storage files are
+updated and consistent to avoid any conflicting information.
 
-==== Description
-Edits the remark for a person specified in the `INDEX`. +
-Format: `remark INDEX r/[REMARK]`
+Another factor that heavily impacted the decision would be that each module is uniquely identified by a module code.
+Hence, by storing the module code only, the module's information can be easily obtained.
 
-Examples:
+//end::requirement-add[]
 
-* `remark 1 r/Likes to drink coffee.` +
-Edits the remark for the first person to `Likes to drink coffee.`
-* `remark 1 r/` +
-Removes the remark for the first person.
+// tag::requirement-move[]
+=== Requirement Move Feature
+The requirement move feature in the application aims to help users to be able to move module code(s) from any degree
+requirement category to the specified requirement category.
 
-==== Step-by-step Instructions
+==== Current implementation
 
-===== [Step 1] Logic: Teach the app to accept 'remark' which does nothing
-Let's start by teaching the application how to parse a `remark` command. We will add the logic of `remark` later.
+When the user invokes the `requirement_move` command, e.g. (requirement_move name/Mathematics code/CS1231). +
+The following steps are taken by the application.
 
-**Main:**
+*1.* The `CommandParser` invokes the `RequirementMoveCommandParser` class to parse the user input provided.
+ The parsed data will then be used to create a `RequirementMoveCommand` object. The `RequirementMoveCommand` object
+ will then be returned to `LogicManager`.
 
-. Add a `RemarkCommand` that extends link:{repoURL}/src/main/java/seedu/address/logic/commands/Command.java[`Command`]. Upon execution, it should just throw an `Exception`.
-. Modify link:{repoURL}/src/main/java/seedu/address/logic/parser/AddressBookParser.java[`AddressBookParser`] to accept a `RemarkCommand`.
+[NOTE]
+====
+* The input should only consist of the `name` of the requirement category and module `code`(s) to be moved
+* `RequirementMoveCommandParser` will throw an error if the user input does not match the command format
+====
 
-**Tests:**
+*2.* Upon receiving the `RequirementMoveCommand` object, `LogicManager` would then invoke the `RequirementMoveCommand`
+ class to pass the object received. +
 
-. Add `RemarkCommandTest` that tests that `execute()` throws an Exception.
-. Add new test method to link:{repoURL}/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java[`AddressBookParserTest`], which tests that typing "remark" returns an instance of `RemarkCommand`.
+Once invoked, `RequirementMoveCommand` will perform the following checks on the
+ object received: +
+* Check if the degree requirement category specified exists in the application through `getRequirementCategory` +
+* Check if the module code(s) provided exists in the application through `model.hasModuleCode` +
+* Check if the module code(s) provided already been added to the degree requirement category +
 
-===== [Step 2] Logic: Teach the app to accept 'remark' arguments
-Let's teach the application to parse arguments that our `remark` command will accept. E.g. `1 r/Likes to drink coffee.`
+[NOTE]
+====
+`RequirementMoveCommand` will throw an error if any of the above checks fails.
+====
 
-**Main:**
+*3.* After passing all of the above checks, `RequirementMoveCommand` determines if the modules code(s) to be moved
+belongs
+ to a single degree requirement category or from multiple degree requirement categories
 
-. Modify `RemarkCommand` to take in an `Index` and `String` and print those two parameters as the error message.
-. Add `RemarkCommandParser` that knows how to parse two arguments, one index and one with prefix 'r/'.
-. Modify link:{repoURL}/src/main/java/seedu/address/logic/parser/AddressBookParser.java[`AddressBookParser`] to use the newly implemented `RemarkCommandParser`.
+*4.* If the module code(s) belongs to a *single* degree requirement category, `RequirementMoveCommand` will move all the
+ module code(s) specified at once. +
+If the module code(s) belong to *multiple* degree requirement categories, `RequirementMoveCommand` will move the
+module code(s) specified at one by one
 
-**Tests:**
+*5.* In addition to adding module code(s) to the specified degree requirement category, the `RequirementMoveCommand`
+class
+also saves the current database state through `commitApplication` (for undo/redo functions).
 
-. Modify `RemarkCommandTest` to test the `RemarkCommand#equals()` method.
-. Add `RemarkCommandParserTest` that tests different boundary values
-for `RemarkCommandParser`.
-. Modify link:{repoURL}/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java[`AddressBookParserTest`] to test that the correct command is generated according to the user input.
+The sequence diagram below shows how this command interacts with the `Logic` components as described above.
 
-===== [Step 3] Ui: Add a placeholder for remark in `PersonCard`
-Let's add a placeholder on all our link:{repoURL}/src/main/java/seedu/address/ui/PersonCard.java[`PersonCard`] s to display a remark for each person later.
+[TIP]
+====
+* You can click on the image below, so that it is enlarged in a new tab (only works on github)
+* The sequence diagram has been extracted into 2 sub-diagrams to better illustrate the component interactions
+====
 
-**Main:**
+.RequirementMoveCommand component interactions
+image::RequirementMoveCommandSequenceDiagram.png[width="650"]
 
-. Add a `Label` with any random text inside link:{repoURL}/src/main/resources/view/PersonListCard.fxml[`PersonListCard.fxml`].
-. Add FXML annotation in link:{repoURL}/src/main/java/seedu/address/ui/PersonCard.java[`PersonCard`] to tie the variable to the actual label.
+.Component interactions of the checks performed by RequirementMoveCommand class
+image::RequirementMoveCommandSequenceDiagramExtracted.png[width="650"]
 
-**Tests:**
+==== Design Considerations
 
-. Modify link:{repoURL}/src/test/java/guitests/guihandles/PersonCardHandle.java[`PersonCardHandle`] so that future tests can read the contents of the remark label.
+This section describes the various design considerations the taken when implementing the `requirement_move`
+feature.
 
-===== [Step 4] Model: Add `Remark` class
-We have to properly encapsulate the remark in our link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`] class. Instead of just using a `String`, let's follow the conventional class structure that the codebase already uses by adding a `Remark` class.
+===== Aspect: To include a check to determine if the module code(s) specified come froms a single source degree requirement category
 
-**Main:**
+The table below shows a comparison between the two approaches that could have been implemented.
 
-. Add `Remark` to model component (you can copy from link:{repoURL}/src/main/java/seedu/address/model/person/Address.java[`Address`], remove the regex and change the names accordingly).
-. Modify `RemarkCommand` to now take in a `Remark` instead of a `String`.
+[cols="30%,35%,35%"]
+|=====
+|*Approach* | *Pros* | *Cons*|
+*1.* Implementing to check if the module code(s) comes from a single source
+ a|
+* Able to move all modules at once
+* Reduce overhead
+a|
+* Extra checks are required in the application
+ |*2.* Not implementing to check if the module code(s) comes from a single source
+a|
+* Lesser checks needs to be implemented
+a|
+* More overhead is needed when handling the moving of the module code(s)
+|=====
 
-**Tests:**
+After evaluating the pros and cons of both approaches, we have decided to implement *Approach 1*.
 
-. Add test for `Remark`, to test the `Remark#equals()` method.
+The main reason is that it has a slight performance boost for the application as all the module code(s) can be moved
+together at once, reducing the overall overhead.
 
-===== [Step 5] Model: Modify `Person` to support a `Remark` field
-Now we have the `Remark` class, we need to actually use it inside link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`].
+//end::requirement-move[]
 
-**Main:**
+// tag::requirement-list[]
+=== Requirement List Feature
+The requirement list feature in the application allow users to display all requirement categories and the module code(s)
+ that have been added to the requirement categories.
 
-. Add `getRemark()` in link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`].
-. You may assume that the user will not be able to use the `add` and `edit` commands to modify the remarks field (i.e. the person will be created without a remark).
-. Modify link:{repoURL}/src/main/java/seedu/address/model/util/SampleDataUtil.java/[`SampleDataUtil`] to add remarks for the sample data (delete your `data/addressbook.json` so that the application will load the sample data when you launch it.)
+==== Current implementation
 
-===== [Step 6] Storage: Add `Remark` field to `JsonAdaptedPerson` class
-We now have `Remark` s for `Person` s, but they will be gone when we exit the application. Let's modify link:{repoURL}/src/main/java/seedu/address/storage/JsonAdaptedPerson.java[`JsonAdaptedPerson`] to include a `Remark` field so that it will be saved.
+The `requirement_list` command requires no additional input other than the command itself.
+When the user executes the `requirement_list` command, the following steps are taken by the the application.
 
-**Main:**
+*1.* The `CommandParser` invokes the `RequirementListCommand` class
 
-. Add a new JSON field for `Remark`.
+*2.* When the `RequirementListCommand` class is invoked, it will perform the following actions before displaying the
+output to the user:
 
-**Tests:**
+- Obtain a list of all the requirement categories and the modules added to each requirement category in the application
+through `getFilteredRequirementCategoryList`
+- Obtain the module credit information for every module added into each requirement category through `getModuleByCode`
 
-. Fix `invalidAndValidPersonAddressBook.json`, `typicalPersonsAddressBook.json`, `validAddressBook.json` etc., such that the JSON tests will not fail due to a missing `remark` field.
+*3.* Once the information has been populated, the application will then display all requirement categories, the current
+ credit count for each requirement category as well as the module(s) added to each requirement category.
 
-===== [Step 6b] Test: Add withRemark() for `PersonBuilder`
-Since `Person` can now have a `Remark`, we should add a helper method to link:{repoURL}/src/test/java/seedu/address/testutil/PersonBuilder.java[`PersonBuilder`], so that users are able to create remarks when building a link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`].
+[NOTE]
+====
+If there are no modules added to a requirement category, the application will display `No modules in this category!`
+ for that particular requirement category.
+====
 
-**Tests:**
+The sequence diagram below shows the interaction with the `Logic` components as described above.
 
-. Add a new method `withRemark()` for link:{repoURL}/src/test/java/seedu/address/testutil/PersonBuilder.java[`PersonBuilder`]. This method will create a new `Remark` for the person that it is currently building.
-. Try and use the method on any sample `Person` in link:{repoURL}/src/test/java/seedu/address/testutil/TypicalPersons.java[`TypicalPersons`].
+[TIP]
+====
+You can click on the image below, so that it is enlarged in a new tab (only works on github)
+====
 
-===== [Step 7] Ui: Connect `Remark` field to `PersonCard`
-Our remark label in link:{repoURL}/src/main/java/seedu/address/ui/PersonCard.java[`PersonCard`] is still a placeholder. Let's bring it to life by binding it with the actual `remark` field.
+.RequirmentListCommand component interactions
+image::RequirementListCommandSequenceDiagram.png[width="650"]
 
-**Main:**
+==== Design Considerations
 
-. Modify link:{repoURL}/src/main/java/seedu/address/ui/PersonCard.java[`PersonCard`]'s constructor to bind the `Remark` field to the `Person` 's remark.
+This section describes the various design considerations the taken when implementing the `requirement_list`
+feature.
 
-**Tests:**
+===== Aspect: Tracking the current amount of credits in a requirement category
 
-. Modify link:{repoURL}/src/test/java/seedu/address/ui/testutil/GuiTestAssert.java[`GuiTestAssert#assertCardDisplaysPerson(...)`] so that it will compare the now-functioning remark label.
+The table below shows a comparison between the two approaches that could have been implemented.
 
-===== [Step 8] Logic: Implement `RemarkCommand#execute()` logic
-We now have everything set up... but we still can't modify the remarks. Let's finish it up by adding in actual logic for our `remark` command.
+[cols="30%,35%,35%"]
+|=====
+|*Approach* | *Pros* | *Cons*|
+*1.* Creating a dedicated attribute to track the current amount credits of a requirement category
+ a|
+* Current amount of credits is always available and easily obtainable
+a|
+* Hard to maintain. When a module credit is updated to a new value, the attribute has to be updated as well to
+ prevent conflicting information.
+ |*2.* Calculating the current amount of credits of a requirement category when needed
+a|
+* Any information related to the modules is easily retrievable as each module is uniquely identified by the module
+code
+* No extra maintenance of information needed
+* Able to easily calculate the credits when needed as module information
+  are easily obtainable.
+a|
+* Extra overhead is required to retrieve the module's information and compute the current amount of credits
+|=====
 
-**Main:**
+After evaluating the pros and cons of both approaches, the group decided that *Approach 2* was to be implemented.
 
-. Replace the logic in `RemarkCommand#execute()` (that currently just throws an `Exception`), with the actual logic to modify the remarks of a person.
+The determining factor was that the module's credits can be easily obtain. Hence the current amount of credits for a
+particular requirement category can be easily calculated as and when needed.
 
-**Tests:**
+Furthermore, when a module's credits is changed, we have to ensure that the information in the
+requirement category storage file is updated as well. Which is hard to maintain as the requirement category
+containing the module code must first be retrieved for the attribute to be updated.
 
-. Update `RemarkCommandTest` to test that the `execute()` logic works.
+//end::requirement-list[]
 
-==== Full Solution
+// tag::planner-add[]
+=== Planner Add Feature
+The `planner_add` command in PWE is used to add module code(s) to the degree plan.
 
-See this https://github.com/se-edu/addressbook-level4/pull/599[PR] for the step-by-step solution.
+==== Current implementation
 
-[appendix]
-== Product Scope
+The `planner_add` command requires the `PlannerAddCommandParser` class to parse the user input provided. The
+ parsed data will then be passed to the `PlannerAddCommand` class.
 
-*Target user profile*:
+The input should contain the year and semester of the degree plan as well as the module code(s) to be added.
 
-* has a need to manage a significant number of contacts
-* prefer desktop apps over other types
-* can type fast
-* prefers typing over mouse input
-* is reasonably comfortable using CLI apps
+`PlannerAddCommandParser` will throw an error if the user input does not match the command format.
 
-*Value proposition*: manage contacts faster than a typical mouse/GUI driven app
+When `PlannerAddCommand` receives the parsed data, it will perform the following checks:
 
-[appendix]
-== User Stories
+- Check if the year and semester exist in the degree plan
+- Check if the module codes provided exist in PWE through `model.hasModuleCode`
+- Check if the module codes have already been added to the degree plan
+- Check if the co-requisites of modules provided already exist in other semesters of the degree plan
 
-Priorities: High (must have) - `* * \*`, Medium (nice to have) - `* \*`, Low (unlikely to have) - `*`
+`PlannerAddCommand` will throw an error if any of the above checks fails.
 
-[width="59%",cols="22%,<23%,<25%,<30%",options="header",]
-|=======================================================================
-|Priority |As a ... |I want to ... |So that I can...
-|`* * *` |new user |see usage instructions |refer to instructions when I forget how to use the App
+After passing all of the above checks, `PlannerAddCommand` updates the context in `ModelManager` through
+`setDegreePlanner`.
 
-|`* * *` |user |add a new person |
+In addition to adding module code(s) to the degree plan, the `PlannerAddCommand` class also saves the
+current database state through `commitApplication` (for undo/redo functions).
 
-|`* * *` |user |delete a person |remove entries that I no longer need
+.PlannerAddCommand component interactions part 1
+image::PlannerAddCommandSequenceDiagram1.png[width="650"]
+.PlannerAddCommand component interactions part 2
+image::PlannerAddCommandSequenceDiagram2.png[width="650"]
 
-|`* * *` |user |find a person by name |locate details of persons without having to go through the entire list
+==== Design Considerations
+===== Aspect: Choice of whether to deal with certain possible errors when the application gets modified.
 
-|`* *` |user |hide <<private-contact-detail,private contact details>> by default |minimize chance of someone else seeing them by accident
+- Alternative 1 (current choice): Checking for invalid co-requisites as well as non-existent year and semester in degree plan.
 
-|`*` |user with many persons in the address book |sort persons by name |locate a person easily
-|=======================================================================
+[cols="30%,<70%"]
+|======
+|*Pros*| Software is more secure against possible errors.
+|*Cons*| Harder to maintain.
+|======
 
-_{More to be added}_
+- Alternative 2: Skipping checks for invalid co-requisites as well as non-existent year and semester in degree plan.
 
-[appendix]
-== Use Cases
+[cols="30%,<70%"]
+|=====
+|*Pros*| Easier to maintain.
+|*Cons*| When certain parts of the software get modified, some errors may occur with this command. For instance, a user may use `EditCommand` to edit co-requisites. If the check was not in place and the edit command fails to add the edited co-requisites to the degree plan, the user will then be able to add the co-requisites to invalid semesters of the degree plan.
 
-(For all use cases below, the *System* is the `AddressBook` and the *Actor* is the `user`, unless specified otherwise)
+|=====
+//end::planner-add[]
 
-[discrete]
-=== Use case: Delete person
+// tag::planner-remove[]
+=== Planner Remove Feature
+The `planner_remove` command in PWE is used to remove module code(s) from the degree plan.
 
-*MSS*
+==== Current implementation
 
-1.  User requests to list persons
-2.  AddressBook shows a list of persons
-3.  User requests to delete a specific person in the list
-4.  AddressBook deletes the person
-+
-Use case ends.
+The `planner_remove` command requires the `PlannerRemoveCommandParser` class to parse the user input provided. The
+ parsed data will then be passed to the `PlannerRemoveCommand` class.
 
-*Extensions*
+The input should contain the module code(s) to be removed.
 
-[none]
-* 2a. The list is empty.
-+
-Use case ends.
+`PlannerRemoveCommandParser` will throw an error if the user input does not match the command format.
 
-* 3a. The given index is invalid.
-+
-[none]
-** 3a1. AddressBook shows an error message.
-+
-Use case resumes at step 2.
+When `PlannerRemoveCommand` receives the parsed data, it will perform the following checks:
 
-_{More to be added}_
+- Check if the module codes to remove exist in the degree plan.
 
-[appendix]
-== Non Functional Requirements
+`PlannerRemoveCommand` will throw an error if any of the above checks fails.
 
-.  Should work on any <<mainstream-os,mainstream OS>> as long as it has Java `9` or higher installed.
-.  Should be able to hold up to 1000 persons without a noticeable sluggishness in performance for typical usage.
-.  A user with above average typing speed for regular English text (i.e. not code, not system admin commands) should be able to accomplish most of the tasks faster using commands than using the mouse.
+After passing all of the above checks, `PlannerRemoveCommand` updates the context in `ModelManager` through
+`setDegreePlanner`.
 
-_{More to be added}_
+In addition to removing module code(s) from the degree plan, the `PlannerRemoveCommand` class also saves the
+current database state through `commitApplication` (for undo/redo functions).
 
-[appendix]
-== Glossary
+.PlannerRemoveCommand class diagram
+image::PlannerRemoveCommandClassDiagram.png[width="650"]
 
-[[mainstream-os]] Mainstream OS::
-Windows, Linux, Unix, OS-X
+==== Design Considerations
+===== Aspect: Choice of whether to use `getDegreePlannerByCode` method for removing module codes.
 
-[[private-contact-detail]] Private contact detail::
-A contact detail that is not meant to be shared with others
+- Alternative 1 (current choice): Looping through all semesters of the degree plan instead of using `getDegreePlannerByCode` to identify the relevant semesters of the codes to remove.
 
-[appendix]
-== Product Survey
+[cols="30%,<70%"]
+|======
+|*Pros*| Simpler code.
+|*Cons*| May loop through extra semesters when there are few module codes to remove.
+|======
 
-*Product Name*
+- Alternative 2: Using `getDegreePlannerByCode` method to identify the relevant semesters containing the code to remove. Removing the codes in the selected semester only.
 
-Author: ...
+[cols="30%,<70%"]
+|=====
+|*Pros*| When there are few module codes to remove, the method may incur in slightly less overhead.
+|*Cons*| When there are N modules to remove, while the current method only needs 16 (total number of semesters) outer loops,
+ this alternative method needs N outer loops. Moreover, `getDegreePlannerByCode` method itself also needs to loop through
+  the DegreePlanner List to find out the right semester. The time complexity for both methods can be the same.
 
-Pros:
+|=====
+//end::planner-remove[]
 
-* ...
-* ...
+// tag::planner-move[]
+=== Planner Move Feature
 
-Cons:
+The `planner_move` command aims to provide functionality for users to move a module between academic semesters in the
+degree plan along with its co-requisites.
 
-* ...
-* ...
+This section shares the implementation and design considerations made during the enhancement of the `planner_move`
+feature.
 
-[appendix]
-== Instructions for Manual Testing
+==== Overview
 
-Given below are instructions to test the app manually.
+As the users often encounter situations where they decide to take the modules in other semesters after they have
+completed their degree planning, the `planner_move` feature is essential to have.
+
+Current `planner_move` feature supports the moving of a module along with its co-requisites given the module and
+its co-requisites are offered in the semester the users wants to move to.
+
+==== Current Implementation
+
+When a user execute the `planner_move` command (e.g. `planner_move year/1 sem/2 code/CS1010`), the following steps
+are taken by the application.
+
+Given below is a sequence diagram for moving a module that illustrates the interactions among `PlannerMoveCommand`,
+`PlannerMoveCommandParser` and `Model`:
+
+.PlannerMove component interactions
+image::PlannerMoveComponentSequenceDiagram.png[width="650"]
+
+Step 1. The `PlannerMoveCommandParser#parse` method is invoked. The `PlannerMoveCommandParser` receives the command with
+the arguments as a string.
+
+Step 2. The `PlannerMoveCommandParser` parses the text related to each `PREFIX` and constructs the `PlannerMoveCommand`
+. If more than one of each kind of `PREFIX` (e.g. `year/1 sem/2 code/CS1231 code/CS1010`) is provided, only text related
+to last of each `PREFIX` (e.g. `year/1 sem/2 code/CS1010`) will be parsed.
+
+[NOTE]
+====
+* The input should consist of the year and the semester of the degree plan that the user wants to move to and the module
+code that the user want to move.
+* `PlannerMoveCommandParser` will throw an error if the user input does not match the command format.
+====
+
+Step 3. The `PlannerMoveCommand` with `YEAR`, `SEMESTER` and `CODE` specified by the user is returned.
+
+Step 4. The `PlannerMoveCommand#execute` method is invoked.
+
+Given below is a sequence diagram that illustrates the interactions among `PlannerMoveCommand`, `Model` and
+`Application`:
+
+.PlannerMoveCommand in detail interactions
+image::PlannerMoveCommandSequenceDiagramDetail.png[width="650"]
+
+During this step, the following methods are carried out in the order:
+
+* The `getDegreePlannerByCode` method will be called to check if there exists any academic semester in degree plan that
+has the parsed module code.
+
+* The `getApplication` method will be called followed by the `getDegreePlannerList` method will be called by the
+model to retrieve the list of academic semesters available in the degree plan. Then, `filter` will be carried out
+with the help of `DegreePlanner#isSameDegreePlanner` to locate the academic semester the user wants to move the
+module to.
+
+[NOTE]
+====
+`null` will be returned instead of `DegreePlanner` object if no academic semester matching the year and the semester is
+found.
+====
+
+* The `getModuleByCode` method will be called to return `Module` object having the code `toMove`. Then, the `Module`
+object will be used to retrieve the semesters the module is available in with the `getSemesters` method to check if the
+module is offered in the academic semester the user is trying to move to.
+
+* The `getModuleByCode` method will be called in a loop during the `filter` to find out all the module's co-requisites
+not offered in the academic semester the user is trying to move to.
+
+[NOTE]
+====
+Any violations in the checks will result in throwing of an error message.
+====
+
+Step 5. The `Model` is updated.
+
+[NOTE]
+====
+* If any of the above check fails, `Model` will not be updated since there is nothing to be
+changed.
+
+* If all the above checks passes, the `PlannerMoveCommand` class will update the context in `ModelManager` by calling
+ the`moveModuleBetweenPlanner` method which will call `setDegreePlanner` method.
+
+* After updating the `Model` The `PlannerMoveCommand` will save the current database state through `commitApplication`
+(for undo/redo functions).
+====
+
+Step 6. A `CommandResult` object is returned.
+
+==== Design Considerations
+===== Aspect: How should searching of the degree plan based on the year and the semester provided to be done
+
+* **Alternative 1 (current choice):** Construct `DegreePlanner` object with the year and the semester provided and use
+`DegreePlanner#isSameDegreePlanner` to compare and search for the corresponding degree plan.
+
+[cols="30%,<70%"]
+|======
+|*Pros*| There is no need to create any method that may create unnecessary coupling.
+|*Cons*| There is a need to create a `DegreePlanner` object in order to use `DegreePlanner#isSameDegreePlanner`.
+|======
+
+* **Alternative 2:** Create `getDegreePlanner` method which retrieves `DegreePlanner` object based on the year and
+the semester provided.
+
+[cols="30%,<70%"]
+|======
+|*Pros*| Easy to implement.
+|*Cons*| The method will create unnecessary couplings between `Application` and `Year` as well as between `Application`
+ and `Semester`.
+|======
+// end::planner-move[]
+
+// tag::planner-show[]
+=== Planner Show Feature
+
+Planner show feature aims to help users to be able to easily locate and display any academic semesters in the degree
+plan which is in our application. We support the displaying of degree planners based on year, semester and boolean
+expressions. This enables our users to display only specific academic semesters in the degree plan that they want.
+
+==== Overview
+
+When a user invokes the `planner_show` command. (e.g. `planner_show y/YEAR && s/SEMESTER`), the following steps
+are taken by the program.
+
+1. Extract the text related to `planner_show` command (e.g. `y/YEAR && s/SEMESTER`)
+2. Parse the text related to each `PREFIX` individually.
+3. Return a composite predicate for all attributes.
+
+Step 1 is performed by the `ApplicationParser` class.
+
+Step 2 and 3 are performed by `BooleanExpressionParser#parse`.
+
+==== Current Implementation
+
+* Show degree planner(s) by year
+i.e. `planner_show y/YEAR`
+returns degree planner(s) having its year matches the year given
+
+* Show degree planner(s) by semester
+i.e. `planner_show s/SEMESTER`
+returns degree planner(s) having its semester matches the semester given
+
+* include `year` and `semester` attributes in one `planner_show` command and list degree planner(s)
+i.e. `planner_show y/YEAR s/SEMESTER`
+returns module having its year or semester matches the given year and semester
+
+==== Design Considerations
+===== Aspect: How to parse multiple attributes
+
+* **Alternative 1 (current choice):** Parse the text related to each `PREFIX` individually using `BooleanExpressionParser`
+
+[cols="30%,<70%"]
+|======
+|*Pros*|User is able to have more flexible search.
+|*Cons*|More time and work needed for developer to implement.
+|======
+
+* **Alternative 2:** Parse the text related to each `PREFIX` at one go without using `BooleanExpressionParser`
+
+[cols="30%,<70%"]
+|======
+|*Pros*|Easy to implement.
+|*Cons*|Additional overhead needed and inconsistent in the application's commands since `find` utilises `BooleanExpressionParser`.
+|======
+// end::planner-show[]
+
+// tag::planner-suggest[]
+=== Planner Suggest Feature
+The `planner_suggest` command in PWE is used to suggest module code(s) to add to the degree plan.
+
+==== Current implementation
+
+The `planner_suggest` command requires the `PlannerSuggestCommandParser` class to parse the user input provided. The
+ parsed data will then be passed to the `PlannerSuggestCommand` class.
+
+The input should contain the desirable credits. Another optional input is the desirable tags.
+
+`PlannerSuggestCommandParser` will throw an error if the user input does not match the command format.
+
+After passing the above check, `PlannerSuggestCommand` will make the result box display 3 lists of modules. The first list
+is the main recommendation list that sorts the modules in a specific way and displays maximum 10 most recommended modules.
+The second and the third list respectively displays the modules with matching tags and modules with matching credits. The
+modules in the two lists should also exist in the main recommendation list.
+
+If `tag` is supplied as a parameter in input, modules will be sorted according to tags first. Modules with greater number
+of tags that match the desirable tags will be prioritized. If tie, modules with credits closer to the desirable credits
+will be prioritized. If tie again, modules will be sorted according to alphabetical order.
+
+.PlannerSuggestCommand activity diagram
+image::PlannerSuggestCommandActivityDiagram.png[width="650"]
+
+==== Design Considerations
+===== Aspect: Choice of where to put `ModuleToSuggest` class.
+
+- Alternative 1 (current choice): Put `ModuleToSuggest` as inner class of `PlannerSuggestCommand` class.
+
+[cols="30%,<70%"]
+|======
+|*Pros*| Cleaner model for the Application.
+|*Cons*| The inner class has access to the private and protected members of the outer class, which can be unnecessary.
+|======
+
+- Alternative 2: Put `ModuleToSuggest` as a separate class apart from `PlannerSuggestCommand` class.
+
+[cols="30%,<70%"]
+|=====
+|*Pros*| Better encapsulation for `PlannerSuggestCommand` class.
+|*Cons*| As no other class needs to access the `ModuleToSuggest` class, making it a separate class is unnecessary and makes the model more complex.
+
+|=====
+//end::planner-suggest[]
+
+=== Logging
+
+We are using `java.util.logging` package for logging. The `LogsCenter` class is used to manage the logging levels and logging destinations.
+
+* The logging level can be controlled using the `logLevel` setting in the configuration file (See <<Implementation-Configuration>>)
+* The `Logger` for a class can be obtained using `LogsCenter.getLogger(Class)` which will log messages according to the specified logging level
+* Currently log messages are output through: `Console` and to a `.log` file.
+
+*Logging Levels*
+
+* `SEVERE` : Critical problem detected which may possibly cause the termination of the application
+* `WARNING` : Can continue, but with caution
+* `INFO` : Information showing the noteworthy actions by the App
+* `FINE` : Details that is not usually noteworthy but may be useful in debugging e.g. print the actual list instead of just its size
+
+[[Implementation-Configuration]]
+=== Configuration
+
+Certain properties of the application can be controlled (e.g user prefs file location, logging level) through the configuration file (default: `config.json`).
+
+== Documentation
+
+We use asciidoc for writing documentation.
+
+[NOTE]
+We chose asciidoc over Markdown because asciidoc, although a bit more complex than Markdown, provides more flexibility in formatting.
+
+=== Editing Documentation
+
+See <<UsingGradle#rendering-asciidoc-files, UsingGradle.adoc>> to learn how to render `.adoc` files locally to preview the end result of your edits.
+Alternatively, you can download the AsciiDoc plugin for IntelliJ, which allows you to preview the changes you have made to your `.adoc` files in real-time.
+
+=== Publishing Documentation
+
+See <<UsingTravis#deploying-github-pages, UsingTravis.adoc>> to learn how to deploy GitHub Pages using Travis.
+
+=== Converting Documentation to PDF format
+
+We use https://www.google.com/chrome/browser/desktop/[Google Chrome] for converting documentation to PDF format, as Chrome's PDF engine preserves hyperlinks used in webpages.
+
+Here are the steps to convert the project documentation files to PDF format.
+
+.  Follow the instructions in <<UsingGradle#rendering-asciidoc-files, UsingGradle.adoc>> to convert the AsciiDoc files in the `docs/` directory to HTML format.
+.  Go to your generated HTML files in the `build/docs` folder, right click on them and select `Open with` -> `Google Chrome`.
+.  Within Chrome, click on the `Print` option in Chrome's menu.
+.  Set the destination to `Save as PDF`, then click `Save` to save a copy of the file in PDF format. For best results, use the settings indicated in the screenshot below.
+
+.Saving documentation as PDF files in Chrome
+image::chrome_save_as_pdf.png[width="300"]
+
+[[Docs-SiteWideDocSettings]]
+=== Site-wide Documentation Settings
+
+The link:{repoURL}/build.gradle[`build.gradle`] file specifies some project-specific https://asciidoctor.org/docs/user-manual/#attributes[asciidoc attributes] which affects how all documentation files within this project are rendered.
+
+[TIP]
+Attributes left unset in the `build.gradle` file will use their *default value*, if any.
+
+[cols="1,2a,1", options="header"]
+.List of site-wide attributes
+|===
+|Attribute name |Description |Default value
+
+|`site-name`
+|The name of the website.
+If set, the name will be displayed near the top of the page.
+|_not set_
+
+|`site-githuburl`
+|URL to the site's repository on https://github.com[GitHub].
+Setting this will add a "View on GitHub" link in the navigation bar.
+|_not set_
+
+|`site-seedu`
+|Define this attribute if the project is an official SE-EDU project.
+This will render the SE-EDU navigation bar at the top of the page, and add some SE-EDU-specific navigation items.
+|_not set_
+
+|===
+
+[[Docs-PerFileDocSettings]]
+=== Per-file Documentation Settings
+
+Each `.adoc` file may also specify some file-specific https://asciidoctor.org/docs/user-manual/#attributes[asciidoc attributes] which affects how the file is rendered.
+
+Asciidoctor's https://asciidoctor.org/docs/user-manual/#builtin-attributes[built-in attributes] may be specified and used as well.
+
+[TIP]
+Attributes left unset in `.adoc` files will use their *default value*, if any.
+
+[cols="1,2a,1", options="header"]
+.List of per-file attributes, excluding Asciidoctor's built-in attributes
+|===
+|Attribute name |Description |Default value
+
+|`site-section`
+|Site section that the document belongs to.
+This will cause the associated item in the navigation bar to be highlighted.
+One of: `UserGuide`, `DeveloperGuide`, ``LearningOutcomes``{asterisk}, `AboutUs`, `ContactUs`
+
+_{asterisk} Official SE-EDU projects only_
+|_not set_
+
+|`no-site-header`
+|Set this attribute to remove the site navigation bar.
+|_not set_
+
+|===
+
+=== Site Template
+
+The files in link:{repoURL}/docs/stylesheets[`docs/stylesheets`] are the https://developer.mozilla.org/en-US/docs/Web/CSS[CSS stylesheets] of the site.
+You can modify them to change some properties of the site's design.
+
+The files in link:{repoURL}/docs/templates[`docs/templates`] controls the rendering of `.adoc` files into HTML5.
+These template files are written in a mixture of https://www.ruby-lang.org[Ruby] and http://slim-lang.com[Slim].
+
+[WARNING]
+====
+Modifying the template files in link:{repoURL}/docs/templates[`docs/templates`] requires some knowledge and experience with Ruby and Asciidoctor's API.
+You should only modify them if you need greater control over the site's layout than what stylesheets can provide.
+The SE-EDU team does not provide support for modified template files.
+====
+
+[[Testing]]
+== Testing
+
+=== Running Tests
+
+There are three ways to run tests.
+
+[TIP]
+The most reliable way to run tests is the 3rd one. The first two methods might fail some GUI tests due to platform/resolution-specific idiosyncrasies.
+
+*Method 1: Using IntelliJ JUnit test runner*
+
+* To run all tests, right-click on the `src/test/java` folder and choose `Run 'All Tests'`
+* To run a subset of tests, you can right-click on a test package, test class, or a test and choose `Run 'ABC'`
+
+*Method 2: Using Gradle*
+
+* Open a console and run the command `gradlew clean allTests` (Mac/Linux: `./gradlew clean allTests`)
+
+[NOTE]
+See <<UsingGradle#, UsingGradle.adoc>> for more info on how to run tests using Gradle.
+
+*Method 3: Using Gradle (headless)*
+
+Thanks to the https://github.com/TestFX/TestFX[TestFX] library we use, our GUI tests can be run in the _headless_ mode. In the headless mode, GUI tests do not show up on the screen. That means the developer can do other things on the Computer while the tests are running.
+
+To run tests in headless mode, open a console and run the command `gradlew clean headless allTests` (Mac/Linux: `./gradlew clean headless allTests`)
+
+=== Types of tests
+
+We have two types of tests:
+
+.  *GUI Tests* - These are tests involving the GUI. They include,
+.. _System Tests_ that test the entire App by simulating user actions on the GUI. These are in the `systemtests` package.
+.. _Unit tests_ that test the individual components. These are in `pwe.planner.ui` package.
+.  *Non-GUI Tests* - These are tests not involving the GUI. They include,
+..  _Unit tests_ targeting the lowest level methods/classes. +
+e.g. `pwe.planner.commons.StringUtilTest`
+..  _Integration tests_ that are checking the integration of multiple code units (those code units are assumed to be working). +
+e.g. `pwe.planner.storage.StorageManagerTest`
+..  Hybrids of unit and integration tests. These test are checking multiple code units as well as how the are connected together. +
+e.g. `pwe.planner.logic.LogicManagerTest`
+
+
+=== Troubleshooting Testing
+**Problem: `HelpWindowTest` fails with a `NullPointerException`.**
+
+* Reason: One of its dependencies, `HelpWindow.html` in `src/main/resources/docs` is missing.
+* Solution: Execute Gradle task `processResources`.
+
+**Problem: Keyboard and mouse movements are not simulated on macOS Mojave, resulting in GUI Tests failure.**
+
+* Reason: From macOS Mojave onwards, applications without `Accessibility` permission cannot simulate certain keyboard and mouse movements.
+* Solution: Open `System Preferences`, click `Security and Privacy` -> `Privacy` -> `Accessibility`, and check the box beside `Intellij IDEA`.
+
+.`Accessibility` permission is granted to `IntelliJ IDEA`
+image::testfx-idea-accessibility-permissions.png[width="600"]
+
+== Dev Ops
+
+=== Build Automation
+
+See <<UsingGradle#, UsingGradle.adoc>> to learn how to use Gradle for build automation.
+
+=== Continuous Integration
+
+We use https://travis-ci.org/[Travis CI] and https://www.appveyor.com/[AppVeyor] to perform _Continuous Integration_ on our projects. See <<UsingTravis#, UsingTravis.adoc>> and <<UsingAppVeyor#, UsingAppVeyor.adoc>> for more details.
+
+=== Coverage Reporting
+
+We use https://coveralls.io/[Coveralls] to track the code coverage of our projects. See <<UsingCoveralls#, UsingCoveralls.adoc>> for more details.
+
+=== Documentation Previews
+When a pull request has changes to asciidoc files, you can use https://www.netlify.com/[Netlify] to see a preview of how the HTML version of those asciidoc files will look like when the pull request is merged. See <<UsingNetlify#, UsingNetlify.adoc>> for more details.
+
+=== Making a Release
+
+Here are the steps to create a new release.
+
+.  Update the version number in link:{repoURL}/src/main/java/pwe/planner/MainApp.java[`MainApp.java`].
+.  Generate a JAR file <<UsingGradle#creating-the-jar-file, using Gradle>>.
+.  Tag the repo with the version number. e.g. `v0.1`
+.  https://help.github.com/articles/creating-releases/[Create a new release using GitHub] and upload the JAR file you created.
+
+=== Managing Dependencies
+
+A project often depends on third-party libraries. For example, PlanWithEase depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
+
+[loweralpha]
+. Include those libraries in the repo (this bloats the repo size)
+. Require developers to download those libraries manually (this creates extra work for developers)
+
+[appendix]
+== Product Scope
+
+*Target user profile*:
+
+* National University of Singapore (NUS) Information Security freshmen
+* does not plan to undertake special programs such as NOC, BComp Dissertation, Co-Op programme, etc.
+* has a need to plan modules to be taken during University life
+* prefer desktop apps over other types
+* can type fast
+* prefers typing over other means of input
+* is reasonably comfortable using CLI apps
+
+*Value proposition*:
+
+* Helps information security freshman plan their modules quickly and more conveniently.
+* Automatically check module pre-requisites to avoid module conflicts.
+* Provide an informed decision so that information security freshmen are able to decide which module to take at which semester.
+
+[appendix]
+== User Stories
+
+Priorities: High (must have) - `* * \*`, Medium (nice to have) - `* \*`, Low (unlikely to have) - `*`
+
+[width="59%",cols="22%,<23%,<25%,<30%",options="header",]
+|=======================================================================
+|Priority |As a ... |I want to ... |So that I can...
+
+|`* * *` |user |add modules  |keep a list of modules that I want to take
+
+|`* * *` |user |delete modules  |remove modules that I am not interested in taking
+
+|`* * *` |user |edit modules |edit the modules' details if there are any changes
+
+|`* * *` |user |list all modules |have an overview of all the modules that are added
+
+|`* * *` |user |find modules that are already added |know if I have previously added them
+
+|`* * *` |user |mark modules that are exempted |keep track of exempted modules
+
+|`* * *` |user |add modules into my degree plan |know which modules to bid/take in future
+
+|`* * *` |user |remove modules from my degree plan |remove modules that I am not interested in taking
+
+|`* * *` |user |move my modules to other academic semester in my degree plan |update my plan if there are any changes
+
+|`* * *` |user |mark those modules that are exempted in the module plan |keep track of exempted modules
+
+|`* * *` |user |list my degree planner |have an overview of my current plan
+
+|`* * *` |user |add module codes into different degree requirement categories |classify the modules according to their
+categories
+
+|`* * *` |user |remove module codes from the degree requirement categories |remove them if I made a mistake
+
+|`* * *` |user |move modules codes from a degree requirement categories to another |easily move them around
+
+|`* * *` |user |see all the degree requirement categories |get an overview of what modules fall under what categories
+
+|`*  *` |user |undo my previous command |easily revert back if a command was entered wrongly
+
+|`*  *` |user |redo my previous command |reverse my undo command if I have changed my opinion
+
+|`* *` |user |choose to overload/underload modules in a semester |manage my workload better
+
+|`*` |user |know the modules to put inside the degree plan |find out the suitable modules to take easily
+
+|`*` |user |generate my own module plan |easily plan which modules to take during university life
+
+|`*`|user |export my data from the application|reuse the existing data on other devices
+
+|`*` |user |import existing data into application| utilise existing data that was previously created
+
+|=======================================================================
+
+[appendix]
+== Use Cases
+
+(For all use cases below, the *System* is the PlanWithEase `Application` and the *Actor* is the `user`, unless
+specified otherwise)
+
+[discrete]
+=== Use Case: Clear All Modules in Application
+
+*MSS*
+
+1.  User requests to clear all modules in the module list
+2.  Application clear all modules in the module list
++
+Use case ends.
+
+*Extensions*
+[none]
+* None
+
+[discrete]
+=== Use case: Add a Module to Module List
+
+*MSS*
+
+1. User requests to add a module to the module list
+2. Application adds the module into the module list
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 1a. The given input is invalid.
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case ends.
+* 1b. The module already exists in the module list.
+** 1b1. Application shows an error message that module specified by user already exists in module list.
++
+Use case ends.
+* 1c. The module to be added has a corequisite that does not exists in the module list.
+** 1c1. Application shows an error message that module specified by user has a non-existent corequisite.
++
+Use case ends.
+* 1d. The module to be added has a corequisite that exists in the degree plan.
+** 1d1. Application shows an error message that module specified by user has a corequisite that exists in the degree
+plan.
++
+Use case ends.
+
+[discrete]
+=== Use Case: Edit a Module in Application
+
+*MSS*
+
+1.  User requests to list modules
+2.  Application shows a list of modules
+3.  User requests to edit a specific module in the module list
+4.  Application update the module in the module list
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 2a. The list is empty.
++
+Use case ends.
+
+[none]
+* 3a. The given index is invalid.
++
+[none]
+** 3a1. Application shows an error message.
++
+Use case resumes at step 2.
+
+[none]
+* 3b. The module already exists in the module list.
++
+[none]
+** 3b1. Application shows an error message that module specified by user already exists in module list.
++
+Use case ends.
+
+[discrete]
+=== Use Case: Delete a Module in Application
+
+*MSS*
+
+1.  User requests to list modules
+2.  Application shows a list of modules
+3.  User requests to delete a specific module in the module list
+4.  Application deletes the module in the module list
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 2a. The list is empty.
++
+Use case ends.
+
+[none]
+* 3a. The given index is invalid.
++
+[none]
+** 3a1. Application shows an error message.
++
+Use case resumes at step 2.
+
+[discrete]
+=== Use Case: List All Modules in Application
+
+*MSS*
+
+1.  User requests to list all modules in the module list
+2.  Application shows a list of all modules in the module list
++
+Use case ends.
+
+*Extensions*
+[none]
+* None
+
+[discrete]
+=== Use case: Find a module in Application
+*Guarantee(s):*
+[none]
+* Modules will be listed if the input from the user is valid and can be matches the existing entries in the module list. +
+
+*MSS*
+
+1. User requests to find modules with their keyword of choice.
+2. Application shows a list of modules matched the keyword.
++
+Use case ends.
+
+*Extensions*
+[none]
+* 1a. The given input is invalid.
++
+[none]
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case ends.
+
+[discrete]
+=== Use case: Add module(s) to degree plan
+
+*MSS*
+
+1. User requests to add module(s) into the Application's degree plan
+2. Application adds the module(s) into the degree plan
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 1a. The given input is invalid.
+[none]
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case ends.
+* 1b. The module(s) already exists in the degree plan.
+[none]
+** 1b1. Application shows an error message that the module(s) specified by user already exists in the degree plan.
++
+Use case ends.
+* 1c. The module(s) does not exist in the module list.
+[none]
+** 1c1. Application shows an error message that the module(s) specified by user does not exist in the module list.
++
+Use case ends.
+
+[discrete]
+=== Use case: Remove module(s) from degree plan
+
+*MSS*
+
+1.  User requests to list modules in the Application's degree plan
+2.  Application shows a list of modules in the degree plan
+3.  User requests to remove module(s) from the degree plan
+4.  Application removes the module(s) from the degree plan
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 2a. The list is empty.
++
+Use case ends.
+
+[none]
+* 3a. The given input is invalid.
++
+[none]
+** 3a1. Application shows an error message that given input is invalid.
++
+Use case resumes from step 2.
+* 3b. The module(s) does not exist in the degree plan.
+[none]
+** 3b1. Application shows an error message that the module(s) specified by user does not exist in the degree plan.
++
+Use case resumes from step 2.
+
+[discrete]
+=== Use case: Move module between academic semesters in degree plan
+
+*MSS*
+
+1.  User requests to move a specific module to another academic semester in the degree plan
+2.  Application updates the degree plan
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 1a. The specified academic semester is empty.
++
+Use case ends.
+
+[none]
+* 1b. The given input is invalid.
++
+[none]
+** 1b1. Application shows an error message.
++
+Use case ends.
+[none]
+* 1c. The module is already in the academic semester the user wants to move to.
++
+
+Use case resumes at step 2.
+
+[discrete]
+=== Use case: List all degree planners
+
+*MSS*
+
+1.  Student requests to list all the Application's degree planners
+2.  Application shows a list of all the degree planners
++
+Use case ends.
+
+[discrete]
+=== Use case: List a specific degree planner
+
+*MSS*
+
+1.  Student requests to list a specific Application's degree planner
+2.  Application shows a list of the specific degree planner
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 1a. The given input is invalid.
++
+[none]
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case resumes from step 1.
+
+[discrete]
+=== Use case: Identify modules to add to degree plan
+*Guarantee(s):*
+[none]
+* Modules will be listed if the input from the user is valid and can match the existing entries in the module list. +
+
+*MSS*
+
+1. User requests to find modules to put inside the degree plan with their criteria of choice.
+2. Application shows a list of modules sorted according to the given criteria, filtering off the modules already existing
+ inside the degree plan.
++
+Use case ends.
+
+*Extensions*
+[none]
+* 1a. The given input is invalid.
++
+[none]
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case ends.
+
+[discrete]
+=== Use case: Add a module to degree requirement category
+
+*MSS*
+
+1. User requests to add a module into the Application's degree requirement category
+2. Application adds the module into the degree requirement category
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 1a. The given input is invalid.
+[none]
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case ends.
+* 1b. The requirement category does not exist in the Application.
+[none]
+** 1b1. Application shows an error message that the requirement category specified by the user does not exist.
++
+Use case ends.
+* 1c. The module already exists in the degree requirement category.
+[none]
+** 1c1. Application shows an error message that module specified by user already exists in degree requirement category.
++
+Use case ends.
+
+[discrete]
+=== Use case: Delete module from degree requirement category
+
+*MSS*
+
+1.  User requests to delete a specific module in the degree requirement category
+2.  Application deletes the module in the degree requirement category
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 1a. The given input is invalid.
+[none]
+** 1a1. Application shows an error message that given input is invalid.
++
+Use case ends.
+* 1b. The requirement category does not exist in the Application.
+[none]
+** 1b1. Application shows an error message that the requirement category specified by the user does not exist.
++
+Use case ends.
+* 1c. The module does not exists in the specified degree requirement category.
+[none]
+** 1c1. Application shows an error message that module specified by user does not exist in degree requirement category.
++
+Use case ends.
+
+[discrete]
+=== Use case: Move module in degree requirement category
+
+*MSS*
+
+1.  User requests to list modules in the Application's degree requirement category
+2.  Application shows a list of modules in the degree requirement category
+3.  User requests to move a specific module to another academic semester in the degree requirement category
+4.  Application update the degree requirement category
++
+Use case ends.
+
+*Extensions*
+
+[none]
+* 2a. The list is empty.
++
+Use case ends.
+
+[none]
+* 3a. The given input is invalid.
++
+[none]
+** 3a1. Application shows an error message.
++
+Use case resumes at step 2.
+
+[discrete]
+=== Use case: List all degree requirement categories
+
+*MSS*
+
+1.  Student requests to list all the Application's degree requirement categories
+2.  Application shows a list of all the degree requirement categories
++
+Use case ends.
+
+*Extensions*
+[none]
+* None
+
+[appendix]
+== Non Functional Requirements
+
+.  The application should work on any <<mainstream-os,mainstream OS>> as long as it has Java `9` installed.
+.  The application should work on both 32-bit and 64-bit environments.
+.  The application should work without requiring an installer.
+.  The application should work without requiring an Internet connection.
+.  The application should work should be able to hold up to 100 modules without a noticeable sluggishness in performance for typical usage.
+.  For a user with above average typing speed for regular English text (i.e. not code, not system admin commands), he/she should be able to accomplish most of the tasks faster using commands than using the mouse.
+.  The module and degree requirement information should be stored on the local filesystem and are able to be persisted across different runs of the application.
+.  The application should have good user documentation, which details all aspects of the application to assist new users in learning how to use the application.
+.  The application should have good developer documentation to allow new developers to understand the design of the application easily.
+.  The application's functionalities should be easily testable.
+
+[appendix]
+== Glossary
+
+[[mainstream-os]] Mainstream OS::
+Windows, Linux, Unix, OS-X
+
+[[overload-module]] Overload::
+Taking above the workload of 22MC per academic semester
+
+[[underload-module]] Underload::
+Taking below the workload of 18MC per academic semester
+
+[[degree-planner]] Degree planner::
+A planner that allows user to decide what modules to take during a specific academic semester
+
+[[degree-requirement-catergory]] Degree requirement category::
+A category that allows classifying of modules based on the University Requirement
+
+[appendix]
+== Instructions for Manual Testing
+
+Given below are instructions to test the app manually.
 
 [NOTE]
 These instructions only provide a starting point for testers to work on; testers are expected to do more _exploratory_ testing.
@@ -932,26 +2028,277 @@ These instructions only provide a starting point for testers to work on; testers
 .. Re-launch the app by double-clicking the jar file. +
    Expected: The most recent window size and location is retained.
 
-_{ more test cases ... }_
+=== Adding a module
 
-=== Deleting a person
+. Adding a module while all modules are listed
 
-. Deleting a person while all persons are listed
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `add code/AA1111 name/ABC credits/4` +
+   Expected: New module (AA1111 ABC) is added into the module list. Details of the added module shown in the status message. Timestamp in the status bar is updated.
+.. Test case: `add code/CS1010 name/DEF credits/4` +
+   Expected: Module is *not* added into the module list (Module `CS1010` already exists in the module list). Error details shown in the status message. Status bar remains the same.
+.. Test case: `add code/AA1111 name/DEF credits/4` +
+   Expected: Module is *not* added into the module list (Module `AA1111` already exists in the module list). Error details shown in the status message. Status bar remains the same.
 
-.. Prerequisites: List all persons using the `list` command. Multiple persons in the list.
-.. Test case: `delete 1` +
-   Expected: First contact is deleted from the list. Details of the deleted contact shown in the status message. Timestamp in the status bar is updated.
-.. Test case: `delete 0` +
-   Expected: No person is deleted. Error details shown in the status message. Status bar remains the same.
-.. Other incorrect delete commands to try: `delete`, `delete x` (where x is larger than the list size) _{give more}_ +
-   Expected: Similar to previous.
+=== Editing a module
 
-_{ more test cases ... }_
+. Editing a module while all modules are listed
 
-=== Saving data
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `edit 1 code/CS1111` +
+   Expected: Module code CS1010 is edited to CS1111 in the module list, requirement categories, degree plan. Details of the edited module shown in the status message. Timestamp in the status bar is updated.
+.. Test case: `edit 2 name/ABC` +
+   Expected: Module name of 2nd module in module list (CS1231 Discrete Structures) is edited to ABC in the module list and degree plan. Details of the edited module shown in the status message. Timestamp in the status bar is updated.
+.. Test case: `edit 5 coreq/` +
+   Expected: Module name of 5th module in module list (CS2101 Effective Communications for Computing Professionals) is edited to None in the module list. CS2113T's co-requisites will also be updated to None. Details of the edited module shown in the status message. Timestamp in the status bar is updated.
+.. Test case: `edit 1 coreq/CS1231` +
+   Expected: Module is *not* edited, as module `CS1010` and `CS1231` are in different semesters of the degree plan,
+   and hence cannot be updated to be co-requisites. Error details shown in the status message. Status bar remains the same.
 
-. Dealing with missing/corrupted data files
+=== Deleting a module
 
-.. _{explain how to simulate a missing/corrupted file and the expected behavior}_
+. Deleting a module while all modules are listed
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `delete 1` +
+   Expected: First module (CS1010) is deleted from the module list and year 1 semester 1 of the degree plan. Details of the deleted module shown in the status message. Timestamp in the status bar is updated.
+.. Test case: `delete 5` +
+   Expected: Fifth module (CS2101) module is deleted from the module list and year 2 semester 1 of the degree plan.
+   CS2113T module co-requisites is updated to None. Error details shown in the status message. Status bar remains the same.
+.. Test case: `delete 0` +
+   Expected: No module is deleted. Error details shown in the status message. Status bar remains the same.
+.. Other incorrect delete commands to try: `delete`, `delete x` (where x is larger than the list size) +
+   Expected: Similar to previous.
 
-_{ more test cases ... }_
+=== Adding module(s) to the degree plan
+
+. Adding valid module(s).
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `planner_add year/1 sem/1 code/CS1010 code/CS1231` +
+Expected: Module codes `CS1010` and `CS1231` will be added to year 1 semester 1 of the degree plan.
+
+. Adding module(s) with bad bad parameters.
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `planner_add invalid/1 sem/1 code/CS1010 code/CS1231` +
+Expected: Invalid command format.
+
+. Adding module(s) with invalid values.
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `planner_add year/-1 sem/1 code/CS1010 code/CS1231` +
+Expected: A message that indicates the valid value range of year.
+
+=== Removing module(s) from the degree plan
+
+. Removing valid module(s).
+
+.. Prerequisites: List all academic semesters using the `planner_list` command.
+.. Test case: `planner_remove code/CS1010 code/CS1231` +
+Expected: Module codes `CS1010` and `CS1231` will be removed from the degree plan.
+
+. Removing module(s) with bad bad parameters.
+
+.. Prerequisites: List all academic semesters using the `planner_list` command.
+.. Test case: `planner_remove invalid/CS1010 code/CS1231` +
+Expected: Invalid command format.
+
+=== Using the degree plan to suggest module(s) to take
+
+. Suggesting valid module(s).
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list` command.
+.. Test case: `planner_suggest credits/1` +
+Expected: Maximum 10 modules recommended in a specially sorted order.
+.. Test case: `planner_suggest credits/1 tag/maths` +
+Expected: Maximum 10 modules recommended in a specially sorted order.
+
+=== Find modules
+
+. Find modules in the module list using one parameter.
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list`
+command.
+.. Test case: `find name/programming` +
+Expected: Module list will displays all the modules whose name contains `programming`. +
+Number of modules found is shown in the *result box*
+.. Test case: `find name/PROGRAMMING` +
+Expected: Module list will displays all the modules whose name contains `programming`. +
+Number of modules found is shown in the *result box*. +
+This will have the same results as the previous test case.
+.. Test case: `find code/CS1231` +
+Expected: Module list will displays all the modules whose code matches `CS1231`. +
+Number of modules found is shown in the *result box*. +
+.. Test case: `find credits/4` +
+Expected: Module list will displays all the modules which assigned `4` modular credits. +
+Number of modules found is shown in the *result box*. +
+.. Test case: `find tag/algorithm` +
+Expected: Module list will displays all the modules which has the tag `algorithm`. +
+Number of modules found is shown in the *result box*.
+.. Test case: `find sem/2` +
+Expected: Module list will displays all modules offered in semesters `2`. +
+Number of modules found is shown in the *result box*.
+
+. Find modules in the module list using multiple parameters.
+
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list`
+command.
+.. Test case: `find name/programming || name/discrete` +
+Expected: Module list will displays all the modules whose name contains `programming` or `discrete`. +
+ Number of modules found is shown in the *result box*.
+.. Test case: `find name/discrete || name/programming` +
+Expected: Module list will displays all the modules whose name contains `programming` or `discrete`. +
+ Number of modules found is shown in the *result box*. +
+This will have the same results as the previous test case.
+.. Test case: `find name/programming && name/methodology` +
+Expected: Module list will displays all the modules whose name contains `programming` and `methodology`. +
+Number of modules found is shown in the *result box*.
+.. Test case: `find name/programming && sem/2` +
+Expected: Module list will displays all the modules whose name contains `programming` and is offered in semester 2 only.
+.. Test case: `find (name/programming || name/algorithm) && sem/2`
+Expected: Module list will displays all the module whose name contains either `programming` or `algorithm` and is
+offered in semesters 2. +
+Number of modules found is shown in the *result box*.
+
+. Find modules with bad parameters.
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list`
+command.
+.. Test case: `find nonExist/` +
+Expected: Invalid command format! +
+A guide on how to use the command will be displayed in the *result box*.
+
+. Find modules with invalid values.
+.. Prerequisites: Populate module list with sample data using `reset` command, then list all modules using the `list`
+command.
+.. Test case: `find code/ZZZZZZ` +
+Expected: A guide on how the accepted value for `code` will be displayed in the *result box*.
+
+=== Moving a module in the degree plan
+
+. Moving a module in the degree plan while all modules are listed
+
+.. Prerequisites: List all academic semesters using the `planner_list` command. All academic semesters present in the
+degree plan. Application is started with the sample data without any modification in the data.
+.. Test case: `planner_move year/1 sem/1 code/CS1010` +
+   Expected: CS1010 module remains in *Year 1 Semester 1* of the degree plan. Success message will be shown in the
+   status message. Timestamp in the status bar is updated.
+.. Test case: `planner_move year/1 sem/2 code/CS1010` +
+   Expected: CS1010 module is moved from *Year 1 Semester 1*  to *Year 1 Semester 2* of the degree plan. Success
+   message will be shown in the status message. Timestamp in the status bar is updated.
+.. Test case: `planner_move year/1 sem/2 code/CS2101` +
+   Expected: CS2101 module is moved along with its co-requisite CS2113T to *Year 1 Semester 2* of the degree plan.
+   Success message will be shown in the status message. Timestamp in the status bar is updated.
+.. Other incorrect `planner_move` commands to try:
+* `planner_move year/x sem/y code/CS1010` (where x or y is larger than 4) +
+Expected: Error message is displayed.
+* `planner_move year/1 sem/3 code/CS2101` +
+Expected: Error message is displayed since CS2101 module is not offered in semester 3 based on the module list.
+
+=== Showing the academic semesters in the degree plan
+
+. Showing some academic semesters in the degree plan based on the condition
+
+.. Prerequisites: List all academic semesters using the `planner_list` command. All academic semesters present in the degree plan.
+.. Test case: `planner_show year/1` +
+   Expected: Only the academic semesters with year `1` are displayed.
+.. Test case: `planner_show sem/1` +
+   Expected: Only the academic semesters with semester `1` are displayed.
+.. Test case: `planner_show year/1 || year/2` +
+   Expected: Only the academic semesters with year `1` or year `2` are displayed.
+.. Test case: `planner_show sem/1 || sem/2` +
+   Expected: Only the academic semesters with semester `1` or semester `2` are displayed.
+.. Test case: `planner_show year/1 && ( sem/1 || sem2 )` +
+   Expected: Only the academic semesters with year `1` and semester 1 or semester 2 are displayed.
+
+.. Other incorrect `planner_show` commands to try:
+* `planner_show year/x`, (where x is larger than 4) +
+   Expected: Error message is displayed.
+* `planner_show sem/x`, (where x is larger than 4) +
+   Expected: Error message is displayed.
+* `planner_show sem/1 sem/2` +
+   Expected: Error message is displayed since there is no boolean expression in between.
+* `planner_show sem/1 ((`, +
+   Expected: Error message is displayed.
+* `planner_show sem/2 & yea/1`, +
+   Expected: Error message is displayed.
+* `planner_show sem/2 | yea/1`, +
+   Expected: Error message is displayed.
+
+=== Listing all the academic semesters in the degree plan
+
+. Listing all the academic semesters in the degree plan when only some academic semesters are listed
+
+.. Prerequisites: List some academic semesters using the `planner_show` command (e.g. `planner_show year/1`). All
+academic semesters present in the degree plan.
+.. Test case: `planner_list` +
+   Expected: All the academic semesters are listed in the degree plan.
+
+=== Degree Requirement Category
+
+. Adding a module to a degree requirement category
+
+.. Prerequisites:
+... Create a new module using the `add` command with the modular code of `CS9999`
+... Ensure that the newly created module does not have corequisite of another module
+... The newly created module do not belong to any degree requirement categories
+
+.. Test case: `requirement_add name/Computing Foundation code/CS9999` +
+   Expected: The module is added to the specified degree requirement category. +
+   Details of the module added to the degree requirement category is shown in the application result box.
+
+.. Test case: `requirement_add name/Computing Foundation code/CS9999` +
+   *This test case is to be tested after the above test case* +
+   Expected: Application displays an error message saying that the module is already in the degree requirement
+   category +
+   Details of the error message is shown in the application result box.
+
+.. Test case: `requirement_add name/Computing ddddd code/CS9999` +
+   Expected: Application displays an error message saying that the specified degree requirement category does not
+   exist +
+   Details of the error message is shown in the application result box.
+
+. Removing a module from the degree requirement category
+
+.. Prerequisites:
+... Create a new module using the `add` command with the modular code of `CS9999`
+... Ensure that the newly created module does not have corequisite of another module
+... Add the newly created module to a degree requirement category
+
+.. Test case: `requirement_remove code/CS9999` +
+   Expected: The module is removed from the degree requirement category. Details of the deleted module is shown in
+   the application result box.
+
+.. Test case: `requirement_remove code/CS9999` +
+   *This test case is to be tested after the above test case* +
+   Expected: Application displays an error message saying that the module does not exist in the degree requirement
+   category +
+   Details of the error message is shown in the application result box.
+
+. Moving a module to a degree requirement category
+
+.. Prerequisites: Module to be moved must already be added to a degree requirement category.
+... Create a new module using the `add` command with the modular code of `CS9999`
+... Ensure that there no modules with the modular code of `CS9998` in the application
+... Ensure that the newly created module does not have corequisite of another module
+... Add the newly created module to a degree requirement category
+
+.. Test case: `requirement_move name/Computing Breadth code/CS9999` +
+   Expected: The module is moved to the specified degree requirement category. Details of the moved module is shown in
+   the application result box.
+
+.. Test case: `requirement_move name/Computing ddddd code/CS9999` +
+   Expected: Application displays an error message saying that the specified degree requirement category does not
+   exist +
+   Details of the error message is shown in the application result box.
+
+.. Test case: `requirement_move name/Computing Breadth code/CS9998` +
+   Expected: Application displays an error message saying that no such module exists in the application +
+   Details of the error message is shown in the application result box.
+
+. Listing all the degree requirement category in the application
+
+.. Prerequisites: NIL.
+.. Test case: `requirement_list` +
+   Expected: All the degree requirement categories in the applications, including the current modular credit count
+   and the module code(s) added to the degree requirement categories is listed in the application result box.
diff --git a/docs/LearningOutcomes.adoc b/docs/LearningOutcomes.adoc
deleted file mode 100644
index 2837c28b72c7..000000000000
--- a/docs/LearningOutcomes.adoc
+++ /dev/null
@@ -1,271 +0,0 @@
-= Learning Outcomes
-:site-section: LearningOutcomes
-:toc: macro
-:toc-title:
-:toclevels: 1
-:sectnums:
-:sectnumlevels: 1
-:imagesDir: images
-:stylesDir: stylesheets
-:repoURL: https://github.com/se-edu/addressbook-level4/tree/master
-
-After studying this code and completing the corresponding exercises, you should be able to,
-
-toc::[]
-
-'''
-
-== Use High-Level Designs `[LO-HighLevelDesign]`
-
-Note how the <<DeveloperGuide#architecture, Developer Guide>> describes the high-level design using an _Architecture Diagrams_ and high-level sequence diagrams.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/architecture/[se-edu/se-book: Design: Architecture]
-* https://se-edu.github.io/se-book/design/introduction/multilevelDesign/[se-edu/se-book: Design: Introduction: Multi-Level Design]
-
-'''
-
-== Use Event-Driven Programming `[LO-EventDriven]`
-
-The JavaFX framework, which this code base uses for its UI, uses _events_ to communicate user input (such as mouse movement and button presses) to interested _event consumers_.
-The JavaFX event loop acts as an _event dispatcher_ to transmit events to event consumers.
-
-*Resources*
-
-* https://docs.oracle.com/javase/8/javafx/events-tutorial/events.htm[JavaFX: Handling Events]
-* https://se-edu.github.io/se-book/architecture/architecturalStyles/eventDriven/[se-edu/se-book: Design: Architecture: Architecture Styles: Event-Driven Architectural Style]
-
-'''
-
-== Use API Design `[LO-ApiDesign]`
-
-Note how components of AddressBook have well-defined APIs. For example, the API of the `Logic` component is given in the link:{repoURL}/src/main/java/seedu/address/logic/Logic.java[`Logic.java`]
-image:LogicClassDiagram.png[width="800"]
-
-*Resources*
-
-* https://se-edu.github.io/se-book/reuse/apis/[se-edu/se-book: Implementation: Reuse: APIs]
-
-'''
-
-== Use Assertions `[LO-Assertions]`
-
-Note how the AddressBook app uses Java ``assert``s to verify assumptions.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/errorHandling/assertions/[se-edu/se-book: Implementation: Error Handling: Assertions]
-
-=== Exercise: Add more assertions
-
-* Make sure assertions are enabled in your IDE by forcing an assertion failure (e.g. add `assert false;` somewhere in the code and run the code to ensure the runtime reports an assertion failure).
-* Add more assertions to AddressBook as you see fit.
-
-
-'''
-
-== Use Logging `[LO-Logging]`
-
-Note <<DeveloperGuide#logging, how the AddressBook app uses Java's `java.util.log` package to do logging>>.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/errorHandling/logging/[se-edu/se-book: Implementation: Error Handling: Logging]
-
-=== Exercise: Add more logging
-
-Add more logging to AddressBook as you see fit.
-
-
-'''
-
-== Use Defensive Coding `[LO-DefensiveCoding]`
-
-Note how AddressBook uses the `ReadOnly*` interfaces to prevent objects being modified by clients who are not supposed to modify them.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/errorHandling/defensiveProgramming/[se-edu/se-book: Implementation: Error Handling: Defensive Programming]
-
-=== Exercise: identify more places for defensive coding
-
-Analyze the AddressBook code/design to identify,
-
-* where defensive coding is used
-* where the code can be more defensive
-
-'''
-
-== Use Build Automation `[LO-BuildAutomation]`
-
-Note <<UsingGradle#, how the AddressBook app uses Gradle to automate build tasks>>.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/integration/buildAutomation/what/[se-edu/se-book: Implementation: Integration: Build Automation: What]
-
-=== Exercise: Use gradle to run tasks
-
-* Use gradle to do these tasks: Run all tests in headless mode, build the jar file.
-
-=== Exercise: Use gradle to manage dependencies
-
-* Note how the build script `build.gradle` file manages third party dependencies such as Jackson. Update that file to manage a third-party library dependency.
-
-
-'''
-
-== Use Continuous Integration `[LO-ContinuousIntegration]`
-
-Note <<UsingTravis#, how the AddressBook app uses Travis to perform Continuous Integration>>. (https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]])
-
-*Resources*
-
-* https://se-edu.github.io/se-book/integration/buildAutomation/continuousIntegrationDeployment/[se-edu/se-book: Implementation: Integration: Build Automation: CI & CD]
-
-=== Exercise: Use Travis in your own project
-
-* Set up Travis to perform CI on your own fork.
-
-
-'''
-
-== Use Code Coverage `[LO-CodeCoverage]`
-
-Note how our CI server <<UsingTravis#, Travis uses Coveralls to report code coverage>>. (https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]) After <<UsingCoveralls#, setting up Coveralls>> for your project, you can visit Coveralls website to find details about the coverage of code pushed to your repo. https://coveralls.io/github/se-edu/addressbook-level4?branch=master[Here] is an example.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/testing/testCoverage/[se-edu/se-book: QA: Testing: Test Coverage]
-
-=== Exercise: Use the IDE to measure coverage locally
-
-* Use the IDE to measure code coverage of your tests.
-
-'''
-
-== Apply Test Case Design Heuristics `[LO-TestCaseDesignHeuristics]`
-
-The link:{repoURL}/src/test/java/seedu/address/commons/util/StringUtilTest.java[`StringUtilTest.java`]
-class gives some examples of how to use _Equivalence Partitions_, _Boundary Value Analysis_, and _Test Input Combination Heuristics_ to improve the efficiency and effectiveness of test cases testing the link:../src/main/java/seedu/address/commons/util/StringUtil.java[`StringUtil.java`] class.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/testCaseDesign/[se-edu/se-book: QA: Test Case Design]
-
-=== Exercise: Apply Test Case Design Heuristics to other places
-
-* Use the test case design heuristics mentioned above to improve test cases in other places.
-
-'''
-
-== Write Integration Tests `[LO-IntegrationTests]`
-
-Consider the link:{repoURL}/src/test/java/seedu/address/storage/StorageManagerTest.java[`StorageManagerTest.java`] class.
-
-* Test methods `prefsReadSave()` and `addressBookReadSave()` are integration tests. Note how they simply test if The `StorageManager` class is correctly wired to its dependencies.
-* Test method `handleAddressBookChangedEvent_exceptionThrown_eventRaised()` is a unit test because it uses _dependency injection_ to isolate the SUT `StorageManager#handleAddressBookChangedEvent(...)` from its dependencies.
-
-Compare the above with link:{repoURL}/src/test/java/seedu/address/logic/LogicManagerTest.java[`LogicManagerTest`]. Some of the tests in that class (e.g. `execute_*` methods) are neither integration nor unit tests. They are _integration + unit_ tests because they not only check if the LogicManager is correctly wired to its dependencies, but also checks the working of its dependencies. For example, the following two lines test the `LogicManager` but also the `Parser`.
-
-[source,java]
-----
-@Test
-public void execute_invalidCommandFormat_throwsParseException() {
-    ...
-    assertParseException(invalidCommand, MESSAGE_UNKNOWN_COMMAND);
-    assertHistoryCorrect(invalidCommand);
-}
-----
-
-*Resources*
-
-* https://se-edu.github.io/se-book/testing/testingTypes/[se-edu/se-book: QA: Testing: Testing Types]
-
-=== Exercise: Write unit and integration tests for the same method.
-
-* Write a unit test for a high-level method somewhere in the code base (or a new method you wrote).
-* Write an integration test for the same method.
-
-'''
-
-== Write System Tests `[LO-SystemTesting]`
-
-Note how tests below `src/test/java/systemtests` package (e.g link:{repoURL}/src/test/java/systemtests/AddCommandSystemTest.java[`AddCommandSystemTest.java`]) are system tests because they test the entire system end-to-end.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/testing/testingTypes/[se-edu/se-book: QA: Testing: Testing Types]
-
-=== Exercise: Write more system tests
-
-* Write system tests for the new features you add.
-
-'''
-
-== Automate GUI Testing `[LO-AutomateGuiTesting]`
-
-Note how this project uses TextFX library to automate GUI testing, including <<DeveloperGuide#headless-gui-testing, _headless_ GUI testing>>.
-
-=== Exercise: Write more automated GUI tests
-
-* Covered by `[LO-SystemTesting]`
-
-'''
-
-== Apply Design Patterns `[LO-DesignPatterns]`
-
-Here are some example design patterns used in the code base.
-
-* *Singleton Pattern* : link:{repoURL}/src/main/java/seedu/address/commons/core/EventsCenter.java[`EventsCenter.java`] is Singleton class. Its single instance can be accessed using the `EventsCenter.getInstance()` method.
-* *Facade Pattern* : link:{repoURL}/src/main/java/seedu/address/storage/StorageManager.java[`StorageManager.java`] is not only shielding the internals of the Storage component from outsiders, it is mostly redirecting method calls to its internal components (i.e. minimal logic in the class itself). Therefore, `StorageManager` can be considered a Facade class.
-* *Command Pattern* : The link:{repoURL}/src/main/java/seedu/address/logic/commands/Command.java[`Command.java`] and its sub classes implement the Command Pattern.
-* *Observer Pattern*: The code base uses JavaFX's https://docs.oracle.com/javase/8/javafx/api/javafx/beans/value/ObservableValue.html[`ObservableValue`] interface to allow objects to watch for changes in data.
-This interface is an implementation of the Observer pattern.
-Objects that are interested in changes to an `ObservableValue` can register a listener via `ObservableValue#addListener(...)`.
-When the value represented by the `ObservableValue` changes, it will notify all registered listeners.
-* *MVC Pattern* :
-** The 'View' part of the application is mostly in the `.fxml` files in the `src/main/resources/view` folder.
-** `Model` component contains the 'Model'. However, note that it is possible to view the `Logic` as the model because it hides the `Model` behind it and the view has to go through the `Logic` to access the `Model`.
-** Sub classes of link:{repoURL}/src/main/java/seedu/address/ui/UiPart.java[`UiPart`] (e.g. `PersonListPanel` ) act as 'Controllers', each controlling some part of the UI and communicating with the 'Model' (via the `Logic` component which sits between the 'Controller' and the 'Model').
-* *Abstraction Occurrence Pattern* : Not currently used in the app.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/designPatterns/[se-edu/se-book: Design: Design Patterns]
-
-=== Exercise: Discover other possible applications of the patterns
-
-* Find other possible applications of the patterns to improve the current design. e.g. where else in the design can you apply the Singleton pattern?
-* Discuss pros and cons of applying the pattern in each of the situations you found in the previous step.
-
-=== Exercise: Find more applicable patterns
-
-* Learn other _Gang of Four_ Design patterns to see if they are applicable to the app.
-
-'''
-
-== Use Static Analysis `[LO-StaticAnalysis]`
-
-Note how this project uses the http://checkstyle.sourceforge.net/[CheckStyle] static analysis tool to confirm compliance with the coding standard.
-
-*Resources*
-
-* https://se-edu.github.io/se-book/qualityAssurance/staticAnalysis/[se-edu/se-book: QA: Static Analysis]
-
-=== Exercise: Use CheckStyle locally to check style compliance
-
-* Install the CheckStyle plugin for your IDE and use it to check compliance of your code with our style rules (given in `/config/checkstyle/checkstyle.xml`).
-
-'''
-
-== Do Code Reviews `[LO-CodeReview]`
-
-* Note how some PRs in this project have been reviewed by other developers. Here is an https://github.com/se-edu/addressbook-level4/pull/147[example].
-* Also note how we have used https://www.codacy.com[Codacy] to do automate some part of the code review workload (https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]])
-
-
-=== Exercise: Review a PR
-
-* Review PRs created by team members.
diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
index 7e0070e12f49..eda14c76de78 100644
--- a/docs/UserGuide.adoc
+++ b/docs/UserGuide.adoc
@@ -1,8 +1,9 @@
-= AddressBook Level 4 - User Guide
+= PlanWithEase - User Guide
 :site-section: UserGuide
 :toc:
 :toc-title:
 :toc-placement: preamble
+:toclevels: 3
 :sectnums:
 :imagesDir: images
 :stylesDir: stylesheets
@@ -11,250 +12,1187 @@
 ifdef::env-github[]
 :tip-caption: :bulb:
 :note-caption: :information_source:
+:warning-caption: :warning:
 endif::[]
-:repoURL: https://github.com/se-edu/addressbook-level4
+:repoURL: https://github.com/CS2113-AY1819S2-T09-1/main
 
-By: `Team SE-EDU`      Since: `Jun 2016`      Licence: `MIT`
+By: `Team T09-1`      Since: `Feb 2019`      Licence: `MIT`
 
 == Introduction
 
-AddressBook Level 4 (AB4) is for those who *prefer to use a desktop app for managing contacts*. More importantly, AB4 is *optimized for those who prefer to work with a Command Line Interface* (CLI) while still having the benefits of a Graphical User Interface (GUI). If you can type fast, AB4 can get your contact management tasks done faster than traditional GUI apps. Interested? Jump to the <<Quick Start>> to get started. Enjoy!
+*PlanWithEase* (PWE) is an application designed to help National University of Singapore (NUS) Information Security freshmen in creating a comprehensive degree plan according to the degree requirements.
+
+*PWE* is optimized for those who prefer using a Command Line Interface (CLI). The commands used to interact with *PWE*
+are designed to be simple and intuitive, so even those who are unfamiliar with CLI can use *PWE* with ease.
+
+*PWE* also comes with a clean Graphical User Interface (GUI) that presents information in an organized manner.
+
+Interested in using *PWE* to plan your degree easily? Jump to <<Quick Start>> to get started!
+
+== Understanding This User Guide
+
+=== Basic Information
+This user guide provides a quick start guide for you to easily setup and install *PlanWithEase*.
+
+You can find all the details of *PlanWithEase*'s features, tips, frequently asked questions and a summary of the
+available commands.
+
+To navigate between the different sections easily, you can use the <<toc, Table of Contents>> above.
+
+The following symbols are used throughout this user guide:
+[NOTE]
+====
+This symbol denotes information that you may want to take note of.
+====
+[TIP]
+====
+This symbol denotes a tip which you may find useful when using our application.
+====
+[WARNING]
+====
+This symbol denotes a warning message which you need to be careful of when using our application.
+====
+
+Additionally, you may also encounter the following text styles:
+====
+* Commands, parameters and file paths will be in this `format`
+* Important messages will be *bold*
+* Undoable command will be in _italics_
+* Keyboard buttons will be referred to as such: kbd:[F1]
+====
+
+=== Navigating Around Our Application
+*PlanWithEase* comes with a very clean and easy to use Graphical User Interface, so don't worry even if you are a new
+ user! You can expect to navigate around our application with ease!
+
+[[GUI]]
+.PlanWithEase's Graphical User Interface
+ifdef::env-github[]
+image::UiLabelled.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::UiLabelled.png[width="970"]
+endif::[]
+
+
+*PlanWithEase* has five main sections that you'll need to know before you get started!. +
+The five main sections are explained below.
+
+[cols="<20%,25%,40%"]
+|====
+|*Section*| *Name* | *Description*
+| 1 | Command Box | This is where you can enter and run commands.
+| 2 | Result Box | This provides you with information on whether a command is successful. If there are errors when
+running the command, information on how to rectify the errors will also be displayed in here.
+| 3 | Module List | This is where you can view the details of all the modules. You can use the commands in <<Module Management>>
+to make changes to the *Module List*.
+| 4 | Requirement Categories | This is where you can view your degree progress. You can use the commands in
+<<Requirement Tracker>> to make changes to the *Requirement Categories*.
+| 5 | Degree Plan | This is where you can view your degree plan. You can use the commands in <<Degree Plan Management>>
+to make changes to the *Degree Plan*.
+|====
+
 
 == Quick Start
 
-.  Ensure you have Java version `9` or later installed in your Computer.
-.  Download the latest `addressbook.jar` link:{repoURL}/releases[here].
-.  Copy the file to the folder you want to use as the home folder for your Address Book.
+.  Ensure you have *Java version 9* installed in your Computer.
+.  Download the latest `PWE.jar` link:{repoURL}/releases/latest[here].
+.  Copy the file to the folder you want to use as the home folder for *PlanWithEase*.
 .  Double-click the file to start the app. The GUI should appear in a few seconds.
 +
-image::Ui.png[width="790"]
+.Successful start up of *PlanWithEase*
+ifdef::env-github[]
+image::Ui.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::Ui.png[width="970"]
+endif::[]
 +
-.  Type the command in the command box and press kbd:[Enter] to execute it. +
+.  You can now try entering commands in the *command box* and press kbd:[Enter] to execute it! +
 e.g. typing *`help`* and pressing kbd:[Enter] will open the help window.
-.  Some example commands you can try:
-
-* *`list`* : lists all contacts
-* **`add`**`n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01` : adds a contact named `John Doe` to the Address Book.
-* **`delete`**`3` : deletes the 3rd contact shown in the current list
-* *`exit`* : exits the app
+.  Below are some example commands you can try:
+* *`list`* : list and displays all modules in the *module list*.
+* **`add`**`name/Programming Methodology code/CS1010J credits/4` : adds a module named `Programming Methodology` with module code `CS1010J`, which is assigned `4` modular credits, to the module list.
+* **`delete`**`3` : deletes the 3^rd^ module shown in the *module list*.
+* *`exit`* : exits the application
 
 .  Refer to <<Features>> for details of each command.
 
 [[Features]]
 == Features
 
+In this section, the expected command format will be introduced, and you can expect to learn the various commands you can use.
+
+[NOTE]
+====
+Don't worry if you don't understand everything at once. +
+There are plentiful examples provided to aid your understanding of the commands' usage better.
 ====
+
 *Command Format*
 
-* Words in `UPPER_CASE` are the parameters to be supplied by the user e.g. in `add n/NAME`, `NAME` is a parameter which can be used as `add n/John Doe`.
-* Items in square brackets are optional e.g `n/NAME [t/TAG]` can be used as `n/John Doe t/friend` or as `n/John Doe`.
-* Items with `…`​ after them can be used multiple times including zero times e.g. `[t/TAG]...` can be used as `{nbsp}` (i.e. 0 times), `t/friend`, `t/friend t/family` etc.
-* Parameters can be in any order e.g. if the command specifies `n/NAME p/PHONE_NUMBER`, `p/PHONE_NUMBER n/NAME` is also acceptable.
+* Words in `UPPER_CASE` are the parameters to be supplied by the user
+** e.g. in `add name/NAME`, `NAME` is a parameter
+which can be used as:
+.. `add name/Programming Methodology`
+.. `add name/Web Security`
+* Items in square brackets are optional parameters
+** e.g. `name/NAME [tag/TAG]` can be used as:
+.. `name/Database Systems tag/sql` (with optional `tag` parameter)
+.. `name/Database Systems` (without optional `tag` parameter)
+* Items with `…`​ after them are parameters that can be used multiple times (including zero times)
+** e.g. `[tag/TAG]…` can be used as:
+.. `{nbsp}` (i.e. 0 times)
+.. `tag/programming` (i.e. 1 time)
+.. `tag/programming tag/algorithms`, etc.  (i.e. many times)
+** e.g. `[name/NAME NAME…]` can be used as:
+.. `{nbsp}` (i.e. 0 times)
+.. `name/Programming` (i.e. 1 time)
+.. `name/Programming Methodology`, etc.  (i.e. many times)
+* Prefixed-parameters can be arranged in any order after all non-prefixed parameters (if any)
+** e.g. if the command specifies `INDEX name/NAME code/CODE`:
+.. entering `INDEX code/CODE name/NAME` is also acceptable, but
+.. entering `name/NAME INDEX code/CODE` is *not acceptable*
+
+[WARNING]
+====
+Parameter values cannot be empty (unless otherwise stated).
 ====
 
-=== Viewing help : `help`
+=== General Commands
 
-Format: `help`
+==== Viewing help : `help` image:https://img.shields.io/badge/general-help-8774C1.svg[]
 
-=== Adding a person: `add`
+Don't worry if you are feeling lost! You can use this User Guide document to gain a better understanding of *PlanWithEase*'s commands.
 
-Adds a person to the address book +
-Format: `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]...`
+To open this User Guide document, simply enter `help` in the *command box*.
 
 [TIP]
-A person can have any number of tags (including 0)
+====
+Alternatively, you can access this User Guide document by pressing kbd:[F1] or via the menu bar (as shown below).
 
-Examples:
+[[f1-help]]
+.Accessing help from menu bar
+image::helpLabelled.png[width=400]
+====
 
-* `add n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01`
-* `add n/Betsy Crowe t/friend e/betsycrowe@example.com a/Newgate Prison p/1234567 t/criminal`
 
-=== Listing all persons : `list`
+==== Listing entered commands : `history` image:https://img.shields.io/badge/general-history-8774C1.svg[]
 
-Shows a list of all persons in the address book. +
-Format: `list`
+Want to check what commands you have entered previously? Simply enter `history` in the *command box*!
 
-=== Editing a person : `edit`
+The list of commands will be displayed in reverse chronological order (from most recent to earliest). +
 
-Edits an existing person in the address book. +
-Format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]...`
+[TIP]
+====
+You can press the kbd:[&uarr;] and kbd:[&darr;] arrows to display the previous and next input respectively in the *command box*.
+====
 
-****
-* Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed person list. The index *must be a positive integer* 1, 2, 3, ...
-* At least one of the optional fields must be provided.
+// tag::undoredo[]
+==== Undoing previous command: `undo` image:https://img.shields.io/badge/general-undo-8774C1.svg[]
+
+Made a critical mistake such as accidentally clearing all modules from *PlanWithEase* and you want to get the data
+back? +
+No problem! You can simply enter `undo` in the *command box* to restore PlanWithEase's data to the state before the
+previous _undoable_ command was executed!
+
+[NOTE]
+====
+_Undoable_ commands are commands that modifies the contents of PlanWithEase's data. +
+Below is a list of all _undoable_ commands in *PlanWithEase*.
+
+|====
+| *General* | *Module Management* | *Requirement Tracker* | *Degree Plan Management*
+a|
+* `undo`
+* `redo`
+* `clear`
+* `reset`
+a|
+* `add`
+* `edit`
+* `delete`
+a|
+* `requirement_add`
+* `requirement_move`
+a|
+ * `planner_add`
+ * `planner_remove`
+ * `planner_move`
+|====
+====
+
+*Examples:*
+
+* `delete 1` (deletes first module in the displayed module list) +
+`list` (displays all modules in the module list) +
+`undo` (reverses the `delete 1` command) +
+
+* `find name/Programming` (finds modules with name containing the word `Programming` and displays them in the module
+list) +
+`list` (displays all modules in the module list) +
+`undo` (the `undo` command fails as there are no undoable commands executed previously)
+
+* `delete 1` (deletes first module in the displayed module list) +
+`clear` (clears all application data) +
+`undo` (reverses the `clear` command) +
+`undo` (reverses the `delete 1` command) +
+
+==== Redoing previously undone command : `redo` image:https://img.shields.io/badge/general-redo-8774C1.svg[]
+
+Took too many steps back in time using the `undo` command and want to move forward in time again? +
+Use the `redo` command to reverse the most recent `undo` command!
+
+[WARNING]
+====
+Be careful when time travelling using the `undo` and `redo` command! +
+You may end up being stuck in the present and can't go back into the future using the `redo` command.
+
+This can happen if you you run an _undoable_ command (excluding `undo` and `redo`) when going back in time using the `undo` command!
+====
+
+*Examples:*
+
+* `delete 1` (deletes first module in the displayed module list) +
+`undo` (reverses the `delete 1` command) +
+`redo` (reapplies the `delete 1` command) +
+
+* `delete 1`  (deletes first module in the displayed module list) +
+`redo` (the `redo` command fails as there are no `undo` commands executed previously)
+
+* `delete 1` (deletes first module in the displayed module list) +
+`clear` (clears all modules from the application) +
+`undo` (reverses the `clear` command) +
+`undo` (reverses the `delete 1` command) +
+`redo` (reapplies the `delete 1` command) +
+`redo` (reapplies the `clear` command) +
+// end::undoredo[]
+
+// tag::clear[]
+==== Clearing modules : `clear` image:https://img.shields.io/badge/general-clear-8774C1.svg[]
+
+Want to clear all the modules in the *module list*, *requirement categories* or *degree plan*? You'll definitely
+want to use the `clear` command!
+
+The `clear` command allows you to remove all modules from the specified section (i.e. *module list*, *requirement categories*, *degree plan*).
+
+*Command Format:* `clear [requirement or planner]` +
+[NOTE]
+====
+If no parameters are specified, all modules in the *module list*, *requirement categories* and *degree plan* will be
+deleted.
+====
+
+[TIP]
+====
+If you want to delete all modules in the *module list* quickly, simply enter the `clear` command in the *command box*
+without specifying any parameters! +
+
+====
+
+*Command Usage:*
+[cols="20%,35%,45%"]
+|====
+|*Input* | *Behaviour* | *Expected Results*
+| `clear` | Clears all *modules* from the application  | The *module list* will be emptied. Additionally, all
+modules in the *requirement categories* and *degree plan* will be removed.
+| `clear requirement` | Clears all *modules* in all *requirement categories* | The *requirement categories* will be
+emptied.
+|`clear planner`| Clears all *modules*  in all  *degree plan* | The *degree plan* will be emptied.
+|====
+
+*Example:*
+
+Here's an example of how *PlanWithEase* would look like after executing the `clear` command. +
+Notice that a success message will be displayed after clearing all modules from *PlanWithEase*.
+
+Before running the `clear` command:
+[[beforeClear]]
+.Before executing the `clear` command.
+ifdef::env-github[]
+image::clearbefore.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::clearbefore.png[width=970]
+endif::[]
+
+After entering `clear` and pressing kbd:[Enter]:
+[[afterClear]]
+.After executing the `clear` command.
+ifdef::env-github[]
+image::clearafter.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::clearafter.png[width=970]
+endif::[]
+// end::clear[]
+
+==== Reset the application: `reset` image:https://img.shields.io/badge/general-reset-8774C1.svg[]
+If you want to populate the program with sample data (sample modules added to the requirement categories and degree plan), you can enter `reset` in the *command box* +
+
+This can help you save time if you want to start afresh!
+
+[WARNING]
+====
+This will *remove all changes* you have made to the module list, requirement categories and degree plan, and
+populate them with sample data.
+====
+
+[TIP]
+====
+If you unintentionally used this command, do use the `undo` command to revert back the changes
+====
+
+==== Exiting PlanWithEase : `exit` image:https://img.shields.io/badge/general-exit-8774C1.svg[]
+
+If you want to exit *PlanWithEase*, you can enter `exit` in the *command box*. +
+Hope you had a wonderful experience using *PlanWithEase*. Do come back soon!
+
+// tag::module_management[]
+=== Module Management
+
+In this section, you'll be introduced to commands that helps you to manage modules in *PlanWithEase*.
+
+Below is a list of command parameters that you can expect to use for commands in this section.
+
+[cols="18%,37%,45%"]
+|======
+|*Parameter*| *Description* | *Acceptable Range of Values*
+| `CODE` | Indicates the module code +
+(e.g. `CS2101`). | `CODE` should begin with two alphabets, followed by four digits, and may optionally end with an
+alphabet. +
+`CODE` is case-insensitive.
+| `NAME` | Indicates the name of the module +
+(e.g. `Effective Communication for Computing Professionals`). |
+`NAME` should only contain alphanumeric characters, punctuations (excluding "(", ")", "&", "\|") and spaces. +
+Note that if you are using punctuations, you may want to consider replacing "()" with "[]", "&" with "and", and "\|" with "l" (lowercase L) instead! +
+| `CREDITS` | Indicates the modular credits assigned to the module +
+(e.g. `4` Modular Credits). | `CREDITS` should be whole numbers between 0 to 999 (both inclusive).
+| `SEMESTER` | Indicates the semester which the module is offered in. +
+(e.g. Semester `1`) | `SEMESTER` should only be either `1`, `2`, `3` or `4`. +
+`3` and `4` indicates special term semesters 1 and 2 respectively.
+| `COREQUISITE` | Indicates the module code of a co-requisite module. +
+(e.g. `CS2101` is a co-requisite module of `CS2113T`) | `COREQUISITE` follow the same format as `CODE`.
+| `TAG` | Indicates the extra information to associate the module with (e.g. `Presentation`, `Email`). | `TAG` should only contain alphabets and numbers.
+|======
+
+[WARNING]
+====
+`CODE` must be unique in the *module list*. +
+You cannot add/edit modules to have the same module code as another module in the *module list*.
+====
+// end::module_management[]
+
+// tag::module_add[]
+==== Adding modules : `add` image:https://img.shields.io/badge/module-add-blue.svg[]
+
+Before you can add modules to the *degree plan*, you'll need to add modules into the *module list* first. +
+It's easy to add a module into the *module list*! Here's how you can use the `add` command.
+
+*Command Format:* `add code/CODE name/NAME credits/CREDITS [sem/SEMESTER]… [coreq/COREQUISITE]… [tag/TAG]…`
+
+[WARNING]
+====
+Please note that you cannot add a new module which has a co-requisite module already existing in the *degree plan*. +
+You'll need to remove the module from the *degree plan* first before you can add the new module in with the co-requisite module specified.
+====
+
+*Example:*
+
+* `add code/GEH1074 name/Luck credits/4 sem/1 sem/2` +
+Adds a module named `Luck` with module code `GEH1074`, which is assigned `4` modular credits and is offered in semesters `1` and `2`, to the *module list*.
+
+.New module "GEH1074 Luck" added to *module list* successfully
+ifdef::env-github[]
+image::module_add_luck.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::module_add_luck.png[width=970]
+endif::[]
+
+[NOTE]
+====
+When adding a module with a corequisite, if the module is added successfully, the co-requisite modules will be updated as well.
+====
+
+*Example:* +
+
+* `add name/Skills code/GEH1074T credits/4 sem/1 sem/2 coreq/GEH1074 tag/GEM tag/economics` +
+Adds a module named `Skills` with module code `GEH1074T`, which is assigned `4` modular credits and has module code
+`GEH1074` as a corequisite, to the module list. The module added has the tags `GEM` and `economics` as well. +
+Both modules (`GEH1074T` and `GEH1074`) will be updated to be co-requisites as shown below.
+
+.Module GEH1074T is added successfully; GEH1074T and GEH1074 are now co-requisites.
+ifdef::env-github[]
+image::module_add_coreq.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::module_add_coreq.png[width=970]
+endif::[]
+
+// end::module_add[]
+
+// tag::module_edit[]
+==== Editing modules : `edit` image:https://img.shields.io/badge/module-edit-blue.svg[]
+
+Want to change the module details? No problem! +
+You can use this handy `edit` command to update the module details to your liking.
+
+*Command Format:* `edit INDEX [name/NAME] [code/CODE] [credits/CREDITS] [sem/SEMESTER]… [coreq/COREQUISITE]… [tag/TAG]…`
+
+[NOTE]
+====
+* Edits the module at the specified `INDEX`. The index refers to the index number (beside the module code) shown in the displayed module list.
+* You need to provide at least one of the optional fields to edit.
 * Existing values will be updated to the input values.
-* When editing tags, the existing tags of the person will be removed i.e adding of tags is not cumulative.
-* You can remove all the person's tags by typing `t/` without specifying any tags after it.
-****
+* When editing semesters/corequisites/tags, the existing semesters/corequisites/tags of the module will be removed (i.e adding of semesters/corequisites/tags is not cumulative.)
+* You can remove all the module's tags by typing `tag/` without specifying any tags after it.
+* Likewise, you can remove all module's co-requisites or semesters by typing `coreq/` and `sem/` respectively without
+ specifying any values after the parameter prefix.
+====
 
 Examples:
 
-* `edit 1 p/91234567 e/johndoe@example.com` +
-Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively.
-* `edit 2 n/Betsy Crower t/` +
-Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
+* `edit 1 name/Data Structures and Algorithms code/CS1234` +
+Edits the name and code of the 1^st^ module in the displayed module list to be `Data Structures and Algorithms` and `CS1234` respectively. +
+* `edit 3 code/CS2040C tag/` +
+Edits the code of the 3^rd^ module in the displayed module list to be `CS2040C` and clears all existing tags associated with the module. +
+* `edit 5 coreq/CS2105 coreq/CS2106` +
+ Edits the co-requisites of the 5^th^ module in the displayed module list to be `CS2105` and `CS2106`. +
+
+[NOTE]
+====
+Just like the `add` command, when editing the co-requisites of a module, the co-requisite modules will be updated as well.
+====
 
-=== Locating persons by name: `find`
+*Example:* If `GEH1074` and `GEH1074T` are not co-requisites, running the command `edit 1 coreq/GEH1074T`
+(assuming index `1` of the module list is `GEH1074`) will result in GEH1074 and GEH1074T being co-requisites.
 
-Finds persons whose names contain any of the given keywords. +
-Format: `find KEYWORD [MORE_KEYWORDS]`
+.`GEH1074` and `GEH1074T` are being edited to be co-requisites.
+ifdef::env-github[]
+image::module_edit_coreq.png[width=800]
+endif::[]
 
-****
-* The search is case insensitive. e.g `hans` will match `Hans`
-* The order of the keywords does not matter. e.g. `Hans Bo` will match `Bo Hans`
-* Only the name is searched.
-* Only full words will be matched e.g. `Han` will not match `Hans`
-* Persons matching at least one keyword will be returned (i.e. `OR` search). e.g. `Hans Bo` will return `Hans Gruber`, `Bo Yang`
-****
+ifndef::env-github[]
+image::module_edit_coreq.png[width=970]
+endif::[]
 
-Examples:
+// end::module_edit[]
+
+// tag::module_delete[]
+==== Deleting modules : `delete` image:https://img.shields.io/badge/module-delete-blue.svg[]
+
+Want to delete a module from the *module list*? Simply locate the module to be deleted in the *module list*, and
+then use the `delete` command!
+
+*Command Format:* `delete INDEX`
+
+[NOTE]
+====
+To choose which module you want to delete, include the index number (beside the module code) in the displayed module list.
+====
+
+[WARNING]
+====
+* The deleted module will be removed from both the requirement category assigned and the degree plan (where applicable).
+* Any modules with the deleted module as a co-requisite will be updated accordingly (i.e. deleted module is removed from the respective module's co-requisite list).
+====
+
+*Example:*
+If `GET1074T` and `GET1074` are co-requisite modules, deleting `GET1074` will cause `GET1074` 's list of co-requisite
+ modules to be updated as well.
+
+.`GET1074` is removed from `GET1074` 's list of co-requisites.
+ifdef::env-github[]
+image::module_delete_coreq.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::module_delete_coreq.png[width=970]
+endif::[]
+
+// end::module_delete[]
+
+// tag::find[]
+==== Finding modules : `find` image:https://img.shields.io/badge/module-find-blue.svg[]
+
+Having trouble locating the modules you want?
+
+Make use of `find` command which allows you to find modules that have their names, code or credits matching the given
+search criteria.
+
+*Command Format:* `find [name/NAME] OPERATOR [code/CODE] OPERATOR [credits/CREDITS]`
+
+When this command is used, the application will display only those modules which satisfy the search criteria.
+
+The following table describes the valid prefixes that you can supply to the search criteria.
+|====
+| *Prefix* | *Description*
+| `name/NAME` | Search for any module `name` which matches `NAME`
+| `code/CODE` | Search for any module `code` which matches `CODE`
+| `credits/CREDITS` | Search for any module `credits` which has `CREDITS`
+| `tag/TAG` | Search for any module `tag` which matches `TAG`
+| `sem/SEMESTER` | Search for any module that is being offered in `SEMESTER`
+|====
+
+The following table describes the valid operators which you can supply to the search criteria.
 
-* `find John` +
-Returns `john` and `John Doe`
-* `find Betsy Tim John` +
-Returns any person having names `Betsy`, `Tim`, or `John`
+|====
+| *Operator* | *Description* | *Precedence*
+| `&&` | Logical "AND" operation (both conditions A AND B must match) | Highest
+| `\|\|` | Logical "OR" operation (either conditions A OR B must match)| Lowest
+a| `(` and `)` | Search term surrounded by parenthesis will always be evaluated first. If there is a tie, the logical
+operator precedence will be taken into consideration. | N.A
+|====
 
-=== Deleting a person : `delete`
+The following examples describes how you could form a valid search criteria for the `find` command.
 
-Deletes the specified person from the address book. +
-Format: `delete INDEX`
+|====
+| *Single Prefix Usage* | *Expected Result*
+| `find name/NAME` | Returns modules containing `NAME` in their names
+| `find code/CODE` |Returns modules containing `CODE` in their codes
+| `find credits/CREDITS` | Returns modules having `CREDITS` in their credits
+|====
+
+If you need multiple prefixes, the following table shows some examples on how it can be done.
+ +
+Note that you will need to separate multiple prefixes with an operator.
+[TIP]
+====
+You could choose which search criteria having a higher priority by specifying parenthesis
+====
+|====
+| *Multiple Prefix Usage* | *Expected Result*
+| `find name/NAME1 && name/NAME2` | Returns modules containing both `NAME1` and `NAME2` in their names.
+| `find name/NAME1 \|\| name/NAME2` | Returns modules containing both `NAME1` or `NAME2` in their names.
+| `find name/NAME && code/CODE` | Returns modules containing `NAME` in their name and `CODE` in their codes.
+| `find code/CODE \|\| (name/NAME && code/CODE2)` | Returns modules containing either `CODE` in their codes or `NAME`
+in their names and `CODE2` in their codes.
+|====
 
 ****
-* Deletes the person at the specified `INDEX`.
-* The index refers to the index number shown in the displayed person list.
-* The index *must be a positive integer* 1, 2, 3, ...
+* The search is case insensitive. e.g `security` will match `Security`
+* Only full words will be matched. e.g. `CS` will not match `CS1231`
+* The order of the prefixes does not matter. e.g. `find code/CODE || name/NAME` returns the same result as
+`find name/NAME || code/CODE`
 ****
-
 Examples:
 
-* `list` +
-`delete 2` +
-Deletes the 2nd person in the address book.
-* `find Betsy` +
-`delete 1` +
-Deletes the 1st person in the results of the `find` command.
+* `find name/computer` +
+Displays all modules with names containing the word `computer` (e.g. `computer` and `Computer Security`) in the module
+list.
 
-=== Selecting a person : `select`
+.Finding modules with name contains `computer`
+ifdef::env-github[]
+image::find1.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::find1.png[width=970]
+endif::[]
 
-Selects the person identified by the index number used in the displayed person list. +
-Format: `select INDEX`
+* `find name/computer && name/Security`
+Displays all modules with names containing the word `computer` and `security` in the module list.
+
+.Finding modules with name contains `computer` and `security`.
+ifdef::env-github[]
+image::find2.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::find2.png[width=970]
+endif::[]
+
+* `find (sem/1 || sem/4) && name/Programming` +
+Displays all modules with names containing `programming` and is offered in either semester `1` or `4` in the module
+list.
+
+.Finding modules with names containing `programming` and is offered in either semester `1` or `4`.
+ifdef::env-github[]
+image::find3.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::find3.png[width=970]
+endif::[]
+
+[TIP]
+====
+If you wish to search for module name with exact name `Information Security`, you could do so via the following command
+ `find name/information security`
+
+Do note that if you prefer to search for module name containing both `Information` and `Security` but in any order,
+you can do the following command. `find name/Information && name/Security` +
+This command will return you modules with both name keywords. (e.g. `Security in Information Privacy`)
+====
+// end::find[]
+
+==== Listing all modules : `list` image:https://img.shields.io/badge/module-list-blue.svg[]
+
+Shows a list of all modules in the *module list*. +
+*Command Format:* `list`
+
+[TIP]
+====
+This command is useful if you want to display all modules in the *module list* after doing a `find` command.
+====
+
+*Example:* Running the `list` command:
+
+.All modules are displayed in the *module list*.
+ifdef::env-github[]
+image::module_list.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::module_list.png[width=970]
+endif::[]
+
+==== Selecting modules : `select` image:https://img.shields.io/badge/module-select-blue.svg[]
+
+Selects the module identified by the index number used in the displayed module list. +
+*Command Format:* `select INDEX`
 
 ****
-* Selects the person and loads the Google search page the person at the specified `INDEX`.
-* The index refers to the index number shown in the displayed person list.
-* The index *must be a positive integer* `1, 2, 3, ...`
+* Selects the module at the specified `INDEX`.
+* The index refers to the index number shown in the displayed module list.
+* The index *must be a positive integer* `1, 2, 3, …`
 ****
 
 Examples:
 
 * `list` +
 `select 2` +
-Selects the 2nd person in the address book.
-* `find Betsy` +
+Selects the 2nd module in the displayed module list.
+* `find Programming` +
 `select 1` +
-Selects the 1st person in the results of the `find` command.
+Selects the 1st module in the results of the `find` command.
+
+// tag::requirementtracker[]
+=== Requirement Tracker
+
+The requirement tracker allows you to manage and and track your degree requirements so that you are always on-track for
+ graduation!
+
+This section contains the various commands that you can use in this application to add, remove, move and list modules
+ to and from the specified requirement categories in this application.
+
+The following table describes the parameters you may use for the commands in this section.
+[cols="<20%,35%,35%"]
+|======
+|*Parameter*| *Description* | *Acceptable Range of Values*
+| `NAME` | Indicates the name of degree requirement category (e.g. `IT Professionalism`).
+| `NAME` must be one of the following values (case-insensitive): +
+1. `Computing Foundation` +
+2. `Information Security Requirements` +
+3. `Information Security Electives` +
+4. `Computing Breadth` +
+5. `IT Professionalism` +
+6. `Mathematics` +
+7. `General Education` +
+8. `Unrestricted Electives`
+| `CODE` | Indicates the module code (e.g. `CS2101`). |
+`CODE` must begin with two or three alphabets, followed by four digits, and may optionally end with an alphabet. +
+`CODE` is case-insensitive.
+|======
+
+[WARNING]
+====
+`NAME` and `CODE` (where applicable) must not be empty or blank.
+====
 
-=== Listing entered commands : `history`
+[NOTE]
+====
+* Both `NAME` and `CODE` parameters are case insensitive. (e.g. `computing foundation` will match `Computing
+Foundation`)
+* `CODE` is treated as uppercase (e.g. cs1010 is treated as CS1010), and should be unique.
+* Only full words will be matched. (e.g. `foundation` will not match `Computing Foundation`)
+====
+// end::requirementtracker[]
 
-Lists all the commands that you have entered in reverse chronological order. +
-Format: `history`
+// tag::requirementadd[]
+==== Adding modules : `requirement_add` image:https://img.shields.io/badge/requirement-add-8AB702.svg[]
+
+Want to see if you have fulfilled a particular degree requirement category?​
+
+Simply add the module code to a degree requirement category using the `requirement_add` command to find out.
+
+*Command Format:* `requirement_add name/NAME code/CODE [code/CODE]…`
+
+*Examples:*
+
+* `requirement_add name/IT Professionalism code/IS4231` +
+Adds the module code `IS4231` to the degree requirement category `IT Professionalism`.
+
+The two images below this command describes what you should see when you execute the above command
+
+image::RequirementAddCommand.png[]
+image::RequirementAddCommandAfter.png[]
+
+* `requirement_add name/Computing Foundation code/CS1231 code/CS2100` +
+Adds module codes `CS1231` and `CS2100` to the degree requirement category `Computing Foundation`.
+// end::requirementadd[]
+
+// tag::requirementremove[]
+==== Removing modules : `requirement_remove` image:https://img.shields.io/badge/requirement-remove-8AB702.svg[]
+
+Want to remove a module code from the degree requirement category?
+
+`requirement_remove` will help you to remove the specified module code from the degree requirement category.
+
+*Command Format:* `requirement_remove code/CODE [code/CODE]…`
+
+[TIP]
+====
+If you want to delete the module entirely, simply use the `delete` command instead! The changes will be reflected in
+the degree requirement category as well.
+====
+
+*Examples:*
+
+* `requirement_remove code/IS4231` +
+Removes the module code `IS4231` from the degree requirement category.
+
+The two images below this command describes what you should see when you execute the above command
+
+image::RequirementRemoveCommand.png[]
+image::RequirementRemoveCommandAfter.png[]
+
+* `requirement_remove code/CS1231 code/CS2100` +
+Removes module codes `CS1231` and `CS2100` from the degree requirement category.
+
+// end::requirementremove[]
+
+// tag::requirementmove[]
+==== Moving modules between requirement categories : `requirement_move` image:https://img.shields.io/badge/requirement-move-8AB702.svg[]
+
+Having seconds thoughts about which degree requirement category the module code should be classified under?
+
+Or simply added the module code to the wong degree requirement category?
+
+No worries, `requirement_move` will allow you to move the specified module to another degree requirement category.
+
+*Command Format:* `requirement_move name/NAME code/CODE [code/CODE]…`
+
+[WARNING]
+====
+The `CODE` specified must be already added to a degree requirement category!
+====
 
 [NOTE]
 ====
-Pressing the kbd:[&uarr;] and kbd:[&darr;] arrows will display the previous and next input respectively in the command box.
+Unlike the `planner_move` command, modules that are co-requisites will not be moved together.
 ====
 
-// tag::undoredo[]
-=== Undoing previous command : `undo`
+*Examples:*
+
+* `requirement_move name/Computing Breadth code/IS4231` +
+Moves the module code `IS4231` to the degree requirement category `Computing Breadth.
+
+The two images below this command describes what you should see when you execute the above command
+
+image::RequirementMoveCommand.png[]
+image::RequirementMoveCommandAfter.png[]
+
+* `requirement_move name/Computing Foundation code/CS1231 code/CS2100` +
+Moves module codes `CS1231` and `CS2100` to the degree requirement category `Computing Foundation`.
+
+// end::requirementmove[]
+
+
+// tag::requirementlist[]
+==== Listing all requirement categories : `requirement_list` image:https://img.shields.io/badge/requirement-list-8AB702.svg[]
+Shows a list of all degree requirement categories in the application and the module codes added into each degree
+requirement category.
+
+*Command Format:* `requirement_list`
+
+*Examples:*
+
+* `requirement_list`
+
+The image below this command describes what you should see when you execute the above command
+
+image::RequirementListCommand.png[]
+// end::requirementlist[]
+
+//tag::degreeplanmanagement[]
+=== Degree Plan Management
 
-Restores the address book to the state before the previous _undoable_ command was executed. +
-Format: `undo`
+The following table describes the parameters you may use for commands in this section.
+[cols="<20%,35%,35%"]
+|======
+|*Parameter*| *Description* | *Acceptable Range of Values*
+| `CODE` | Indicates the module code +
+(e.g. `CS2101`). | `CODE` should begin with two alphabets, followed by four digits, and may optionally end with an alphabet. `CODE` is case-insensitive.
+| `YEAR` | Indicates the year of one of the semesters in the degree plan. +
+(e.g. `1`) | `YEAR` should only be either 1, 2, 3 or 4. +
+| `SEMESTER` | Indicates the semester of one of the semesters in the degree plan. +
+(e.g. `1`) | `SEMESTER` should only be either 1, 2, 3 or 4. +
+3 and 4 indicates special term semesters 1 and 2 respectively.
+|======
+
+[WARNING]
+====
+* `YEAR`, `SEMESTER` and `CODE` (if specified) must not be empty. +
+* `CODE` is case insensitive, and is treated as uppercase (e.g. `cs1010` is treated as `CS1010`), and should be unique.
+====
+//end::degreeplanmanagement[]
+
+//tag::planner-add-remove[]
+==== Adding modules : `planner_add` image:https://img.shields.io/badge/planner-add-F17D3F.svg[]
+
+Want to add modules to the *degree plan*? +
+Make use of the `planner_add` command to add one or multiple modules to the *degree plan*.
+
+*Command Format:* `planner_add year/YEAR sem/SEMESTER code/CODE [code/CODE]…`
 
 [NOTE]
 ====
-Undoable commands: those commands that modify the address book's content (`add`, `delete`, `edit` and `clear`).
+* 3 and 4 for `SEMESTER` indicates special term semesters 1 and 2 respectively.
+* All the module(s) to be added *must exist in the module list*.
+* All the module(s) to add *must not have duplicate(s)* in the *degree plan*.
+* For the following two points, `added to the valid semester` is defined as:
+The semesters in which module(s) are offered should contain the semester to which the module(s) are added.
+* The module(s) *must be added to the valid semester*.
+* The co-requisite(s) of the module(s) added *must be added to the valid semester*.
+* After adding, the updated *degree plan* will be displayed.
 ====
 
-Examples:
+*Examples:*
 
-* `delete 1` +
-`list` +
-`undo` (reverses the `delete 1` command) +
+* `planner_add year/1 sem/3 code/CS1010` +
+Adds module `CS1010` to year 1 semester 3 (special term semester 1) of the *degree plan*.
 
-* `select 1` +
-`list` +
-`undo` +
-The `undo` command fails as there are no undoable commands executed previously.
+* `planner_add year/1 sem/4 code/CS1231 code/CS2040C` +
+Adds modules `CS1231` and `CS2040C` to year 1 semester 4 (special term semester 2) of the *degree plan*.
 
-* `delete 1` +
-`clear` +
-`undo` (reverses the `clear` command) +
-`undo` (reverses the `delete 1` command) +
+* `planner_add year/1 sem/2 code/CS2113T code/CS2107` +
+Adds modules `CS2113T` and `CS2107` to year 1 semester 2 of the *degree plan*.
 
-=== Redoing the previously undone command : `redo`
+==== Removing modules : `planner_remove` image:https://img.shields.io/badge/planner-remove-F17D3F.svg[]
 
-Reverses the most recent `undo` command. +
-Format: `redo`
+Want to remove modules from the *degree plan*? +
+Make use of `planner_remove` command to remove one or multiple modules from the *degree plan*. +
 
-Examples:
+*Command Format:* `planner_remove code/CODE [code/CODE]…`
 
-* `delete 1` +
-`undo` (reverses the `delete 1` command) +
-`redo` (reapplies the `delete 1` command) +
+[NOTE]
+====
+* All the module(s) to remove *must exist in the degree plan*.
+* After removing, the updated *degree plan* will be displayed.
+====
 
-* `delete 1` +
-`redo` +
-The `redo` command fails as there are no `undo` commands executed previously.
+*Examples:*
 
-* `delete 1` +
-`clear` +
-`undo` (reverses the `clear` command) +
-`undo` (reverses the `delete 1` command) +
-`redo` (reapplies the `delete 1` command) +
-`redo` (reapplies the `clear` command) +
-// end::undoredo[]
+* `planner_remove code/CS1231` +
+Removes module `CS1231` from the *degree plan*.
+
+* `planner_remove code/CS2100 code/CS2040C` +
+Removes modules `CS2100` and `CS2040C` from the *degree plan*.
+//end::planner-add-remove[]
+
+//tag::plannermove[]
+==== Moving a module between semesters: `planner_move` image:https://img.shields.io/badge/planner-move-F17D3F.svg[]
+
+Any change in your decision? Want to take your module in other semester instead? +
+No worry! Simply use `planner_move` command to move your module in the degree plan along with its co-requisite(s)
+between the semesters by providing your module code and a semester you want to move your module to. +
+
+*Command Format:* `planner_move year/YEAR sem/SEMESTER code/CODE`
+
+[NOTE]
+====
+When moving a module with co-requisites, if the module is moved successfully, the co-requisite modules will be moved as
+well.
+====
+
+*Examples:*
+
+* `planner_move year/1 sem/2 code/CS1231` +
+Moves module CS1231 along with its co-requisite(s) to year 1 semester 2.
+
+* `planner_move year/2 sem/1 code/CS1231` +
+Moves module CS1231 along with its co-requisite(s) to year 2 semester 1.
+
+Before the `planner_move` command:
+[[beforePlannerMove]]
+.Before executing the `planner_move` command.
+ifdef::env-github[]
+image::plannermove1.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::plannermove1.png[width=970]
+endif::[]
+
+After entering `planner_move` and pressing kbd:[Enter]:
+
+.After executing the `planner_move` command.
+ifdef::env-github[]
+image::plannermove2.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::plannermove2.png[width=970]
+endif::[]
+
+Note that co-requste of the module is moved too:
 
-=== Clearing all entries : `clear`
+.After executing the `planner_move` command.
+ifdef::env-github[]
+image::plannermove3.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::plannermove3.png[width=970]
+endif::[]
+
+//tag::plannershow[]
+==== Showing semesters based on year/semester: `planner_show` image:https://img.shields.io/badge/planner-show-F17D3F.svg[]
+
+Having trouble locating semesters you want? +
+Simply use `planner_show` command. It will only show you the semesters you want to see. +
+
+*Command Format:* `planner_list [y/YEAR] OPERATOR [s/SEMESTER`]
+
+When this command is used, the application will display only those semesters which satisfy the search criteria.
+
+The following table describes the valid prefixes that you can use to supply to the search criteria.
+|====
+| *Prefix* | *Description*
+| `year/YEAR` | Search for any semester `year` which matches `YEAR`
+| `sem/SEMESTER` | Search for any semester `sem` which matches `SEMESTER`
+|====
+
+The following table describes the valid operators which you can to use supply to the search criteria.
+
+|====
+| *Operator* | *Description* | *Precedence*
+| `&&` | Logical "AND" operation (both conditions A AND B must match) | Highest
+| `\|\|` | Logical "OR" operation (either conditions A OR B must match)| Lowest
+|====
+
+The following examples describes how you could form a valid search criteria for the `planner_show` command.
+
+|====
+| *Single Prefix Usage* | *Expected Result*
+| `planner_show year/YEAR` | Shows only semesters that are in year `YEAR`
+| `planner_show sem/SEMESTER` | Shows only semesters that are in semester `SEMESTER`
+|====
+
+If you need multiple prefixes, the following table shows you how you could do it.
+ +
+Note that you will need to separate multiple prefixes with an operator.
+[TIP]
+====
+You could choose which search criteria having a higher priority by specifying parenthesis
+====
+|====
+| *Multiple Prefix Usage* | *Expected Result*
+| `planner_show year/YEAR1 \|\| year/YEAR2` | Shows only semesters that are in years `YEAR1` or `YEAR2`.
+| `planner_show sem/SEMESTER1 \|\| sem/SEMESTER2` | Shows only semesters that are in semester `SEMESTER1`
+or `SEMESTER`.
+| `planner_show sem/SEMESTER && (year/YEAR1 \|\| year/YEAR2)` | Shows only semesters that are in year `YEAR1`
+semester `SEMESTER` or `YEAR2` semester `SEMESTER`.
+|====
+
+****
+* The order of the prefixes does not matter. e.g. `planner_show sem/SEMESTER || year/YEAR` returns the same result as
+`planner_show year/YEAR || sem/SEMESTER`
+****
+*Examples:*
+
+* `planner_show year/1` +
+Shows any semesters having the year `1` (e.g. `Year 1 Semester 1`, `Year 1 Semester 2` ...) in the degree plan.
+* `planner_show sem/1` +
+Shows any semesters having the year `1` (e.g. `Year 1 Semester 1`, `Year 2 Semester 1` ...) in the degree plan.
+* `planner_show year/1 || year/2`  +
+Shows any semesters having the year `1` or year `2` in the degree plan.
+* `planner_show sem/1 || sem/2` +
+Shows any semesters having the semester `1` or semester `2` in the degree plan.
+* `planner_show year/1 && sem/1` +
+Shows a semester having the year `1` and semester `1` (e.g. `Year 1 Semester 1`)in the degree plan.
+* `planner_show sem/1 && (year/1 || year/2)` +
+Shows a semester having the year `1` semester `1` and  year `2` semester `1` (e.g. `Year 1 Semester 1` and `Year 2
+Semester 2`) in the degree plan.
+
+Before the `planner_show` command:
+[[beforePlannerShow]]
+.Before executing the `planner_show` command.
+ifdef::env-github[]
+image::plannershow1.png[width=800]
+endif::[]
 
-Clears all entries from the address book. +
-Format: `clear`
+ifndef::env-github[]
+image::plannershow1.png[width=970]
+endif::[]
+
+After entering `planner_show` and pressing kbd:[Enter]:
+
+.After executing the `planner_show` command.
+ifdef::env-github[]
+image::plannershow2.png[width=800]
+endif::[]
+
+ifndef::env-github[]
+image::plannershow2.png[width=970]
+endif::[]
+//end::plannershow[]
+
+//tag::plannerlist[]
+==== Listing all semesters: `planner_list` image:https://img.shields.io/badge/planner-list-F17D3F.svg[]
+
+Maybe you need to list all your semesters back after using `planner_show`? +
+Simply enter `planner_list` into the application! +
+It wil show you a list of all semesters in degree plan.
+
+*Command Format:* `planner_list`
+//end::plannerlist[]
+
+//tag::planner-suggest[]
+==== Using degree plan to suggest modules : `planner_suggest` image:https://img.shields.io/badge/planner-suggest-F17D3F.svg[]
 
-=== Exiting the program : `exit`
+Having trouble identifying modules to add to the *degree plan*? +
+Make use of `planner_suggest` command to find out recommended modules to add to the *degree plan*. +
 
-Exits the program. +
-Format: `exit`
+*Command Format:* `planner_suggest credits/CREDITS [tag/TAG]…`
 
-=== Saving the data
+When this command is successfully executed, the *result box* will display modules recommended.
 
-Address book data are saved in the hard disk automatically after any command that changes the data. +
-There is no need to save manually.
+[NOTE]
+====
+* *Maximum 10* modules are recommended in the recommendation list.
+* In addition to the recommendation list, supplementary information on the specific modules with matching tags and credits
+is given as two additional lists. The modules in the two additional lists are all from the recommendation list.
+* Modules recommended in all 3 aforementioned lists are sorted according to the following criteria:
+** For modules with different number of tags that match the desirable tags (matching tags), modules with more matching
+tags will be sorted to the front of the list.
+** If modules have the same number of matching tags but different credits, modules with the credits closer to the
+desirable credits will be sorted to the front of the list.
+** If modules have the same number of matching tags and credits, they will be sorted according to alphabetical
+order.
+** If `tag/TAG` is not supplied as a parameter in the command, modules will be sorted according to credits and alphabetical order only.
+* All modules in the recommendation list and the two additional lists are modules not found in the degree plan.
+====
+
+*Examples:*
+
+* `planner_suggest credits/4` +
+Suggests maximum 10 modules not found in the degree plan, prioritizing modules with credits closer to 4. If tie,
+prioritizes according to alphabetical order.
+
+* `planner_suggest credits/2 tag/algorithms` +
+Suggests maximum 10 modules not found in the degree plan, prioritizing modules with tag `algorithms`. If tie, prioritizes
+according to credits closer to 2. If tie again, prioritizes according to alphabetical order.
+//end::planner-suggest[]
 
-// tag::dataencryption[]
-=== Encrypting data files `[coming in v2.0]`
+== Future Enhancements `[coming in v2.0]`
+These are features that will come in future releases of *PlanWithEase*
+
+=== Module Prerequisites `prereq/`
+
+We aim to provide the support of `prerequisites` for our *Module Management*. +
+This changes will allow our users to indicate a module prerequisites and we can handle its dependency for the users
+before they add the module into the *Degree Plan*.
+
+=== Auto-create Degree Plan `autoplan`
+
+We plan to implement this feature to allow an automated planning, we can make use of users feedback and current
+treads based on module popularity then create the degree plan for the users.
 
-_{explain how the user can enable/disable data encryption}_
-// end::dataencryption[]
 
 == FAQ
 
-*Q*: How do I transfer my data to another Computer? +
-*A*: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous Address Book folder.
+*Q*: How do I save my data in the application? +
+*A*: You do need to save the data manually. Whenever you run any commands that makes changes, *PlanWithEase*'s data are saved automatically in the `data` directory.
 
 == Command Summary
-
-* *Add* `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]...` +
-e.g. `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 t/friend t/colleague`
-* *Clear* : `clear`
-* *Delete* : `delete INDEX` +
-e.g. `delete 3`
-* *Edit* : `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [t/TAG]...` +
-e.g. `edit 2 n/James Lee e/jameslee@example.com`
-* *Find* : `find KEYWORD [MORE_KEYWORDS]` +
-e.g. `find James Jake`
-* *List* : `list`
-* *Help* : `help`
-* *Select* : `select INDEX` +
-e.g.`select 2`
-* *History* : `history`
-* *Undo* : `undo`
-* *Redo* : `redo`
+This section provides a quick references for all commands available in *PlanWithEase*.
+
+=== General Commands
+The table below shows a list of general commands.
+|====
+| *Task* | *Purpose* | *Command Format* | *Example*
+| *Help* | Displays the User Guide | `help` | `help`
+| *History* | Get a list of command entered | `history` | `history`
+| *Undo* | Undo your previous action| `undo` | `undo`
+| *Redo* | Redo your previous action | `redo` | `redo`
+| *Clear* | Clear the all the modules from the specified section | `clear [requirement or planner]` | `clear`
+| *Reset* | Resets and populates the application with sample data | `reset` | `reset`
+| *Exit* | Exits the application | `exit` | `exit`
+|====
+
+=== Module Management Commands
+The table below shows a list of commands which helps you to manage the module list.
+
+|====
+| *Task* | *Purpose* |*Command Format* | *Example*
+|*Add module to module list* | Add a new module to the module list.
+a|`add code/CODE name/NAME credits/CREDITS [sem/SEMESTER]… [coreq/COREQUISITE]… [tag/TAG]…`
+a|`add code/GEH1074 name/Luck credits/4 sem/1 sem/2`
+| *Edit the details of a module* | Edit the module's details based on the index given.
+a| `edit INDEX [name/NAME] [code/CODE] [credits/CREDITS] [sem/SEMESTER]… [coreq/COREQUISITE]… [tag/TAG]…`
+a| `edit 1 name/Data Structures and Algorithms code/CS2040C`
+ | *Delete module from module list*| Remove the module
+entirely from the module list based on the index given.
+a| `delete INDEX` a| `delete 3`
+| *Find modules in the module list* | Display a list of modules based on your search criteria
+a| `find [name/NAME] OPERATOR [code/CODE] OPERATOR [credits/CREDITS] OPERATOR [sem/SEMESTER] OPERATOR [tag/TAG]`
+a| `find credits/4 && (name/Programming \|\| name/Discrete)`
+| *List all modules* | List all modules available in the module list a| `list` a| `list`
+| *Selecting a module* | Selects a module in the module list a| `select INDEX` a| `select 1`
+|====
+
+=== Requirement Tracker Commands
+The table below shows a list of command which helps you to manage and track your degree requirements.
+
+|====
+|*Task*  | *Purpose* |*Command Format* | *Example*
+| *Add module(s) to a requirement category* | Add module(s) to the specified requirement category based
+ on the module code provided.
+a| `requirement_add name/NAME code/CODE [code/CODE]…`
+a| `requirement_add name/IT Professionalism code/IS4231`
+| *Remove module(s) from the requirement category* | Remove module(s) from the requirement category
+based on the module code provided.
+a| `requirement_remove code/CODE [code/CODE]…`
+a| `requirement_remove code/IS4231`
+| *Move module(s) between requirement categories* | Move module(s) between the requirement categories from
+ any requirement categories to a specified requirement categories.
+a| `requirement_move name/NAME code/CODE [code/CODE]…`
+a| `requirement_move name/IT Professionalism code/IS4231`
+| *List all requirement categories in the application*
+| List all requirement categories in the application and the module(s) added to each requirement categories
+a| `requirement_list`
+a| `requirement_list`
+|====
+
+=== Degree Plan Commands
+The table below shows a list of commands which helps you to manage the degree plan.
+
+|====
+| *Task*  | *Purpose* |*Command Format* | *Example*
+|*Add module(s) to degree plan* | Add module(s) to degree plan based on module code and academic year
+a|  `planner_add year/YEAR sem/SEMESTER code/CODE [code/CODE]…`
+a| `planner_add year/1 sem/2 code/CS1010 code/CS2113T`
+|*Remove module(s) from degree plan*| Remove module(s) from degree plan based on the module code
+a| `planner_remove code/CODE [code/CODE]…`
+a| `planner_remove code/CS1231 code/CS1010`
+| *Move module between semesters in the degree plan* | Move module between the semesters based on year and
+semester.
+a| `planner_move year/YEAR sem/SEMESTER code/CODE`
+a| `planner_move year/1 sem/2 code/CS1231`
+|*List all semesters in the degree plan* | List all semesters in the degree plan a| `planner_list` a| `planner_list`
+|*List specific semesters in the degree plan* | List specific semesters in the degree plan based on your search term.
+a| `planner_show [year/YEAR] OPERATOR [sem/SEMESTER]`
+a| `planner_show sem/2 && ( year/1 \|\|year/2 )`
+| *Suggest available modules* | Suggest available modules from the module lists based on input argument.
+a| `planner_suggest credits/CREDITS [tag/TAG]…`
+a| `planner_suggest credits/4 tag/maths`
+|====
diff --git a/docs/UsingGradle.adoc b/docs/UsingGradle.adoc
index d1be2f3b7c3a..97bd63dda111 100644
--- a/docs/UsingGradle.adoc
+++ b/docs/UsingGradle.adoc
@@ -83,9 +83,9 @@ The set of code style rules implemented can be found in `config/checkstyle/check
 * **`allTests`** +
 Runs all tests.
 * **`guiTests`** +
-Runs all tests in the `seedu.address.ui` and `systemtests` package
+Runs all tests in the `pwe.planner.ui` and `systemtests` package
 * **`nonGuiTests`** +
-Runs all non-GUI tests in the `seedu.address`
+Runs all non-GUI tests in the `pwe.planner`
 package
 * **`headless`** +
 Sets the test mode as _headless_. The mode is effective for that Gradle run only so it should be combined with other test tasks.
diff --git a/docs/diagrams/ArchitectureDiagram.pptx b/docs/diagrams/ArchitectureDiagram.pptx
index 13051e815c46..b532447055a3 100644
Binary files a/docs/diagrams/ArchitectureDiagram.pptx and b/docs/diagrams/ArchitectureDiagram.pptx differ
diff --git a/docs/diagrams/HighLevelSequenceDiagrams.pptx b/docs/diagrams/HighLevelSequenceDiagrams.pptx
index 38332090a79a..659604c9efcf 100644
Binary files a/docs/diagrams/HighLevelSequenceDiagrams.pptx and b/docs/diagrams/HighLevelSequenceDiagrams.pptx differ
diff --git a/docs/diagrams/LogicComponentClassDiagram.pptx b/docs/diagrams/LogicComponentClassDiagram.pptx
index 6fcc1136a5bb..894e644fd56f 100644
Binary files a/docs/diagrams/LogicComponentClassDiagram.pptx and b/docs/diagrams/LogicComponentClassDiagram.pptx differ
diff --git a/docs/diagrams/LogicComponentSequenceDiagram.pptx b/docs/diagrams/LogicComponentSequenceDiagram.pptx
index 410277bbd866..6d9af683c57c 100644
Binary files a/docs/diagrams/LogicComponentSequenceDiagram.pptx and b/docs/diagrams/LogicComponentSequenceDiagram.pptx differ
diff --git a/docs/diagrams/ModelComponentClassBetterOopDiagram.pptx b/docs/diagrams/ModelComponentClassBetterOopDiagram.pptx
deleted file mode 100644
index a0b23659eb29..000000000000
Binary files a/docs/diagrams/ModelComponentClassBetterOopDiagram.pptx and /dev/null differ
diff --git a/docs/diagrams/ModelComponentClassDiagram.pptx b/docs/diagrams/ModelComponentClassDiagram.pptx
index dc0e4ac5ea66..b3d9365ffe16 100644
Binary files a/docs/diagrams/ModelComponentClassDiagram.pptx and b/docs/diagrams/ModelComponentClassDiagram.pptx differ
diff --git a/docs/diagrams/StorageComponentClassDiagram.pptx b/docs/diagrams/StorageComponentClassDiagram.pptx
index 4afecd63e210..bf56b0b09879 100644
Binary files a/docs/diagrams/StorageComponentClassDiagram.pptx and b/docs/diagrams/StorageComponentClassDiagram.pptx differ
diff --git a/docs/diagrams/UiComponentClassDiagram.pptx b/docs/diagrams/UiComponentClassDiagram.pptx
index ab325e889f70..57665827c917 100644
Binary files a/docs/diagrams/UiComponentClassDiagram.pptx and b/docs/diagrams/UiComponentClassDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoActivityDiagram.pptx b/docs/diagrams/UndoRedoActivityDiagram.pptx
index 16fec930cf3f..c08d4315a3e9 100644
Binary files a/docs/diagrams/UndoRedoActivityDiagram.pptx and b/docs/diagrams/UndoRedoActivityDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoExecuteUndoStateListDiagram.pptx b/docs/diagrams/UndoRedoExecuteUndoStateListDiagram.pptx
index 6fd31b5f3fbd..9bbd4cf3193a 100644
Binary files a/docs/diagrams/UndoRedoExecuteUndoStateListDiagram.pptx and b/docs/diagrams/UndoRedoExecuteUndoStateListDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoNewCommand1StateListDiagram.pptx b/docs/diagrams/UndoRedoNewCommand1StateListDiagram.pptx
index 1f3261976dce..8d7d5c79d26f 100644
Binary files a/docs/diagrams/UndoRedoNewCommand1StateListDiagram.pptx and b/docs/diagrams/UndoRedoNewCommand1StateListDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoNewCommand2StateListDiagram.pptx b/docs/diagrams/UndoRedoNewCommand2StateListDiagram.pptx
index e2907d4a9cae..ccf0e64953ba 100644
Binary files a/docs/diagrams/UndoRedoNewCommand2StateListDiagram.pptx and b/docs/diagrams/UndoRedoNewCommand2StateListDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoNewCommand3StateListDiagram.pptx b/docs/diagrams/UndoRedoNewCommand3StateListDiagram.pptx
index 4ecc659bd600..4cc66793e17d 100644
Binary files a/docs/diagrams/UndoRedoNewCommand3StateListDiagram.pptx and b/docs/diagrams/UndoRedoNewCommand3StateListDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoNewCommand4StateListDiagram.pptx b/docs/diagrams/UndoRedoNewCommand4StateListDiagram.pptx
index 16ebf585ddbd..5af44f287a16 100644
Binary files a/docs/diagrams/UndoRedoNewCommand4StateListDiagram.pptx and b/docs/diagrams/UndoRedoNewCommand4StateListDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoSequenceDiagram.pptx b/docs/diagrams/UndoRedoSequenceDiagram.pptx
index 5ccc1042caac..a404e7d52777 100644
Binary files a/docs/diagrams/UndoRedoSequenceDiagram.pptx and b/docs/diagrams/UndoRedoSequenceDiagram.pptx differ
diff --git a/docs/diagrams/UndoRedoStartingStateListDiagram.pptx b/docs/diagrams/UndoRedoStartingStateListDiagram.pptx
index 98ce067642ff..267c86a32cd7 100644
Binary files a/docs/diagrams/UndoRedoStartingStateListDiagram.pptx and b/docs/diagrams/UndoRedoStartingStateListDiagram.pptx differ
diff --git a/docs/diagrams/~$LogicComponentSequenceDiagram.pptx b/docs/diagrams/~$LogicComponentSequenceDiagram.pptx
new file mode 100644
index 000000000000..be51eabc9cd5
Binary files /dev/null and b/docs/diagrams/~$LogicComponentSequenceDiagram.pptx differ
diff --git a/docs/images/DeleteModuleSdForLogic.png b/docs/images/DeleteModuleSdForLogic.png
new file mode 100644
index 000000000000..04ee3ae8098b
Binary files /dev/null and b/docs/images/DeleteModuleSdForLogic.png differ
diff --git a/docs/images/DeletePersonSdForLogic.png b/docs/images/DeletePersonSdForLogic.png
deleted file mode 100644
index 0462b9b7be6e..000000000000
Binary files a/docs/images/DeletePersonSdForLogic.png and /dev/null differ
diff --git a/docs/images/FindCommandClassDiagram.png b/docs/images/FindCommandClassDiagram.png
new file mode 100644
index 000000000000..a6aa1c78a772
Binary files /dev/null and b/docs/images/FindCommandClassDiagram.png differ
diff --git a/docs/images/FindCommandSequenceDiagram.png b/docs/images/FindCommandSequenceDiagram.png
new file mode 100644
index 000000000000..0b66f509fbcb
Binary files /dev/null and b/docs/images/FindCommandSequenceDiagram.png differ
diff --git a/docs/images/LogicClassDiagram.png b/docs/images/LogicClassDiagram.png
index f4ecf65b3193..25497e26de22 100644
Binary files a/docs/images/LogicClassDiagram.png and b/docs/images/LogicClassDiagram.png differ
diff --git a/docs/images/ModelClassBetterOopDiagram.png b/docs/images/ModelClassBetterOopDiagram.png
deleted file mode 100644
index b7df3a1c02b4..000000000000
Binary files a/docs/images/ModelClassBetterOopDiagram.png and /dev/null differ
diff --git a/docs/images/ModelClassDiagram.png b/docs/images/ModelClassDiagram.png
index 4961edd74e76..e45850462be1 100644
Binary files a/docs/images/ModelClassDiagram.png and b/docs/images/ModelClassDiagram.png differ
diff --git a/docs/images/PlannerAddCommandSequenceDiagram1.png b/docs/images/PlannerAddCommandSequenceDiagram1.png
new file mode 100644
index 000000000000..dff0e343484f
Binary files /dev/null and b/docs/images/PlannerAddCommandSequenceDiagram1.png differ
diff --git a/docs/images/PlannerAddCommandSequenceDiagram2.png b/docs/images/PlannerAddCommandSequenceDiagram2.png
new file mode 100644
index 000000000000..048bfbbb3435
Binary files /dev/null and b/docs/images/PlannerAddCommandSequenceDiagram2.png differ
diff --git a/docs/images/PlannerListComponentSequenceDiagram.png b/docs/images/PlannerListComponentSequenceDiagram.png
new file mode 100644
index 000000000000..44b1ac0e7033
Binary files /dev/null and b/docs/images/PlannerListComponentSequenceDiagram.png differ
diff --git a/docs/images/PlannerMoveCommandSequenceDiagramDetail.png b/docs/images/PlannerMoveCommandSequenceDiagramDetail.png
new file mode 100644
index 000000000000..e286dec197c6
Binary files /dev/null and b/docs/images/PlannerMoveCommandSequenceDiagramDetail.png differ
diff --git a/docs/images/PlannerMoveComponentSequenceDiagram.png b/docs/images/PlannerMoveComponentSequenceDiagram.png
new file mode 100644
index 000000000000..70fe3ad56fc6
Binary files /dev/null and b/docs/images/PlannerMoveComponentSequenceDiagram.png differ
diff --git a/docs/images/PlannerRemoveCommandClassDiagram.png b/docs/images/PlannerRemoveCommandClassDiagram.png
new file mode 100644
index 000000000000..18b47b93ed19
Binary files /dev/null and b/docs/images/PlannerRemoveCommandClassDiagram.png differ
diff --git a/docs/images/PlannerSuggestCommandActivityDiagram.png b/docs/images/PlannerSuggestCommandActivityDiagram.png
new file mode 100644
index 000000000000..5dc4747717d3
Binary files /dev/null and b/docs/images/PlannerSuggestCommandActivityDiagram.png differ
diff --git a/docs/images/RequirementAddCommand.png b/docs/images/RequirementAddCommand.png
new file mode 100644
index 000000000000..94e3f1e06a46
Binary files /dev/null and b/docs/images/RequirementAddCommand.png differ
diff --git a/docs/images/RequirementAddCommandAfter.png b/docs/images/RequirementAddCommandAfter.png
new file mode 100644
index 000000000000..06eff082141f
Binary files /dev/null and b/docs/images/RequirementAddCommandAfter.png differ
diff --git a/docs/images/RequirementAddCommandSequenceDiagram.png b/docs/images/RequirementAddCommandSequenceDiagram.png
new file mode 100644
index 000000000000..da82aac14e01
Binary files /dev/null and b/docs/images/RequirementAddCommandSequenceDiagram.png differ
diff --git a/docs/images/RequirementAddCommandSequenceDiagramExtracted.png b/docs/images/RequirementAddCommandSequenceDiagramExtracted.png
new file mode 100644
index 000000000000..72642011fee8
Binary files /dev/null and b/docs/images/RequirementAddCommandSequenceDiagramExtracted.png differ
diff --git a/docs/images/RequirementListCommand.png b/docs/images/RequirementListCommand.png
new file mode 100644
index 000000000000..506b440d5ec1
Binary files /dev/null and b/docs/images/RequirementListCommand.png differ
diff --git a/docs/images/RequirementListCommandSequenceDiagram.png b/docs/images/RequirementListCommandSequenceDiagram.png
new file mode 100644
index 000000000000..b852322324da
Binary files /dev/null and b/docs/images/RequirementListCommandSequenceDiagram.png differ
diff --git a/docs/images/RequirementMoveCommand.png b/docs/images/RequirementMoveCommand.png
new file mode 100644
index 000000000000..c42a425887bc
Binary files /dev/null and b/docs/images/RequirementMoveCommand.png differ
diff --git a/docs/images/RequirementMoveCommandAfter.png b/docs/images/RequirementMoveCommandAfter.png
new file mode 100644
index 000000000000..1d9c26a40a3f
Binary files /dev/null and b/docs/images/RequirementMoveCommandAfter.png differ
diff --git a/docs/images/RequirementMoveCommandSequenceDiagram.png b/docs/images/RequirementMoveCommandSequenceDiagram.png
new file mode 100644
index 000000000000..70fcbfb9cf13
Binary files /dev/null and b/docs/images/RequirementMoveCommandSequenceDiagram.png differ
diff --git a/docs/images/RequirementMoveCommandSequenceDiagramExtracted.png b/docs/images/RequirementMoveCommandSequenceDiagramExtracted.png
new file mode 100644
index 000000000000..ea3e2ee7c5aa
Binary files /dev/null and b/docs/images/RequirementMoveCommandSequenceDiagramExtracted.png differ
diff --git a/docs/images/RequirementRemoveCommand.png b/docs/images/RequirementRemoveCommand.png
new file mode 100644
index 000000000000..f86c6c1c17a6
Binary files /dev/null and b/docs/images/RequirementRemoveCommand.png differ
diff --git a/docs/images/RequirementRemoveCommandAfter.png b/docs/images/RequirementRemoveCommandAfter.png
new file mode 100644
index 000000000000..ca05f45a3f80
Binary files /dev/null and b/docs/images/RequirementRemoveCommandAfter.png differ
diff --git a/docs/images/SD_Edit_Detailed.png b/docs/images/SD_Edit_Detailed.png
new file mode 100644
index 000000000000..623612adec98
Binary files /dev/null and b/docs/images/SD_Edit_Detailed.png differ
diff --git a/docs/images/SD_Edit_Overview.png b/docs/images/SD_Edit_Overview.png
new file mode 100644
index 000000000000..1dcfb859e3b1
Binary files /dev/null and b/docs/images/SD_Edit_Overview.png differ
diff --git a/docs/images/SDforDeleteModule.png b/docs/images/SDforDeleteModule.png
new file mode 100644
index 000000000000..e138ef4c21e6
Binary files /dev/null and b/docs/images/SDforDeleteModule.png differ
diff --git a/docs/images/SDforDeletePerson.png b/docs/images/SDforDeletePerson.png
deleted file mode 100644
index ae171fda7622..000000000000
Binary files a/docs/images/SDforDeletePerson.png and /dev/null differ
diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png
index e5527ecac459..e15c5c49c1b2 100644
Binary files a/docs/images/StorageClassDiagram.png and b/docs/images/StorageClassDiagram.png differ
diff --git a/docs/images/StorageComponentDiagram.png b/docs/images/StorageComponentDiagram.png
new file mode 100644
index 000000000000..2fe8bde072b1
Binary files /dev/null and b/docs/images/StorageComponentDiagram.png differ
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
index 5ec9c527b49c..514541b47161 100644
Binary files a/docs/images/Ui.png and b/docs/images/Ui.png differ
diff --git a/docs/images/UiClassDiagram.png b/docs/images/UiClassDiagram.png
index 5f3847621e07..2ae439351b55 100644
Binary files a/docs/images/UiClassDiagram.png and b/docs/images/UiClassDiagram.png differ
diff --git a/docs/images/UiLabelled.png b/docs/images/UiLabelled.png
new file mode 100644
index 000000000000..1b448a8cf133
Binary files /dev/null and b/docs/images/UiLabelled.png differ
diff --git a/docs/images/UndoRedoActivityDiagram.png b/docs/images/UndoRedoActivityDiagram.png
index 55e4138cc64f..4836aeec4847 100644
Binary files a/docs/images/UndoRedoActivityDiagram.png and b/docs/images/UndoRedoActivityDiagram.png differ
diff --git a/docs/images/UndoRedoExecuteUndoStateListDiagram.png b/docs/images/UndoRedoExecuteUndoStateListDiagram.png
index 29c365d6b4a1..b28e51fe698a 100644
Binary files a/docs/images/UndoRedoExecuteUndoStateListDiagram.png and b/docs/images/UndoRedoExecuteUndoStateListDiagram.png differ
diff --git a/docs/images/UndoRedoNewCommand1StateListDiagram.png b/docs/images/UndoRedoNewCommand1StateListDiagram.png
index 76e661d62027..ddce538da4f1 100644
Binary files a/docs/images/UndoRedoNewCommand1StateListDiagram.png and b/docs/images/UndoRedoNewCommand1StateListDiagram.png differ
diff --git a/docs/images/UndoRedoNewCommand2StateListDiagram.png b/docs/images/UndoRedoNewCommand2StateListDiagram.png
index adcb9aeadc51..b22dcd1e72d1 100644
Binary files a/docs/images/UndoRedoNewCommand2StateListDiagram.png and b/docs/images/UndoRedoNewCommand2StateListDiagram.png differ
diff --git a/docs/images/UndoRedoNewCommand3StateListDiagram.png b/docs/images/UndoRedoNewCommand3StateListDiagram.png
index aac9c5fe05db..4bab84f3f83c 100644
Binary files a/docs/images/UndoRedoNewCommand3StateListDiagram.png and b/docs/images/UndoRedoNewCommand3StateListDiagram.png differ
diff --git a/docs/images/UndoRedoNewCommand4StateListDiagram.png b/docs/images/UndoRedoNewCommand4StateListDiagram.png
index 66a0a3b5f323..fa32b5349df2 100644
Binary files a/docs/images/UndoRedoNewCommand4StateListDiagram.png and b/docs/images/UndoRedoNewCommand4StateListDiagram.png differ
diff --git a/docs/images/UndoRedoSequenceDiagram.png b/docs/images/UndoRedoSequenceDiagram.png
index 5c9d5936f098..45d8c22d502b 100644
Binary files a/docs/images/UndoRedoSequenceDiagram.png and b/docs/images/UndoRedoSequenceDiagram.png differ
diff --git a/docs/images/UndoRedoStartingStateListDiagram.png b/docs/images/UndoRedoStartingStateListDiagram.png
index 002f3e2bbf79..d988366e9841 100644
Binary files a/docs/images/UndoRedoStartingStateListDiagram.png and b/docs/images/UndoRedoStartingStateListDiagram.png differ
diff --git a/docs/images/chyeo.png b/docs/images/chyeo.png
new file mode 100644
index 000000000000..bef8627454dd
Binary files /dev/null and b/docs/images/chyeo.png differ
diff --git a/docs/images/clearafter.png b/docs/images/clearafter.png
new file mode 100644
index 000000000000..9fbfe3a3b68b
Binary files /dev/null and b/docs/images/clearafter.png differ
diff --git a/docs/images/clearbefore.png b/docs/images/clearbefore.png
new file mode 100644
index 000000000000..db2b345a4c82
Binary files /dev/null and b/docs/images/clearbefore.png differ
diff --git a/docs/images/creastery.png b/docs/images/creastery.png
new file mode 100644
index 000000000000..64e608b0deec
Binary files /dev/null and b/docs/images/creastery.png differ
diff --git a/docs/images/damithc.jpg b/docs/images/damithc.jpg
deleted file mode 100644
index 127543883893..000000000000
Binary files a/docs/images/damithc.jpg and /dev/null differ
diff --git a/docs/images/edit_coreq.png b/docs/images/edit_coreq.png
new file mode 100644
index 000000000000..fa74bafbe7ba
Binary files /dev/null and b/docs/images/edit_coreq.png differ
diff --git a/docs/images/find1.png b/docs/images/find1.png
new file mode 100644
index 000000000000..909db8cdc73f
Binary files /dev/null and b/docs/images/find1.png differ
diff --git a/docs/images/find2.png b/docs/images/find2.png
new file mode 100644
index 000000000000..76bef36799db
Binary files /dev/null and b/docs/images/find2.png differ
diff --git a/docs/images/find3.png b/docs/images/find3.png
new file mode 100644
index 000000000000..f90617535939
Binary files /dev/null and b/docs/images/find3.png differ
diff --git a/docs/images/helpLabelled.png b/docs/images/helpLabelled.png
new file mode 100644
index 000000000000..9bc3cd757b46
Binary files /dev/null and b/docs/images/helpLabelled.png differ
diff --git a/docs/images/lejolly.jpg b/docs/images/lejolly.jpg
deleted file mode 100644
index 2d1d94e0cf5d..000000000000
Binary files a/docs/images/lejolly.jpg and /dev/null differ
diff --git a/docs/images/lycjackie.png b/docs/images/lycjackie.png
new file mode 100644
index 000000000000..217635774fb5
Binary files /dev/null and b/docs/images/lycjackie.png differ
diff --git a/docs/images/m133225.jpg b/docs/images/m133225.jpg
deleted file mode 100644
index fd14fb94593a..000000000000
Binary files a/docs/images/m133225.jpg and /dev/null differ
diff --git a/docs/images/module_add_coreq.png b/docs/images/module_add_coreq.png
new file mode 100644
index 000000000000..e3190958c7f0
Binary files /dev/null and b/docs/images/module_add_coreq.png differ
diff --git a/docs/images/module_add_luck.png b/docs/images/module_add_luck.png
new file mode 100644
index 000000000000..a5c759b85e82
Binary files /dev/null and b/docs/images/module_add_luck.png differ
diff --git a/docs/images/module_delete_coreq.png b/docs/images/module_delete_coreq.png
new file mode 100644
index 000000000000..15223cbdf27f
Binary files /dev/null and b/docs/images/module_delete_coreq.png differ
diff --git a/docs/images/module_delete_successfully.png b/docs/images/module_delete_successfully.png
new file mode 100644
index 000000000000..f3c7cbf1c573
Binary files /dev/null and b/docs/images/module_delete_successfully.png differ
diff --git a/docs/images/module_edit_coreq.png b/docs/images/module_edit_coreq.png
new file mode 100644
index 000000000000..a823045b8077
Binary files /dev/null and b/docs/images/module_edit_coreq.png differ
diff --git a/docs/images/module_list.png b/docs/images/module_list.png
new file mode 100644
index 000000000000..0b5fc8835bee
Binary files /dev/null and b/docs/images/module_list.png differ
diff --git a/docs/images/parserSequenceDiagram.png b/docs/images/parserSequenceDiagram.png
new file mode 100644
index 000000000000..8fe6c238c59c
Binary files /dev/null and b/docs/images/parserSequenceDiagram.png differ
diff --git a/docs/images/plannermove1.png b/docs/images/plannermove1.png
new file mode 100644
index 000000000000..e2ab10db061b
Binary files /dev/null and b/docs/images/plannermove1.png differ
diff --git a/docs/images/plannermove2.png b/docs/images/plannermove2.png
new file mode 100644
index 000000000000..e2c37c997b23
Binary files /dev/null and b/docs/images/plannermove2.png differ
diff --git a/docs/images/plannermove3.png b/docs/images/plannermove3.png
new file mode 100644
index 000000000000..def88c8756fe
Binary files /dev/null and b/docs/images/plannermove3.png differ
diff --git a/docs/images/plannershow1.png b/docs/images/plannershow1.png
new file mode 100644
index 000000000000..893ab280b27f
Binary files /dev/null and b/docs/images/plannershow1.png differ
diff --git a/docs/images/plannershow2.png b/docs/images/plannershow2.png
new file mode 100644
index 000000000000..f417422c874c
Binary files /dev/null and b/docs/images/plannershow2.png differ
diff --git a/docs/images/testfx-idea-accessibility-permissions.png b/docs/images/testfx-idea-accessibility-permissions.png
new file mode 100644
index 000000000000..02b3097114fb
Binary files /dev/null and b/docs/images/testfx-idea-accessibility-permissions.png differ
diff --git a/docs/images/truegitnovice.png b/docs/images/truegitnovice.png
new file mode 100644
index 000000000000..32ca85ec6bf7
Binary files /dev/null and b/docs/images/truegitnovice.png differ
diff --git a/docs/images/wendybaiyunwei.png b/docs/images/wendybaiyunwei.png
new file mode 100644
index 000000000000..33a28c437e0a
Binary files /dev/null and b/docs/images/wendybaiyunwei.png differ
diff --git a/docs/images/yijinl.jpg b/docs/images/yijinl.jpg
deleted file mode 100644
index adbf62ad9406..000000000000
Binary files a/docs/images/yijinl.jpg and /dev/null differ
diff --git a/docs/images/yl_coder.jpg b/docs/images/yl_coder.jpg
deleted file mode 100644
index 17b48a732272..000000000000
Binary files a/docs/images/yl_coder.jpg and /dev/null differ
diff --git a/docs/stylesheets/asciidoctor.css b/docs/stylesheets/asciidoctor.css
index 36590bf346cd..3811bb0010e8 100644
--- a/docs/stylesheets/asciidoctor.css
+++ b/docs/stylesheets/asciidoctor.css
@@ -295,7 +295,7 @@ td.hdlist1{font-weight:bold;padding-bottom:1.25em}
 .thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
 .imageblock.left,.imageblock[style*="float: left"]{margin:.25em .625em 1.25em 0}
 .imageblock.right,.imageblock[style*="float: right"]{margin:.25em 0 1.25em .625em}
-.imageblock>.title{margin-bottom:0}
+.imageblock>.title{margin-bottom:0; font-size:0.8em}
 .imageblock.thumb,.imageblock.th{border-width:6px}
 .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
 .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
diff --git a/docs/team/chyeo.adoc b/docs/team/chyeo.adoc
new file mode 100644
index 000000000000..c7ada13eadad
--- /dev/null
+++ b/docs/team/chyeo.adoc
@@ -0,0 +1,104 @@
+= Yeo Cheng Hong - Project Portfolio
+:site-section: AboutUs
+:imagesDir: ../images
+:stylesDir: ../stylesheets
+
+== PROJECT: PlanWithEase
+Greetings! I am *Yeo Cheng Hong*, a Year 2 student studying in the National University of Singapore (NUS). +
+I have a burning passion for developing applications and software that have a positive impact on peoples’ life.
+
+This portfolio serves as a documentation of my contributions and involvements of a team-based project that I recently
+worked on for a module (CS2113T
+Software Engineering & Object-Oriented Programming) here at NUS. +
+
+This project was completed over the span of 8 weeks by me and 4 other amazing students (<<truegitnovice#,Ahn TaeGyu>>,
+<<wendybaiyunwei#,Bai YunWei>>, <<lycjackie#,Lee Yu Choy>>, <<creastery#, Ngo Wei Lin>>).
+
+I believe that this project is able to illustrate how I am able to turn my passion into a positive impact.
+
+== Overview
+
+PlanWithEase (PWE) is an application designed to help National University of Singapore (NUS) Information Security
+freshmen in creating a comprehensive degree plan according to the degree requirements.
+
+The main motivation behind PWE is to assist students by simplify the degree planning process, and at the same time
+provide them with an overview of the degree plan so that they are able to make informed decisions.
+
+ifndef::env-github[]
+image::Ui.png[width="700"]
+endif::[]
+
+== Understanding This Project Portfolio
+
+The following symbols are used throughout this project portfolio:
+[NOTE]
+====
+This symbol denotes information that you may want to take note of when using PlanWithEase.
+====
+[TIP]
+====
+This symbol denotes a tip which you may find useful when using PlanWithEase.
+====
+[WARNING]
+====
+This symbol denotes a warning message which you need to be careful of when using PlanWithEase.
+====
+
+== Summary of contributions
+
+This section provides an overview of the contributions that I have made to this project
+
+* *Major enhancement*: Degree Requirement Management
+** This feature allows the user to manage the degree requirement categories in PlanWithEase easily using the
+`requirement_add`, `requirement_remove` and `requirement_move` and `requirement_list` commands.
+
+** Justification: This feature allows users to be able to keep track of the various different requirement categories.
+ So that they are able to fulfill all the degree requirement categories in order to graduate on time.
+
+** Highlights: This enhancement provides an overview of all the degree requirement categories by listing the modules
+added to each degree requirement category as well as the current credit count of each degree requirement category.
+
+* *Code contributed* : [link:https://github.com/CS2113-AY1819S2-T09-1/main/commits/master?author=chyeo[Commits]] [link:https://github.com/CS2113-AY1819S2-T09-1/main/pulls?q=is%3Apr+author%3Achyeo[Pull Requests]] [https://nuscs2113-ay1819s2.github.io/dashboard-beta/#=undefined&search=chyeo[RepoSense Code Contribution Dashboard]]
+
+* *Notable Enhancements to the project*:
+** Enhancements to existing features:
+*** Updated the UI aesthetics: https://github.com/CS2113-AY1819S2-T09-1/main/pull/133[#133]
+
+** Signification Modification of Address Book code base for use in PWE:
+*** Implementation of `RequirementCategory` model: https://github.com/CS2113-AY1819S2-T09-1/main/pull/43[#43]
+*** Combination of all `Versioned` class to a single: `VersionAddressBook` class https://github.com/CS2113-AY1819S2-T09-1/main/pull/69[#69]
+
+** Documentation:
+*** Update of user stories and Use Cases: https://github.com/CS2113-AY1819S2-T09-1/main/pull/61[#61]
+
+** Community:
+*** Contributed to *forum discussions* (examples: Forum link:https://github.com/nusCS2113-AY1819S2/forum/issues/25[#25])
+*** Reported bugs in another team's project, link:https://github.com/cs2113-ay1819s2-t08-2/main[LIFE] (examples: Issues
+link:https://github.com/cs2113-ay1819s2-t08-2/main/issues/55[#55], link:https://github.com/cs2113-ay1819s2-t08-2/main/issues/62[#62], link:https://github.com/cs2113-ay1819s2-t08-2/main/issues/65[#65],
+link:https://github.com/cs2113-ay1819s2-t08-2/main/issues/67[#67], link:https://github.com/cs2113-ay1819s2-t08-2/main/issues/75[#75])
+
+
+== Contributions to the User Guide
+
+
+|===
+|_The following are documentations made to the User Guide which acts as manual on how to use the features that I have
+implemented in PWE. On top of that, it provides me with an opportunity to showcase my ability to write documentation
+ for end-users._
+|===
+
+include::../UserGuide.adoc[tag=requirementtracker]
+include::../UserGuide.adoc[tag=requirementadd]
+
+
+== Contributions to the Developer Guide
+
+|===
+|_The following are documentations made to the Developer Guide to serve as a manual to guide the developers on how the
+ features are implemented PWE as well as insights on the design considerations made. On top of that, it provides me an
+ opportunity to showcase my ability to write technical documentation and the technical depth of my contributions to PWE.._
+|===
+
+include::../DeveloperGuide.adoc[tag=requirement-add]
+
+
diff --git a/docs/team/creastery.adoc b/docs/team/creastery.adoc
new file mode 100644
index 000000000000..c048e7c19131
--- /dev/null
+++ b/docs/team/creastery.adoc
@@ -0,0 +1,130 @@
+= Ngo Wei Lin - Project Portfolio
+:site-section: AboutUs
+:imagesDir: ../images
+:stylesDir: ../stylesheets
+:repoURL: https://github.com/CS2113-AY1819S2-T09-1/main
+:prURL: {repoURL}/pull
+:forumURL: https://github.com/nusCS2113-AY1819S2/forum/issues
+:budgeterURL: https://github.com/CS2113-AY1819S2-T11-3/main
+:experimental:
+ifdef::env-github[]
+:tip-caption: :bulb:
+:note-caption: :information_source:
+:warning-caption: :warning:
+endif::[]
+
+== PROJECT: PlanWithEase
+
+Hello there, I am _Wei Lin_. I am currently pursuing a degree in Information Security at National University of Singapore (NUS). +
+I love to build and break applications!
+
+This portfolio serves to document my involvements in a team-based project CS2113T (Software Engineering & Object-Oriented Programming) module by NUS.
+The project spans over a period of eight weeks, and was completed by a team of five members (consisting of <<truegitnovice#,Ahn TaeGyu>>, <<wendybaiyunwei#,Bai YunWei>>, <<lycjackie#,Lee Yu Choy>>, <<chyeo#, Yeo Cheng Hong>> and myself) over the span of 8 weeks.
+
+== Overview
+
+In this project, our aim was to simplify the process of planning a degree, and ensure that the degree plan fulfills the
+degree requirements.
+
+Planning a degree is certainly not an easy task, and can be very time-consuming. Furthermore, there are many considerations to make, making it difficult to create the perfect degree plan.
+
+With this goal in mind, we developed PlanWithEase (PWE), a degree planner application designed to help NUS
+Information Security freshmen in creating a comprehensive degree plan according to the degree requirements effortlessly.
+
+ifdef::env-github[]
+image::Ui.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::Ui.png[width="970"]
+endif::[]
+
+== Understanding This Project Portfolio
+
+The following symbols are used throughout this project portfolio:
+[NOTE]
+====
+This symbol denotes information that you may want to take note of when using the application.
+====
+[TIP]
+====
+This symbol denotes a tip which you may find useful when using the application.
+====
+[WARNING]
+====
+This symbol denotes a warning message which you need to be careful of when using the application.
+====
+
+Additionally, you may also encounter the following text styles:
+====
+* Commands or parameters will be in this `format`.
+* Important messages will be *bold*.
+* Undoable command will be in _italics_.
+* Keyboard buttons will be referred to as such: kbd:[F1].
+====
+
+== Summary of Contributions
+
+|===
+|_This section provides a summary on the contributions I made to this project._
+|===
+
+=== *Major Enhancement*: Module Management
+
+==== Add, Edit & Delete Modules
+
+This feature allows the user to manage modules in PlanWithEase easily using the `add`, `edit` and `delete` commands.
+
+** Justification: Users can keep track of module details (such as module co-requisites, the semesters the modules are offered in, etc.) within PlanWithEase to facilitate their planning.
+
+** Highlights: This enhancement performs numerous validation checks to ensure that the degree plan created by the user remains sound after users edit module details, which is crucial in enabling the whole application to function correctly. The module management commands also provide tips on how to resolve any errors encountered by the users.
+
+=== *Code Contributed*:
+
+* [link:{repoURL}/commits?author=creastery[Commits]] [link:{repoURL}/pulls?q=is%3Apr+is%3Amerged+author%3Acreastery[Pull Requests]] [https://nuscs2113-ay1819s2.github.io/dashboard-beta/#=undefined&search=creastery[RepoSense Code Contribution Dashboard]]
+
+=== *Other Contributions*:
+
+* Project management:
+** Managed releases `v1.1`, `v1.2`, `v1.2.1` and `v1.3` (4 releases) on link:{repoURL}/releases[GitHub]
+** Reviewed about one-third of the team's Pull Requests (PRs) and gave non-trivial review comments (examples: PRs link:{prURL}/43[#43], link:{prURL}/64[#64], link:{prURL}/69[#69])
+
+* Notable Enhancements/Modifications to Existing Features:
+** Collaborated with a team mate (<<lycjackie#,Lee Yu Choy>>) to implement a *custom string tokenizer* `BooleanExpressionTokenizer`, which was pivotal in enabling users to be able to use complex search conditions to narrow down their search when using the `find` and `planner_show` commands (PR link:{prURL}/119[#119])
+** Introduced *data integrity validations* for Storage component (PRs link:{prURL}/122[#122], link:{prURL}/204[#204], link:{prURL}/222[#222])
+** Performed surgical *refactoring* of the original https://github.com/se-edu/addressbook-level4[Address Book (Level 4)] codebase to fit our requirements (example: PRs link:{prURL}/18[#18], link:{prURL}/27[#27], link:{prURL}/30[#30])
+** Populated *sample data* used to guide new users in using the application (examples: PRs link:{prURL}/45[#45], link:{prURL}/146[#146])
+** Implemented *precondition checks* to all functional code to follow defensive programming practices (example: PR link:{prURL}/170[#170])
+
+* Documentation:
+** Performed *cosmetic tweaks* to existing contents of the User Guide: (examples: PRs link:{prURL}/147[#147], link:{prURL}/218[#218])
+
+* Community:
+** Contributed to *forum discussions* (examples: PRs link:{forumURL}/14[#14], link:{forumURL}/15[#15], link:{forumURL}/23[#23], link:{forumURL}/24[#24])
+** Reported *numerous bugs* in another team's project, link:{budgeterURL}[Budgeter] (examples: Issues link:{budgeterURL}/issues/71[#71], link:{budgeterURL}/issues/78[#78], link:{budgeterURL}/issues/84[#84], link:{budgeterURL}/issues/88[#88])
+
+* Tools:
+** Integrated https://travis-ci.org/CS2113-AY1819S2-T09-1/main[Travis] & https://ci.appveyor.com/project/Creastery/main[AppVeyor] *Continuous Integration (CI)* tools, https://coveralls.io/github/CS2113-AY1819S2-T09-1/main?branch=master[Coveralls] *code coverage* tool, https://www.codacy.com/app/cs2113-ay1819s2-t09-1/main[Codacy] *code analytics* tool, https://app.netlify.com/sites/cs2113-ay1819s2-t09-1/deploys[Netlify] *deployment preview* tool to the team's repository (examples: PRs {prURL}/4[#4], {prURL}/23[#23])
+** Updated *Gradle build configuration* to automate and simplify the build process (examples: PRs link:{prURL}/107[#107], link:{prURL}/201[#201])
+** Added a new *Github plugin* (https://github.com/apps/project-bot[project-bot]) to automate triaging of issues in the team's link:{repoURL}/projects/6[Project Board]
+
+== Contributions to the User Guide
+
+|===
+|_The following sections illustrate my ability in writing documentation targeting end-users to guide them in using the various features of the application._
+|===
+
+include::../UserGuide.adoc[tag=module_management]
+
+include::../UserGuide.adoc[tag=module_add]
+
+include::../UserGuide.adoc[tag=module_edit]
+
+== Contributions to the Developer Guide
+
+|===
+|_The following sections illustrate my ability in writing documentation to provide developers insights on the design
+of the application. It also showcase the technical depth of my contributions to the project._
+|===
+
+include::../DeveloperGuide.adoc[tag=editing_module]
diff --git a/docs/team/johndoe.adoc b/docs/team/johndoe.adoc
deleted file mode 100644
index 453c2152ab9d..000000000000
--- a/docs/team/johndoe.adoc
+++ /dev/null
@@ -1,72 +0,0 @@
-= John Doe - Project Portfolio
-:site-section: AboutUs
-:imagesDir: ../images
-:stylesDir: ../stylesheets
-
-== PROJECT: AddressBook - Level 4
-
----
-
-== Overview
-
-AddressBook - Level 4 is a desktop address book application used for teaching Software Engineering principles. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
-
-== Summary of contributions
-
-* *Major enhancement*: added *the ability to undo/redo previous commands*
-** What it does: allows the user to undo all previous commands one at a time. Preceding undo commands can be reversed by using the redo command.
-** Justification: This feature improves the product significantly because a user can make mistakes in commands and the app should provide a convenient way to rectify them.
-** Highlights: This enhancement affects existing commands and commands to be added in future. It required an in-depth analysis of design alternatives. The implementation too was challenging as it required changes to existing commands.
-** Credits: _{mention here if you reused any code/ideas from elsewhere or if a third-party library is heavily used in the feature so that a reader can make a more accurate judgement of how much effort went into the feature}_
-
-* *Minor enhancement*: added a history command that allows the user to navigate to previous commands using up/down keys.
-
-* *Code contributed*: [https://github.com[Functional code]] [https://github.com[Test code]] _{give links to collated code files}_
-
-* *Other contributions*:
-
-** Project management:
-*** Managed releases `v1.3` - `v1.5rc` (3 releases) on GitHub
-** Enhancements to existing features:
-*** Updated the GUI color scheme (Pull requests https://github.com[#33], https://github.com[#34])
-*** Wrote additional tests for existing features to increase coverage from 88% to 92% (Pull requests https://github.com[#36], https://github.com[#38])
-** Documentation:
-*** Did cosmetic tweaks to existing contents of the User Guide: https://github.com[#14]
-** Community:
-*** PRs reviewed (with non-trivial review comments): https://github.com[#12], https://github.com[#32], https://github.com[#19], https://github.com[#42]
-*** Contributed to forum discussions (examples:  https://github.com[1], https://github.com[2], https://github.com[3], https://github.com[4])
-*** Reported bugs and suggestions for other teams in the class (examples:  https://github.com[1], https://github.com[2], https://github.com[3])
-*** Some parts of the history feature I added was adopted by several other class mates (https://github.com[1], https://github.com[2])
-** Tools:
-*** Integrated a third party library (Natty) to the project (https://github.com[#42])
-*** Integrated a new Github plugin (CircleCI) to the team repo
-
-_{you can add/remove categories in the list above}_
-
-== Contributions to the User Guide
-
-
-|===
-|_Given below are sections I contributed to the User Guide. They showcase my ability to write documentation targeting end-users._
-|===
-
-include::../UserGuide.adoc[tag=undoredo]
-
-include::../UserGuide.adoc[tag=dataencryption]
-
-== Contributions to the Developer Guide
-
-|===
-|_Given below are sections I contributed to the Developer Guide. They showcase my ability to write technical documentation and the technical depth of my contributions to the project._
-|===
-
-include::../DeveloperGuide.adoc[tag=undoredo]
-
-include::../DeveloperGuide.adoc[tag=dataencryption]
-
-
-== PROJECT: PowerPointLabs
-
----
-
-_{Optionally, you may include other projects in your portfolio.}_
diff --git a/docs/team/lycjackie.adoc b/docs/team/lycjackie.adoc
new file mode 100644
index 000000000000..0712679a615b
--- /dev/null
+++ b/docs/team/lycjackie.adoc
@@ -0,0 +1,147 @@
+= Lee Yu Choy - Project Portfolio
+:site-section: AboutUs
+:imagesDir: ../images
+:stylesDir: ../stylesheets
+:repoURL: https://github.com/CS2113-AY1819S2-T09-1/main
+:prURL: {repoURL}/pull
+:forumURL: https://github.com/nusCS2113-AY1819S2/forum/issues
+:budgeterURL: https://github.com/CS2113-AY1819S2-M11-2/main
+:experimental:
+ifdef::env-github[]
+:tip-caption: :bulb:
+:note-caption: :information_source:
+:warning-caption: :warning:
+endif::[]
+
+
+== PROJECT: PlanWithEase
+
+Hello there! I am Jackie. I am currently a student at the National University of Singapore +
+(NUS) studying Information Security. I love to build application that could simplify our life then break it down to make
+it better again!
+
+This portfolio documents my involvement in the PlanWithEase, a degree planner
+application which is morphed from https://github.com/se-edu/addressbook-level4[AddressBook Level 4].
+
+PlanWithEase is developed by my team (consisting of <<truegitnovice#,Ahn TaeGyu>>, <<wendybaiyunwei#,Bai YunWei>>, <<creastery#,Ngo Wei Lin>>,
+ <<chyeo#, Yeo Cheng Hong>> and myself) under the CS2113T (Software Engineering & Object-Oriented Programming) module
+taken in NUS over the span of 8 weeks.
+
+== Overview
+
+For this project, we aim to simplify the process of planning a degree, and ensure that the degree plan fulfills the
+degree requirements for graduation.
+
+With this goal in mind, we developed PlanWithEase (PWE), degree planner desktop application designed to help
+National University of Singapore (NUS) Information Security freshmen in creating a comprehensive degree plan with ease
+according to their degree requirements.
+
+We understand that planning a degree is not an easy task,and can be very time-consuming. Further more there are much
+considerations to make, making it confusing, troublesome and difficult to create the perfect degree plan.
+
+With this goal in mind, we developed PlanWithEase (PWE), a degree planner application designed to help NUS
+Information Security freshmen in creating a comprehensive degree plan according to the degree requirements effortlessly.
+
+ifdef::env-github[]
+image::Ui.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::Ui.png[width="970"]
+endif::[]
+
+
+My role as a developer in this project involves designing and write code to enhance our existing `find` features
+which enables our users to do the following:
+
+* *Finding modules* with either its name, code or credits.
+* *Complex search terms* to narrow down the find results.
+
+== Understanding This Project Portfolio
+
+The following symbols are used throughout this project portfolio:
+[NOTE]
+====
+This symbol denotes information that you may want to take note of when using the application.
+====
+[TIP]
+====
+This symbol denotes a tip which you may find useful when using the application.
+====
+[WARNING]
+====
+This symbol denotes a warning message which you need to be careful of when using the application.
+====
+
+Additionally, you may also encounter the following text styles:
+====
+* Commands or parameters will be in this `format`.
+* Important messages will be *bold*.
+* Undoable command will be in _italics_.
+* Keyboard buttons will be referred to as such: kbd:[F1].
+====
+
+== Summary of contributions
+
+|===
+|_This section details the main enhancements as well as other contributions I have made in the project._
+|===
+
+* *Main enhancement*: added *the ability to perform complex find command*
+** What it does: allows the user to find modules via more complex find criteria. Find criteria can be composed from
+mixed of logical AND (`&&`) and logical OR (`||`), users can optionally specify parenthesis to denote the expression
+to be evaluated first.
+** Justification: With a expected large number of modules available in our application, users needs to be able to
+find a small subset of modules which are of interest to them. The ability of performing complex find commands give users
+the flexibility of finding a smaller subset of modules which are relevant to them.
+** Highlights: The algorithm for this enhancement was generalized not only to suit my own features, but also my team
+mate's features. My team mate (<<truegitnovice#,Ahn TaeGyu>>) has managed to make use of this generalized class I created for his own
+features. The implementation of this enhancement required some research on the different ways of parsing a boolean
+expression, as there are many parsing algorithms available. After deciding on the algorithm to be used, I had to
+implement the said algorithm in code using an Object-Orientated style, while trying to abstract the algorithm as much
+ as possible as per the requirements of Object-Oriented Programming.
+
+
+* *Code contributed*: [{repoURL}/commits?author=lycjackie[Commits]] [{repoURL}/pulls?q=is%3Apr+author%3Alycjackie+is%3Amerged[Pull Requests]] [https://nuscs2113-ay1819s2.github.io/dashboard-beta/#search=lycjackie[RepoSense Code Contribution Dashboard]]
+
+* *Other contributions*:
+
+** Project management:
+*** Set up the organization and main repository.
+*** Managed release `v1.4` on {repoURL}/releases[GitHub]
+*** Contributed to user stories on Github issue tracker https://github.com/CS2113-AY1819S2-T09-1/main/issues/66[#66]
+and help to create issues label on Github.
+** Enhancements to existing features:
+*** Sourced for new application icon and update the application accordingly. https://github.com/CS2113-AY1819S2-T09-1/main/pull/110[#110]
+*** Updated the GUI color scheme. https://github.com/CS2113-AY1819S2-T09-1/main/pull/144[#144]
+*** Collaborated with a team mate (<<creastery#,Ngo Wei Lin>>) to implement a custom string tokenizer
+`BooleanExpressionTokenizer`, which enables the users to be able to use complex search conditions to narrow down
+their search when using `find` and `planner_show` commands. ({repoURL}/pull/119[#119])
+** Documentation:
+*** Modify the structure and did clean up to existing contents of the User Guide:  {repoURL}/pull/1[#1],
+{repoURL}/pull/207[#207]
+** Community:
+*** Reviewed about one-third of the team's Pull Requests(PRs) and gave non-trivial review comments :
+{repoURL}/pull/82[#82], {repoURL}/pull/109[#109], {repoURL}/pull/136[#136]
+*** Contributed to forum discussions https://github.com/nusCS2113-AY1819S2/forum/issues/14[#14]
+*** Reported bugs and suggestions for other teams in the class ({budgeterURL}/issues/127[1], {budgeterURL}/issues/131[2], {budgeterURL}/issues/144[3])
+
+
+== Contributions to the User Guide
+
+
+|===
+|_Given below are sections I contributed to the User Guide. They showcase my ability to write
+documentation targeting end-users to facilitate mastering of *PlanWithEase*'s features. ._
+|===
+
+include::../UserGuide.adoc[tag=find]
+
+
+== Contributions to the Developer Guide
+
+|===
+|_Given below are sections I contributed to the Developer Guide. They showcase my ability to write technical documentation and the technical depth of my contributions to the project._
+|===
+
+include::../DeveloperGuide.adoc[tag=find]
diff --git a/docs/team/truegitnovice.adoc b/docs/team/truegitnovice.adoc
new file mode 100644
index 000000000000..fbcabf42fc23
--- /dev/null
+++ b/docs/team/truegitnovice.adoc
@@ -0,0 +1,161 @@
+= Ahn TaeGyu - Project Portfolio
+:site-section: AboutUs
+:imagesDir: ../images
+:stylesDir: ../stylesheets
+:repoURL: https://github.com/CS2113-AY1819S2-T09-1/main
+:prURL: {repoURL}/pull
+:forumURL: https://github.com/nusCS2113-AY1819S2/forum/issues
+:experimental:
+ifdef::env-github[]
+:tip-caption: :bulb:
+:note-caption: :information_source:
+:warning-caption: :warning:
+endif::[]
+
+== PROJECT: PlanWithEase
+
+Hi! I am  Ahn Tae Gyu, an Information Security student in National University of Singapore. I am keen on writing
+programs that help to improve qualities of our lives. You will be able to find brief introduction of the project
+along with some of my contributions to the project below.
+
+== Overview
+
+PlanWithEase (PWE) is a degree planner desktop application designed to help National University of Singapore (NUS)
+Information Security freshmen in creating a comprehensive degree plan according to the degree requirements. PWE is
+designed to be simple and intuitive application that allows users to interact with by typing the commands
+(using a Command Line Interface). Moreover, PWE also comes with a clean Graphical User Interface (GUI) that presents
+information in an organized manner.Hence, even if you are unfamiliar with the Command Line Interface, you will  not
+need to spend much time understanding how to use PWE. PWE was completed by a team of five members consisting of
+<<creastery#,Ngo Wei Lin>>, <<wendybaiyunwei#,Bai YunWei>>, <<lycjackie#,Lee Yu Choy>>, <<chyeo#, Yeo Cheng Hong>>
+and me.
+
+ifdef::env-github[]
+image::Ui.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::Ui.png[width="970"]
+endif::[]
+
+== Understanding This Project Portfolio
+
+The following symbols are used throughout this project portfolio:
+[NOTE]
+====
+This symbol denotes information that you may want to take note of when using the application.
+====
+[TIP]
+====
+This symbol denotes a tip which you may find useful when using the application.
+====
+[WARNING]
+====
+This symbol denotes a warning message which you need to be careful of when using the application.
+====
+
+Additionally, you may also encounter the following text styles:
+====
+* Commands or parameters will be in this `format`.
+* Important messages will be *bold*.
+* Undoable command will be in _italics_.
+* Keyboard buttons will be referred to as such: kbd:[F1].
+====
+
+== Summary of contributions
+|===
+|_Given below is a summary of contributions I made in this project._
+|===
+
+=== *Major Enhancement*: Degree Plan Management
+
+==== Planner Move, Planner Show & Planner list
+
+During this enhancement, *Degree Planner* model was build to allow other developer <<wendybaiyunwei#,Bai YunWei>> and me
+to integrate planner related features into the application as well as stores degree plan related information.
+
+* Summary of the features:
+** Planner Move feature allows a module in the degree plan to be easily moved to another semester.
+** Planner Show feature allows displaying of specific semesters.
+** Planner list feature allows displaying of all semesters in the degree plan.
+
+* Justification:
+** Users can keep track of degree plan details (such as modules to take in particular semesters).
+** Users can easily make changes to the degree plan by moving a module in the degree plan with `planner_move` command.
+** Users can easily display specific semesters that the user wants with `planner_show` command.
+
+* Highlights:
+** During the enhancement, there were numerous reviews done to ensure that no other model components is
+broken and any degree plan related features can be integrated without any problem.
+* Planner Move was enhanced to carried out checks for the module's co-requisite and semesters it and its
+co-requisites are offered in.
+* Planner Show was enhanced to utilize boolean expression parser that was designed by <<lycjackie#,Lee Yu Choy>>.
+
+* Credits:
+** Plenty of module corrections and suggestions were made during the built of  *Degree Planner* model by <<creastery#,
+Ngo Wei Lin>>.
+** Boolean expression parser was designed by <<lycjackie#,Lee Yu Choy>>.
+
+=== *Minor Enhancement*: Adding UI segment for degree plan
+* Justification: UI part for degree plan was added to displays the semesters and modules to be taken during the
+semesters.
+* Highlights:
+** Browser Panel that existed originally have to be adjusted in order for the UI part of the degree
+plan to be added.
+** UI for Degree plan was updated to sort the degree plan before displaying.
+* Credits:
+** Beautification of the overall UI including the part for the degree plan was done by <<lycjackie#,Lee Yu
+Choy>>
+
+=== *Code Contributed*:
+
+link:{repoURL}/commits?author=truegitnovice[Commits],
+link:{repoURL}/pulls?q=is%3Apr+is%3Amerged+author%3Atruegitnovice[Pull Requests] &
+https://nuscs2113-ay1819s2.github.io/dashboard-beta/#=undefined&search=truegitnovice[RepoSense Code Contribution
+Dashboard]
+
+=== *Other contributions*:
+
+** Project management:
+** Enhancements to existing features:
+*** Enhance `planner_move` feature to handle co-requisites as well as semester the modules are offered in (Pull
+Request https://github.com/CS2113-AY1819S2-T09-1/main/pull/197[#197])
+*** Enhance `planner_show` feature to utilize `BooleanExpressionParser` (Pull Request
+https://github.com/CS2113-AY1819S2-T09-1/main/pull/196[#196]) (Note: this was done during the implementation)
+** Documentation:
+*** Update UI mock up for
+**** v 1.1 (Pull Request https://github.com/CS2113-AY1819S2-T09-1/main/pull/31[#31])
+**** v.1.2 (Pull Request https://github.com/CS2113-AY1819S2-T09-1/main/pull/98[#98])
+*** Manage user guide (e.g. Pull Request https://github.com/CS2113-AY1819S2-T09-1/main/pull/47[#47])
+*** Manage developer guide (e.g. Pull Request https://github.com/CS2113-AY1819S2-T09-1/main/pull/2[#2],
+https://github.com/CS2113-AY1819S2-T09-1/main/pull/7[#7])
+*** Documentation management was mainly done through reviews (e.g.
+https://github.com/CS2113-AY1819S2-T09-1/main/pull/172[#172])
+
+** PRs reviewed:
+https://github.com/CS2113-AY1819S2-T09-1/main/pulls?q=is%3Apr+is%3Aclosed+reviewed-by%3Atruegitnovice[Approved Pull
+Requests]
+
+** Issues:
+*** Opened issues for enhancement and improvements that could be made (e.g.
+https://github.com/CS2113-AY1819S2-T09-1/main/issues/164[164], https://github.com/CS2113-AY1819S2-T09-1/main/issues/97[97])
+
+== Contributions to the User Guide
+
+
+|===
+|_Given below are sections I contributed to the User Guide. They showcase my ability to write documentation targeting end-users._
+|===
+
+include::../UserGuide.adoc[tag=plannermove]
+
+include::../UserGuide.adoc[tag=plannershow]
+
+== Contributions to the Developer Guide
+
+|===
+|_Given below are sections I contributed to the Developer Guide. They showcase my ability to write technical documentation and the technical depth of my contributions to the project._
+|===
+
+include::../DeveloperGuide.adoc[tag=planner-move]
+
+include::../DeveloperGuide.adoc[tag=planner-show]
diff --git a/docs/team/wendybaiyunwei.adoc b/docs/team/wendybaiyunwei.adoc
new file mode 100644
index 000000000000..37f4165e0124
--- /dev/null
+++ b/docs/team/wendybaiyunwei.adoc
@@ -0,0 +1,82 @@
+= Bai Yunwei - Project Portfolio
+:site-section: AboutUs
+:imagesDir: ../images
+:stylesDir: ../stylesheets
+:repoURL: https://github.com/CS2113-AY1819S2-T09-1/main
+:prURL: {repoURL}/pull
+:forumURL: https://github.com/nusCS2113-AY1819S2/forum/issues
+:budgeterURL: https://github.com/CS2113-AY1819S2-M11-2/main
+:experimental:
+ifdef::env-github[]
+:tip-caption: :bulb:
+:note-caption: :information_source:
+:warning-caption: :warning:
+endif::[]
+
+
+== PROJECT: PlanWithEase
+
+Hi! I am Yunwei, a student from the National University of Singapore (NUS). I love to build
+applications that improve people's lives.
+
+This portfolio documents my involvement in a software development project, through which my teammates
+and me created a degree planner application within one school semester. This portfolio shows
+ what the project is about and my contribution to the project.
+
+== Overview
+
+For this project, we aim to simplify the process of degree-planning among NUS information security students.
+
+ifdef::env-github[]
+image::Ui.png[width="800"]
+endif::[]
+
+ifndef::env-github[]
+image::Ui.png[width="970"]
+endif::[]
+
+
+As a developer, my role in the project was writing codes to enable users to:
+
+* Add modules to the degree plan.
+* Remove modules from the degree plan.
+* Know the modules suggested to put inside the degree plan.
+
+== Summary of contributions
+
+|===
+|_This section summarises my contribution to the project._
+|===
+
+* *Major enhancement*: added *the ability to add/remove module codes to/from the degree plan*
+** What it does: allows the user to add module codes to the degree plan, and remove the codes from the degree plan.
+** Justification: This feature can be crucial because the degree plan is an important section that enables the users to plan well. Therefore, adding and removing the module codes are essential features that make PWE fulfill its purpose.
+** Highlights: This enhancement aims to prevent possible errors, including the hidden ones that may occur when other parts of the software get modified. Besides, the model and logic implementation for the feature is kept as minimalistic as possible to reduce unnecessary coupling.
+
+* *Minor enhancement*: added a command to suggest modules to put inside the degree plan.
+
+* *Code contributed*: [{repoURL}/commits?author=WendyBaiyunwei[Commits]] [https://nuscs2113-ay1819s2.github.io/dashboard-beta/#search=WendyBaiyunwei[RepoSense Code Contribution Dashboard]]
+
+** Project management:
+*** Assigned and managed "issues" for "planner_add", "planner_remove" and "planner_suggest" commands.
+*** PR reviewed: https://github.com/CS2113-AY1819S2-T09-1/main/pull/146
+
+== Contributions to the User Guide
+
+|===
+|_Given below are sections I contributed to the User Guide. They showcase my ability to write
+documentation targeting end-users to facilitate mastering of *PlanWithEase*'s features. ._
+|===
+
+include::../UserGuide.adoc[tag=planner-add-remove]
+include::../UserGuide.adoc[tag=planner-suggest]
+
+== Contributions to the Developer Guide
+
+|===
+|_Given below are sections I contributed to the Developer Guide. They showcase my ability to write technical documentation and the technical depth of my contributions to the project._
+|===
+
+include::../DeveloperGuide.adoc[tag=planner-add]
+include::../DeveloperGuide.adoc[tag=planner-remove]
+include::../DeveloperGuide.adoc[tag=planner-suggest]
diff --git a/src/main/java/seedu/address/AppParameters.java b/src/main/java/pwe/planner/AppParameters.java
similarity index 90%
rename from src/main/java/seedu/address/AppParameters.java
rename to src/main/java/pwe/planner/AppParameters.java
index ab552c398f3d..b2a26d6af94c 100644
--- a/src/main/java/seedu/address/AppParameters.java
+++ b/src/main/java/pwe/planner/AppParameters.java
@@ -1,4 +1,6 @@
-package seedu.address;
+package pwe.planner;
+
+import static java.util.Objects.requireNonNull;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -7,8 +9,8 @@
 import java.util.logging.Logger;
 
 import javafx.application.Application;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.util.FileUtil;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.commons.util.FileUtil;
 
 /**
  * Represents the parsed command-line parameters given to the application.
@@ -30,6 +32,8 @@ public void setConfigPath(Path configPath) {
      * Parses the application command-line parameters.
      */
     public static AppParameters parse(Application.Parameters parameters) {
+        requireNonNull(parameters);
+
         AppParameters appParameters = new AppParameters();
         Map<String, String> namedParameters = parameters.getNamed();
 
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/pwe/planner/MainApp.java
similarity index 59%
rename from src/main/java/seedu/address/MainApp.java
rename to src/main/java/pwe/planner/MainApp.java
index a92d4d5d71f0..ca7fc3b2b375 100644
--- a/src/main/java/seedu/address/MainApp.java
+++ b/src/main/java/pwe/planner/MainApp.java
@@ -1,4 +1,7 @@
-package seedu.address;
+package pwe.planner;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.model.util.InitialDataUtil.getInitialApplication;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -7,36 +10,35 @@
 
 import javafx.application.Application;
 import javafx.stage.Stage;
-import seedu.address.commons.core.Config;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.core.Version;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.commons.util.ConfigUtil;
-import seedu.address.commons.util.StringUtil;
-import seedu.address.logic.Logic;
-import seedu.address.logic.LogicManager;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.util.SampleDataUtil;
-import seedu.address.storage.AddressBookStorage;
-import seedu.address.storage.JsonAddressBookStorage;
-import seedu.address.storage.JsonUserPrefsStorage;
-import seedu.address.storage.Storage;
-import seedu.address.storage.StorageManager;
-import seedu.address.storage.UserPrefsStorage;
-import seedu.address.ui.Ui;
-import seedu.address.ui.UiManager;
+import pwe.planner.commons.core.Config;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.commons.core.Version;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.commons.util.ConfigUtil;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.Logic;
+import pwe.planner.logic.LogicManager;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.ReadOnlyUserPrefs;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.util.SampleDataUtil;
+import pwe.planner.storage.ApplicationStorage;
+import pwe.planner.storage.JsonApplicationStorage;
+import pwe.planner.storage.JsonUserPrefsStorage;
+import pwe.planner.storage.Storage;
+import pwe.planner.storage.StorageManager;
+import pwe.planner.storage.UserPrefsStorage;
+import pwe.planner.ui.Ui;
+import pwe.planner.ui.UiManager;
 
 /**
  * The main entry point to the application.
  */
 public class MainApp extends Application {
 
-    public static final Version VERSION = new Version(0, 6, 0, true);
+    public static final Version VERSION = new Version(1, 4, 0, false);
 
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 
@@ -48,7 +50,7 @@ public class MainApp extends Application {
 
     @Override
     public void init() throws Exception {
-        logger.info("=============================[ Initializing AddressBook ]===========================");
+        logger.info("=============================[ Initializing PlanWithEase ]===========================");
         super.init();
 
         AppParameters appParameters = AppParameters.parse(getParameters());
@@ -56,8 +58,11 @@ public void init() throws Exception {
 
         UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
         UserPrefs userPrefs = initPrefs(userPrefsStorage);
-        AddressBookStorage addressBookStorage = new JsonAddressBookStorage(userPrefs.getAddressBookFilePath());
-        storage = new StorageManager(addressBookStorage, userPrefsStorage);
+        ApplicationStorage applicationStorage =
+                new JsonApplicationStorage(userPrefs.getModuleListFilePath(), userPrefs.getDegreePlannerListFilePath(),
+                        userPrefs.getRequirementCategoryListFilePath());
+
+        storage = new StorageManager(applicationStorage, userPrefsStorage);
 
         initLogging(config);
 
@@ -69,31 +74,45 @@ public void init() throws Exception {
     }
 
     /**
-     * Returns a {@code ModelManager} with the data from {@code storage}'s address book and {@code userPrefs}. <br>
-     * The data from the sample address book will be used instead if {@code storage}'s address book is not found,
-     * or an empty address book will be used instead if errors occur when reading {@code storage}'s address book.
+     * Returns a {@code ModelManager} with the data from {@code storage}'s module list, requirement categories
+     * list, degree planner list and {@code userPrefs}. <br>
+     * The data from the sample application will be used instead if {@code storage}'s module list,
+     * requirement categories list and degree planner list is not found,
+     * or an empty application will be used instead if errors occur when reading {@code storage}'s module list,
+     * requirement categories list and degree planner list.
      */
     private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
-        Optional<ReadOnlyAddressBook> addressBookOptional;
-        ReadOnlyAddressBook initialData;
+        assert storage != null;
+        assert userPrefs != null;
+
+        Optional<ReadOnlyApplication> applicationOptional;
+
+        ReadOnlyApplication initialData;
+
         try {
-            addressBookOptional = storage.readAddressBook();
-            if (!addressBookOptional.isPresent()) {
-                logger.info("Data file not found. Will be starting with a sample AddressBook");
+            applicationOptional = storage.readApplication();
+
+            if (!applicationOptional.isPresent()) {
+                logger.info("Data file not found. Will be starting the application with sample data");
             }
-            initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
+            initialData = applicationOptional.orElseGet(SampleDataUtil::getSampleApplication);
         } catch (DataConversionException e) {
-            logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
-            initialData = new AddressBook();
+            logger.warning(
+                    "Data file not in the correct format. Will be starting the application with empty module list");
+            initialData = getInitialApplication();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
-            initialData = new AddressBook();
+            logger.warning(
+                    "Problem while reading from the file. Will be starting the application with empty module list");
+            initialData = getInitialApplication();
         }
 
         return new ModelManager(initialData, userPrefs);
+
     }
 
     private void initLogging(Config config) {
+        assert config != null;
+
         LogsCenter.init(config);
     }
 
@@ -139,6 +158,8 @@ protected Config initConfig(Path configFilePath) {
      * reading from the file.
      */
     protected UserPrefs initPrefs(UserPrefsStorage storage) {
+        assert storage != null;
+
         Path prefsFilePath = storage.getUserPrefsFilePath();
         logger.info("Using prefs file : " + prefsFilePath);
 
@@ -151,7 +172,8 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
                     + "Using default user prefs");
             initializedPrefs = new UserPrefs();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
+            logger.warning(
+                    "Problem while reading from the file. Will be starting the application with empty module list");
             initializedPrefs = new UserPrefs();
         }
 
@@ -167,13 +189,15 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
 
     @Override
     public void start(Stage primaryStage) {
-        logger.info("Starting AddressBook " + MainApp.VERSION);
+        requireNonNull(primaryStage);
+
+        logger.info("Starting PlanWithEase " + MainApp.VERSION);
         ui.start(primaryStage);
     }
 
     @Override
     public void stop() {
-        logger.info("============================ [ Stopping Address Book ] =============================");
+        logger.info("============================ [ Stopping PlanWithEase ] =============================");
         try {
             storage.saveUserPrefs(model.getUserPrefs());
         } catch (IOException e) {
diff --git a/src/main/java/seedu/address/commons/core/Config.java b/src/main/java/pwe/planner/commons/core/Config.java
similarity index 67%
rename from src/main/java/seedu/address/commons/core/Config.java
rename to src/main/java/pwe/planner/commons/core/Config.java
index 911457455217..62e7e056c509 100644
--- a/src/main/java/seedu/address/commons/core/Config.java
+++ b/src/main/java/pwe/planner/commons/core/Config.java
@@ -1,4 +1,6 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
+
+import static java.util.Objects.requireNonNull;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -21,6 +23,8 @@ public Level getLogLevel() {
     }
 
     public void setLogLevel(Level logLevel) {
+        requireNonNull(logLevel);
+
         this.logLevel = logLevel;
     }
 
@@ -29,6 +33,8 @@ public Path getUserPrefsFilePath() {
     }
 
     public void setUserPrefsFilePath(Path userPrefsFilePath) {
+        requireNonNull(userPrefsFilePath);
+
         this.userPrefsFilePath = userPrefsFilePath;
     }
 
@@ -44,7 +50,7 @@ public boolean equals(Object other) {
         Config o = (Config) other;
 
         return Objects.equals(logLevel, o.logLevel)
-                && Objects.equals(userPrefsFilePath, o.userPrefsFilePath);
+                && Objects.equals(userPrefsFilePath.toAbsolutePath(), o.userPrefsFilePath.toAbsolutePath());
     }
 
     @Override
@@ -54,10 +60,13 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Current log level : " + logLevel);
-        sb.append("\nPreference file Location : " + userPrefsFilePath);
-        return sb.toString();
+        return new StringBuilder()
+                .append("Current log level : ")
+                .append(logLevel)
+                .append('\n')
+                .append("Preference file Location : ")
+                .append(Paths.get("").toAbsolutePath().relativize(userPrefsFilePath.toAbsolutePath()))
+                .toString();
     }
 
 }
diff --git a/src/main/java/seedu/address/commons/core/GuiSettings.java b/src/main/java/pwe/planner/commons/core/GuiSettings.java
similarity index 95%
rename from src/main/java/seedu/address/commons/core/GuiSettings.java
rename to src/main/java/pwe/planner/commons/core/GuiSettings.java
index 5ace559ad156..a14e39bf1303 100644
--- a/src/main/java/seedu/address/commons/core/GuiSettings.java
+++ b/src/main/java/pwe/planner/commons/core/GuiSettings.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
 
 import java.awt.Point;
 import java.io.Serializable;
@@ -11,7 +11,7 @@
 public class GuiSettings implements Serializable {
 
     private static final double DEFAULT_HEIGHT = 600;
-    private static final double DEFAULT_WIDTH = 740;
+    private static final double DEFAULT_WIDTH = 960;
 
     private final double windowWidth;
     private final double windowHeight;
diff --git a/src/main/java/seedu/address/commons/core/LogsCenter.java b/src/main/java/pwe/planner/commons/core/LogsCenter.java
similarity index 91%
rename from src/main/java/seedu/address/commons/core/LogsCenter.java
rename to src/main/java/pwe/planner/commons/core/LogsCenter.java
index 431e7185e762..a247d56d8260 100644
--- a/src/main/java/seedu/address/commons/core/LogsCenter.java
+++ b/src/main/java/pwe/planner/commons/core/LogsCenter.java
@@ -1,4 +1,6 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
+
+import static java.util.Objects.requireNonNull;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -18,7 +20,7 @@
 public class LogsCenter {
     private static final int MAX_FILE_COUNT = 5;
     private static final int MAX_FILE_SIZE_IN_BYTES = (int) (Math.pow(2, 20) * 5); // 5MB
-    private static final String LOG_FILE = "addressbook.log";
+    private static final String LOG_FILE = "application.log";
     private static Level currentLogLevel = Level.INFO;
     private static final Logger logger = LogsCenter.getLogger(LogsCenter.class);
     private static FileHandler fileHandler;
@@ -31,6 +33,8 @@ public class LogsCenter {
      * is requested again from the LogsCenter.
      */
     public static void init(Config config) {
+        requireNonNull(config);
+
         currentLogLevel = config.getLogLevel();
         logger.info("currentLogLevel: " + currentLogLevel);
     }
@@ -39,6 +43,8 @@ public static void init(Config config) {
      * Creates a logger with the given name.
      */
     public static Logger getLogger(String name) {
+        requireNonNull(name);
+
         Logger logger = Logger.getLogger(name);
         logger.setUseParentHandlers(false);
 
@@ -53,6 +59,8 @@ public static Logger getLogger(String name) {
      * Creates a Logger for the given class name.
      */
     public static <T> Logger getLogger(Class<T> clazz) {
+        requireNonNull(clazz);
+
         if (clazz == null) {
             return Logger.getLogger("");
         }
@@ -64,6 +72,8 @@ public static <T> Logger getLogger(Class<T> clazz) {
      * Creates the {@code consoleHandler} if it is null.
      */
     private static void addConsoleHandler(Logger logger) {
+        assert logger != null;
+
         if (consoleHandler == null) {
             consoleHandler = createConsoleHandler();
         }
@@ -74,6 +84,8 @@ private static void addConsoleHandler(Logger logger) {
      * Remove all the handlers from {@code logger}.
      */
     private static void removeHandlers(Logger logger) {
+        assert logger != null;
+
         Arrays.stream(logger.getHandlers())
                 .forEach(logger::removeHandler);
     }
@@ -83,6 +95,8 @@ private static void removeHandlers(Logger logger) {
      * Creates {@code fileHandler} if it is null.
      */
     private static void addFileHandler(Logger logger) {
+        assert logger != null;
+
         try {
             if (fileHandler == null) {
                 fileHandler = createFileHandler();
diff --git a/src/main/java/seedu/address/commons/core/Messages.java b/src/main/java/pwe/planner/commons/core/Messages.java
similarity index 51%
rename from src/main/java/seedu/address/commons/core/Messages.java
rename to src/main/java/pwe/planner/commons/core/Messages.java
index 1deb3a1e4695..241a8bde26a5 100644
--- a/src/main/java/seedu/address/commons/core/Messages.java
+++ b/src/main/java/pwe/planner/commons/core/Messages.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
 
 /**
  * Container for user visible messages.
@@ -7,7 +7,7 @@ public class Messages {
 
     public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
-    public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
-    public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+    public static final String MESSAGE_INVALID_MODULE_DISPLAYED_INDEX = "The module index provided is invalid";
+    public static final String MESSAGE_MODULES_LISTED_OVERVIEW = "%1$d modules listed!";
 
 }
diff --git a/src/main/java/seedu/address/commons/core/Version.java b/src/main/java/pwe/planner/commons/core/Version.java
similarity index 95%
rename from src/main/java/seedu/address/commons/core/Version.java
rename to src/main/java/pwe/planner/commons/core/Version.java
index e117f91b3b2e..0a2836ac9f84 100644
--- a/src/main/java/seedu/address/commons/core/Version.java
+++ b/src/main/java/pwe/planner/commons/core/Version.java
@@ -1,4 +1,6 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
+
+import static java.util.Objects.requireNonNull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -52,6 +54,8 @@ public boolean isEarlyAccess() {
      */
     @JsonCreator
     public static Version fromString(String versionString) throws IllegalArgumentException {
+        requireNonNull(versionString);
+
         Matcher versionMatcher = VERSION_PATTERN.matcher(versionString);
 
         if (!versionMatcher.find()) {
@@ -71,6 +75,8 @@ public String toString() {
 
     @Override
     public int compareTo(Version other) {
+        requireNonNull(other);
+
         if (major != other.major) {
             return major - other.major;
         }
diff --git a/src/main/java/seedu/address/commons/core/index/Index.java b/src/main/java/pwe/planner/commons/core/index/Index.java
similarity index 97%
rename from src/main/java/seedu/address/commons/core/index/Index.java
rename to src/main/java/pwe/planner/commons/core/index/Index.java
index 19536439c099..c95df411f77d 100644
--- a/src/main/java/seedu/address/commons/core/index/Index.java
+++ b/src/main/java/pwe/planner/commons/core/index/Index.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core.index;
+package pwe.planner.commons.core.index;
 
 /**
  * Represents a zero-based or one-based index.
diff --git a/src/main/java/seedu/address/commons/exceptions/DataConversionException.java b/src/main/java/pwe/planner/commons/exceptions/DataConversionException.java
similarity index 84%
rename from src/main/java/seedu/address/commons/exceptions/DataConversionException.java
rename to src/main/java/pwe/planner/commons/exceptions/DataConversionException.java
index 1f689bd8e3f9..b3e018bb1c5d 100644
--- a/src/main/java/seedu/address/commons/exceptions/DataConversionException.java
+++ b/src/main/java/pwe/planner/commons/exceptions/DataConversionException.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.exceptions;
+package pwe.planner.commons.exceptions;
 
 /**
  * Represents an error during conversion of data from one format to another
diff --git a/src/main/java/seedu/address/commons/exceptions/IllegalValueException.java b/src/main/java/pwe/planner/commons/exceptions/IllegalValueException.java
similarity index 93%
rename from src/main/java/seedu/address/commons/exceptions/IllegalValueException.java
rename to src/main/java/pwe/planner/commons/exceptions/IllegalValueException.java
index 19124db485c9..b3717409fd0d 100644
--- a/src/main/java/seedu/address/commons/exceptions/IllegalValueException.java
+++ b/src/main/java/pwe/planner/commons/exceptions/IllegalValueException.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.exceptions;
+package pwe.planner.commons.exceptions;
 
 /**
  * Signals that some given data does not fulfill some constraints.
diff --git a/src/main/java/seedu/address/commons/util/AppUtil.java b/src/main/java/pwe/planner/commons/util/AppUtil.java
similarity index 82%
rename from src/main/java/seedu/address/commons/util/AppUtil.java
rename to src/main/java/pwe/planner/commons/util/AppUtil.java
index da90201dfd64..98de5705b42f 100644
--- a/src/main/java/seedu/address/commons/util/AppUtil.java
+++ b/src/main/java/pwe/planner/commons/util/AppUtil.java
@@ -1,9 +1,10 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import javafx.scene.image.Image;
-import seedu.address.MainApp;
+import pwe.planner.MainApp;
 
 /**
  * A container for App specific utility functions
@@ -12,6 +13,7 @@ public class AppUtil {
 
     public static Image getImage(String imagePath) {
         requireNonNull(imagePath);
+
         return new Image(MainApp.class.getResourceAsStream(imagePath));
     }
 
@@ -21,6 +23,8 @@ public static Image getImage(String imagePath) {
      * @throws IllegalArgumentException if {@code condition} is false.
      */
     public static void checkArgument(Boolean condition) {
+        requireNonNull(condition);
+
         if (!condition) {
             throw new IllegalArgumentException();
         }
@@ -32,6 +36,8 @@ public static void checkArgument(Boolean condition) {
      * @throws IllegalArgumentException with {@code errorMessage} if {@code condition} is false.
      */
     public static void checkArgument(Boolean condition, String errorMessage) {
+        requireAllNonNull(condition, errorMessage);
+
         if (!condition) {
             throw new IllegalArgumentException(errorMessage);
         }
diff --git a/src/main/java/seedu/address/commons/util/CollectionUtil.java b/src/main/java/pwe/planner/commons/util/CollectionUtil.java
similarity index 96%
rename from src/main/java/seedu/address/commons/util/CollectionUtil.java
rename to src/main/java/pwe/planner/commons/util/CollectionUtil.java
index eafe4dfd6818..971acb06e6f2 100644
--- a/src/main/java/seedu/address/commons/util/CollectionUtil.java
+++ b/src/main/java/pwe/planner/commons/util/CollectionUtil.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static java.util.Objects.requireNonNull;
 
@@ -15,6 +15,7 @@ public class CollectionUtil {
     /** @see #requireAllNonNull(Collection) */
     public static void requireAllNonNull(Object... items) {
         requireNonNull(items);
+
         Stream.of(items).forEach(Objects::requireNonNull);
     }
 
@@ -23,6 +24,7 @@ public static void requireAllNonNull(Object... items) {
      */
     public static void requireAllNonNull(Collection<?> items) {
         requireNonNull(items);
+
         items.forEach(Objects::requireNonNull);
     }
 
diff --git a/src/main/java/seedu/address/commons/util/ConfigUtil.java b/src/main/java/pwe/planner/commons/util/ConfigUtil.java
similarity index 77%
rename from src/main/java/seedu/address/commons/util/ConfigUtil.java
rename to src/main/java/pwe/planner/commons/util/ConfigUtil.java
index f7f8a2bd44c0..8547d1ffd97f 100644
--- a/src/main/java/seedu/address/commons/util/ConfigUtil.java
+++ b/src/main/java/pwe/planner/commons/util/ConfigUtil.java
@@ -1,11 +1,11 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import seedu.address.commons.core.Config;
-import seedu.address.commons.exceptions.DataConversionException;
+import pwe.planner.commons.core.Config;
+import pwe.planner.commons.exceptions.DataConversionException;
 
 /**
  * A class for accessing the Config File.
diff --git a/src/main/java/seedu/address/commons/util/FileUtil.java b/src/main/java/pwe/planner/commons/util/FileUtil.java
similarity index 86%
rename from src/main/java/seedu/address/commons/util/FileUtil.java
rename to src/main/java/pwe/planner/commons/util/FileUtil.java
index b1e2767cdd92..f907b7571a63 100644
--- a/src/main/java/seedu/address/commons/util/FileUtil.java
+++ b/src/main/java/pwe/planner/commons/util/FileUtil.java
@@ -1,4 +1,7 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -23,6 +26,8 @@ public static boolean isFileExists(Path file) {
      * @param path A string representing the file path. Cannot be null.
      */
     public static boolean isValidPath(String path) {
+        requireNonNull(path);
+
         try {
             Paths.get(path);
         } catch (InvalidPathException ipe) {
@@ -36,6 +41,8 @@ public static boolean isValidPath(String path) {
      * @throws IOException if the file or directory cannot be created.
      */
     public static void createIfMissing(Path file) throws IOException {
+        requireNonNull(file);
+
         if (!isFileExists(file)) {
             createFile(file);
         }
@@ -45,6 +52,8 @@ public static void createIfMissing(Path file) throws IOException {
      * Creates a file if it does not exist along with its missing parent directories.
      */
     public static void createFile(Path file) throws IOException {
+        requireNonNull(file);
+
         if (Files.exists(file)) {
             return;
         }
@@ -58,6 +67,8 @@ public static void createFile(Path file) throws IOException {
      * Creates parent directories of file if it has a parent directory
      */
     public static void createParentDirsOfFile(Path file) throws IOException {
+        requireNonNull(file);
+
         Path parentDir = file.getParent();
 
         if (parentDir != null) {
@@ -69,6 +80,8 @@ public static void createParentDirsOfFile(Path file) throws IOException {
      * Assumes file exists
      */
     public static String readFromFile(Path file) throws IOException {
+        requireNonNull(file);
+
         return new String(Files.readAllBytes(file), CHARSET);
     }
 
@@ -77,6 +90,8 @@ public static String readFromFile(Path file) throws IOException {
      * Will create the file if it does not exist yet.
      */
     public static void writeToFile(Path file, String content) throws IOException {
+        requireAllNonNull(file, content);
+
         Files.write(file, content.getBytes(CHARSET));
     }
 
diff --git a/src/main/java/seedu/address/commons/util/InvalidationListenerManager.java b/src/main/java/pwe/planner/commons/util/InvalidationListenerManager.java
similarity index 96%
rename from src/main/java/seedu/address/commons/util/InvalidationListenerManager.java
rename to src/main/java/pwe/planner/commons/util/InvalidationListenerManager.java
index 70165336db6d..d76d95b6f8a5 100644
--- a/src/main/java/seedu/address/commons/util/InvalidationListenerManager.java
+++ b/src/main/java/pwe/planner/commons/util/InvalidationListenerManager.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static java.util.Objects.requireNonNull;
 
@@ -21,6 +21,8 @@ public class InvalidationListenerManager {
      * @param observable The {@code Observable} that became invalid.
      */
     public void callListeners(Observable observable) {
+        requireNonNull(observable);
+
         // Make a copy of listeners such that any modifications to the listeners list during
         // the invocation of this method will only take effect on the next invocation of this method.
         ArrayList<InvalidationListener> listenersCopy = new ArrayList<>(listeners);
@@ -36,6 +38,7 @@ public void callListeners(Observable observable) {
      */
     public void addListener(InvalidationListener listener) {
         requireNonNull(listener);
+
         listeners.add(listener);
     }
 
@@ -46,6 +49,7 @@ public void addListener(InvalidationListener listener) {
      */
     public void removeListener(InvalidationListener listener) {
         requireNonNull(listener);
+
         listeners.remove(listener);
     }
 
diff --git a/src/main/java/seedu/address/commons/util/JsonUtil.java b/src/main/java/pwe/planner/commons/util/JsonUtil.java
similarity index 90%
rename from src/main/java/seedu/address/commons/util/JsonUtil.java
rename to src/main/java/pwe/planner/commons/util/JsonUtil.java
index 8ef609f055df..e5cc68d6af16 100644
--- a/src/main/java/seedu/address/commons/util/JsonUtil.java
+++ b/src/main/java/pwe/planner/commons/util/JsonUtil.java
@@ -1,6 +1,7 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,8 +21,8 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.exceptions.DataConversionException;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.commons.exceptions.DataConversionException;
 
 /**
  * Converts a Java object instance to JSON and vice versa
@@ -45,6 +46,8 @@ static <T> void serializeObjectToJsonFile(Path jsonFile, T objectToSerialize) th
 
     static <T> T deserializeObjectFromJsonFile(Path jsonFile, Class<T> classOfObjectToDeserialize)
             throws IOException {
+        requireAllNonNull(jsonFile, classOfObjectToDeserialize);
+
         return fromJsonString(FileUtil.readFromFile(jsonFile), classOfObjectToDeserialize);
     }
 
@@ -57,7 +60,7 @@ static <T> T deserializeObjectFromJsonFile(Path jsonFile, Class<T> classOfObject
      */
     public static <T> Optional<T> readJsonFile(
             Path filePath, Class<T> classOfObjectToDeserialize) throws DataConversionException {
-        requireNonNull(filePath);
+        requireAllNonNull(filePath, classOfObjectToDeserialize);
 
         if (!Files.exists(filePath)) {
             logger.info("Json file " + filePath + " not found");
@@ -84,8 +87,7 @@ public static <T> Optional<T> readJsonFile(
      * @throws IOException if there was an error during writing to the file
      */
     public static <T> void saveJsonFile(T jsonFile, Path filePath) throws IOException {
-        requireNonNull(filePath);
-        requireNonNull(jsonFile);
+        requireAllNonNull(filePath, jsonFile);
 
         serializeObjectToJsonFile(filePath, jsonFile);
     }
@@ -97,6 +99,8 @@ public static <T> void saveJsonFile(T jsonFile, Path filePath) throws IOExceptio
      * @return The instance of T with the specified values in the JSON string
      */
     public static <T> T fromJsonString(String json, Class<T> instanceClass) throws IOException {
+        requireAllNonNull(json, instanceClass);
+
         return objectMapper.readValue(json, instanceClass);
     }
 
@@ -107,6 +111,8 @@ public static <T> T fromJsonString(String json, Class<T> instanceClass) throws I
      * @return JSON data representation of the given class instance, in string
      */
     public static <T> String toJsonString(T instance) throws JsonProcessingException {
+        requireNonNull(instance);
+
         return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(instance);
     }
 
@@ -121,6 +127,8 @@ protected LevelDeserializer(Class<?> vc) {
 
         @Override
         protected Level _deserialize(String value, DeserializationContext ctxt) {
+            requireNonNull(value);
+
             return getLoggingLevel(value);
         }
 
@@ -131,6 +139,8 @@ protected Level _deserialize(String value, DeserializationContext ctxt) {
          *
          */
         private Level getLoggingLevel(String loggingLevelString) {
+            requireNonNull(loggingLevelString);
+
             return Level.parse(loggingLevelString);
         }
 
diff --git a/src/main/java/seedu/address/commons/util/StringUtil.java b/src/main/java/pwe/planner/commons/util/StringUtil.java
similarity index 53%
rename from src/main/java/seedu/address/commons/util/StringUtil.java
rename to src/main/java/pwe/planner/commons/util/StringUtil.java
index 61cc8c9a1cb8..871197a23aeb 100644
--- a/src/main/java/seedu/address/commons/util/StringUtil.java
+++ b/src/main/java/pwe/planner/commons/util/StringUtil.java
@@ -1,17 +1,43 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Helper functions for handling strings.
  */
 public class StringUtil {
 
+    /**
+     * Returns a string of all elements of the stream separated by commas.
+     * If there are no elements in the stream, returns "None".
+     * Syntactic sugar for {@code joinStreamAsString(stream, ", ")}
+     * @param stream stream of elements to join
+     */
+    public static String joinStreamAsString(Stream<?> stream) {
+        return joinStreamAsString(stream, ", ");
+    }
+
+    /**
+     * Returns a string of all elements of the stream separated by delimiter.
+     * If there are no elements in the stream, returns "None".
+     * @param stream stream of elements to join
+     * @param delimiter string used to separate the elements when joining them together as a string
+     */
+    public static String joinStreamAsString(Stream<?> stream, String delimiter) {
+        requireAllNonNull(stream, delimiter);
+
+        String joinnedString = stream.map(Object::toString).collect(Collectors.joining(delimiter));
+        return (joinnedString.isEmpty()) ? "None" : joinnedString;
+    }
+
     /**
      * Returns true if the {@code sentence} contains the {@code word}.
      *   Ignores case, but a full word match is required.
@@ -24,8 +50,7 @@ public class StringUtil {
      * @param word cannot be null, cannot be empty, must be a single word
      */
     public static boolean containsWordIgnoreCase(String sentence, String word) {
-        requireNonNull(sentence);
-        requireNonNull(word);
+        requireAllNonNull(sentence, word);
 
         String preppedWord = word.trim();
         checkArgument(!preppedWord.isEmpty(), "Word parameter cannot be empty");
@@ -38,11 +63,29 @@ public static boolean containsWordIgnoreCase(String sentence, String word) {
                 .anyMatch(preppedWord::equalsIgnoreCase);
     }
 
+    /**
+     * Compare one string with another while ignoring cases and leading/trailing spaces.
+     * @param stringA first string to compare
+     * @param stringB second string to compare with
+     * @return true if both strings are equal; false otherwise
+     */
+    public static boolean compareEqualsIgnoreCase(String stringA, String stringB) {
+        requireAllNonNull(stringA, stringB);
+
+        String preppedStringA = stringA.trim();
+        checkArgument(!preppedStringA.isEmpty(), "stringA parameter cannot be empty");
+        String preppedStringB = stringB.trim();
+        checkArgument(!preppedStringB.isEmpty(), "stringB parameter cannot be empty");
+
+        return preppedStringA.equalsIgnoreCase(preppedStringB);
+    }
+
     /**
      * Returns a detailed message of the t, including the stack trace.
      */
     public static String getDetails(Throwable t) {
         requireNonNull(t);
+
         StringWriter sw = new StringWriter();
         t.printStackTrace(new PrintWriter(sw));
         return t.getMessage() + "\n" + sw.toString();
diff --git a/src/main/java/seedu/address/logic/CommandHistory.java b/src/main/java/pwe/planner/logic/CommandHistory.java
similarity index 95%
rename from src/main/java/seedu/address/logic/CommandHistory.java
rename to src/main/java/pwe/planner/logic/CommandHistory.java
index 404675e43811..371d0e23e4ff 100644
--- a/src/main/java/seedu/address/logic/CommandHistory.java
+++ b/src/main/java/pwe/planner/logic/CommandHistory.java
@@ -1,4 +1,4 @@
-package seedu.address.logic;
+package pwe.planner.logic;
 
 import static java.util.Objects.requireNonNull;
 
@@ -16,6 +16,8 @@ public class CommandHistory {
     public CommandHistory() {}
 
     public CommandHistory(CommandHistory commandHistory) {
+        requireNonNull(commandHistory);
+
         userInputHistory.addAll(commandHistory.userInputHistory);
     }
 
@@ -24,6 +26,7 @@ public CommandHistory(CommandHistory commandHistory) {
      */
     public void add(String userInput) {
         requireNonNull(userInput);
+
         userInputHistory.add(userInput);
     }
 
diff --git a/src/main/java/pwe/planner/logic/Logic.java b/src/main/java/pwe/planner/logic/Logic.java
new file mode 100644
index 000000000000..cad66c16c6e5
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/Logic.java
@@ -0,0 +1,97 @@
+package pwe.planner.logic;
+
+import java.nio.file.Path;
+
+import javafx.beans.property.ReadOnlyProperty;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.logic.commands.CommandResult;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.Model;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * API of the Logic component
+ */
+public interface Logic {
+    /**
+     * Executes the command and returns the result.
+     *
+     * @param commandText The command as entered by the user.
+     * @return the result of the command execution.
+     * @throws CommandException If an error occurs during command execution.
+     * @throws ParseException   If an error occurs during parsing.
+     */
+    CommandResult execute(String commandText) throws CommandException, ParseException;
+
+    /**
+     * Returns the Application.
+     *
+     * @see Model#getApplication()
+     */
+    ReadOnlyApplication getApplication();
+
+    /** Returns an unmodifiable view of the filtered list of modules */
+    ObservableList<Module> getFilteredModuleList();
+
+    /** Returns an unmodifiable view of the filtered degreePlanner list */
+    ObservableList<DegreePlanner> getFilteredDegreePlannerList();
+
+    /** Returns an unmodifiable view of the filtered list of modules */
+    ObservableList<RequirementCategory> getFilteredRequirementCategoryList();
+
+    /**
+     * Returns an unmodifiable view of the list of commands entered by the user.
+     * The list is ordered from the least recent command to the most recent command.
+     */
+    ObservableList<String> getHistory();
+
+    /**
+     * Returns the user prefs' module list file path.
+     */
+    Path getModuleListFilePath();
+
+    /**
+     * Returns the user prefs' GUI settings.
+     */
+    GuiSettings getGuiSettings();
+
+    /**
+     * Set the user prefs' GUI settings.
+     */
+    void setGuiSettings(GuiSettings guiSettings);
+
+    /**
+     * Selected module in the filtered module list.
+     * null if no module is selected.
+     *
+     * @see Model#selectedModuleProperty()
+     */
+    ReadOnlyProperty<Module> selectedModuleProperty();
+
+    /**
+     * Sets the selected module in the filtered module list.
+     *
+     * @see Model#setSelectedModule(Module)
+     */
+    void setSelectedModule(Module module);
+
+    /**
+     * Selected module in the filtered module list.
+     * null if no module is selected.
+     *
+     * @see Model#selectedModuleProperty()
+     */
+    ReadOnlyProperty<RequirementCategory> selectedRequirementCategoryProperty();
+
+    /**
+     * Sets the selected module in the filtered module list.
+     *
+     * @see Model#setSelectedModule(Module)
+     */
+    void setSelectedRequirementCategory(RequirementCategory requirementCategory);
+}
diff --git a/src/main/java/pwe/planner/logic/LogicManager.java b/src/main/java/pwe/planner/logic/LogicManager.java
new file mode 100644
index 000000000000..c628ab7031cc
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/LogicManager.java
@@ -0,0 +1,140 @@
+package pwe.planner.logic;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.logging.Logger;
+
+import javafx.beans.property.ReadOnlyProperty;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.logic.commands.Command;
+import pwe.planner.logic.commands.CommandResult;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.logic.parser.CommandParser;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.Model;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.storage.Storage;
+
+/**
+ * The main LogicManager of the app.
+ */
+public class LogicManager implements Logic {
+    public static final String FILE_OPS_ERROR_MESSAGE = "Could not save data to file: ";
+    private final Logger logger = LogsCenter.getLogger(LogicManager.class);
+
+    private final Model model;
+    private final Storage storage;
+    private final CommandHistory history;
+    private final CommandParser commandParser;
+    private boolean applicationModified;
+
+    public LogicManager(Model model, Storage storage) {
+        requireAllNonNull(model, storage);
+
+        this.model = model;
+        this.storage = storage;
+        history = new CommandHistory();
+        commandParser = new CommandParser();
+
+        // Set applicationModified to true whenever the models' application is modified.
+        model.getApplication().addListener(observable -> applicationModified = true);
+    }
+
+    @Override
+    public CommandResult execute(String commandText) throws CommandException, ParseException {
+        requireNonNull(commandText);
+
+        logger.info("----------------[USER COMMAND][" + commandText + "]");
+        applicationModified = false;
+
+        CommandResult commandResult;
+        try {
+            Command command = commandParser.parseCommand(commandText);
+            commandResult = command.execute(model, history);
+        } finally {
+            history.add(commandText);
+        }
+
+        if (applicationModified) {
+            logger.info("Application modified, saving to file.");
+            try {
+                storage.saveApplication(model.getApplication());
+            } catch (IOException ioe) {
+                throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
+            }
+        }
+
+        return commandResult;
+    }
+
+    @Override
+    public ReadOnlyApplication getApplication() {
+        return model.getApplication();
+    }
+
+    @Override
+    public ObservableList<Module> getFilteredModuleList() {
+        return model.getFilteredModuleList();
+    }
+
+    @Override
+    public ObservableList<DegreePlanner> getFilteredDegreePlannerList() {
+        return model.getFilteredDegreePlannerList();
+    }
+
+    @Override
+    public ObservableList<RequirementCategory> getFilteredRequirementCategoryList() {
+        return model.getFilteredRequirementCategoryList();
+    }
+
+    @Override
+    public ObservableList<String> getHistory() {
+        return history.getHistory();
+    }
+
+    @Override
+    public Path getModuleListFilePath() {
+        return model.getModuleListFilePath();
+    }
+
+    @Override
+    public GuiSettings getGuiSettings() {
+        return model.getGuiSettings();
+    }
+
+    @Override
+    public void setGuiSettings(GuiSettings guiSettings) {
+        requireNonNull(guiSettings);
+
+        model.setGuiSettings(guiSettings);
+    }
+
+    @Override
+    public ReadOnlyProperty<Module> selectedModuleProperty() {
+        return model.selectedModuleProperty();
+    }
+
+    @Override
+    public void setSelectedModule(Module module) {
+        model.setSelectedModule(module);
+    }
+
+    @Override
+    public ReadOnlyProperty<RequirementCategory> selectedRequirementCategoryProperty() {
+        return model.selectedRequirementCategoryProperty();
+    }
+
+    @Override
+    public void setSelectedRequirementCategory(RequirementCategory requirementCategory) {
+        model.setSelectedRequirementCategory(requirementCategory);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/logic/commands/AddCommand.java b/src/main/java/pwe/planner/logic/commands/AddCommand.java
new file mode 100644
index 000000000000..626d4d5f6cef
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/AddCommand.java
@@ -0,0 +1,110 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_COREQUISITE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+
+/**
+ * Adds a {@link Module} to the {@link Application#modules module list}.
+ */
+public class AddCommand extends Command {
+    public static final String COMMAND_WORD = "add";
+
+    // This is declared before MESSAGE_USAGE to prevent illegal forward reference
+    public static final String FORMAT_AND_EXAMPLES = "Format: " + COMMAND_WORD + ' '
+            + PREFIX_CODE + "CODE "
+            + PREFIX_NAME + "NAME "
+            + PREFIX_CREDITS + "CREDITS "
+            + "[" + PREFIX_SEMESTER + "SEMESTER]... "
+            + "[" + PREFIX_COREQUISITE + "COREQUISITE]... "
+            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_CODE + "CS2113T "
+            + PREFIX_NAME + "Software Engineering and Object-Oriented Programming "
+            + PREFIX_CREDITS + "4 "
+            + PREFIX_SEMESTER + "1 "
+            + PREFIX_SEMESTER + "2 "
+            + PREFIX_COREQUISITE + "CS2101 "
+            + PREFIX_TAG + "OOP "
+            + PREFIX_TAG + "RCS "
+            + PREFIX_TAG + "UML";
+
+    // General command help details
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a new module to the module list.\n"
+            + FORMAT_AND_EXAMPLES;
+
+    // Command success message
+    public static final String MESSAGE_SUCCESS = "Successfully added a new module:\n%1$s";
+
+    // Command failure messages
+    public static final String MESSAGE_DUPLICATE_MODULE =
+            "You cannot add a new module (%1$s), as the module code %1$s already exists in the module list!";
+
+    public static final String MESSAGE_NON_EXISTENT_COREQUISITE =
+            "You cannot add a new module (%1$s) that has a co-requisite module (%2$s) "
+            + "which does not exists in the module list!\n"
+            + "[Tip] You can try adding the module (%1$s) without specifying the co-requisite module (%2$s) first.\n"
+            + "Afterwards, add the module (%2$s) and specify the module (%1$s) as a co-requisite.\n"
+            + "This will make both modules (%1$s & %2$s) co-requisites!";
+
+    public static final String MESSAGE_EXISTING_COREQUISITES_IN_DEGREE_PLAN =
+            "You cannot add a new module (%1$s) that has a co-requisite module (%2$s) that exists in the degree plan!\n"
+            + "[Tip] You can remove the module (%2$s) from the degree plan first, add the module (%1$s) and specify "
+            + "(%2$s) as a co-requisite, then add back the module (%2$s) to the degree plan.\n"
+            + "This will make both modules (%1$s & %2$s) co-requisites!";
+
+    private final Module toAdd;
+
+    /**
+     * Creates an AddCommand to add the specified {@code Module}
+     */
+    public AddCommand(Module module) {
+        requireNonNull(module);
+
+        toAdd = module;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        if (model.hasModule(toAdd)) {
+            throw new CommandException(String.format(MESSAGE_DUPLICATE_MODULE, toAdd.getCode()));
+        }
+
+        for (Code corequisite : toAdd.getCorequisites()) {
+            if (!model.hasModuleCode(corequisite)) {
+                throw new CommandException(String.format(
+                        MESSAGE_NON_EXISTENT_COREQUISITE, toAdd.getCode(), corequisite)
+                );
+            }
+            if (model.getDegreePlannerByCode(corequisite) != null) {
+                throw new CommandException(String.format(
+                        MESSAGE_EXISTING_COREQUISITES_IN_DEGREE_PLAN, toAdd.getCode(), corequisite)
+                );
+            }
+        }
+
+        model.addModule(toAdd);
+        model.commitApplication();
+        return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof AddCommand // instanceof handles nulls
+                && toAdd.equals(((AddCommand) other).toAdd));
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/ClearCommand.java b/src/main/java/pwe/planner/logic/commands/ClearCommand.java
new file mode 100644
index 000000000000..ea3a0f2b9887
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/ClearCommand.java
@@ -0,0 +1,65 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.model.util.InitialDataUtil.getInitialApplication;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+
+/**
+ * Clears all existing data in {@link Application}, and populates the initial (empty)
+ * degree planners and requirement categories.
+ */
+public class ClearCommand extends Command {
+
+    public static final String COMMAND_WORD = "clear";
+    public static final String MESSAGE_SUCCESS = "Successfully cleared all data!\n"
+            + "[Tip] If you unintentionally used this command, do use the undo command to revert back the changes!";
+    public static final String MESSAGE_USAGE = COMMAND_WORD + " [requirement or planner]\n"
+            + "requirement - clear all data related to requirement categories\n"
+            + "planner - clear all data related to degree planner";
+
+    public static final String PLANNER = "planner";
+    public static final String REQUIREMENT = "requirement";
+    private String panelToClear = "";
+
+    // default constructor
+    public ClearCommand() {
+    }
+
+    public ClearCommand(String panelToClear) {
+        requireNonNull(panelToClear);
+        this.panelToClear = panelToClear;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof ClearCommand // instanceof handles nulls
+                && panelToClear.equals(((ClearCommand) other).panelToClear));
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        // initialize with default constructor
+        if (panelToClear.isEmpty()) {
+            model.setApplication(getInitialApplication());
+        } else {
+            if (panelToClear.equals(PLANNER)) {
+                model.resetPlanner();
+            } else if (panelToClear.equals(REQUIREMENT)) {
+                model.resetRequirement();
+            } else {
+                throw new CommandException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+            }
+        }
+
+        model.commitApplication();
+        return new CommandResult(MESSAGE_SUCCESS);
+    }
+}
diff --git a/src/main/java/seedu/address/logic/commands/Command.java b/src/main/java/pwe/planner/logic/commands/Command.java
similarity index 77%
rename from src/main/java/seedu/address/logic/commands/Command.java
rename to src/main/java/pwe/planner/logic/commands/Command.java
index 34e99d786ec6..a9b1ebabd3ad 100644
--- a/src/main/java/seedu/address/logic/commands/Command.java
+++ b/src/main/java/pwe/planner/logic/commands/Command.java
@@ -1,8 +1,8 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
 
 /**
  * Represents a command with hidden internal logic and the ability to be executed.
diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/pwe/planner/logic/commands/CommandResult.java
similarity index 93%
rename from src/main/java/seedu/address/logic/commands/CommandResult.java
rename to src/main/java/pwe/planner/logic/commands/CommandResult.java
index 92f900b7916d..5ff5e5ad7610 100644
--- a/src/main/java/seedu/address/logic/commands/CommandResult.java
+++ b/src/main/java/pwe/planner/logic/commands/CommandResult.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
 import static java.util.Objects.requireNonNull;
 
@@ -21,7 +21,9 @@ public class CommandResult {
      * Constructs a {@code CommandResult} with the specified fields.
      */
     public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
-        this.feedbackToUser = requireNonNull(feedbackToUser);
+        requireNonNull(feedbackToUser);
+
+        this.feedbackToUser = feedbackToUser;
         this.showHelp = showHelp;
         this.exit = exit;
     }
diff --git a/src/main/java/pwe/planner/logic/commands/DeleteCommand.java b/src/main/java/pwe/planner/logic/commands/DeleteCommand.java
new file mode 100644
index 000000000000..31858d5d84d1
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/DeleteCommand.java
@@ -0,0 +1,69 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+
+import java.util.List;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
+
+/**
+ * Deletes a module identified using it's displayed index in the module list.
+ * Deletes a {@link Module} identified using it's displayed {@link Index} in the
+ * {@link Application#modules module list}.
+ */
+public class DeleteCommand extends Command {
+
+    public static final String COMMAND_WORD = "delete";
+
+    // This is declared before MESSAGE_USAGE to prevent illegal forward reference
+    public static final String FORMAT_AND_EXAMPLES = "Format: " + COMMAND_WORD + " INDEX \n"
+            + "Example: To delete the first module in the displayed module list below, you can enter: "
+            + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Deletes a module in the displayed module list.\n"
+            + "To choose which module you want to delete, please include the index number "
+            + "(beside the module code) in the displayed module list.\n"
+            + "Note: This will also remove the module from the degree plan, the requirement categories and other "
+            + "modules' corequisites (where applicable).\n"
+            + FORMAT_AND_EXAMPLES;
+
+    public static final String MESSAGE_DELETE_MODULE_SUCCESS = "Successfully deleted the module:\n%1$s";
+
+    private final Index targetIndex;
+
+    public DeleteCommand(Index targetIndex) {
+        requireNonNull(targetIndex);
+
+        this.targetIndex = targetIndex;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        List<Module> lastShownList = model.getFilteredModuleList();
+
+        if (targetIndex.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+        }
+
+        Module moduleToDelete = lastShownList.get(targetIndex.getZeroBased());
+        model.deleteModule(moduleToDelete);
+        model.commitApplication();
+        return new CommandResult(String.format(MESSAGE_DELETE_MODULE_SUCCESS, moduleToDelete));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof DeleteCommand // instanceof handles nulls
+                && targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/EditCommand.java b/src/main/java/pwe/planner/logic/commands/EditCommand.java
new file mode 100644
index 000000000000..22aae52829b2
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/EditCommand.java
@@ -0,0 +1,511 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.commons.util.CollectionUtil.isAnyNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.commons.util.StringUtil.joinStreamAsString;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_COREQUISITE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_MODULES;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Edits the details of an existing {@link Module} in the {@link Application#modules module list}.
+ */
+public class EditCommand extends Command {
+
+    public static final String COMMAND_WORD = "edit";
+
+    // This is declared before MESSAGE_USAGE to prevent illegal forward reference
+    public static final String FORMAT_AND_EXAMPLES = "Format: " + COMMAND_WORD
+            + " INDEX "
+            + "[" + PREFIX_NAME + "NAME] "
+            + "[" + PREFIX_CODE + "CODE] "
+            + "[" + PREFIX_CREDITS + "CREDITS] "
+            + "[" + PREFIX_SEMESTER + "SEMESTER]... "
+            + "[" + PREFIX_COREQUISITE + "COREQUISITE]... "
+            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "Example: To edit the number of credits assigned to the first module in the displayed module list below"
+            + ", you can enter: " + COMMAND_WORD + " 1 " + PREFIX_CREDITS + "8 ";
+
+    // General command help details
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Edits the existing details (e.g. name, code, credits) of a module in the displayed module list.\n"
+            + "To choose which module you want to edit, please include the index number "
+            + "(beside the module code) in the displayed module list."
+            + '\n' + FORMAT_AND_EXAMPLES;
+
+    // Command success message
+    public static final String MESSAGE_EDIT_MODULE_SUCCESS = "Successfully edited the module (%1$s) to:\n%2$s";
+
+    // Command failure messages
+    public static final String MESSAGE_COREQUISITES_NOT_IN_DEGREE_PLANNER =
+            "You cannot edit the module (%1$s) to have co-requisite module(s) (%2$s) when Year %3$s Semester %4$s of "
+            + "the degree plan contains the module (%1$s), but not the all the co-requisite module(s) (%5$s)!\n"
+            + "[Tip] You can use the \"planner_add\" command to add the co-requisite module(s) (%5$s) into Year %3$s "
+            + "Semester %4$s of the degree plan, then edit the module (%1$s) to have co-requisite module(s) (%2$s)!";
+    public static final String MESSAGE_DUPLICATE_MODULE =
+            "You cannot edit module (%1$s) to have the module code (%2$s).\n"
+            + "Module (%2$s) already exists in the module list!";
+    public static final String MESSAGE_SELF_REFERENCING_COREQUISITE =
+            "You cannot edit the module (%1$s) to have itself as a co-requisite module!\n"
+            + "Perhaps you might have entered the new co-requisites module(s) incorrectly?";
+    public static final String MESSAGE_INVALID_SEMESTER =
+            "You cannot edit the semesters offering module (%1$s) from (%2$s) to (%3$s), as the module can no longer "
+            + "be taken in Year %4$s Semester %5$s (as indicated in your degree plan)!\n"
+            + "[Tip] You can remove module (%1$s) from the degree plan first, edit the semesters offering the module "
+            + "to (%3$s), and then add the module back to a suitable year/semester of the degree plan!\n";
+    public static final String MESSAGE_NON_EXISTENT_COREQUISITE =
+            "You cannot edit the module (%1$s) to have a co-requisite module(s) (%2$s) "
+            + "that does not exists in the module list!\n"
+            + "[Tip] You can add the module (%1$s), and specify the module(s) (%2$s) as co-requisite module(s) instead!"
+            + '\n';
+    public static final String MESSAGE_NOT_EDITED = "You didn't specify what module details you want to edit.\n"
+            + "Perhaps you would like to see the command format and example again?\n"
+            + FORMAT_AND_EXAMPLES;
+    public static final String MESSAGE_MODULE_AND_COREQUISITES_DIFFERENT_SEMESTERS =
+            "You cannot edit the module (%1$s) to have co-requisite module(s) that are already being "
+            + "added to different semesters of the degree plan!\n"
+            + "[Tip] You can move all co-requisite module(s) to the same semester, or remove them from the degree plan."
+            + "\nBelow is a list of the co-requisite module(s) that are causing the error:\n%2$s";
+    public static final String MESSAGE_MODULE_NOT_IN_DEGREE_PLANNER_BUT_SOME_COREQUISITES_IN_DEGREE_PLANNER =
+            "You cannot edit the module (%1$s) to have co-requisite module(s) (%2$s) that are already added to Year "
+            + "%3$s Semester %4$s of the degree plan!\n"
+            + "[Tip] You can add the module (%1$s) to Year %3$s Semester %4$s of the degree plan first, then edit "
+            + "the module (%1$s) to have co-requisite modules (%5$s)!";
+
+    private final Index index;
+    private final EditModuleDescriptor editModuleDescriptor;
+
+    /**
+     * @param index of the module in the filtered module list to edit
+     * @param editModuleDescriptor details to edit the module with
+     */
+    public EditCommand(Index index, EditModuleDescriptor editModuleDescriptor) {
+        requireAllNonNull(index, editModuleDescriptor);
+
+        this.index = index;
+        this.editModuleDescriptor = editModuleDescriptor;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        List<Module> lastShownModuleList = model.getFilteredModuleList();
+        ensureValidIndexInModuleList(lastShownModuleList);
+
+        Module moduleToEdit = lastShownModuleList.get(index.getZeroBased());
+        Module editedModule = createEditedModule(moduleToEdit, editModuleDescriptor);
+
+        ensureEditedModuleIsUniqueInModel(model, moduleToEdit, editedModule);
+        ensureEditedModuleIsNotCorequisiteOfItself(moduleToEdit, editedModule);
+        ensureEditedCorequisitesExistsInModel(model, moduleToEdit, editedModule);
+        if (!moduleToEdit.getCorequisites().equals(editedModule.getCorequisites())) {
+            ensureDegreePlannerUnaffectedByEditedCorequisites(model, moduleToEdit, editedModule);
+        }
+        if (!moduleToEdit.getSemesters().equals(editedModule.getSemesters())) {
+            ensureDegreePlannerUnaffectedByEditedSemesters(model, moduleToEdit, editedModule);
+        }
+
+        // Edit and cascade the changes of the module to the rest of the entire application
+        model.editModule(moduleToEdit, editedModule);
+        model.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
+        model.commitApplication();
+
+        // Get latest copy of edited module after cascading changes
+        Optional<Module> editedModuleInModuleList = model.getFilteredModuleList().stream()
+                .filter(module -> editedModule.getCode().equals(module.getCode())).findFirst();
+
+        assert editedModuleInModuleList.isPresent();
+
+        String successMessage = String.format(MESSAGE_EDIT_MODULE_SUCCESS, moduleToEdit.getCode(),
+                editedModuleInModuleList.get());
+        return new CommandResult(successMessage);
+    }
+
+    /**
+     * Ensures that {@code index} is valid in the displayed {@code module list}.
+     * @param lastShownModuleList the displayed module list
+     * @throws CommandException
+     */
+    private void ensureValidIndexInModuleList(List<Module> lastShownModuleList) throws CommandException {
+        assert lastShownModuleList != null;
+
+        if (index.getZeroBased() >= lastShownModuleList.size()) {
+            throw new CommandException(MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+        }
+    }
+
+    /**
+     * Ensures that the edited module is unique in the module list.
+     * @throws CommandException if editing the module will result in duplicate modules
+     */
+    private void ensureEditedModuleIsUniqueInModel(Model model, Module moduleToEdit, Module editedModule)
+            throws CommandException {
+        assert model != null;
+        assert moduleToEdit != null;
+        assert editedModule != null;
+
+        if (!moduleToEdit.isSameModule(editedModule) && model.hasModule(editedModule)) {
+            String exceptionMessage = String.format(MESSAGE_DUPLICATE_MODULE, moduleToEdit.getCode(),
+                    editedModule.getCode());
+            throw new CommandException(exceptionMessage);
+        }
+    }
+
+    /**
+     * Ensures that the edited module is not a co-requisite of itself.
+     * @throws CommandException if the above constraint is violated.
+     */
+    private void ensureEditedModuleIsNotCorequisiteOfItself(Module moduleToEdit, Module editedModule)
+            throws CommandException {
+        assert moduleToEdit != null;
+        assert editedModule != null;
+
+        boolean hasOriginalCodeInCorequisites = editedModule.getCorequisites().contains(moduleToEdit.getCode());
+        boolean hasEditedCodeInCorequisites = editedModule.getCorequisites().contains(editedModule.getCode());
+        if (hasOriginalCodeInCorequisites || hasEditedCodeInCorequisites) {
+            String exceptionMessage = String.format(MESSAGE_SELF_REFERENCING_COREQUISITE, moduleToEdit.getCode());
+            throw new CommandException(exceptionMessage);
+        }
+    }
+
+    /**
+     * Ensures that the corequisites of the edited module exists in the module list.
+     * @throws CommandException if the above constraint is violated.
+     */
+    private void ensureEditedCorequisitesExistsInModel(Model model, Module moduleToEdit, Module editedModule)
+            throws CommandException {
+        assert model != null;
+        assert moduleToEdit != null;
+        assert editedModule != null;
+
+        Set<Code> nonExistentCorequisites = editedModule.getCorequisites().stream()
+                .filter(corequisite -> !model.hasModuleCode(corequisite)).collect(Collectors.toSet());
+
+        if (!nonExistentCorequisites.isEmpty()) {
+            String exceptionMessage = String.format(MESSAGE_NON_EXISTENT_COREQUISITE, moduleToEdit.getCode(),
+                    joinStreamAsString(nonExistentCorequisites.stream().sorted()));
+            throw new CommandException(exceptionMessage);
+        }
+    }
+
+    /**
+     * Ensures that the editing the module does not affect the data integrity of the degree planner.
+     * - Edited module is not in the degree plan, but at least one co-requisite module is in the degree plan.
+     * - Edited module and corequisites exists in different semesters of the degree plan.
+     * - Edited module is in the degree plan, but at least one co-requisite module is not.
+     * @throws CommandException if any of the above constraints is violated.
+     */
+    private void ensureDegreePlannerUnaffectedByEditedCorequisites(Model model, Module moduleToEdit,
+            Module editedModule) throws CommandException {
+        assert model != null;
+        assert moduleToEdit != null;
+        assert editedModule != null;
+
+        List<Code> editedCorequisitesInDegreePlanner = editedModule.getCorequisites().stream()
+                .filter(code -> model.getDegreePlannerByCode(code) != null).collect(Collectors.toList());
+
+        List<DegreePlanner> degreePlannersContainingEditedCorequisites = editedCorequisitesInDegreePlanner.stream()
+                .map(model::getDegreePlannerByCode).distinct().collect(Collectors.toList());
+
+        if (degreePlannersContainingEditedCorequisites.size() > 1) {
+            List<DegreePlanner> problematicDegreePlanners = degreePlannersContainingEditedCorequisites.stream()
+                    .map((degreePlanner) -> {
+                        Set<Code> newCodes = new HashSet<>(degreePlanner.getCodes());
+                        newCodes.retainAll(editedModule.getCorequisites());
+                        return new DegreePlanner(degreePlanner.getYear(), degreePlanner.getSemester(), newCodes);
+                    }).collect(Collectors.toList());
+
+            String exceptionMessage = String.format(MESSAGE_MODULE_AND_COREQUISITES_DIFFERENT_SEMESTERS,
+                    moduleToEdit.getCode(), joinStreamAsString(problematicDegreePlanners.stream().sorted(), "\n"));
+            throw new CommandException(exceptionMessage);
+        }
+
+        DegreePlanner degreePlannerContainingModuleToEdit = model.getDegreePlannerByCode(moduleToEdit.getCode());
+        boolean isModuleToEditInDegreePlanner = degreePlannerContainingModuleToEdit != null;
+        boolean isEditedCorequisitesInDegreePlanner = !degreePlannersContainingEditedCorequisites.isEmpty();
+
+        if (!isModuleToEditInDegreePlanner && isEditedCorequisitesInDegreePlanner) {
+            DegreePlanner degreePlannerContainingEditedCorequisites = degreePlannersContainingEditedCorequisites.get(0);
+            Set<Code> existingCorequisites = degreePlannerContainingEditedCorequisites.getCodes().stream()
+                    .filter(editedModule.getCorequisites()::contains).collect(Collectors.toSet());
+            String existingCorequisitesInDegreePlanner = joinStreamAsString(existingCorequisites.stream().sorted());
+            String year = degreePlannersContainingEditedCorequisites.get(0).getYear().toString();
+            String semester = degreePlannersContainingEditedCorequisites.get(0).getSemester().toString();
+            String editedCorequisites = joinStreamAsString(editedModule.getCorequisites().stream().sorted());
+            String exceptionMessage = String.format(
+                    MESSAGE_MODULE_NOT_IN_DEGREE_PLANNER_BUT_SOME_COREQUISITES_IN_DEGREE_PLANNER,
+                    moduleToEdit.getCode(), existingCorequisitesInDegreePlanner, year, semester, editedCorequisites);
+            throw new CommandException(exceptionMessage);
+        }
+        if (isModuleToEditInDegreePlanner && isEditedCorequisitesInDegreePlanner) {
+            DegreePlanner degreePlannerContainingEditedCorequisites = degreePlannersContainingEditedCorequisites.get(0);
+            boolean isDegreePlannersSemesterEquals = degreePlannerContainingEditedCorequisites.getSemester()
+                    .equals(degreePlannerContainingModuleToEdit.getSemester());
+            if (!isDegreePlannersSemesterEquals) {
+                List<DegreePlanner> problematicDegreePlanners = degreePlannersContainingEditedCorequisites.stream()
+                        .map((degreePlanner) -> {
+                            Set<Code> newCodes = new HashSet<>(degreePlanner.getCodes());
+                            newCodes.retainAll(editedModule.getCorequisites());
+                            return new DegreePlanner(degreePlanner.getYear(), degreePlanner.getSemester(), newCodes);
+                        }).collect(Collectors.toList());
+
+                String exceptionMessage = String.format(MESSAGE_MODULE_AND_COREQUISITES_DIFFERENT_SEMESTERS,
+                        moduleToEdit.getCode(), joinStreamAsString(problematicDegreePlanners.stream().sorted(), "\n"));
+                throw new CommandException(exceptionMessage);
+            }
+        }
+
+        boolean hasMissingCorequisitesInDegreePlanner =
+                editedCorequisitesInDegreePlanner.size() != editedModule.getCorequisites().size();
+
+        if (isModuleToEditInDegreePlanner && hasMissingCorequisitesInDegreePlanner) {
+            Set<Code> missingCorequisites = new HashSet<>(editedModule.getCorequisites());
+            missingCorequisites.removeAll(editedCorequisitesInDegreePlanner);
+            String exceptionMessage = String.format(MESSAGE_COREQUISITES_NOT_IN_DEGREE_PLANNER, moduleToEdit.getCode(),
+                    joinStreamAsString(editedModule.getCorequisites().stream().sorted()),
+                    degreePlannerContainingModuleToEdit.getYear(), degreePlannerContainingModuleToEdit.getSemester(),
+                    joinStreamAsString(missingCorequisites.stream().sorted()));
+            throw new CommandException(exceptionMessage);
+        }
+    }
+
+    /**
+     * Ensures that the edited module remains valid after updating semesters.
+     * If the module is in semester X, but the edited module's semesters do not contain X, the edited module is
+     * considered invalid.
+     * @throws CommandException if the above constraint is violated.
+     */
+    private void ensureDegreePlannerUnaffectedByEditedSemesters(Model model, Module moduleToEdit,
+            Module editedModule) throws CommandException {
+        assert model != null;
+        assert moduleToEdit != null;
+        assert editedModule != null;
+
+        DegreePlanner degreePlannerContainingModuleToEdit = model.getDegreePlannerByCode(moduleToEdit.getCode());
+        if (degreePlannerContainingModuleToEdit == null) {
+            return;
+        }
+
+        if (!editedModule.getSemesters().contains(degreePlannerContainingModuleToEdit.getSemester())) {
+            String semestersToEdit = joinStreamAsString(moduleToEdit.getSemesters().stream().sorted());
+            String editedSemesters = joinStreamAsString(editedModule.getSemesters().stream().sorted());
+            String exceptionMessage = String.format(MESSAGE_INVALID_SEMESTER, moduleToEdit.getCode(), semestersToEdit,
+                    editedSemesters, degreePlannerContainingModuleToEdit.getYear(),
+                    degreePlannerContainingModuleToEdit.getSemester());
+            throw new CommandException(exceptionMessage);
+        }
+    }
+
+    /**
+     * Creates and returns a {@code Module} with the details of {@code moduleToEdit}
+     * edited with {@code editModuleDescriptor}.
+     */
+    private static Module createEditedModule(Module moduleToEdit, EditModuleDescriptor editModuleDescriptor) {
+        assert moduleToEdit != null;
+        assert editModuleDescriptor != null;
+
+        Code updatedCode = editModuleDescriptor.getCode().orElse(moduleToEdit.getCode());
+        Name updatedName = editModuleDescriptor.getName().orElse(moduleToEdit.getName());
+        Credits updatedCredits = editModuleDescriptor.getCredits().orElse(moduleToEdit.getCredits());
+        Set<Code> updatedCorequisites = editModuleDescriptor.getCorequisites().orElse(moduleToEdit.getCorequisites());
+        Set<Semester> updatedSemesters = editModuleDescriptor.getSemesters().orElse(moduleToEdit.getSemesters());
+        Set<Tag> updatedTags = editModuleDescriptor.getTags().orElse(moduleToEdit.getTags());
+
+        return new Module(updatedCode, updatedName, updatedCredits, updatedSemesters, updatedCorequisites, updatedTags);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        // short circuit if same object
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof EditCommand)) {
+            return false;
+        }
+
+        // state check
+        EditCommand e = (EditCommand) other;
+        return index.equals(e.index)
+                && editModuleDescriptor.equals(e.editModuleDescriptor);
+    }
+
+    /**
+     * Stores the details to edit the module with.<br>
+     * Each non-empty field value will replace the corresponding field value of the module.
+     */
+    public static class EditModuleDescriptor {
+        private Code code;
+        private Name name;
+        private Credits credits;
+        private Set<Code> corequisites;
+        private Set<Semester> semesters;
+        private Set<Tag> tags;
+
+        public EditModuleDescriptor() {}
+
+        /**
+         * Copy constructor.<br>
+         * Defensive copies of {@code tags} and {@code corequisites} are used internally to prevent accidental
+         * modifications.
+         */
+        public EditModuleDescriptor(EditModuleDescriptor toCopy) {
+            requireNonNull(toCopy);
+
+            setCode(toCopy.code);
+            setName(toCopy.name);
+            setCredits(toCopy.credits);
+            setCorequisites(toCopy.corequisites);
+            setSemesters(toCopy.semesters);
+            setTags(toCopy.tags);
+        }
+
+        /**
+         * Returns true if at least one field is edited.
+         */
+        public boolean isAnyFieldEdited() {
+            return isAnyNonNull(code, name, credits, corequisites, semesters, tags);
+        }
+
+        public Optional<Code> getCode() {
+            return Optional.ofNullable(code);
+        }
+
+        public void setCode(Code code) {
+            this.code = code;
+        }
+
+        public void setName(Name name) {
+            this.name = name;
+        }
+
+        public Optional<Name> getName() {
+            return Optional.ofNullable(name);
+        }
+
+        public void setCredits(Credits credits) {
+            this.credits = credits;
+        }
+
+        public Optional<Credits> getCredits() {
+            return Optional.ofNullable(credits);
+        }
+
+        /**
+         * Returns an unmodifiable {@link Semester} set, which throws {@code UnsupportedOperationException}
+         * if modification is attempted.
+         * <br><br>
+         * Returns {@code Optional#empty()} if {@code semesters} is null.
+         */
+        public Optional<Set<Semester>> getSemesters() {
+            return semesters != null
+                    ? Optional.of(Collections.unmodifiableSet(semesters))
+                    : Optional.empty();
+        }
+
+        /**
+         * Sets {@code semesters} to this object's {@link #semesters}.
+         * A defensive copy of {@code semesters} is used internally.
+         */
+        public void setSemesters(Set<Semester> semesters) {
+            this.semesters = (semesters != null)
+                    ? new HashSet<>(semesters)
+                    : null;
+        }
+
+        /**
+         * Returns an unmodifiable {@link Code} set, which throws {@code UnsupportedOperationException}
+         * if modification is attempted.
+         * <br><br>
+         * Returns {@code Optional#empty()} if {@code corequisites} is null.
+         */
+        public Optional<Set<Code>> getCorequisites() {
+            return corequisites != null
+                    ? Optional.of(Collections.unmodifiableSet(corequisites))
+                    : Optional.empty();
+        }
+
+        /**
+         * Sets {@code corequisites} to this object's {@link #corequisites}.
+         * A defensive copy of {@code corequisites} is used internally.
+         */
+        public void setCorequisites(Set<Code> corequisites) {
+            this.corequisites = (corequisites != null)
+                    ? new HashSet<>(corequisites)
+                    : null;
+        }
+
+        /**
+         * Returns an unmodifiable {@link Tag} set, which throws {@code UnsupportedOperationException}
+         * if modification is attempted.
+         * <br><br>
+         * Returns {@code Optional#empty()} if {@link #tags} is null.
+         */
+        public Optional<Set<Tag>> getTags() {
+            return tags != null
+                    ? Optional.of(Collections.unmodifiableSet(tags))
+                    : Optional.empty();
+        }
+
+        /**
+         * Sets {@code tags} to this object's {@link #tags}.<br>
+         * A defensive copy of {@code tags} is used internally.
+         */
+        public void setTags(Set<Tag> tags) {
+            this.tags = (tags != null)
+                    ? new HashSet<>(tags)
+                    : null;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            // short circuit if same object
+            if (other == this) {
+                return true;
+            }
+
+            // instanceof handles nulls
+            if (!(other instanceof EditModuleDescriptor)) {
+                return false;
+            }
+
+            // state check
+            EditModuleDescriptor e = (EditModuleDescriptor) other;
+            return getCode().equals(e.getCode())
+                    && getName().equals(e.getName())
+                    && getCredits().equals(e.getCredits())
+                    && getSemesters().equals(e.getSemesters())
+                    && getCorequisites().equals(e.getCorequisites())
+                    && getTags().equals(e.getTags());
+        }
+    }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/pwe/planner/logic/commands/ExitCommand.java
similarity index 70%
rename from src/main/java/seedu/address/logic/commands/ExitCommand.java
rename to src/main/java/pwe/planner/logic/commands/ExitCommand.java
index 2240a3e4be1f..1d8fa7189316 100644
--- a/src/main/java/seedu/address/logic/commands/ExitCommand.java
+++ b/src/main/java/pwe/planner/logic/commands/ExitCommand.java
@@ -1,7 +1,7 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
 
 /**
  * Terminates the program.
@@ -10,7 +10,7 @@ public class ExitCommand extends Command {
 
     public static final String COMMAND_WORD = "exit";
 
-    public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
+    public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting PlanWithEase as requested ...";
 
     @Override
     public CommandResult execute(Model model, CommandHistory history) {
diff --git a/src/main/java/pwe/planner/logic/commands/FindCommand.java b/src/main/java/pwe/planner/logic/commands/FindCommand.java
new file mode 100644
index 000000000000..6fc6a5602f72
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/FindCommand.java
@@ -0,0 +1,75 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_MODULES_LISTED_OVERVIEW;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_AND;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_LEFT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_OR;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_RIGHT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.function.Predicate;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
+
+/**
+ * Finds and lists all modules in application whose name or code contains any of the argument keywords.
+ * Keyword matching is case insensitive.
+ */
+public class FindCommand extends Command {
+
+    public static final String COMMAND_WORD = "find";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all modules which satisfies the expression"
+            + " of search conditions specified and displays them as a list with index numbers.\n"
+            + "Format: " + COMMAND_WORD + ' '
+            + "[" + PREFIX_NAME + "NAME] "
+            + "OPERATOR "
+            + "[" + PREFIX_CODE + "CODE] "
+            + "OPERATOR "
+            + "[" + PREFIX_CREDITS + "CREDITS] "
+            + "OPERATOR "
+            + "[" + PREFIX_SEMESTER + "SEMESTER] "
+            + "OPERATOR "
+            + "[" + PREFIX_TAG + "TAG]\n"
+            + "OPERATOR " + OPERATOR_AND + " for logical \"AND\" operation (both conditions A AND B must match)\n"
+            + "OPERATOR " + OPERATOR_OR + " for logical \"OR\" operation (either conditions A OR B must match)\n"
+            + "You can also use parenthesis to group what search conditions to evaluate first.\n"
+            + "Example 1 " + COMMAND_WORD + " " + PREFIX_NAME + "Programming " + OPERATOR_OR + " "
+            + PREFIX_NAME + "Data\n"
+            + "Example 2: " + COMMAND_WORD + " " + PREFIX_NAME + "Programming " + OPERATOR_AND + " "
+            + PREFIX_NAME + "Methodology\n"
+            + "Example 3: " + COMMAND_WORD + " " + PREFIX_NAME + "Programming " + OPERATOR_AND + " "
+            + OPERATOR_LEFT_BRACKET + " " + PREFIX_CODE + "CS1231 " + OPERATOR_OR + " " + PREFIX_CODE + "CS1010 "
+            + OPERATOR_RIGHT_BRACKET + " ";
+
+    private final Predicate<Module> predicate;
+
+    public FindCommand(Predicate<Module> predicate) {
+        requireNonNull(predicate);
+
+        this.predicate = predicate;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        model.updateFilteredModuleList(predicate);
+        return new CommandResult(
+                String.format(MESSAGE_MODULES_LISTED_OVERVIEW, model.getFilteredModuleList().size()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof FindCommand // instanceof handles nulls
+                && predicate.equals(((FindCommand) other).predicate)); // state check
+    }
+}
diff --git a/src/main/java/seedu/address/logic/commands/HelpCommand.java b/src/main/java/pwe/planner/logic/commands/HelpCommand.java
similarity index 82%
rename from src/main/java/seedu/address/logic/commands/HelpCommand.java
rename to src/main/java/pwe/planner/logic/commands/HelpCommand.java
index f0ef78dddded..3cee52ce700e 100644
--- a/src/main/java/seedu/address/logic/commands/HelpCommand.java
+++ b/src/main/java/pwe/planner/logic/commands/HelpCommand.java
@@ -1,7 +1,7 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
 
 /**
  * Format full help instructions for every command for display.
diff --git a/src/main/java/seedu/address/logic/commands/HistoryCommand.java b/src/main/java/pwe/planner/logic/commands/HistoryCommand.java
similarity index 53%
rename from src/main/java/seedu/address/logic/commands/HistoryCommand.java
rename to src/main/java/pwe/planner/logic/commands/HistoryCommand.java
index dc3de1aad55e..ac39547f8b59 100644
--- a/src/main/java/seedu/address/logic/commands/HistoryCommand.java
+++ b/src/main/java/pwe/planner/logic/commands/HistoryCommand.java
@@ -1,12 +1,14 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
 import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
 
 /**
  * Lists all the commands entered by user from the start of app launch.
@@ -15,19 +17,26 @@ public class HistoryCommand extends Command {
 
     public static final String COMMAND_WORD = "history";
     public static final String MESSAGE_SUCCESS = "Entered commands (from most recent to earliest):\n%1$s";
-    public static final String MESSAGE_NO_HISTORY = "You have not yet entered any commands.";
+    public static final String MESSAGE_NO_HISTORY = "You have not entered any commands yet!";
 
     @Override
     public CommandResult execute(Model model, CommandHistory history) {
         requireNonNull(history);
-        ArrayList<String> previousCommands = new ArrayList<>(history.getHistory());
 
-        if (previousCommands.isEmpty()) {
+        List<String> commandHistory = history.getHistory();
+
+        if (commandHistory.isEmpty()) {
             return new CommandResult(MESSAGE_NO_HISTORY);
         }
 
-        Collections.reverse(previousCommands);
-        return new CommandResult(String.format(MESSAGE_SUCCESS, String.join("\n", previousCommands)));
+        List<String> reversedCommandHistory = new ArrayList<>(commandHistory);
+        Collections.reverse(reversedCommandHistory);
+
+        String preppedReversedCommandHistory = reversedCommandHistory.stream()
+                .map(command -> "- " + command)
+                .collect(Collectors.joining("\n"));
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, preppedReversedCommandHistory));
     }
 
 }
diff --git a/src/main/java/pwe/planner/logic/commands/ListCommand.java b/src/main/java/pwe/planner/logic/commands/ListCommand.java
new file mode 100644
index 000000000000..4aff7adba9b7
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/ListCommand.java
@@ -0,0 +1,26 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_MODULES;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+
+/**
+ * Lists all modules in the application to the user.
+ */
+public class ListCommand extends Command {
+
+    public static final String COMMAND_WORD = "list";
+
+    public static final String MESSAGE_SUCCESS = "Listed all modules";
+
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        model.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
+        return new CommandResult(MESSAGE_SUCCESS);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/PlannerAddCommand.java b/src/main/java/pwe/planner/logic/commands/PlannerAddCommand.java
new file mode 100644
index 000000000000..d98e90c388f1
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/PlannerAddCommand.java
@@ -0,0 +1,187 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+/**
+ * Adds module(s) to the degree plan.
+ * Related co-requisite(s) are added as well.
+ */
+public class PlannerAddCommand extends Command {
+
+    public static final String COMMAND_WORD = "planner_add";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds module(s) to the degree plan.\n"
+            + "Format: " + COMMAND_WORD + ' '
+            + PREFIX_YEAR + "YEAR "
+            + PREFIX_SEMESTER + "SEMESTER "
+            + PREFIX_CODE + "CODE "
+            + "[" + PREFIX_CODE + "CODE]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_YEAR + "2 "
+            + PREFIX_SEMESTER + "2 "
+            + PREFIX_CODE + "CS2040C "
+            + PREFIX_CODE + "CS2113T "
+            + PREFIX_CODE + "CS2100";
+
+    public static final String MESSAGE_SUCCESS = "Successfully added new module(s) to year %1$s semester %2$s of"
+            + " the degree plan: %3$s\nCo-requisite(s) added: %4$s";
+    public static final String MESSAGE_DUPLICATE_CODE = "You cannot add the module(s) %1$s"
+            + " that already exists in the degree plan.\n";
+    public static final String MESSAGE_INVALID_COREQ = "You cannot add the module(s) %2$s with co-requisite(s) %1$s"
+            + " that already exists in a different year and semester of the degree plan.\n"
+            + "Co-requisite module(s) have to be in the same year and semester of the degree plan.";
+    public static final String MESSAGE_NONEXISTENT_MODULES = "You cannot add module(s) %1$s that does not exist in the "
+            + "module list.\n[Tip] Maybe you want to review the module list and select module(s) from there.";
+    public static final String MESSAGE_NONEXISTENT_DEGREE_PLANNER = "You cannot add to year %1$s semester "
+            + "%2$s which does not exist in the degree plan.";
+    public static final String MESSAGE_CODE_INVALID_SEMESTER = "You cannot add module(s) %1$s that is not "
+            + "offered in semester %2$s.\n[Tip] Maybe you can review the semesters of the modules "
+            + ", and perhaps use edit command to amend.";
+    public static final String MESSAGE_COREQ_INVALID_SEMESTER = "You cannot add module(s) %2$s with co-requisite(s) "
+            + "%1$s that is not offered in semester %3$s!\n[Tip] Maybe you can review the semesters of the"
+            + " modules, and perhaps use edit command to amend.";
+    private Year yearToAddTo;
+    private Semester semesterToAddTo;
+    private Set<Code> codesToAdd;
+
+    /**
+     * Creates a PlannerAddCommand to add the specified {@code codes} to the degree plan.
+     */
+    public PlannerAddCommand(Year year, Semester semester, Set<Code> codes) {
+        requireAllNonNull(year, semester, codes);
+
+        yearToAddTo = year;
+        semesterToAddTo = semester;
+        codesToAdd = codes;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        DegreePlanner selectedDegreePlanner = model.getApplication().getDegreePlannerList().stream()
+                .filter(degreePlanner -> (degreePlanner.getYear().equals(yearToAddTo)
+                        && degreePlanner.getSemester().equals(semesterToAddTo))).findFirst().orElse(null);
+        if (selectedDegreePlanner == null) {
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_DEGREE_PLANNER, yearToAddTo, semesterToAddTo));
+        }
+
+        Set<Code> duplicatePlannerCodes = codesToAdd.stream().filter(codesToCheck -> model.getApplication()
+                .getDegreePlannerList().stream().map(DegreePlanner::getCodes)
+                .anyMatch(selectedPlannerCodes -> selectedPlannerCodes.contains(codesToCheck)))
+                .collect(Collectors.toSet());
+        if (!duplicatePlannerCodes.isEmpty()) {
+            // Converts a set to a string to remove the brackets of set.
+            String duplicatePlannerCodeString = StringUtil.joinStreamAsString(duplicatePlannerCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_DUPLICATE_CODE, duplicatePlannerCodeString));
+        }
+
+        Set<Code> nonExistentModuleCodes = codesToAdd.stream()
+                .filter(codeToCheck -> !model.hasModuleCode(codeToCheck)).collect(Collectors.toSet());
+        if (!nonExistentModuleCodes.isEmpty()) {
+            String nonExistentModuleString = StringUtil.joinStreamAsString(nonExistentModuleCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_MODULES, nonExistentModuleString));
+        }
+
+        Set<Code> invalidSemesterCodes = codesToAdd.stream().filter(codeToCheck -> !model.getModuleByCode(codeToCheck)
+                        .getSemesters().contains(semesterToAddTo)).collect(Collectors.toSet());
+        if (!invalidSemesterCodes.isEmpty()) {
+            String invalidSemCodesString = StringUtil.joinStreamAsString(invalidSemesterCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_CODE_INVALID_SEMESTER, invalidSemCodesString,
+                    semesterToAddTo));
+        }
+
+        // Returns the co-requisite(s) of codes to add.
+        Set<Code> coreqsOfCodesToAdd = new HashSet<>();
+        codesToAdd.stream().map(model::getModuleByCode).map(Module::getCorequisites)
+                .forEach(coreqsOfCodesToAdd::addAll);
+        // Returns the invalid co-requisite(s) of codes to add.
+        Set<Code> invalidSemesterCoreqs = coreqsOfCodesToAdd.stream()
+                .filter(codeToCheck -> !model.getModuleByCode(codeToCheck).getSemesters().contains(semesterToAddTo))
+                    .collect(Collectors.toSet());
+        if (!invalidSemesterCoreqs.isEmpty()) {
+            // Returns the codes to add that has invalid co-requisite(s).
+            Set<Code> invalidCodesToAdd = codesToAdd.stream()
+                    .filter(codeToCheck -> !Collections.disjoint(model.getModuleByCode(codeToCheck)
+                            .getCorequisites(), invalidSemesterCoreqs)).collect(Collectors.toSet());
+
+            String invalidCodeString = StringUtil.joinStreamAsString(invalidCodesToAdd.stream().sorted());
+            String invalidSemCoreqsString = StringUtil.joinStreamAsString(invalidSemesterCoreqs.stream().sorted());
+
+            throw new CommandException(String.format(MESSAGE_COREQ_INVALID_SEMESTER, invalidSemCoreqsString,
+                    invalidCodeString, semesterToAddTo));
+        }
+
+        Set<Code> selectedCodeSet = new HashSet<>(selectedDegreePlanner.getCodes());
+        Set<Code> coreqsAdded = new HashSet<>();
+
+        for (Code codeToAdd : codesToAdd) {
+            selectedCodeSet.add(codeToAdd);
+            // Gets the module for the current code to add.
+            Module module = model.getModuleByCode(codeToAdd);
+
+            // Returns the relevant duplicate co-requisite(s) of the code to add in the entire degree plan.
+            Set<Code> duplicateCoreqs = module.getCorequisites().stream().filter(coreqToCheck -> model.getApplication()
+                    .getDegreePlannerList().stream().map(DegreePlanner::getCodes)
+                    .anyMatch(selectedPlannerCodes -> selectedPlannerCodes.contains(coreqToCheck)))
+                    .collect(Collectors.toSet());
+            Set<Code> invalidCoreqs = new HashSet<>(duplicateCoreqs);
+            // Returns the invalid duplicate co-requisite(s) that exists in a different section of the degree plan.
+            invalidCoreqs.removeAll(selectedDegreePlanner.getCodes());
+            if (!invalidCoreqs.isEmpty()) {
+                String invalidCoreqsString = StringUtil.joinStreamAsString(invalidCoreqs.stream().sorted());
+                String codesToAddString = StringUtil.joinStreamAsString(codesToAdd.stream().sorted());
+                throw new CommandException(String.format(MESSAGE_INVALID_COREQ, invalidCoreqsString, codesToAddString));
+            }
+
+            coreqsAdded.addAll(module.getCorequisites());
+
+            // Returns the valid duplicate co-requisite(s) that exists in the selected section of the degree plan.
+            duplicateCoreqs.retainAll(selectedDegreePlanner.getCodes());
+            // Records the co-requisites added for feedback to users.
+            coreqsAdded.removeAll(duplicateCoreqs);
+            selectedCodeSet.addAll(coreqsAdded);
+        }
+
+        coreqsAdded.removeAll(codesToAdd);
+
+        DegreePlanner editedDegreePlanner = new DegreePlanner(yearToAddTo, semesterToAddTo, selectedCodeSet);
+        model.setDegreePlanner(selectedDegreePlanner, editedDegreePlanner);
+        model.commitApplication();
+
+        String codesToAddString = StringUtil.joinStreamAsString(codesToAdd.stream().sorted());
+        String coreqsAddedString = StringUtil.joinStreamAsString(coreqsAdded.stream().sorted());
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, yearToAddTo, semesterToAddTo,
+                codesToAddString, coreqsAddedString));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof PlannerAddCommand // instanceof handles nulls
+                && yearToAddTo.equals(((PlannerAddCommand) other).yearToAddTo)
+                && semesterToAddTo.equals(((PlannerAddCommand) other).semesterToAddTo)
+                && codesToAdd.equals(((PlannerAddCommand) other).codesToAdd));
+    }
+}
+
diff --git a/src/main/java/pwe/planner/logic/commands/PlannerListCommand.java b/src/main/java/pwe/planner/logic/commands/PlannerListCommand.java
new file mode 100644
index 000000000000..8dfba03fbe11
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/PlannerListCommand.java
@@ -0,0 +1,31 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_DEGREE_PLANNERS;
+
+import java.util.stream.Stream;
+
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * Lists all degree planners in the application to the user.
+ */
+public class PlannerListCommand extends Command {
+
+    public static final String COMMAND_WORD = "planner_list";
+
+    public static final String MESSAGE_SUCCESS = "Listed all degree planners:\n%1$s";
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        model.updateFilteredDegreePlannerList(PREDICATE_SHOW_ALL_DEGREE_PLANNERS);
+        Stream<DegreePlanner> degreePlannersStream = model.getApplication().getDegreePlannerList().stream().sorted();
+        String degreePlannerListContent = StringUtil.joinStreamAsString(degreePlannersStream, "\n");
+        return new CommandResult(String.format(MESSAGE_SUCCESS, degreePlannerListContent));
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/PlannerMoveCommand.java b/src/main/java/pwe/planner/logic/commands/PlannerMoveCommand.java
new file mode 100644
index 000000000000..a3270e241bf0
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/PlannerMoveCommand.java
@@ -0,0 +1,148 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+/**
+ * Moves a module in the degree plan
+ */
+public class PlannerMoveCommand extends Command {
+
+    public static final String COMMAND_WORD = "planner_move";
+
+    // General command help details
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Moves a module along with its co-requisites to"
+            + " the given year/semester of the degree plan.\n"
+            + "Format: " + COMMAND_WORD + " "
+            + PREFIX_YEAR + "YEAR "
+            + PREFIX_SEMESTER + "SEMESTER "
+            + PREFIX_CODE + "CODE\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_YEAR + "1 "
+            + PREFIX_SEMESTER + "2 "
+            + PREFIX_CODE + "CS1010";
+
+    // Command success message
+    public static final String MESSAGE_SUCCESS = "Successfully moved %1$s to Year %2$s Semester %3$s of "
+            + "degree planner!\n" + "Co-Requisite(s) moved along: %4$s";
+
+    // Command failure messages
+    public static final String MESSAGE_NONEXISTENT_CODE =
+            "You cannot move a module %1$s that does not exist in the degree plan!\n"
+            + "Perhaps you were trying to add the module into the degree plan?\n"
+            + "[Tip] You may want to try adding the module into the degree plan using the "
+            + "\"planner_add\" command!";
+
+    public static final String MESSAGE_NONEXISTENT_DEGREE_PLANNER =
+            "You cannot move a module as Year %1$s Semester %2$s does not exist in the degree plan!\n"
+            + "Perhaps you mistyped either year or semester?\n"
+            + "[Tip] You may want to refer to the degree plan to see the semesters"
+            + " available in the application using the \"planner_list\" command!";
+
+    public static final String MESSAGE_UNAVAILABLE_SEMESTER =
+            "You cannot move a module that is not offered in Semester %1$s\n"
+            + "Perhaps you may want to check the module list for the semester(s) the module is offered in.\n"
+            + "[Tip] You may want to refer to the degree plan to see the semesters"
+            + " available in the application using the \"planner_list\" command!";
+
+    public static final String MESSAGE_UNAVAILABLE_COREQUISITES =
+            "You cannot move a module that has co-requisite(s) %1$s, which isn't offered in Semester %2$s\n"
+            + "Perhaps, you may want to check the semester(s) the co-requisite modules are offered in.";
+
+    private final Year destinationYear;
+    private final Semester destinationSemester;
+    private final Code toMove;
+
+    /**
+     * Creates an PlannerMoveCommand to add the specified {@code PlannerMoveCommand}
+     */
+    public PlannerMoveCommand(Year year, Semester semester, Code code) {
+        requireAllNonNull(year, semester, code);
+
+        this.destinationYear = year;
+        this.destinationSemester = semester;
+        this.toMove = code;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        DegreePlanner toFind = new DegreePlanner(destinationYear, destinationSemester, Collections.emptySet());
+        DegreePlanner sourcePlanner = model.getDegreePlannerByCode(toMove);
+        DegreePlanner destinationPlanner = model.getApplication().getDegreePlannerList().stream()
+                .filter(toFind::isSameDegreePlanner)
+                .findFirst()
+                .orElse(null);
+
+        if (sourcePlanner == null) {
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_CODE, toMove));
+        }
+
+        Module moduleToMove = model.getModuleByCode(toMove);
+        if (!moduleToMove.getSemesters().contains(destinationSemester)) {
+            throw new CommandException(String.format(MESSAGE_UNAVAILABLE_SEMESTER, destinationSemester));
+        }
+
+        if (destinationPlanner == null) {
+            throw new CommandException(
+                    String.format(MESSAGE_NONEXISTENT_DEGREE_PLANNER, destinationYear, destinationSemester));
+        }
+
+        Set<Code> codesNotOffered = moduleToMove.getCorequisites().stream()
+                .filter(corequisite -> !model.getModuleByCode(corequisite).getSemesters()
+                        .contains(destinationPlanner.getSemester()))
+                .collect(Collectors.toSet());
+
+        if (!codesNotOffered.isEmpty()) {
+            String codesNotOfferedContent =
+                    codesNotOffered.stream().sorted().map(Code::toString).collect(Collectors.joining(", "));
+            throw new CommandException(
+                    String.format(MESSAGE_UNAVAILABLE_COREQUISITES, codesNotOfferedContent, destinationSemester));
+        }
+
+        model.moveModuleBetweenPlanner(sourcePlanner, destinationPlanner, toMove);
+
+        Set<Code> corequisites = moduleToMove.getCorequisites();
+        String corequisitesMoved = corequisites.isEmpty()
+                ? "None"
+                : corequisites.stream().sorted().map(Code::toString).collect(Collectors.joining(", "));
+
+        model.commitApplication();
+        return new CommandResult(
+                String.format(MESSAGE_SUCCESS, toMove, destinationYear, destinationSemester, corequisitesMoved));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof PlannerMoveCommand)) {
+            return false;
+        }
+
+        PlannerMoveCommand otherCommand = (PlannerMoveCommand) other;
+        return destinationYear.equals(otherCommand.destinationYear)
+                && destinationSemester.equals(otherCommand.destinationSemester)
+                && toMove.equals(otherCommand.toMove);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/logic/commands/PlannerRemoveCommand.java b/src/main/java/pwe/planner/logic/commands/PlannerRemoveCommand.java
new file mode 100644
index 000000000000..bffe36e0812a
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/PlannerRemoveCommand.java
@@ -0,0 +1,108 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * Removes module(s) from the degree plan.
+ * Related co-requisite(s) are removed as well.
+ */
+public class PlannerRemoveCommand extends Command {
+
+    public static final String COMMAND_WORD = "planner_remove";
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Removes module(s) from the degree plan.\n"
+            + "Format: " + COMMAND_WORD + " "
+            + PREFIX_CODE + "CODE "
+            + "[" + PREFIX_CODE + "CODE]...\n"
+            + "Example: " + COMMAND_WORD + " code/CS1010 code/CS2040C";
+
+    public static final String MESSAGE_SUCCESS = "Successfully removed module(s) %1$s from the degree plan!\n"
+            + "Co-requisite(s) removed: %2$s";
+    public static final String MESSAGE_NONEXISTENT_CODES = "You cannot remove module(s) %1$s that does not"
+            + "exist in the degree plan.\n[Tip] Maybe you can review the module(s) in the degree plan, "
+            + "then select module(s) to remove from there.";
+    private Set<Code> codesToRemove;
+
+    /**
+     * Creates a PlannerRemoveCommand to remove the specified {@code codes} from the degree planner
+     * Related co-requisite(s) are removed as well.
+     */
+    public PlannerRemoveCommand(Set<Code> codes) {
+        requireNonNull(codes);
+
+        codesToRemove = codes;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        // Returns codes that the user wants to remove but are non-existent in the degree plan.
+        Set<Code> nonExistentPlannerCodes = codesToRemove.stream().filter(codeToCheck -> model.getApplication()
+                .getDegreePlannerList().stream().map(DegreePlanner::getCodes)
+                .noneMatch(selectedPlannerCodes -> selectedPlannerCodes.contains(codeToCheck)))
+                .collect(Collectors.toSet());
+        if (!nonExistentPlannerCodes.isEmpty()) {
+            // Converts the set to a string to remove the square brackets.
+            String nonExistentCodesString = StringUtil.joinStreamAsString(nonExistentPlannerCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_CODES, nonExistentCodesString));
+        }
+
+        Set<Code> coreqsRemoved = new HashSet<>();
+        Set<Code> coreqsOfCodesToRemove = new HashSet<>();
+
+        ObservableList<DegreePlanner> degreePlannerList = model.getApplication().getDegreePlannerList();
+        for (DegreePlanner degreePlanner : degreePlannerList) {
+            Set<Code> selectedCodeSet = new HashSet<>(degreePlanner.getCodes());
+            // Adds co-requisites of codes to remove to a set.
+            codesToRemove.stream().map(model::getModuleByCode).map(Module::getCorequisites)
+                    .forEach(coreqsOfCodesToRemove::addAll);
+
+            // Returns relevant codes that are not just co-requisites to the code to remove, but are also existing
+            // in the selected section of the degree plan.
+            coreqsOfCodesToRemove.retainAll(selectedCodeSet);
+
+            // Removes the relevant co-requisites.
+            selectedCodeSet.removeAll(coreqsOfCodesToRemove);
+            // Removes the codes to remove.
+            selectedCodeSet.removeAll(codesToRemove);
+            // Updates the selected section of the degree plan.
+            DegreePlanner editedDegreePlanner = new DegreePlanner(degreePlanner.getYear(),
+                    degreePlanner.getSemester(), selectedCodeSet);
+            model.setDegreePlanner(degreePlanner, editedDegreePlanner);
+
+            // Combines the removed co-requisites together into a set for feedback to user.
+            coreqsRemoved.addAll(coreqsOfCodesToRemove);
+        }
+
+        coreqsRemoved.removeAll(codesToRemove);
+        model.commitApplication();
+
+        // Converts a set to a string to remove the brackets of set.
+        String removedCodesString = StringUtil.joinStreamAsString(codesToRemove.stream().sorted());
+        String coreqsRemovedString = StringUtil.joinStreamAsString(coreqsRemoved.stream().sorted());
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, removedCodesString, coreqsRemovedString));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof PlannerRemoveCommand // instanceof handles nulls
+                && codesToRemove.equals(((PlannerRemoveCommand) other).codesToRemove)); // state check
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/PlannerShowCommand.java b/src/main/java/pwe/planner/logic/commands/PlannerShowCommand.java
new file mode 100644
index 000000000000..f97aeec2fc8c
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/PlannerShowCommand.java
@@ -0,0 +1,74 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_AND;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_LEFT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_OR;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_RIGHT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+
+import java.util.function.Predicate;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * Shows all semesters in degree plan that have year and semester contains any of the argument keywords.
+ * Keyword matching is case insensitive.
+ */
+public class PlannerShowCommand extends Command {
+    public static final String COMMAND_WORD = "planner_show";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Shows all semesters which satisfies the expression of search conditions "
+            + "specified based on year and/or semester in the degree plan\n"
+            + "Format: " + COMMAND_WORD
+            + " [" + PREFIX_YEAR + "YEAR] "
+            + "OPERATOR "
+            + "[" + PREFIX_SEMESTER + "SEMESTER]\n"
+            + "OPERATOR " + OPERATOR_AND
+            + " for logical \"AND\" operation (both conditions A AND B must match)\n"
+            + "OPERATOR " + OPERATOR_OR
+            + " for logical \"OR\" operation (either conditions A OR B must match)\n"
+            + "[Tip] You can also use parenthesis to group which search conditions to be evaluated first.\n"
+            + "Example 1: " + COMMAND_WORD + " " + PREFIX_YEAR + "1 " + OPERATOR_AND + " "
+            + PREFIX_SEMESTER + "2\n"
+            + "Example 2: " + COMMAND_WORD + " " + PREFIX_YEAR + "1 " + OPERATOR_OR + " " + PREFIX_YEAR + "2\n"
+            + "Example 3: " + COMMAND_WORD + " " + PREFIX_YEAR + "1 " + OPERATOR_AND + " "
+            + OPERATOR_LEFT_BRACKET + " " + PREFIX_SEMESTER + "1 " + OPERATOR_OR + " " + PREFIX_SEMESTER + "2 "
+            + OPERATOR_RIGHT_BRACKET + " ";
+
+    public static final String MESSAGE_SUCCESS = "Number of semesters showed: %1$s";
+
+    private final Predicate<DegreePlanner> predicate;
+
+    public PlannerShowCommand(Predicate<DegreePlanner> predicate) {
+        this.predicate = predicate;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        model.updateFilteredDegreePlannerList(predicate);
+
+        return new CommandResult(
+                String.format(MESSAGE_SUCCESS, model.getFilteredDegreePlannerList().size()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof PlannerShowCommand)) {
+            return false;
+        }
+
+        PlannerShowCommand otherCommand = (PlannerShowCommand) other;
+        return predicate.equals(otherCommand.predicate);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/PlannerSuggestCommand.java b/src/main/java/pwe/planner/logic/commands/PlannerSuggestCommand.java
new file mode 100644
index 000000000000..4fb9a7ed47c1
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/PlannerSuggestCommand.java
@@ -0,0 +1,170 @@
+package pwe.planner.logic.commands;
+
+import static java.lang.Math.abs;
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Suggests module(s) to take.
+ */
+public class PlannerSuggestCommand extends Command {
+
+    public static final String COMMAND_WORD = "planner_suggest";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Suggests module(s) to take.\n"
+            + "Format: " + COMMAND_WORD + ' '
+            + PREFIX_CREDITS + "CREDITS "
+            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_CREDITS + "2 "
+            + PREFIX_TAG + "algorithms "
+            + PREFIX_TAG + "c";
+
+    public static final String MESSAGE_SUCCESS = "The lists are sorted with the more recommended module(s)"
+            + " in front.\nModule(s) recommended: %1$s\nModule(s) with relevant"
+            + " tags: %2$s\nModule(s) with matching credits: %3$s";
+    private static final int MAX_NUMBER_OF_ELEMENETS = 10;
+    private static final int VALUE_OF_NO_DIFFERENCE = 0;
+
+    private Credits creditsToFind;
+    private Set<Tag> tagsToFind;
+
+    /**
+     * Creates a PlannerSuggestCommand to suggest {@code codes} to take.
+     */
+    public PlannerSuggestCommand(Credits bestCredits, Set<Tag> tags) {
+        requireAllNonNull(bestCredits, tags);
+
+        creditsToFind = bestCredits;
+        tagsToFind = tags;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        Set<Code> plannerCodes = new HashSet<>();
+        // Adds all the codes in the degree plan to a set.
+        model.getApplication().getDegreePlannerList()
+                .stream().map(DegreePlanner::getCodes).forEach(plannerCodes::addAll);
+
+        ObservableList<Module> moduleList = model.getApplication().getModuleList();
+        List<ModuleToSuggest> modulesToSuggest = new ArrayList<>();
+        List<ModuleToSuggest> modulesWithMatchingTags = new ArrayList<>();
+        List<ModuleToSuggest> modulesWithMatchingCredits = new ArrayList<>();
+        for (Module module : moduleList) {
+            // Finds the matching tags for each module.
+            Set<Tag> matchingTags = new HashSet<>(tagsToFind);
+            matchingTags.retainAll(module.getTags());
+
+            // Finds the credits difference.
+            int credit = Integer.valueOf((module.getCredits().toString()));
+            int bestCredits = Integer.valueOf(creditsToFind.toString());
+            int creditDifference = abs(credit - bestCredits);
+
+            ModuleToSuggest moduleToSuggest =
+                    new ModuleToSuggest(creditDifference, matchingTags.size(), module.getCode());
+            modulesToSuggest.add(moduleToSuggest);
+
+            if (!matchingTags.isEmpty()) {
+                modulesWithMatchingTags.add(moduleToSuggest);
+            }
+
+            if (creditDifference == VALUE_OF_NO_DIFFERENCE) {
+                modulesWithMatchingCredits.add(moduleToSuggest);
+            }
+        }
+
+        // Returns a sorted list of codes to suggest based on both credits and tags.
+        List<Code> codesToSuggest = modulesToSuggest.stream().sorted().map(ModuleToSuggest::getModuleCode)
+                .filter(code -> !plannerCodes.contains(code)).limit(MAX_NUMBER_OF_ELEMENETS)
+                    .collect(Collectors.toList());
+        // Converts the list to a string to remove the brackets of list.
+        String suggestionString = StringUtil.joinStreamAsString(codesToSuggest.stream());
+
+        // Returns a sorted list of codes with matching tags in the recommendation list.
+        List<Code> codesWithMatchingTags = modulesWithMatchingTags.stream().sorted().map(ModuleToSuggest::getModuleCode)
+                .filter(code -> !plannerCodes.contains(code) && codesToSuggest.contains(code))
+                    .collect(Collectors.toList());
+        String matchingTagCodeString = StringUtil.joinStreamAsString(codesWithMatchingTags.stream());
+
+        // Returns a sorted list of codes with matching credits in the recommendation list.
+        List<Code> codesWithMatchingCredits = modulesWithMatchingCredits.stream().sorted()
+                .map(ModuleToSuggest::getModuleCode).filter(code -> !plannerCodes.contains(code) && codesToSuggest
+                        .contains(code)).collect(Collectors.toList());
+        String matchingCreditCodeString = StringUtil.joinStreamAsString(codesWithMatchingCredits.stream());
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, suggestionString, matchingTagCodeString,
+                matchingCreditCodeString));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof PlannerSuggestCommand // instanceof handles nulls
+                && tagsToFind.equals(((PlannerSuggestCommand) other).tagsToFind)
+                && creditsToFind.equals(((PlannerSuggestCommand) other).creditsToFind));
+    }
+
+    /**
+     * Creates a ModuleToSuggest object for sorting.
+     */
+    public class ModuleToSuggest implements Comparable<ModuleToSuggest> {
+        private int creditDifference;
+        private int numberOfMatchingTags;
+        private Code moduleCode;
+
+        public ModuleToSuggest(int creditDifference, int numberOfMatchingTags, Code moduleCode) {
+            this.creditDifference = creditDifference;
+            this.numberOfMatchingTags = numberOfMatchingTags;
+            this.moduleCode = moduleCode;
+        }
+
+        public int getCreditDifference() {
+            return creditDifference;
+        }
+
+        public int getNumberOfMatchingTags() {
+            return numberOfMatchingTags;
+        }
+
+        public Code getModuleCode() {
+            return moduleCode;
+        }
+
+        /**
+         * @param moduleToCompare A valid module to suggest
+         * @return number of matching tags difference between two modules to suggest, or
+         * credit difference between two modules if tie. If both tie, sort according to
+         * alphabetical order.
+         */
+        @Override
+        public int compareTo(ModuleToSuggest moduleToCompare) {
+            if (this.getNumberOfMatchingTags() == moduleToCompare.getNumberOfMatchingTags()
+                && this.getCreditDifference() == moduleToCompare.getCreditDifference()) {
+                return this.getModuleCode().compareTo(moduleToCompare.getModuleCode());
+            } else if (this.getNumberOfMatchingTags() == moduleToCompare.getNumberOfMatchingTags()) {
+                return this.getCreditDifference() - moduleToCompare.getCreditDifference();
+            }
+            return moduleToCompare.getNumberOfMatchingTags() - this.getNumberOfMatchingTags();
+        }
+    }
+}
diff --git a/src/main/java/seedu/address/logic/commands/RedoCommand.java b/src/main/java/pwe/planner/logic/commands/RedoCommand.java
similarity index 55%
rename from src/main/java/seedu/address/logic/commands/RedoCommand.java
rename to src/main/java/pwe/planner/logic/commands/RedoCommand.java
index 227771a4eef6..2d7fb21f1daa 100644
--- a/src/main/java/seedu/address/logic/commands/RedoCommand.java
+++ b/src/main/java/pwe/planner/logic/commands/RedoCommand.java
@@ -1,14 +1,14 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_MODULES;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
 
 /**
- * Reverts the {@code model}'s address book to its previously undone state.
+ * Reverts the {@code model}'s application to its previously undone state.
  */
 public class RedoCommand extends Command {
 
@@ -20,12 +20,12 @@ public class RedoCommand extends Command {
     public CommandResult execute(Model model, CommandHistory history) throws CommandException {
         requireNonNull(model);
 
-        if (!model.canRedoAddressBook()) {
+        if (!model.canRedoApplication()) {
             throw new CommandException(MESSAGE_FAILURE);
         }
 
-        model.redoAddressBook();
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.redoApplication();
+        model.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }
diff --git a/src/main/java/pwe/planner/logic/commands/RequirementAddCommand.java b/src/main/java/pwe/planner/logic/commands/RequirementAddCommand.java
new file mode 100644
index 000000000000..bbdf635e09f7
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/RequirementAddCommand.java
@@ -0,0 +1,136 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Adds a module to a requirement category.
+ */
+public class RequirementAddCommand extends Command {
+
+    public static final String COMMAND_WORD = "requirement_add";
+
+    // This is declared before MESSAGE_USAGE to prevent illegal forward reference
+    public static final String FORMAT_AND_EXAMPLES = "Format: " + COMMAND_WORD + ' '
+            + PREFIX_NAME + "NAME "
+            + PREFIX_CODE + "CODE "
+            + "[" + PREFIX_CODE + "CODE]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_NAME + "Computing Foundation "
+            + PREFIX_CODE + "CS1010";
+
+    // General command help details
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a module to a requirement category.\n"
+            + FORMAT_AND_EXAMPLES;
+
+    // Command success message
+    public static final String MESSAGE_SUCCESS = "Successfully added module(s) (%1$s) the requirement category %2$s!";
+
+    // Command failure messages
+    public static final String MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY =
+            "You cannot specify a requirement category (%1$s) that does not exist!\n"
+            + "Perhaps you misspelled the name of the requirement category?\n"
+            + "[Tip] You may want to refer to the requirement category list to see the requirement categories"
+            + " in the application using the \"requirement_list\" command!";
+
+    public static final String MESSAGE_NONEXISTENT_CODE = "You cannot specify module(s) (%1$s) that does not exist!\n"
+            + "Perhaps you were trying to add modules into the application?\n"
+            + "[Tip] You may want to add the module into the module list first using the \"add\" command.\n"
+            + "Afterwards, you can add the module into the requirement category using the "
+            + "\"requirement_add\" command!";
+
+    public static final String MESSAGE_DUPLICATE_CODE =
+            "The module has already been added to requirement category %1$s\n"
+            + "Perhaps you misspelled a module code?\n"
+            + "[Tip] You are able to view all the modules in application using the \"list\" command.";
+
+    public static final String MESSAGE_EXISTING_CODE =
+            "The module to be added already exists in another requirement category!\n"
+            + "Perhaps you misspelled a module code?\n"
+            + "[Tip] You may want to refer to the requirement category list to see the requirement categories"
+            + " in the application using the \"requirement_list\" command!";
+
+    private final Name toFind;
+    private final Set<Code> toAdd = new HashSet<>();
+
+    /**
+     * Creates an RequirementAddCommand to add the specified {@code RequirementCategory}
+     */
+    public RequirementAddCommand(Name name, Set<Code> codeSet) {
+        requireAllNonNull(name, codeSet);
+
+        this.toFind = name;
+        this.toAdd.addAll(codeSet);
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        RequirementCategory currentRequirementCategory = model.getRequirementCategory(toFind);
+
+        if (currentRequirementCategory == null) {
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY, toFind));
+        }
+
+        List<Code> nonExistentCodes = toAdd.stream().filter(code -> !model.hasModuleCode(code))
+                .collect(Collectors.toList());
+
+        if (!nonExistentCodes.isEmpty()) {
+            String nonExistentCodesErrorMessage = StringUtil.joinStreamAsString(nonExistentCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_CODE, nonExistentCodesErrorMessage));
+        }
+
+        if (currentRequirementCategory.hasModuleCode(toAdd)) {
+            throw new CommandException(String.format(MESSAGE_DUPLICATE_CODE, currentRequirementCategory.getName()));
+        }
+
+        Stream<RequirementCategory> requirementCategories = model.getApplication()
+                .getRequirementCategoryList().stream();
+
+        boolean isAnyCodeInRequirementCategories = requirementCategories.anyMatch(reqCat -> toAdd.stream()
+                .anyMatch(code -> reqCat.getCodeSet().contains(code)));
+
+        if (isAnyCodeInRequirementCategories) {
+            throw new CommandException(MESSAGE_EXISTING_CODE);
+        }
+
+        Set<Code> newCodeSet = new HashSet<>(currentRequirementCategory.getCodeSet());
+        newCodeSet.addAll(toAdd);
+
+        RequirementCategory editedRequirementCategory = new RequirementCategory(
+                currentRequirementCategory.getName(), currentRequirementCategory.getCredits(), newCodeSet
+        );
+        model.setRequirementCategory(currentRequirementCategory, editedRequirementCategory);
+        model.commitApplication();
+
+        String codesAdded = StringUtil.joinStreamAsString(toAdd.stream().sorted());
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, codesAdded, currentRequirementCategory.getName()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof RequirementAddCommand // instanceof handles nulls
+                && toFind.equals(((RequirementAddCommand) other).toFind)
+                && toAdd.equals(((RequirementAddCommand) other).toAdd));
+    }
+
+}
diff --git a/src/main/java/pwe/planner/logic/commands/RequirementListCommand.java b/src/main/java/pwe/planner/logic/commands/RequirementListCommand.java
new file mode 100644
index 000000000000..52c05588f323
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/RequirementListCommand.java
@@ -0,0 +1,52 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_REQUIREMENT_CATEGORIES;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Lists all requirement categories in the application to the user.
+ */
+public class RequirementListCommand extends Command {
+
+    public static final String COMMAND_WORD = "requirement_list";
+
+    public static final String MESSAGE_SUCCESS = "Successfully listed all requirement categories: \n%1$s";
+
+    @Override public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        model.updateFilteredRequirementCategoryList(PREDICATE_SHOW_ALL_REQUIREMENT_CATEGORIES);
+        StringBuilder requirementListContent = new StringBuilder();
+
+        ObservableList<RequirementCategory> requirementCategories = model.getFilteredRequirementCategoryList();
+
+        for (RequirementCategory requirementCategory : requirementCategories) {
+            requirementListContent.append(requirementCategory.getName()).append(" ");
+
+            int currentCredits = requirementCategory.getCodeSet().stream()
+                    .map(code -> model.getModuleByCode(code).getCredits().toString())
+                    .map(Integer::parseInt).reduce(0, (totalCredits, credit) -> totalCredits + credit);
+
+            requirementListContent.append("(").append(currentCredits).append("/")
+                    .append(requirementCategory.getCredits()).append(" Modular Credits Fulfilled) \n");
+
+            if (requirementCategory.getCodeSet().isEmpty()) {
+                requirementListContent.append("No modules added!");
+            } else {
+                requirementListContent.append("Modules: ")
+                        .append(StringUtil.joinStreamAsString(requirementCategory.getCodeSet().stream().sorted()));
+            }
+
+            requirementListContent.append("\n\n");
+        }
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, requirementListContent.toString()));
+
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/RequirementMoveCommand.java b/src/main/java/pwe/planner/logic/commands/RequirementMoveCommand.java
new file mode 100644
index 000000000000..cc7f3b2d58d7
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/RequirementMoveCommand.java
@@ -0,0 +1,163 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.model.util.RequirementCategoryUtil.getRequirementCategoryWithCodeAdded;
+import static pwe.planner.model.util.RequirementCategoryUtil.getRequirementCategoryWithCodeRemoved;
+import static pwe.planner.model.util.RequirementCategoryUtil.getRequirementCategoryWithCodesAdded;
+import static pwe.planner.model.util.RequirementCategoryUtil.getRequirementCategoryWithCodesRemoved;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Moves modules from a requirement category to another requirement category
+ */
+public class RequirementMoveCommand extends Command {
+
+    public static final String COMMAND_WORD = "requirement_move";
+
+    // This is declared before MESSAGE_USAGE to prevent illegal forward reference
+    public static final String FORMAT_AND_EXAMPLES = "Format: " + COMMAND_WORD + ' '
+            + PREFIX_NAME + "NAME "
+            + PREFIX_CODE + "CODE "
+            + "[" + PREFIX_CODE + "CODE]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_NAME + "Computing Foundation "
+            + PREFIX_CODE + "CS1010";
+
+    // General command help details
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Moves module(s) from one"
+            + " requirement category to another. \n"
+            + FORMAT_AND_EXAMPLES;
+
+    // Command success message
+    public static final String MESSAGE_SUCCESS = "Successfully moved module(s) (%1$s) to requirement category %2$s!";
+
+    // Command failure messages
+    public static final String MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY =
+            "You cannot specify a requirement category (%1$s) that does not exist!\n"
+            + "Perhaps you misspelled the name of the requirement category?\n"
+            + "[Tip] You may want to refer to the requirement category list to see the requirement categories"
+            + " in the application using the \"requirement_list\" command!";
+
+    public static final String MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY =
+            "You cannot move module(s) (%1$s) that does not exist in any requirement category!\n"
+            + "Perhaps you were trying to add modules into the requirement category?\n"
+            + "[Tip] You can try adding the module into the requirement category using the "
+            + "\"requirement_add\" command!";
+
+    public static final String MESSAGE_NONEXISTENT_CODE = "You cannot specify module(s) (%1$s) that does not exist!\n"
+            + "Perhaps you were trying to add modules into the application?\n"
+            + "[Tip] You may want to add the module into the module list first using the \"add\" command.\n"
+            + "Afterwards, you can add the module into the requirement category using the "
+            + "\"requirement_add\" command!";
+
+    private final Name toFind;
+    private final Set<Code> toMove = new HashSet<>();
+
+    /**
+     * Creates an RequirementMoveCommand to add the specified {@code RequirementMoveCommand}
+     */
+    public RequirementMoveCommand(Name name, Set<Code> codeSet) {
+        requireAllNonNull(name, codeSet);
+
+        this.toFind = name;
+        this.toMove.addAll(codeSet);
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        ObservableList<RequirementCategory> requirementCategories = model.getApplication().getRequirementCategoryList();
+        RequirementCategory destinationRequirementCategory = model.getRequirementCategory(toFind);
+
+        if (destinationRequirementCategory == null) {
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY, toFind));
+        }
+
+        List<Code> nonExistentCodes = toMove.stream().filter(code -> !model.hasModuleCode(code))
+                .collect(Collectors.toList());
+
+        if (!nonExistentCodes.isEmpty()) {
+            String nonExistentCodesErrorMessage = StringUtil.joinStreamAsString(nonExistentCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_CODE, nonExistentCodesErrorMessage));
+        }
+
+        List<Code> codeNotInAnyRequirementCategory = toMove.stream().filter(code -> requirementCategories.stream()
+                .noneMatch(requirementCategory -> requirementCategory.getCodeSet()
+                .contains(code))).collect(Collectors.toList());
+
+        if (!codeNotInAnyRequirementCategory.isEmpty()) {
+            String codeNotInAnyRequirementCategoryErrorMessage =
+                    StringUtil.joinStreamAsString(codeNotInAnyRequirementCategory.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY,
+                    codeNotInAnyRequirementCategoryErrorMessage));
+        }
+
+        RequirementCategory singleSourceRequirementCategory = requirementCategories.stream()
+                .filter(requirementCategory -> requirementCategory.getCodeSet()
+                .containsAll(toMove)).findFirst().orElse(null);
+
+        //If all codes to be moved is from a requirement category only, all the codes can be moved together
+        if (singleSourceRequirementCategory != null) {
+            //Check if destination code contains codes to move for edge cases
+            if (!destinationRequirementCategory.getCodeSet().containsAll(toMove)) {
+                RequirementCategory editedSourceRequirementCategory =
+                        getRequirementCategoryWithCodesRemoved(singleSourceRequirementCategory, toMove);
+                RequirementCategory editedDestinationRequirementCategory =
+                        getRequirementCategoryWithCodesAdded(destinationRequirementCategory, toMove);
+
+                model.setRequirementCategory(singleSourceRequirementCategory, editedSourceRequirementCategory);
+                model.setRequirementCategory(destinationRequirementCategory, editedDestinationRequirementCategory);
+            }
+        } else {
+            for (Code code : toMove) {
+                //Check if destination code contains codes to move for edge cases
+                if (!destinationRequirementCategory.getCodeSet().contains(code)) {
+                    RequirementCategory sourceRequirementCategory = requirementCategories.stream()
+                            .filter(reqCat -> reqCat.getCodeSet().contains(code)).findFirst().orElse(null);
+
+                    RequirementCategory editedSourceRequirementCategory =
+                            getRequirementCategoryWithCodeRemoved(sourceRequirementCategory, code);
+                    RequirementCategory editedDestinationRequirementCategory =
+                            getRequirementCategoryWithCodeAdded(destinationRequirementCategory, code);
+
+                    model.setRequirementCategory(sourceRequirementCategory, editedSourceRequirementCategory);
+                    model.setRequirementCategory(destinationRequirementCategory, editedDestinationRequirementCategory);
+
+                    //reinitialize the updated destination requirement category
+                    destinationRequirementCategory = model.getRequirementCategory(toFind);
+                }
+            }
+        }
+
+        String codesMoved = StringUtil.joinStreamAsString(toMove.stream().sorted());
+
+        model.commitApplication();
+        return new CommandResult(String.format(MESSAGE_SUCCESS, codesMoved, destinationRequirementCategory.getName()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof RequirementMoveCommand // instanceof handles nulls
+                && toFind.equals(((RequirementMoveCommand) other).toFind)
+                && toMove.equals(((RequirementMoveCommand) other).toMove));
+    }
+
+}
diff --git a/src/main/java/pwe/planner/logic/commands/RequirementRemoveCommand.java b/src/main/java/pwe/planner/logic/commands/RequirementRemoveCommand.java
new file mode 100644
index 000000000000..2e98ddf7e4bc
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/RequirementRemoveCommand.java
@@ -0,0 +1,131 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Removes a module from a requirement category.
+ */
+public class RequirementRemoveCommand extends Command {
+
+    public static final String COMMAND_WORD = "requirement_remove";
+
+    // This is declared before MESSAGE_USAGE to prevent illegal forward reference
+    public static final String FORMAT_AND_EXAMPLES = "Format: " + COMMAND_WORD + ' '
+            + PREFIX_CODE + "CODE "
+            + "[" + PREFIX_CODE + "CODE]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_CODE + "IS4231 ";
+
+    // General command help details
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Removes module(s) from the requirement category.\n"
+            + FORMAT_AND_EXAMPLES;
+
+    // Command success message
+    public static final String MESSAGE_SUCCESS = "Successfully removed module(s) (%1$s)";
+
+    //Command Failure messages
+    public static final String MESSAGE_NONEXISTENT_CODE = "You cannot specify module(s) (%1$s) that does not exist!\n"
+            + "Perhaps you misspelled a module code?\n"
+            + "[Tip] You are able to view all the modules in application using the \"list\" command.";
+
+    public static final String MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY =
+            "You cannot remove module(s) (%1$s) that does not exist in any requirement category!\n"
+            + "Perhaps you were trying to delete modules from the application?\n"
+            + "[Tip] You are able to delete a module from the application using the \"delete\" command.\n"
+            + "The module deleted will be automatically removed from the corresponding requirement category";
+
+    private final Set<Code> toRemove = new HashSet<>();
+
+    /**
+     * Creates an RequirementRemoveCommand to remove the specified {@code codeSet}
+     */
+    public RequirementRemoveCommand(Set<Code> codeSet) {
+        requireNonNull(codeSet);
+
+        this.toRemove.addAll(codeSet);
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        ObservableList<RequirementCategory> requirementCategories = model.getApplication().getRequirementCategoryList();
+
+        List<Code> nonExistentCodes = toRemove.stream().filter(code -> !model.hasModuleCode(code))
+                .collect(Collectors.toList());
+
+        if (!nonExistentCodes.isEmpty()) {
+            String nonExistentCodesErrorMessage =
+                    StringUtil.joinStreamAsString(nonExistentCodes.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_NONEXISTENT_CODE, nonExistentCodesErrorMessage));
+        }
+
+        List<Code> codeNotInAnyRequirementCategory = toRemove.stream().filter(code -> requirementCategories.stream()
+                .noneMatch(requirementCategory -> requirementCategory.getCodeSet()
+                        .contains(code))).collect(Collectors.toList());
+
+        if (!codeNotInAnyRequirementCategory.isEmpty()) {
+            String codeNotInAnyRequirementCategoryErrorMessage =
+                    StringUtil.joinStreamAsString(codeNotInAnyRequirementCategory.stream().sorted());
+            throw new CommandException(String.format(MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY,
+                    codeNotInAnyRequirementCategoryErrorMessage));
+        }
+
+        RequirementCategory singleSourceRequirementCategory = requirementCategories.stream()
+                .filter(requirementCategory -> requirementCategory.getCodeSet()
+                        .containsAll(toRemove)).findFirst().orElse(null);
+
+        //If all codes to be removed is from a requirement category only, all the codes can be removed together
+        if (singleSourceRequirementCategory != null) {
+            Set<Code> newCodeSet = new HashSet<>(singleSourceRequirementCategory.getCodeSet());
+            newCodeSet.removeAll(toRemove);
+
+            RequirementCategory editedRequirementCategory = new RequirementCategory(
+                    singleSourceRequirementCategory.getName(), singleSourceRequirementCategory.getCredits(),
+                    newCodeSet);
+
+            model.setRequirementCategory(singleSourceRequirementCategory, editedRequirementCategory);
+        } else {
+            //If all codes to be removed are from multiple requirement category, have to remove the codes individually
+            for (Code code : toRemove) {
+                RequirementCategory sourceRequirementCategory = requirementCategories.stream()
+                        .filter(reqCat -> reqCat.getCodeSet().contains(code)).findFirst().orElse(null);
+
+                Set<Code> newCodeSet = new HashSet<>(sourceRequirementCategory.getCodeSet());
+                newCodeSet.remove(code);
+
+                RequirementCategory editedRequirementCategory = new RequirementCategory(
+                        sourceRequirementCategory.getName(), sourceRequirementCategory.getCredits(), newCodeSet);
+
+                model.setRequirementCategory(sourceRequirementCategory, editedRequirementCategory);
+
+            }
+        }
+
+        String codesMoved = StringUtil.joinStreamAsString(toRemove.stream().sorted());
+
+        model.commitApplication();
+        return new CommandResult(String.format(MESSAGE_SUCCESS, codesMoved));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof RequirementRemoveCommand // instanceof handles nulls
+                && toRemove.equals(((RequirementRemoveCommand) other).toRemove));
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/commands/ResetCommand.java b/src/main/java/pwe/planner/logic/commands/ResetCommand.java
new file mode 100644
index 000000000000..6d093010c02f
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/ResetCommand.java
@@ -0,0 +1,26 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.util.SampleDataUtil;
+
+/**
+ * Populate the application with sample data.
+ */
+public class ResetCommand extends Command {
+    public static final String COMMAND_WORD = "reset";
+    public static final String MESSAGE_SUCCESS = "Application has been populated with the sample data!\n"
+            + "[Tip] If you unintentionally used this command, do use the undo command to revert back the changes!";
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
+
+        model.setApplication(SampleDataUtil.getSampleApplication());
+        model.commitApplication();
+        return new CommandResult(MESSAGE_SUCCESS);
+    }
+}
+
diff --git a/src/main/java/pwe/planner/logic/commands/SelectCommand.java b/src/main/java/pwe/planner/logic/commands/SelectCommand.java
new file mode 100644
index 000000000000..38fa69677ff1
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/commands/SelectCommand.java
@@ -0,0 +1,57 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+
+import java.util.List;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
+
+/**
+ * Selects a module identified using it's displayed index from the application.
+ */
+public class SelectCommand extends Command {
+
+    public static final String COMMAND_WORD = "select";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Selects the module identified by the index number used in the displayed module list.\n"
+            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_SELECT_MODULE_SUCCESS = "Selected Module: %1$s";
+
+    private final Index targetIndex;
+
+    public SelectCommand(Index targetIndex) {
+        requireNonNull(targetIndex);
+
+        this.targetIndex = targetIndex;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+
+        List<Module> filteredModuleList = model.getFilteredModuleList();
+
+        if (targetIndex.getZeroBased() >= filteredModuleList.size()) {
+            throw new CommandException(MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+        }
+
+        model.setSelectedModule(filteredModuleList.get(targetIndex.getZeroBased()));
+        return new CommandResult(String.format(MESSAGE_SELECT_MODULE_SUCCESS, targetIndex.getOneBased()));
+
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof SelectCommand // instanceof handles nulls
+                && targetIndex.equals(((SelectCommand) other).targetIndex)); // state check
+    }
+}
diff --git a/src/main/java/seedu/address/logic/commands/UndoCommand.java b/src/main/java/pwe/planner/logic/commands/UndoCommand.java
similarity index 55%
rename from src/main/java/seedu/address/logic/commands/UndoCommand.java
rename to src/main/java/pwe/planner/logic/commands/UndoCommand.java
index 40441264f346..dcc1a903846f 100644
--- a/src/main/java/seedu/address/logic/commands/UndoCommand.java
+++ b/src/main/java/pwe/planner/logic/commands/UndoCommand.java
@@ -1,14 +1,14 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_MODULES;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
 
 /**
- * Reverts the {@code model}'s address book to its previous state.
+ * Reverts the {@code model}'s application to its previous state.
  */
 public class UndoCommand extends Command {
 
@@ -20,12 +20,12 @@ public class UndoCommand extends Command {
     public CommandResult execute(Model model, CommandHistory history) throws CommandException {
         requireNonNull(model);
 
-        if (!model.canUndoAddressBook()) {
+        if (!model.canUndoApplication()) {
             throw new CommandException(MESSAGE_FAILURE);
         }
 
-        model.undoAddressBook();
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.undoApplication();
+        model.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }
diff --git a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java b/src/main/java/pwe/planner/logic/commands/exceptions/CommandException.java
similarity index 89%
rename from src/main/java/seedu/address/logic/commands/exceptions/CommandException.java
rename to src/main/java/pwe/planner/logic/commands/exceptions/CommandException.java
index a16bd14f2cde..e5aaa271c77d 100644
--- a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java
+++ b/src/main/java/pwe/planner/logic/commands/exceptions/CommandException.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.commands.exceptions;
+package pwe.planner.logic.commands.exceptions;
 
 /**
  * Represents an error which occurs during execution of a {@link Command}.
diff --git a/src/main/java/pwe/planner/logic/parser/AddCommandParser.java b/src/main/java/pwe/planner/logic/parser/AddCommandParser.java
new file mode 100644
index 000000000000..9dc799d458b5
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/AddCommandParser.java
@@ -0,0 +1,67 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_COREQUISITE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCode;
+import static pwe.planner.logic.parser.ParserUtil.parseCorequisites;
+import static pwe.planner.logic.parser.ParserUtil.parseCredits;
+import static pwe.planner.logic.parser.ParserUtil.parseName;
+import static pwe.planner.logic.parser.ParserUtil.parseSemesters;
+import static pwe.planner.logic.parser.ParserUtil.parseTags;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Parses input arguments and creates a new AddCommand object
+ */
+public class AddCommandParser implements Parser<AddCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the {@link AddCommand}
+     * and returns an {@link AddCommand} object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public AddCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(AddCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(
+                args, PREFIX_CODE, PREFIX_NAME, PREFIX_CREDITS, PREFIX_SEMESTER, PREFIX_COREQUISITE, PREFIX_TAG
+        );
+
+        boolean isAnyRequiredPrefixAbsent = !arePrefixesPresent(argMultimap, PREFIX_CODE, PREFIX_NAME, PREFIX_CREDITS);
+
+        if (isAnyRequiredPrefixAbsent || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+        }
+
+        Code code = parseCode(argMultimap.getValue(PREFIX_CODE).get());
+        Name name = parseName(argMultimap.getValue(PREFIX_NAME).get());
+        Credits credits = parseCredits(argMultimap.getValue(PREFIX_CREDITS).get());
+        Set<Semester> semesterSet = parseSemesters(argMultimap.getAllValues(PREFIX_SEMESTER));
+        Set<Code> corequisiteSet = parseCorequisites(argMultimap.getAllValues(PREFIX_COREQUISITE));
+        Set<Tag> tagSet = parseTags(argMultimap.getAllValues(PREFIX_TAG));
+
+        Module module = new Module(code, name, credits, semesterSet, corequisiteSet, tagSet);
+        return new AddCommand(module);
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java b/src/main/java/pwe/planner/logic/parser/ArgumentMultimap.java
similarity index 89%
rename from src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
rename to src/main/java/pwe/planner/logic/parser/ArgumentMultimap.java
index 954c8e18f8ea..83e8828d6687 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
+++ b/src/main/java/pwe/planner/logic/parser/ArgumentMultimap.java
@@ -1,4 +1,7 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +29,8 @@ public class ArgumentMultimap {
      * @param argValue Argument value to be associated with the specified prefix key
      */
     public void put(Prefix prefix, String argValue) {
+        requireAllNonNull(prefix, argValue);
+
         List<String> argValues = getAllValues(prefix);
         argValues.add(argValue);
         argMultimap.put(prefix, argValues);
@@ -35,6 +40,8 @@ public void put(Prefix prefix, String argValue) {
      * Returns the last value of {@code prefix}.
      */
     public Optional<String> getValue(Prefix prefix) {
+        requireNonNull(prefix);
+
         List<String> values = getAllValues(prefix);
         return values.isEmpty() ? Optional.empty() : Optional.of(values.get(values.size() - 1));
     }
@@ -45,6 +52,8 @@ public Optional<String> getValue(Prefix prefix) {
      * Modifying the returned list will not affect the underlying data structure of the ArgumentMultimap.
      */
     public List<String> getAllValues(Prefix prefix) {
+        requireNonNull(prefix);
+
         if (!argMultimap.containsKey(prefix)) {
             return new ArrayList<>();
         }
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java b/src/main/java/pwe/planner/logic/parser/ArgumentTokenizer.java
similarity index 89%
rename from src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
rename to src/main/java/pwe/planner/logic/parser/ArgumentTokenizer.java
index 5c9aebfa4888..0c9b0e035469 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
+++ b/src/main/java/pwe/planner/logic/parser/ArgumentTokenizer.java
@@ -1,7 +1,10 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,6 +27,8 @@ public class ArgumentTokenizer {
      * @return           ArgumentMultimap object that maps prefixes to their arguments
      */
     public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
+        requireAllNonNull(argsString, prefixes);
+
         List<PrefixPosition> positions = findAllPrefixPositions(argsString, prefixes);
         return extractArguments(argsString, positions);
     }
@@ -36,6 +41,9 @@ public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
      * @return           List of zero-based prefix positions in the given arguments string
      */
     private static List<PrefixPosition> findAllPrefixPositions(String argsString, Prefix... prefixes) {
+        assert argsString != null;
+        assert prefixes != null;
+
         return Arrays.stream(prefixes)
                 .flatMap(prefix -> findPrefixPositions(argsString, prefix).stream())
                 .collect(Collectors.toList());
@@ -45,6 +53,9 @@ private static List<PrefixPosition> findAllPrefixPositions(String argsString, Pr
      * {@see findAllPrefixPositions}
      */
     private static List<PrefixPosition> findPrefixPositions(String argsString, Prefix prefix) {
+        assert argsString != null;
+        assert prefix != null;
+
         List<PrefixPosition> positions = new ArrayList<>();
 
         int prefixPosition = findPrefixPosition(argsString, prefix.getPrefix(), 0);
@@ -70,6 +81,9 @@ private static List<PrefixPosition> findPrefixPositions(String argsString, Prefi
      * {@code fromIndex} = 0, this method returns 5.
      */
     private static int findPrefixPosition(String argsString, String prefix, int fromIndex) {
+        assert argsString != null;
+        assert prefix != null;
+
         int prefixIndex = argsString.indexOf(" " + prefix, fromIndex);
         return prefixIndex == -1 ? -1
                 : prefixIndex + 1; // +1 as offset for whitespace
@@ -85,9 +99,11 @@ private static int findPrefixPosition(String argsString, String prefix, int from
      * @return                ArgumentMultimap object that maps prefixes to their arguments
      */
     private static ArgumentMultimap extractArguments(String argsString, List<PrefixPosition> prefixPositions) {
+        assert argsString != null;
+        assert prefixPositions != null;
 
         // Sort by start position
-        prefixPositions.sort((prefix1, prefix2) -> prefix1.getStartPosition() - prefix2.getStartPosition());
+        prefixPositions.sort(Comparator.comparingInt(PrefixPosition::getStartPosition));
 
         // Insert a PrefixPosition to represent the preamble
         PrefixPosition preambleMarker = new PrefixPosition(new Prefix(""), 0);
@@ -116,6 +132,10 @@ private static ArgumentMultimap extractArguments(String argsString, List<PrefixP
     private static String extractArgumentValue(String argsString,
                                         PrefixPosition currentPrefixPosition,
                                         PrefixPosition nextPrefixPosition) {
+        assert argsString != null;
+        assert currentPrefixPosition != null;
+        assert nextPrefixPosition != null;
+
         Prefix prefix = currentPrefixPosition.getPrefix();
 
         int valueStartPos = currentPrefixPosition.getStartPosition() + prefix.getPrefix().length();
@@ -132,6 +152,8 @@ private static class PrefixPosition {
         private final Prefix prefix;
 
         PrefixPosition(Prefix prefix, int startPosition) {
+            requireAllNonNull(prefix, startPosition);
+
             this.prefix = prefix;
             this.startPosition = startPosition;
         }
diff --git a/src/main/java/pwe/planner/logic/parser/BooleanExpressionParser.java b/src/main/java/pwe/planner/logic/parser/BooleanExpressionParser.java
new file mode 100644
index 000000000000..8a7e531ec49b
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/BooleanExpressionParser.java
@@ -0,0 +1,198 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.logic.parser.Operator.getOperatorFromString;
+import static pwe.planner.logic.parser.ParserUtil.parseCode;
+import static pwe.planner.logic.parser.ParserUtil.parseCredits;
+import static pwe.planner.logic.parser.ParserUtil.parseName;
+import static pwe.planner.logic.parser.ParserUtil.parseSemester;
+import static pwe.planner.logic.parser.ParserUtil.parseTag;
+import static pwe.planner.logic.parser.ParserUtil.parseYear;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.function.Predicate;
+
+import pwe.planner.logic.parser.exceptions.BooleanParserException;
+import pwe.planner.logic.parser.exceptions.BooleanParserPredicateException;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.CodeContainsKeywordsPredicate;
+import pwe.planner.model.module.CreditsContainsKeywordsPredicate;
+import pwe.planner.model.module.KeywordsPredicate;
+import pwe.planner.model.module.NameContainsKeywordsPredicate;
+import pwe.planner.model.module.TagContainsKeywordsPredicate;
+import pwe.planner.model.planner.SemesterContainsKeywordPredicate;
+import pwe.planner.model.planner.YearContainsKeywordPredicate;
+
+/**
+ * Parse input string into a composite predicate.
+ */
+public class BooleanExpressionParser<T> {
+
+    public static final String MESSAGE_TIP = "[Tip] If you are unclear about the expected expression format, "
+            + "please check the help page.\nYou can do so by typing \"help\"";
+    public static final String MESSAGE_INVALID_EXPRESSION =
+            "It looks like an invalid command format! (Filter expression is invalid) \n%1$s";
+    public static final String MESSAGE_INVALID_OPERATOR = "This operator is not supported yet!";
+    public static final String MESSAGE_INVALID_OPERATOR_APPLICATION =
+            "Perhaps you missed out one or more search terms?\n" + MESSAGE_TIP;
+    public static final String MESSAGE_UNABLE_TO_CREATE_PREDICATE =
+            "%1$s is not a valid parameter accepted by this command!";
+    public static final String MESSAGE_EMPTY_OUTPUT = "There seems to be an empty condition!\n"
+            + "Perhaps you might want to consider providing the criteria to filter?\n" + MESSAGE_TIP;
+    public static final String MESSAGE_GENERAL_FAIL = "You might want to double check your filter expression!\n"
+            + MESSAGE_TIP;
+
+    private static final String WHITESPACE = " ";
+
+    private List<Prefix> prefixes;
+    private String stringToTokenize;
+
+    public BooleanExpressionParser(String stringToTokenize, List<Prefix> prefixes) {
+        requireAllNonNull(stringToTokenize, prefixes);
+        this.stringToTokenize = stringToTokenize;
+        this.prefixes = prefixes;
+    }
+
+    private Predicate<T> getKeywordsPredicate(String args) throws BooleanParserPredicateException, ParseException {
+        assert args != null;
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, prefixes.toArray(new Prefix[0]));
+        KeywordsPredicate<T> predicate = null;
+        if (prefixes.contains(PREFIX_NAME) && argMultimap.getValue(PREFIX_NAME).isPresent()) {
+            String nameKeyword = parseName(argMultimap.getValue(PREFIX_NAME).get()).toString();
+            predicate = new NameContainsKeywordsPredicate<>(nameKeyword);
+        } else if (prefixes.contains(PREFIX_CODE) && argMultimap.getValue(PREFIX_CODE).isPresent()) {
+            String codeKeyword = parseCode(argMultimap.getValue(PREFIX_CODE).get()).toString();
+            predicate = new CodeContainsKeywordsPredicate<>(codeKeyword);
+        } else if (prefixes.contains(PREFIX_CREDITS) && argMultimap.getValue(PREFIX_CREDITS).isPresent()) {
+            String creditKeyword = parseCredits(argMultimap.getValue(PREFIX_CREDITS).get()).toString();
+            predicate = new CreditsContainsKeywordsPredicate<>(creditKeyword);
+        } else if (prefixes.contains(PREFIX_YEAR) && argMultimap.getValue(PREFIX_YEAR).isPresent()) {
+            String yearKeyword = parseYear(argMultimap.getValue(PREFIX_YEAR).get()).toString();
+            predicate = new YearContainsKeywordPredicate<>(yearKeyword);
+        } else if (prefixes.contains(PREFIX_SEMESTER) && argMultimap.getValue(PREFIX_SEMESTER).isPresent()) {
+            String semesterKeyword = parseSemester(argMultimap.getValue(PREFIX_SEMESTER).get()).toString();
+            predicate = new SemesterContainsKeywordPredicate<>(semesterKeyword);
+        } else if (prefixes.contains(PREFIX_TAG) && argMultimap.getValue(PREFIX_TAG).isPresent()) {
+            String tagKeyword = parseTag(argMultimap.getValue(PREFIX_TAG).get()).tagName;
+            predicate = new TagContainsKeywordsPredicate<>(tagKeyword);
+        } else {
+            throw new BooleanParserPredicateException(String.format(MESSAGE_UNABLE_TO_CREATE_PREDICATE, args));
+        }
+        return predicate;
+    }
+
+    /**
+     * Apply the operator on the 2 predicates
+     *
+     * @param operator
+     * @param predicate1
+     * @param predicate2
+     * @return a composite predicate
+     */
+    private Predicate<T> applyOperator(Operator operator, Predicate<T> predicate1,
+                                       Predicate<T> predicate2) throws BooleanParserException {
+        requireAllNonNull(operator, predicate1, predicate2);
+
+        switch (operator) {
+        case OR:
+            return predicate1.or(predicate2);
+        case AND:
+            return predicate1.and(predicate2);
+        default:
+            throw new BooleanParserException(String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_INVALID_OPERATOR));
+        }
+    }
+
+    /**
+     * Parse input argument into a composite predicate.
+     * This parse method make use of the shunting yard algorithm to convert in-fix to post fix then evaluate
+     * the expression.
+     *
+     * @return a composite predicate
+     */
+    public Predicate<T> parse() throws BooleanParserException, ParseException {
+        BooleanExpressionTokenizer tokenizer = new BooleanExpressionTokenizer(stringToTokenize, prefixes);
+
+        Deque<Predicate<T>> output = new ArrayDeque<>();
+        Deque<Operator> operatorStack = new ArrayDeque<>();
+
+        try {
+            boolean isNotExpectingLeftBracket = false;
+            while (tokenizer.hasMoreTokens()) {
+                String currentToken = tokenizer.nextToken();
+                switch (currentToken) {
+                case CliSyntax.OPERATOR_LEFT_BRACKET:
+                    if (isNotExpectingLeftBracket) {
+                        throw new BooleanParserException(String.format(MESSAGE_INVALID_EXPRESSION,
+                                MESSAGE_GENERAL_FAIL));
+                    } else {
+                        operatorStack.push(Operator.LEFT_BRACKET);
+                        isNotExpectingLeftBracket = false;
+                    }
+                    break;
+                case CliSyntax.OPERATOR_RIGHT_BRACKET:
+                    while (operatorStack.peek() != Operator.LEFT_BRACKET) {
+                        output.push(applyOperator(operatorStack.pop(), output.pop(), output.pop()));
+                    }
+                    operatorStack.pop();
+                    isNotExpectingLeftBracket = true;
+                    break;
+                case CliSyntax.OPERATOR_OR: // Fallthrough
+                case CliSyntax.OPERATOR_AND:
+                    while (!operatorStack.isEmpty()
+                            && Operator.hasHigherPrecedence(operatorStack.peek(),
+                            getOperatorFromString(currentToken))) {
+                        output.push(applyOperator(operatorStack.pop(), output.pop(), output.pop()));
+                    }
+                    operatorStack.push(getOperatorFromString(currentToken));
+                    isNotExpectingLeftBracket = false;
+                    break;
+                default:
+                    // as ArgumentMultimap require a whitespace before the args
+                    // we will have to add a whitespace before our args without changing the code
+                    // of ArgumentMultimap.
+                    Predicate<T> in = getKeywordsPredicate(WHITESPACE + currentToken);
+                    output.push(in);
+                    isNotExpectingLeftBracket = false;
+                    break;
+                }
+            }
+        } catch (NoSuchElementException nse) {
+            throw new BooleanParserException(String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_GENERAL_FAIL));
+        }
+
+        while (!operatorStack.isEmpty()) {
+            // need at least 2 inputs predicates to apply operator
+            if (output.size() >= 2) {
+                output.push(applyOperator(operatorStack.pop(), output.pop(), output.pop()));
+            } else {
+                throw new BooleanParserException(
+                        String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_INVALID_OPERATOR_APPLICATION));
+            }
+        }
+
+        // Output stack cannot have more than 1 predicate after shunting yard.
+        // i.e. There is 2 predicate in an expression without a operator.
+        if (output.size() > 1) {
+            throw new BooleanParserException(String.format(MESSAGE_INVALID_EXPRESSION,
+                    MESSAGE_INVALID_OPERATOR_APPLICATION));
+        }
+
+        if (output.size() == 0) {
+            throw new BooleanParserException(String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_EMPTY_OUTPUT));
+        }
+
+        assert output.size() == 1 : "output.size() should be 1.";
+        return output.pop();
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/BooleanExpressionTokenizer.java b/src/main/java/pwe/planner/logic/parser/BooleanExpressionTokenizer.java
new file mode 100644
index 000000000000..350aa9f490e5
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/BooleanExpressionTokenizer.java
@@ -0,0 +1,147 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.OPERATORS;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Tokenizes command in the format of a boolean expression by extracting all arguments with {@link Prefix prefix} and
+ * {@link CliSyntax#OPERATORS boolean operators} as tokens.
+ * <br><br>
+ * This class functions differently from {@link ArgumentTokenizer} (does not use whitespace as delimiter) and
+ * {@link java.util.StringTokenizer StringTokenizer} (insufficient in extracting prefixed arguments and boolean
+ * operators), and is intended to be used by {@link BooleanExpressionParser}.
+ * <br><br>
+ * e.g. Tokenizing {@code a/A || (b/B && c/C)} where prefixes are {@code a/ b/ c/} will yield the following tokens: <br>
+ * 1. a/A <br>
+ * 2. ||  <br>
+ * 3. (   <br>
+ * 4. b/B <br>
+ * 5. &&  <br>
+ * 6. c/C <br>
+ * 7. )   <br>
+ */
+public class BooleanExpressionTokenizer {
+    private String stringToTokenize;
+    private final List<String> prefixes;
+    private final List<String> delimiters;
+
+    private Deque<String> tokens = new ArrayDeque<>();
+    private int nextTokenStartIndex = 0;
+    private int nextTokenEndIndex = 0;
+
+    /**
+     * Initializes a {@link BooleanExpressionTokenizer} that tokenizes {@code stringToTokenize} by extracting all
+     * arguments with {@link Prefix prefix} and {@link CliSyntax#OPERATORS boolean operators} as tokens.
+     * @param stringToTokenize a string to be tokenized
+     * @param prefixes         a list of prefixes to be included as delimiters
+     */
+    public BooleanExpressionTokenizer(String stringToTokenize, List<Prefix> prefixes) {
+        requireAllNonNull(stringToTokenize, prefixes);
+
+        this.stringToTokenize = stringToTokenize;
+        this.prefixes = prefixes.stream().map(Prefix::getPrefix).collect(Collectors.toList());
+        this.delimiters = Stream.concat(this.prefixes.stream(), OPERATORS.stream()).collect(Collectors.toList());
+
+        tokenizeString();
+    }
+
+    /**
+     * Tokenizes {@link #stringToTokenize} based on the {@link CliSyntax#OPERATORS boolean operators} and the specified
+     * {@link #prefixes} until there are no more tokens to be extracted.
+     * <br><br>
+     * Note: This method does not parse or validate the contents of the tokens.
+     */
+    private void tokenizeString() {
+        while (hasNextToken()) {
+            extractNextToken();
+        }
+    }
+
+    /**
+     * Tests if there are still more tokens available for extraction.<br>
+     * If this method returns {@code true}, then a subsequent call to {@link #extractNextToken()} will successfully
+     * extract the next token available.
+     * @return {@code true} if and only if there is at least one token remaining; {@code false} otherwise.
+     */
+    private boolean hasNextToken() {
+        // ensure token start/end indexes are within valid range
+        if (nextTokenStartIndex >= stringToTokenize.length() || nextTokenEndIndex >= stringToTokenize.length()) {
+            return false;
+        }
+
+        Optional<Integer> optionalNextTokenEndIndex = delimiters.stream()
+                .map(delimiter -> {
+                    int index = stringToTokenize.indexOf(delimiter, nextTokenStartIndex);
+                    if (index == nextTokenStartIndex) {
+                        index += delimiter.length();
+                    }
+                    return index;
+                })
+                .filter(index -> index != -1) // exclude -1 (indicates delimiter does not exists)
+                .min(Integer::compare); // get the smallest end index for next token
+
+        if (!optionalNextTokenEndIndex.isPresent()) {
+            nextTokenEndIndex = stringToTokenize.length();
+            return nextTokenStartIndex != nextTokenEndIndex;
+        } else {
+            nextTokenEndIndex = optionalNextTokenEndIndex.get();
+            return true;
+        }
+    }
+
+    /**
+     * Extracts the next available trimmed token, and adds it to the {@link #tokens} if it is not empty.
+     * <br><br>
+     * However, if the last token extracted is prefixed but the next token extracted is not a delimiter, the next token
+     * extracted will be concatenated to the last token extracted.
+     */
+    private void extractNextToken() {
+        if (nextTokenStartIndex >= stringToTokenize.length() || nextTokenEndIndex > stringToTokenize.length()) {
+            return;
+        }
+
+        String nextToken = stringToTokenize.substring(nextTokenStartIndex, nextTokenEndIndex).trim();
+        if (!nextToken.isEmpty()) {
+            String lastToken = tokens.peekLast();
+
+            // Checks if last token extracted is prefixed, but nextToken is not delimiter
+            if (!delimiters.contains(nextToken) && lastToken != null && prefixes.contains(lastToken)) {
+                // concatenate both tokens together if so, and update tokens accordingly
+                String joinnedToken = lastToken + nextToken;
+                tokens.removeLast();
+                tokens.addLast(joinnedToken);
+            } else {
+                tokens.addLast(nextToken);
+            }
+        }
+
+        nextTokenStartIndex = nextTokenEndIndex;
+    }
+
+    /**
+     * Returns the next token from this boolean expression tokenizer.
+     * @return the next token extracted
+     * @throws NoSuchElementException if there is no more tokens remaining
+     */
+    public String nextToken() throws NoSuchElementException {
+        return tokens.removeFirst();
+    }
+
+    /**
+     * Returns a boolean that indicates whether there are still tokens remaining.<br>
+     * If this method returns {@code true}, then a subsequent call to {@link #nextToken()} will successfully return a
+     * token.
+     * @return {@code true} if and only if there is at least one token remaining; {@code false} otherwise.
+     */
+    public boolean hasMoreTokens() {
+        return tokens.size() > 0;
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/ClearCommandParser.java b/src/main/java/pwe/planner/logic/parser/ClearCommandParser.java
new file mode 100644
index 000000000000..04202b370372
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/ClearCommandParser.java
@@ -0,0 +1,41 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.commands.ClearCommand.MESSAGE_USAGE;
+import static pwe.planner.logic.commands.ClearCommand.PLANNER;
+import static pwe.planner.logic.commands.ClearCommand.REQUIREMENT;
+
+import java.util.Set;
+
+import pwe.planner.commons.core.Messages;
+import pwe.planner.logic.commands.ClearCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.Application;
+
+/**
+ * Parse the argument and clear the {@link Application} based on the arguments
+ */
+public class ClearCommandParser implements Parser<ClearCommand> {
+    private Set<String> acceptedArgument = Set.of(PLANNER, REQUIREMENT);
+
+    /**
+     * Parse the user provided argument.
+     *
+     * @param args user provided argument
+     * @return {@link ClearCommand}
+     * @throws ParseException if no argument is provided
+     */
+    public ClearCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        String trimmedLowerArgs = args.trim().toLowerCase();
+        if (trimmedLowerArgs.isEmpty()) {
+            return new ClearCommand();
+        }
+        if (acceptedArgument.contains(trimmedLowerArgs)) {
+            return new ClearCommand(trimmedLowerArgs);
+        } else {
+            throw new ParseException(String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+        }
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/CliSyntax.java b/src/main/java/pwe/planner/logic/parser/CliSyntax.java
new file mode 100644
index 000000000000..3b646678cdb3
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/CliSyntax.java
@@ -0,0 +1,30 @@
+package pwe.planner.logic.parser;
+
+import java.util.List;
+
+/**
+ * Contains Command Line Interface (CLI) syntax definitions common to multiple commands
+ */
+public class CliSyntax {
+
+    /* Prefix definitions */
+    public static final Prefix PREFIX_NAME = new Prefix("name/");
+    public static final Prefix PREFIX_CODE = new Prefix("code/");
+    public static final Prefix PREFIX_CREDITS = new Prefix("credits/");
+    public static final Prefix PREFIX_TAG = new Prefix("tag/");
+    public static final Prefix PREFIX_COREQUISITE = new Prefix("coreq/");
+    public static final Prefix PREFIX_YEAR = new Prefix("year/");
+    public static final Prefix PREFIX_SEMESTER = new Prefix("sem/");
+
+    public static final String OPERATOR_OR = "||";
+    public static final String OPERATOR_AND = "&&";
+    public static final String OPERATOR_LEFT_BRACKET = "(";
+    public static final String OPERATOR_RIGHT_BRACKET = ")";
+
+    public static final List<String> OPERATORS = List.of(
+            OPERATOR_AND,
+            OPERATOR_OR,
+            OPERATOR_LEFT_BRACKET,
+            OPERATOR_RIGHT_BRACKET
+    );
+}
diff --git a/src/main/java/pwe/planner/logic/parser/CommandParser.java b/src/main/java/pwe/planner/logic/parser/CommandParser.java
new file mode 100644
index 000000000000..715d8702b6a8
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/CommandParser.java
@@ -0,0 +1,138 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.logic.commands.ClearCommand;
+import pwe.planner.logic.commands.Command;
+import pwe.planner.logic.commands.DeleteCommand;
+import pwe.planner.logic.commands.EditCommand;
+import pwe.planner.logic.commands.ExitCommand;
+import pwe.planner.logic.commands.FindCommand;
+import pwe.planner.logic.commands.HelpCommand;
+import pwe.planner.logic.commands.HistoryCommand;
+import pwe.planner.logic.commands.ListCommand;
+import pwe.planner.logic.commands.PlannerAddCommand;
+import pwe.planner.logic.commands.PlannerListCommand;
+import pwe.planner.logic.commands.PlannerMoveCommand;
+import pwe.planner.logic.commands.PlannerRemoveCommand;
+import pwe.planner.logic.commands.PlannerShowCommand;
+import pwe.planner.logic.commands.PlannerSuggestCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.RequirementAddCommand;
+import pwe.planner.logic.commands.RequirementListCommand;
+import pwe.planner.logic.commands.RequirementMoveCommand;
+import pwe.planner.logic.commands.RequirementRemoveCommand;
+import pwe.planner.logic.commands.ResetCommand;
+import pwe.planner.logic.commands.SelectCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses user input.
+ */
+public class CommandParser {
+
+    /**
+     * Used for initial separation of command word and args.
+     */
+    private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");
+
+    /**
+     * Parses user input into command for execution.
+     *
+     * @param userInput full user input string
+     * @return the command based on the user input
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public Command parseCommand(String userInput) throws ParseException {
+        requireNonNull(userInput);
+
+        final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
+        if (!matcher.matches()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
+        }
+
+        final String commandWord = matcher.group("commandWord");
+        final String arguments = matcher.group("arguments");
+        switch (commandWord) {
+
+        case AddCommand.COMMAND_WORD:
+            return new AddCommandParser().parse(arguments);
+
+        case EditCommand.COMMAND_WORD:
+            return new EditCommandParser().parse(arguments);
+
+        case SelectCommand.COMMAND_WORD:
+            return new SelectCommandParser().parse(arguments);
+
+        case DeleteCommand.COMMAND_WORD:
+            return new DeleteCommandParser().parse(arguments);
+
+        case ClearCommand.COMMAND_WORD:
+            return new ClearCommandParser().parse(arguments);
+
+        case ResetCommand.COMMAND_WORD:
+            return new ResetCommand();
+
+        case FindCommand.COMMAND_WORD:
+            return new FindCommandParser().parse(arguments);
+
+        case ListCommand.COMMAND_WORD:
+            return new ListCommand();
+
+        case RequirementAddCommand.COMMAND_WORD:
+            return new RequirementAddCommandParser().parse(arguments);
+
+        case RequirementListCommand.COMMAND_WORD:
+            return new RequirementListCommand();
+
+        case RequirementMoveCommand.COMMAND_WORD:
+            return new RequirementMoveCommandParser().parse(arguments);
+
+        case RequirementRemoveCommand.COMMAND_WORD:
+            return new RequirementRemoveCommandParser().parse(arguments);
+
+        case HistoryCommand.COMMAND_WORD:
+            return new HistoryCommand();
+
+        case PlannerListCommand.COMMAND_WORD:
+            return new PlannerListCommand();
+
+        case PlannerShowCommand.COMMAND_WORD:
+            return new PlannerShowCommandParser().parse(arguments);
+
+        case PlannerMoveCommand.COMMAND_WORD:
+            return new PlannerMoveCommandParser().parse(arguments);
+
+        case ExitCommand.COMMAND_WORD:
+            return new ExitCommand();
+
+        case HelpCommand.COMMAND_WORD:
+            return new HelpCommand();
+
+        case UndoCommand.COMMAND_WORD:
+            return new UndoCommand();
+
+        case RedoCommand.COMMAND_WORD:
+            return new RedoCommand();
+
+        case PlannerAddCommand.COMMAND_WORD:
+            return new PlannerAddCommandParser().parse(arguments);
+
+        case PlannerSuggestCommand.COMMAND_WORD:
+            return new PlannerSuggestCommandParser().parse(arguments);
+
+        case PlannerRemoveCommand.COMMAND_WORD:
+            return new PlannerRemoveCommandParser().parse(arguments);
+
+        default:
+            throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
+        }
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/DeleteCommandParser.java b/src/main/java/pwe/planner/logic/parser/DeleteCommandParser.java
new file mode 100644
index 000000000000..be2fd5ed590f
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/DeleteCommandParser.java
@@ -0,0 +1,36 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.ParserUtil.parseIndex;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.DeleteCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new DeleteCommand object
+ */
+public class DeleteCommandParser implements Parser<DeleteCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the DeleteCommand
+     * and returns an DeleteCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public DeleteCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(DeleteCommand.MESSAGE_USAGE);
+        }
+
+        try {
+            Index index = parseIndex(args);
+            return new DeleteCommand(index);
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), pe);
+        }
+    }
+
+}
diff --git a/src/main/java/pwe/planner/logic/parser/EditCommandParser.java b/src/main/java/pwe/planner/logic/parser/EditCommandParser.java
new file mode 100644
index 000000000000..87ea382479da
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/EditCommandParser.java
@@ -0,0 +1,131 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_COREQUISITE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.ParserUtil.parseCode;
+import static pwe.planner.logic.parser.ParserUtil.parseCorequisites;
+import static pwe.planner.logic.parser.ParserUtil.parseCredits;
+import static pwe.planner.logic.parser.ParserUtil.parseIndex;
+import static pwe.planner.logic.parser.ParserUtil.parseName;
+import static pwe.planner.logic.parser.ParserUtil.parseSemesters;
+import static pwe.planner.logic.parser.ParserUtil.parseTags;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.EditCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Parses input arguments and creates a new EditCommand object
+ */
+public class EditCommandParser implements Parser<EditCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the EditCommand
+     * and returns an EditCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public EditCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(EditCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(
+                args, PREFIX_CODE, PREFIX_NAME, PREFIX_CREDITS, PREFIX_SEMESTER, PREFIX_COREQUISITE, PREFIX_TAG
+        );
+
+        Index index;
+
+        try {
+            index = parseIndex(argMultimap.getPreamble());
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
+        }
+
+        EditModuleDescriptor editModuleDescriptor = new EditCommand.EditModuleDescriptor();
+        if (argMultimap.getValue(PREFIX_CODE).isPresent()) {
+            editModuleDescriptor.setCode(parseCode(argMultimap.getValue(PREFIX_CODE).get()));
+        }
+        if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
+            editModuleDescriptor.setName(parseName(argMultimap.getValue(PREFIX_NAME).get()));
+        }
+        if (argMultimap.getValue(PREFIX_CREDITS).isPresent()) {
+            editModuleDescriptor.setCredits(parseCredits(argMultimap.getValue(PREFIX_CREDITS).get()));
+        }
+        parseSemestersForEdit(argMultimap.getAllValues(PREFIX_SEMESTER)).ifPresent(editModuleDescriptor::setSemesters);
+        parseCorequisitesForEdit(argMultimap.getAllValues(PREFIX_COREQUISITE))
+                .ifPresent(editModuleDescriptor::setCorequisites);
+        parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editModuleDescriptor::setTags);
+
+        if (!editModuleDescriptor.isAnyFieldEdited()) {
+            throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
+        }
+
+        return new EditCommand(index, editModuleDescriptor);
+    }
+
+    /**
+     * Parses {@code Collection<String> semesters} into a {@code Set<Semester>} if {@code semesters} is non-empty.
+     * If {@code semesters} contain only one element which is an empty string, it will be parsed into a
+     * {@code Set<Semester>} containing zero semesters.
+     */
+    private Optional<Set<Semester>> parseSemestersForEdit(Collection<String> semesters) throws ParseException {
+        assert semesters != null;
+
+        if (semesters.isEmpty()) {
+            return Optional.empty();
+        }
+        Collection<String> corequisitesSet = (semesters.size() == 1 && semesters.contains(""))
+                ? Collections.emptySet()
+                : semesters;
+        return Optional.of(parseSemesters(corequisitesSet));
+    }
+
+    /**
+     * Parses {@code Collection<String> corequisites} into a {@code Set<Code>} if {@code corequisites} is non-empty.
+     * If {@code corequisites} contain only one element which is an empty string, it will be parsed into a
+     * {@code Set<Code>} containing zero codes.
+     */
+    private Optional<Set<Code>> parseCorequisitesForEdit(Collection<String> corequisites) throws ParseException {
+        assert corequisites != null;
+
+        if (corequisites.isEmpty()) {
+            return Optional.empty();
+        }
+        Collection<String> corequisitesSet = (corequisites.size() == 1 && corequisites.contains(""))
+                ? Collections.emptySet()
+                : corequisites;
+        return Optional.of(parseCorequisites(corequisitesSet));
+    }
+
+    /**
+     * Parses {@code Collection<String> tags} into a {@code Set<Tag>} if {@code tags} is non-empty.
+     * If {@code tags} contain only one element which is an empty string, it will be parsed into a
+     * {@code Set<Tag>} containing zero tags.
+     */
+    private Optional<Set<Tag>> parseTagsForEdit(Collection<String> tags) throws ParseException {
+        assert tags != null;
+
+        if (tags.isEmpty()) {
+            return Optional.empty();
+        }
+        Collection<String> tagSet = tags.size() == 1 && tags.contains("") ? Collections.emptySet() : tags;
+        return Optional.of(parseTags(tagSet));
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/FindCommandParser.java b/src/main/java/pwe/planner/logic/parser/FindCommandParser.java
new file mode 100644
index 000000000000..e3c0f232e763
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/FindCommandParser.java
@@ -0,0 +1,61 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.LogsCenter.getLogger;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.FindCommand.MESSAGE_USAGE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+
+import pwe.planner.logic.commands.FindCommand;
+import pwe.planner.logic.parser.exceptions.BooleanParserException;
+import pwe.planner.logic.parser.exceptions.BooleanParserPredicateException;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Module;
+
+/**
+ * Parses input arguments and creates a new FindCommand object
+ */
+public class FindCommandParser implements Parser<FindCommand> {
+    private static final Logger logger = getLogger(FindCommandParser.class);
+    private static final List<Prefix> PREFIXES = List.of(
+            PREFIX_NAME,
+            PREFIX_CODE,
+            PREFIX_CREDITS,
+            PREFIX_TAG,
+            PREFIX_SEMESTER
+    );
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the FindCommand
+     * and returns an FindCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public FindCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(FindCommand.MESSAGE_USAGE);
+        }
+
+        try {
+            BooleanExpressionParser<Module> expressionParser = new BooleanExpressionParser<>(args, PREFIXES);
+            Predicate<Module> predicate = expressionParser.parse();
+            return new FindCommand(predicate);
+        } catch (BooleanParserPredicateException predicateException) {
+            logger.warning(predicateException.getMessage());
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+        } catch (BooleanParserException parserException) {
+            throw new ParseException(parserException.getMessage());
+        }
+    }
+
+}
diff --git a/src/main/java/pwe/planner/logic/parser/Operator.java b/src/main/java/pwe/planner/logic/parser/Operator.java
new file mode 100644
index 000000000000..a6512d442aa1
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/Operator.java
@@ -0,0 +1,56 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_AND;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_OR;
+
+import java.util.Map;
+
+/**
+ * Operators that can be used
+ */
+public enum Operator {
+    /*
+     We will use 99 for highest precedence, 0 for lowest precedence
+     Order of precedence
+        && > OR
+    */
+    // LEFT_BRACKET and RIGHT_BRACKET uses 1 because we handle it in our switch condition.
+    LEFT_BRACKET(0),
+    RIGHT_BRACKET(0),
+    // Boolean OR. We use 11 to indicate lower precedence
+    OR(11),
+    // Boolean AND. We use 22 to indicate a higher precedence vs boolean OR
+    // We increase more than 1 mainly for future references if there is any operators we need between them.
+    AND(22);
+
+    private static Map<String, Operator> ops = Map.of(
+            OPERATOR_OR, Operator.OR,
+            OPERATOR_AND, Operator.AND
+    );
+    final int precedence;
+
+    Operator(int precedence) {
+        this.precedence = precedence;
+    }
+
+    public static Operator getOperatorFromString(String input) {
+        requireNonNull(input);
+
+        return ops.get(input);
+    }
+
+    /**
+     * Returns {@code true} if {@code op1} has higher precedence than {@code op2}.<br>
+     * Note: If {@code op1} has equal precedence as {@code op2}, it is considered to have higher precedence than
+     * {@code op2}.
+     * @param op1 first operator to compare
+     * @param op2 second operator to compare
+     * @return {@code true} if {@code op1} has higher precedence than {@code op2}; {@code false} otherwise
+     */
+    public static boolean hasHigherPrecedence(Operator op1, Operator op2) {
+        requireAllNonNull(op1, op2);
+        return op1.precedence >= op2.precedence;
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/Parser.java b/src/main/java/pwe/planner/logic/parser/Parser.java
similarity index 72%
rename from src/main/java/seedu/address/logic/parser/Parser.java
rename to src/main/java/pwe/planner/logic/parser/Parser.java
index d6551ad8e3ff..3810779ced23 100644
--- a/src/main/java/seedu/address/logic/parser/Parser.java
+++ b/src/main/java/pwe/planner/logic/parser/Parser.java
@@ -1,7 +1,7 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
 
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.parser.exceptions.ParseException;
+import pwe.planner.logic.commands.Command;
+import pwe.planner.logic.parser.exceptions.ParseException;
 
 /**
  * Represents a Parser that is able to parse user input into a {@code Command} of type {@code T}.
diff --git a/src/main/java/pwe/planner/logic/parser/ParserUtil.java b/src/main/java/pwe/planner/logic/parser/ParserUtil.java
new file mode 100644
index 000000000000..84ca6fa66069
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/ParserUtil.java
@@ -0,0 +1,219 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Contains utility methods used for parsing strings in the various *Parser classes.
+ */
+public class ParserUtil {
+
+    public static final String MESSAGE_INVALID_INDEX = "Index is not a non-zero unsigned integer.";
+
+    /**
+     * Returns true if none of the prefixes contains empty {@code Optional} values in the given
+     * {@code ArgumentMultimap}.
+     */
+    public static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+        requireAllNonNull(argumentMultimap, prefixes);
+
+        return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+    }
+
+    /**
+     * Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
+     * trimmed.
+     *
+     * @throws ParseException if the specified index is invalid (not non-zero unsigned integer).
+     */
+    public static Index parseIndex(String oneBasedIndex) throws ParseException {
+        requireNonNull(oneBasedIndex);
+
+        String trimmedIndex = oneBasedIndex.trim();
+        if (!StringUtil.isNonZeroUnsignedInteger(trimmedIndex)) {
+            throw new ParseException(MESSAGE_INVALID_INDEX);
+        }
+        return Index.fromOneBased(Integer.parseInt(trimmedIndex));
+    }
+
+    /**
+     * Parses a {@code String name} into a {@code Name}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code name} is invalid.
+     */
+    public static Name parseName(String name) throws ParseException {
+        requireNonNull(name);
+
+        String trimmedName = name.trim();
+        if (!Name.isValidName(trimmedName)) {
+            throw new ParseException(Name.MESSAGE_CONSTRAINTS);
+        }
+        return new Name(trimmedName);
+    }
+
+    /**
+     * Parses a {@code String credits} into a {@code Credits}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code credits} is invalid.
+     */
+    public static Credits parseCredits(String credits) throws ParseException {
+        requireNonNull(credits);
+
+        String trimmedCredits = credits.trim();
+        if (!Credits.isValidCredits(trimmedCredits)) {
+            throw new ParseException(Credits.MESSAGE_CONSTRAINTS);
+        }
+        return new Credits(trimmedCredits);
+    }
+
+    /**
+     * Parses a {@code String code} into an {@code Code}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code code} is invalid.
+     */
+    public static Code parseCode(String code) throws ParseException {
+        requireNonNull(code);
+
+        String trimmedCode = code.trim();
+        if (!Code.isValidCode(trimmedCode)) {
+            throw new ParseException(Code.MESSAGE_CONSTRAINTS);
+        }
+        return new Code(trimmedCode);
+    }
+
+    /**
+     * Parses a {@code String year} into an {@code Year}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code year} is invalid.
+     */
+    public static Year parseYear(String year) throws ParseException {
+        requireNonNull(year);
+
+        String trimmedYear = year.trim();
+        if (!Year.isValidYear(trimmedYear)) {
+            throw new ParseException(Year.MESSAGE_YEAR_CONSTRAINTS);
+        }
+        return new Year(trimmedYear);
+    }
+
+    /**
+     * Parses a {@code String semester} into an {@code Semester}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code year} is invalid.
+     */
+    public static Semester parseSemester(String semester) throws ParseException {
+        requireNonNull(semester);
+
+        String trimmedSemester = semester.trim();
+        if (!Semester.isValidSemester(trimmedSemester)) {
+            throw new ParseException(Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+        }
+        return new Semester(trimmedSemester);
+    }
+
+    /**
+     * Parses {@code Collection<String> semesters} into a {@code Set<Semester>}.<br>
+     */
+    public static Set<Semester> parseSemesters(Collection<String> semesters) throws ParseException {
+        requireNonNull(semesters);
+
+        final Set<Semester> semesterSet = new HashSet<>();
+        for (String semester : semesters) {
+            semesterSet.add(parseSemester(semester));
+        }
+        return semesterSet;
+    }
+
+    /**
+     * Parses a {@code String tag} into a {@code Tag}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code tag} is invalid.
+     */
+    public static Tag parseTag(String tag) throws ParseException {
+        requireNonNull(tag);
+
+        String trimmedTag = tag.trim();
+        if (!Tag.isValidTagName(trimmedTag)) {
+            throw new ParseException(Tag.MESSAGE_CONSTRAINTS);
+        }
+        return new Tag(trimmedTag);
+    }
+
+    /**
+     * Parses {@code Collection<String> tags} into a {@code Set<Tag>}.
+     */
+    public static Set<Tag> parseTags(Collection<String> tags) throws ParseException {
+        requireNonNull(tags);
+
+        final Set<Tag> tagSet = new HashSet<>();
+        for (String tagName : tags) {
+            tagSet.add(parseTag(tagName));
+        }
+        return tagSet;
+    }
+
+    /**
+     * Parses {@code Collection<String> codes} into a {@code Set<Code>}.
+     */
+    public static Set<Code> parseCodes(Collection<String> codes) throws ParseException {
+        requireNonNull(codes);
+
+        final Set<Code> codeList = new HashSet<>();
+        for (String code : codes) {
+            codeList.add(parseCode(code));
+        }
+        return codeList;
+    }
+
+    /**
+     * Parses {@code Collection<String> corequisites} into a {@code Set<Code>}.<br>
+     * Syntactic sugar for {@link #parseCodes} method.
+     */
+    public static Set<Code> parseCorequisites(Collection<String> corequisites) throws ParseException {
+        return parseCodes(corequisites);
+    }
+
+    /**
+     * Checks if the {@code keyword} is a word of {@code compareTo},
+     * or if {@code keyword} contain multiple words, checks whether {@code keyword} is equals to {@code compareTo}
+     * Ignore cases.
+     * If keyword do not contain any space. We will check if its part of a word.
+     * Else we check for a full match.
+     * <br>examples: <pre>
+     *     keyword = "abc"
+     *     Returns true since "abc" is part of "abc xyz 123"
+     *     keyword = "abc xyz
+     *     Returns true since "abc xyz" is equal to "abc xyz"
+     * </pre>
+     */
+    public static boolean parseKeyword(String keyword, String compareTo) {
+        requireAllNonNull(keyword, compareTo);
+
+        if (keyword.split("\\s+").length == 1) {
+            return StringUtil.containsWordIgnoreCase(compareTo, keyword);
+        } else {
+            return StringUtil.compareEqualsIgnoreCase(compareTo, keyword);
+        }
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/PlannerAddCommandParser.java b/src/main/java/pwe/planner/logic/parser/PlannerAddCommandParser.java
new file mode 100644
index 000000000000..d49bbbc15a6f
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/PlannerAddCommandParser.java
@@ -0,0 +1,52 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCodes;
+import static pwe.planner.logic.parser.ParserUtil.parseSemester;
+import static pwe.planner.logic.parser.ParserUtil.parseYear;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.PlannerAddCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+/**
+ * Parses input arguments and creates a new PlannerAddCommand object.
+ */
+public class PlannerAddCommandParser implements Parser<PlannerAddCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the PlannerAddCommand
+     * and returns an PlannerAddCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format.
+     */
+    public PlannerAddCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(PlannerAddCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap =
+                ArgumentTokenizer.tokenize(args, PREFIX_CODE, PREFIX_YEAR , PREFIX_SEMESTER);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_CODE, PREFIX_YEAR , PREFIX_SEMESTER)
+                || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerAddCommand.MESSAGE_USAGE));
+        }
+
+        Set<Code> codes = parseCodes(argMultimap.getAllValues(PREFIX_CODE));
+        Year year = parseYear(argMultimap.getValue(PREFIX_YEAR).get());
+        Semester semester = parseSemester(argMultimap.getValue(PREFIX_SEMESTER).get());
+
+        return new PlannerAddCommand(year, semester, codes);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/PlannerMoveCommandParser.java b/src/main/java/pwe/planner/logic/parser/PlannerMoveCommandParser.java
new file mode 100644
index 000000000000..686cf35e59ea
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/PlannerMoveCommandParser.java
@@ -0,0 +1,49 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCode;
+import static pwe.planner.logic.parser.ParserUtil.parseSemester;
+import static pwe.planner.logic.parser.ParserUtil.parseYear;
+
+import pwe.planner.logic.commands.PlannerMoveCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+/**
+ * Parses input arguments and creates a new PlannerMoveCommand object
+ */
+public class PlannerMoveCommandParser implements Parser<PlannerMoveCommand> {
+    /**
+     * Parses the given {@code String} of arguments in the context of the PlannerMoveCommand
+     * and returns an PlannerMoveCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public PlannerMoveCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(PlannerMoveCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_YEAR, PREFIX_SEMESTER, PREFIX_CODE);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_YEAR, PREFIX_SEMESTER, PREFIX_CODE)
+                || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerMoveCommand.MESSAGE_USAGE));
+        }
+
+        Year year = parseYear(argMultimap.getValue(PREFIX_YEAR).get());
+        Semester semester = parseSemester(argMultimap.getValue(PREFIX_SEMESTER).get());
+        Code code = parseCode(argMultimap.getValue(PREFIX_CODE).get());
+
+        return new PlannerMoveCommand(year, semester, code);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/PlannerRemoveCommandParser.java b/src/main/java/pwe/planner/logic/parser/PlannerRemoveCommandParser.java
new file mode 100644
index 000000000000..19f70f8208b6
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/PlannerRemoveCommandParser.java
@@ -0,0 +1,41 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.PlannerRemoveCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+
+/**
+ * Parses input arguments and creates a new PlannerRemoveCommand object.
+ */
+public class PlannerRemoveCommandParser implements Parser<PlannerRemoveCommand> {
+    /**
+     * Parses the given {@code String} of arguments in the context of the PlannerRemoveCommand
+     * and returns an PlannerRemoveCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format.
+     */
+    public PlannerRemoveCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(PlannerRemoveCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_CODE);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_CODE) || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerRemoveCommand.MESSAGE_USAGE));
+        }
+
+        Set<Code> codes = ParserUtil.parseCodes(argMultimap.getAllValues(PREFIX_CODE));
+
+        return new PlannerRemoveCommand(codes);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/PlannerShowCommandParser.java b/src/main/java/pwe/planner/logic/parser/PlannerShowCommandParser.java
new file mode 100644
index 000000000000..b0b9ca264637
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/PlannerShowCommandParser.java
@@ -0,0 +1,57 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.LogsCenter.getLogger;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+
+import pwe.planner.logic.commands.PlannerShowCommand;
+import pwe.planner.logic.parser.exceptions.BooleanParserException;
+import pwe.planner.logic.parser.exceptions.BooleanParserPredicateException;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * Parses input arguments and creates a new PlannerShowCommand object
+ */
+public class PlannerShowCommandParser implements Parser<PlannerShowCommand> {
+    private static final Logger logger = getLogger(PlannerShowCommandParser.class);
+    private static final List<Prefix> PREFIXES = List.of(
+            PREFIX_YEAR,
+            PREFIX_SEMESTER
+    );
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the PlannerShowCommand
+     * and returns an PlannerShowCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public PlannerShowCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(PlannerShowCommand.MESSAGE_USAGE);
+        }
+
+        String trimmedArgs = args.trim();
+        if (trimmedArgs.isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerShowCommand.MESSAGE_USAGE));
+        }
+        try {
+            BooleanExpressionParser<DegreePlanner> expressionParser = new BooleanExpressionParser<>(args, PREFIXES);
+            Predicate<DegreePlanner> predicate = expressionParser.parse();
+            return new PlannerShowCommand(predicate);
+        } catch (BooleanParserPredicateException predicateException) {
+            logger.warning(predicateException.getMessage());
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerShowCommand.MESSAGE_USAGE));
+        } catch (BooleanParserException parserException) {
+            throw new ParseException(parserException.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/PlannerSuggestCommandParser.java b/src/main/java/pwe/planner/logic/parser/PlannerSuggestCommandParser.java
new file mode 100644
index 000000000000..d5c904e9c16b
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/PlannerSuggestCommandParser.java
@@ -0,0 +1,47 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCredits;
+import static pwe.planner.logic.parser.ParserUtil.parseTags;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.PlannerSuggestCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Parses input arguments and creates a new PlannerSuggestCommand object.
+ */
+public class PlannerSuggestCommandParser implements Parser<PlannerSuggestCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the PlannerSuggestCommand
+     * and returns an PlannerSuggestCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format.
+     */
+    public PlannerSuggestCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(PlannerSuggestCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_CREDITS, PREFIX_TAG);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_CREDITS) || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(
+                    MESSAGE_INVALID_COMMAND_FORMAT, PlannerSuggestCommand.MESSAGE_USAGE));
+        }
+
+        Credits credits = parseCredits(argMultimap.getValue(PREFIX_CREDITS).get());
+        Set<Tag> tags = parseTags(argMultimap.getAllValues(PREFIX_TAG));
+
+        return new PlannerSuggestCommand(credits, tags);
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/Prefix.java b/src/main/java/pwe/planner/logic/parser/Prefix.java
similarity index 87%
rename from src/main/java/seedu/address/logic/parser/Prefix.java
rename to src/main/java/pwe/planner/logic/parser/Prefix.java
index c859d5fa5db1..d8ba2cccae05 100644
--- a/src/main/java/seedu/address/logic/parser/Prefix.java
+++ b/src/main/java/pwe/planner/logic/parser/Prefix.java
@@ -1,4 +1,6 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
 
 /**
  * A prefix that marks the beginning of an argument in an arguments string.
@@ -8,6 +10,8 @@ public class Prefix {
     private final String prefix;
 
     public Prefix(String prefix) {
+        requireNonNull(prefix);
+
         this.prefix = prefix;
     }
 
diff --git a/src/main/java/pwe/planner/logic/parser/RequirementAddCommandParser.java b/src/main/java/pwe/planner/logic/parser/RequirementAddCommandParser.java
new file mode 100644
index 000000000000..d56aade44a13
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/RequirementAddCommandParser.java
@@ -0,0 +1,47 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCodes;
+import static pwe.planner.logic.parser.ParserUtil.parseName;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.RequirementAddCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+
+/**
+ * Parses input arguments and creates a new AddCommand object
+ */
+public class RequirementAddCommandParser implements Parser<RequirementAddCommand> {
+    /**
+     * Parses the given {@code String} of arguments in the context of the AddCommand
+     * and returns an AddCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public RequirementAddCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(RequirementAddCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_CODE);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_CODE) || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, RequirementAddCommand.MESSAGE_USAGE));
+        }
+
+        Name name = parseName(argMultimap.getValue(PREFIX_NAME).get());
+        Set<Code> codeList = parseCodes(argMultimap.getAllValues(PREFIX_CODE));
+
+        return new RequirementAddCommand(name, codeList);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/RequirementMoveCommandParser.java b/src/main/java/pwe/planner/logic/parser/RequirementMoveCommandParser.java
new file mode 100644
index 000000000000..4f9429bc9f68
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/RequirementMoveCommandParser.java
@@ -0,0 +1,47 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCodes;
+import static pwe.planner.logic.parser.ParserUtil.parseName;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.RequirementMoveCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+
+/**
+ * Parses input arguments and creates a new RequirementMoveCommand object
+ */
+public class RequirementMoveCommandParser implements Parser<RequirementMoveCommand> {
+    /**
+     * Parses the given {@code String} of arguments in the context of the RequirementMoveCommand
+     * and returns an RequirementMoveCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public RequirementMoveCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(RequirementMoveCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_CODE);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_CODE) || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                    RequirementMoveCommand.MESSAGE_USAGE));
+        }
+
+        Name name = parseName(argMultimap.getValue(PREFIX_NAME).get());
+        Set<Code> codeSet = parseCodes(argMultimap.getAllValues(PREFIX_CODE));
+
+        return new RequirementMoveCommand(name, codeSet);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/RequirementRemoveCommandParser.java b/src/main/java/pwe/planner/logic/parser/RequirementRemoveCommandParser.java
new file mode 100644
index 000000000000..e622cdcb062d
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/RequirementRemoveCommandParser.java
@@ -0,0 +1,43 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.ParserUtil.arePrefixesPresent;
+import static pwe.planner.logic.parser.ParserUtil.parseCodes;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.RequirementRemoveCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+
+/**
+ * Parses input arguments and creates a new RequirementRemoveCommand object
+ */
+public class RequirementRemoveCommandParser implements Parser<RequirementRemoveCommand> {
+    /**
+     * Parses the given {@code String} of arguments in the context of the RequirementRemoveCommand
+     * and returns an RequirementRemoveCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public RequirementRemoveCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(RequirementRemoveCommand.MESSAGE_USAGE);
+        }
+
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_CODE);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_CODE) || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, RequirementRemoveCommand.MESSAGE_USAGE));
+        }
+
+        Set<Code> codeSet = parseCodes(argMultimap.getAllValues(PREFIX_CODE));
+
+        return new RequirementRemoveCommand(codeSet);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/SelectCommandParser.java b/src/main/java/pwe/planner/logic/parser/SelectCommandParser.java
new file mode 100644
index 000000000000..ee7857ed9700
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/SelectCommandParser.java
@@ -0,0 +1,35 @@
+package pwe.planner.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.ParserUtil.parseIndex;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.SelectCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new SelectCommand object
+ */
+public class SelectCommandParser implements Parser<SelectCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the SelectCommand
+     * and returns an SelectCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public SelectCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+
+        if (args.isEmpty()) {
+            throw new ParseException(SelectCommand.MESSAGE_USAGE);
+        }
+
+        try {
+            Index index = parseIndex(args);
+            return new SelectCommand(index);
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, SelectCommand.MESSAGE_USAGE), pe);
+        }
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/exceptions/BooleanParserException.java b/src/main/java/pwe/planner/logic/parser/exceptions/BooleanParserException.java
new file mode 100644
index 000000000000..bef62b1a13c5
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/exceptions/BooleanParserException.java
@@ -0,0 +1,16 @@
+package pwe.planner.logic.parser.exceptions;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+
+/**
+ * Represent a boolean parser exceptions when handling the logic.
+ */
+public class BooleanParserException extends IllegalValueException {
+    public BooleanParserException(String message) {
+        super(message);
+    }
+
+    public BooleanParserException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/src/main/java/pwe/planner/logic/parser/exceptions/BooleanParserPredicateException.java b/src/main/java/pwe/planner/logic/parser/exceptions/BooleanParserPredicateException.java
new file mode 100644
index 000000000000..f44de31d0687
--- /dev/null
+++ b/src/main/java/pwe/planner/logic/parser/exceptions/BooleanParserPredicateException.java
@@ -0,0 +1,14 @@
+package pwe.planner.logic.parser.exceptions;
+
+/**
+ *  Boolean Parser exception when trying to create a predicate from keyword.
+ */
+public class BooleanParserPredicateException extends BooleanParserException {
+    public BooleanParserPredicateException(String message) {
+        super(message);
+    }
+
+    public BooleanParserPredicateException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/exceptions/ParseException.java b/src/main/java/pwe/planner/logic/parser/exceptions/ParseException.java
similarity index 73%
rename from src/main/java/seedu/address/logic/parser/exceptions/ParseException.java
rename to src/main/java/pwe/planner/logic/parser/exceptions/ParseException.java
index 158a1a54c1c5..7d425fc66829 100644
--- a/src/main/java/seedu/address/logic/parser/exceptions/ParseException.java
+++ b/src/main/java/pwe/planner/logic/parser/exceptions/ParseException.java
@@ -1,6 +1,6 @@
-package seedu.address.logic.parser.exceptions;
+package pwe.planner.logic.parser.exceptions;
 
-import seedu.address.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.exceptions.IllegalValueException;
 
 /**
  * Represents a parse error encountered by a parser.
diff --git a/src/main/java/pwe/planner/model/Application.java b/src/main/java/pwe/planner/model/Application.java
new file mode 100644
index 000000000000..df41d34c4826
--- /dev/null
+++ b/src/main/java/pwe/planner/model/Application.java
@@ -0,0 +1,525 @@
+package pwe.planner.model;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import javafx.beans.InvalidationListener;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.InvalidationListenerManager;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.module.UniqueModuleList;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.UniqueDegreePlannerList;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.model.requirement.UniqueRequirementCategoryList;
+
+/**
+ * Wraps all data at the application levels
+ * Duplicates are not allowed (by .isSameModule comparison)
+ */
+public class Application implements ReadOnlyApplication {
+
+    private final UniqueModuleList modules;
+    private final UniqueDegreePlannerList degreePlanners;
+    private final UniqueRequirementCategoryList requirementCategories;
+    private final InvalidationListenerManager invalidationListenerManager = new InvalidationListenerManager();
+
+    /*
+     * The 'unusual' code block below is an non-static initialization block, sometimes used to avoid duplication
+     * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
+     *
+     * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
+     *   among constructors.
+     */
+    {
+        modules = new UniqueModuleList();
+        degreePlanners = new UniqueDegreePlannerList();
+        requirementCategories = new UniqueRequirementCategoryList();
+    }
+
+    public Application() {}
+
+    /**
+     * Creates an Application using the Modules in the {@code toBeCopied}
+     */
+    public Application(ReadOnlyApplication toBeCopied) {
+        this();
+        requireNonNull(toBeCopied);
+
+        resetData(toBeCopied);
+    }
+
+    /**
+     * Resets the existing data of this {@code Application} with {@code newData}.
+     */
+    public void resetData(ReadOnlyApplication newData) {
+        requireNonNull(newData);
+
+        setModules(newData.getModuleList());
+        setDegreePlanners(newData.getDegreePlannerList());
+        setRequirementCategories(newData.getRequirementCategoryList());
+    }
+
+    /**
+     * Resets the existing {@code DegreePlanner} data with empty {@code Code}.
+     */
+    public void resetPlanner() {
+        List<DegreePlanner> editedDegreePlannerList = new ArrayList<>();
+        for (DegreePlanner planner : degreePlanners) {
+            editedDegreePlannerList.add(new DegreePlanner(planner.getYear(), planner.getSemester(), Set.of()));
+        }
+        setDegreePlanners(editedDegreePlannerList);
+    }
+
+    /**
+     * Resets the existing {@code RequirementCategories} data with empty {@code Code}.
+     */
+    public void resetRequirement() {
+        List<RequirementCategory> editedRequirementCategories = new ArrayList<>();
+        for (RequirementCategory requirementCategory : requirementCategories) {
+            editedRequirementCategories.add(new RequirementCategory(requirementCategory.getName(),
+                    requirementCategory.getCredits(), Set.of()));
+        }
+        setRequirementCategories(editedRequirementCategories);
+    }
+
+    //// list overwrite operations
+
+    /**
+     * Replaces the contents of the module list with {@code modules}.
+     * {@code modules} must not contain duplicate modules.
+     */
+    public void setModules(List<Module> modules) {
+        requireNonNull(modules);
+
+        this.modules.setModules(modules);
+        indicateModified();
+    }
+
+    /**
+     * Replaces the contents of the degree planner list with {@code degreePlanners}.
+     * {@code degreePlanners} must not contain duplicate degree planner.
+     */
+    public void setDegreePlanners(List<DegreePlanner> degreePlanners) {
+        requireNonNull(degreePlanners);
+
+        this.degreePlanners.setDegreePlanners(degreePlanners);
+        indicateModified();
+    }
+
+    /**
+     * Replaces the contents of the requirement list with {@code requirement}.
+     * {@code requirement} must not contain duplicate requirement.
+     */
+    public void setRequirementCategories(List<RequirementCategory> requirementCategories) {
+        requireNonNull(requirementCategories);
+
+        this.requirementCategories.setRequirementCategories(requirementCategories);
+        indicateModified();
+    }
+
+    //// module-level operations
+
+    /**
+     * Returns true if a module with the same identity as {@code module} exists in the application.
+     */
+    public boolean hasModule(Module module) {
+        requireNonNull(module);
+
+        return modules.contains(module);
+    }
+
+    /**
+     * Returns a module if there is a module with the same module code as {@code code}
+     */
+    public Module getModuleByCode(Code code) {
+        requireNonNull(code);
+
+        return modules.getModuleByCode(code);
+    }
+
+    /**
+     * Returns true if a {@code Module} with the specified {@code Code} exists in the application.
+     */
+    public boolean hasModuleCode(Code code) {
+        requireNonNull(code);
+
+        return modules.asUnmodifiableObservableList().stream().anyMatch((module) -> module.getCode().equals(code));
+    }
+
+    /**
+     * Adds a module to the application.
+     * The module must not already exist in the application.
+     */
+    public void addModule(Module moduleToAdd) {
+        requireNonNull(moduleToAdd);
+
+        modules.add(moduleToAdd);
+        indicateModified();
+    }
+
+    /**
+     * Replaces the given module {@code target} in the list with {@code editedModule}.
+     * {@code target} must exist in the application.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the application.
+     */
+    public void setModule(Module target, Module editedModule) {
+        requireAllNonNull(target, editedModule);
+
+        modules.setModule(target, editedModule);
+    }
+
+    /**
+     * Replaces the given module {@code target} in the list with {@code editedModule}.
+     * {@code target} must exist in the application.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the application.
+     */
+    public void editModule(Module target, Module editedModule) {
+        requireAllNonNull(target, editedModule);
+
+        modules.setModule(target, editedModule);
+        if (!target.getCode().equals(editedModule.getCode())) {
+            cascadeEditedCodeInDegreePlanners(target.getCode(), editedModule.getCode());
+            cascadeEditedCodeInRequirementCategories(target.getCode(), editedModule.getCode());
+        }
+
+        indicateModified();
+    }
+
+    /**
+     * Cascades the edited module code by updating {@code UniqueDegreePlannerList} accordingly
+     * @param codeToEdit module code to edit/find
+     * @param editedCode module code to replace with
+     */
+    private void cascadeEditedCodeInDegreePlanners(Code codeToEdit, Code editedCode) {
+        requireAllNonNull(codeToEdit, editedCode);
+
+        ObservableList<DegreePlanner> degreePlanners = getDegreePlannerList();
+
+        for (DegreePlanner degreePlanner : degreePlanners) {
+            if (degreePlanner.getCodes().contains(codeToEdit)) {
+                Set<Code> editedDegreePlannerCodes = new HashSet<>(degreePlanner.getCodes());
+                editedDegreePlannerCodes.remove(codeToEdit);
+                editedDegreePlannerCodes.add(editedCode);
+
+                DegreePlanner editedDegreePlanner = new DegreePlanner(
+                        degreePlanner.getYear(),
+                        degreePlanner.getSemester(),
+                        editedDegreePlannerCodes
+                );
+
+                setDegreePlanner(degreePlanner, editedDegreePlanner);
+            }
+        }
+    }
+
+    /**
+     * Cascades the edited module code by updating {@code UniqueRequirementCategoryList} accordingly
+     * @param codeToEdit module code to edit/find
+     * @param editedCode module code to replace with
+     */
+    private void cascadeEditedCodeInRequirementCategories(Code codeToEdit, Code editedCode) {
+        requireAllNonNull(codeToEdit, editedCode);
+
+        ObservableList<RequirementCategory> requirementCategories = getRequirementCategoryList();
+
+        for (RequirementCategory requirementCategory : requirementCategories) {
+            if (requirementCategory.getCodeSet().contains(codeToEdit)) {
+                Set<Code> editedCodes = new HashSet<>(requirementCategory.getCodeSet());
+                editedCodes.remove(codeToEdit);
+                editedCodes.add(editedCode);
+
+                RequirementCategory editedRequirementCategory = new RequirementCategory(
+                        requirementCategory.getName(),
+                        requirementCategory.getCredits(),
+                        editedCodes
+                );
+
+                setRequirementCategory(requirementCategory, editedRequirementCategory);
+            }
+        }
+    }
+
+    /**
+     * Deletes {@code module} from this {@code Application}.
+     * {@code moduleToDelete} must exist in the application.
+     */
+    public void removeModule(Module moduleToDelete) {
+        requireNonNull(moduleToDelete);
+
+        modules.remove(moduleToDelete);
+        cascadeDeleteCodeToDegreePlanners(moduleToDelete.getCode());
+        cascadeDeleteCodeToRequirementCategories(moduleToDelete.getCode());
+        indicateModified();
+    }
+
+    /**
+     * Cascades the deleted module code by removing it from {@code UniqueDegreePlannerList} accordingly
+     * @param codeToDelete module code to delete
+     */
+    private void cascadeDeleteCodeToDegreePlanners(Code codeToDelete) {
+        assert codeToDelete != null;
+
+        ObservableList<DegreePlanner> degreePlanners = getDegreePlannerList();
+        for (DegreePlanner degreePlanner : degreePlanners) {
+            if (degreePlanner.getCodes().contains(codeToDelete)) {
+                Set<Code> editedCodes = new HashSet<>(degreePlanner.getCodes());
+                editedCodes.remove(codeToDelete);
+
+                DegreePlanner editedDegreePlanner = new DegreePlanner(
+                        degreePlanner.getYear(),
+                        degreePlanner.getSemester(),
+                        editedCodes
+                );
+
+                setDegreePlanner(degreePlanner, editedDegreePlanner);
+            }
+        }
+    }
+
+    /**
+     * Cascades the deleted module code by removing it from {@code UniqueRequirementCategoryList} accordingly
+     * @param codeToDelete module code to delete
+     */
+    private void cascadeDeleteCodeToRequirementCategories(Code codeToDelete) {
+        assert codeToDelete != null;
+
+        ObservableList<RequirementCategory> requirementCategories = getRequirementCategoryList();
+        for (RequirementCategory requirementCategory : requirementCategories) {
+            if (requirementCategory.getCodeSet().contains(codeToDelete)) {
+                Set<Code> editedCodes = new HashSet<>(requirementCategory.getCodeSet());
+                editedCodes.remove(codeToDelete);
+
+                RequirementCategory editedRequirementCategory = new RequirementCategory(
+                        requirementCategory.getName(),
+                        requirementCategory.getCredits(),
+                        editedCodes
+                );
+
+                setRequirementCategory(requirementCategory, editedRequirementCategory);
+            }
+        }
+    }
+
+    //// planner-level operations
+
+    /**
+     * Returns true if a degree planner with the same identity as {@code degreePlanner} exists in the
+     * degree planner.
+     */
+    public boolean hasDegreePlanner(DegreePlanner degreePlanner) {
+        requireNonNull(degreePlanner);
+
+        return degreePlanners.contains(degreePlanner);
+    }
+
+    /**
+     * Return the degree planner which contains the given {@code code}, otherwise returns null.
+     */
+    public DegreePlanner getDegreePlannerByCode(Code code) {
+        requireNonNull(code);
+
+        return degreePlanners.getDegreePlannerByCode(code);
+    }
+
+    /**
+     * Adds a degree planner to the degree planner list.
+     * The degree planner must not already exist in the degree planner list.
+     */
+    public void addDegreePlanner(DegreePlanner degreePlanner) {
+        requireNonNull(degreePlanner);
+
+        degreePlanners.add(degreePlanner);
+    }
+
+    /**
+     * Replaces the given degree planner {@code target} in the list with {@code editedDegreePlanner}.
+     * {@code target} must exist in the degree planner list.
+     * The identity of {@code editedDegreePlanner} must not be the same as another existing degree planner
+     * in the degree planner list.
+     */
+    public void setDegreePlanner(DegreePlanner target, DegreePlanner editedDegreePlanner) {
+        requireAllNonNull(target, editedDegreePlanner);
+
+        degreePlanners.setDegreePlanner(target, editedDegreePlanner);
+    }
+
+    /**
+     * Moves the given module code {@code code} from {@code sourcePlanner} to {@code destinationPlanner} along
+     * with its corequisites.
+     * {@code code} must exist in the {@code sourcePlanner}.
+     */
+    public void moveModuleBetweenPlanner(DegreePlanner sourcePlanner, DegreePlanner destinationPlanner, Code code) {
+        requireAllNonNull(sourcePlanner, destinationPlanner, code);
+
+        Set<Code> codesToMove = new HashSet<>(modules.getModuleByCode(code).getCorequisites());
+        codesToMove.add(code);
+        Set<Code> editedDestinationPlannerCodes = new HashSet<>(destinationPlanner.getCodes());
+
+        for (Code codeToMove : codesToMove) {
+            DegreePlanner sourceDegreePlanner = degreePlanners.getDegreePlannerByCode(codeToMove);
+            Set<Code> editedSourceDegreePlanner = new HashSet<>(sourceDegreePlanner.getCodes());
+            editedSourceDegreePlanner.remove(codeToMove);
+            DegreePlanner editedSourcePlanner =
+                    new DegreePlanner(sourceDegreePlanner.getYear(), sourceDegreePlanner.getSemester(),
+                            editedSourceDegreePlanner);
+
+            setDegreePlanner(sourceDegreePlanner, editedSourcePlanner);
+        }
+
+        editedDestinationPlannerCodes.addAll(codesToMove);
+        DegreePlanner editedDestinationPlanner = new DegreePlanner(destinationPlanner.getYear(),
+                destinationPlanner.getSemester(), editedDestinationPlannerCodes);
+
+        // Search for the destinationPlanner is necessary as code could have been removed from destinationPlanner
+        DegreePlanner targetDestinationPlanner = getDegreePlannerList().stream()
+                .filter(destinationPlanner::isSameDegreePlanner)
+                .findFirst()
+                .orElse(null);
+        setDegreePlanner(targetDestinationPlanner, editedDestinationPlanner);
+    }
+
+    /**
+     * Removes {@code key} from this {@code DegreePlannerList}.
+     * {@code key} must exist in the degree planner list.
+     */
+    public void removeDegreePlanner(DegreePlanner key) {
+        requireNonNull(key);
+
+        degreePlanners.remove(key);
+    }
+
+    //// requirement-level operations
+
+    /**
+     * Returns true if a requirement with the name as {@code requirement} exists in the
+     * requirement list.
+     */
+    public boolean hasRequirementCategory(Name requirementCategoryName) {
+        requireNonNull(requirementCategoryName);
+
+        return requirementCategories.contains(requirementCategoryName);
+    }
+
+    /**
+     * Returns true if a requirement object {@code requirement} exists in the
+     * requirement list.
+     */
+    public boolean hasRequirementCategory(RequirementCategory requirementCategory) {
+        requireNonNull(requirementCategory);
+
+        return requirementCategories.contains(requirementCategory);
+    }
+
+    /**
+     * Returns true if an requirement with the same identity as {@code requirement} exists in the
+     * requirement.
+     */
+    public RequirementCategory getRequirementCategory(Name requirementCategoryName) {
+        requireNonNull(requirementCategoryName);
+
+        return requirementCategories.getRequirementCategory(requirementCategoryName);
+    }
+
+    /**
+     * Adds a requirement to the requirementCategoryList.
+     * The requirement must not already exist in the requirementCategoryList.
+     */
+    public void addRequirementCategory(RequirementCategory requirementCategory) {
+        requireNonNull(requirementCategory);
+
+        requirementCategories.add(requirementCategory);
+    }
+
+    /**
+     * Replaces the given requirement {@code target} in the list with {@code editedRequirementCategory}.
+     * {@code target} must exist in the requirement list.
+     * The identity of {@code editedRequirementCategory} must not be the same as another existing requirement
+     * in the
+     * requirement list.
+     */
+    public void setRequirementCategory(RequirementCategory target, RequirementCategory editedRequirementCategory) {
+        requireAllNonNull(target, editedRequirementCategory);
+
+        requirementCategories.setRequirementCategory(target, editedRequirementCategory);
+    }
+
+    /**
+     * Removes {@code key} from this {@code RequirementCategoryList}.
+     * {@code key} must exist in the requirement list.
+     */
+    public void removeRequirementCategory(RequirementCategory key) {
+        requireNonNull(key);
+
+        requirementCategories.remove(key);
+    }
+
+    //// listener methods
+
+    @Override
+    public void addListener(InvalidationListener listener) {
+        requireNonNull(listener);
+
+        invalidationListenerManager.addListener(listener);
+    }
+
+    @Override
+    public void removeListener(InvalidationListener listener) {
+        requireNonNull(listener);
+
+        invalidationListenerManager.removeListener(listener);
+    }
+
+    /**
+     * Notifies listeners that the application has been modified.
+     */
+    protected void indicateModified() {
+        invalidationListenerManager.callListeners(this);
+    }
+
+    //// util methods
+
+    @Override
+    public String toString() {
+        return modules.asUnmodifiableObservableList().size() + " modules \n"
+                + degreePlanners.asUnmodifiableObservableList().size() + " degree planners \n"
+                + requirementCategories.asUnmodifiableObservableList().size() + " requirementCategories";
+    }
+
+    @Override
+    public ObservableList<Module> getModuleList() {
+        return modules.asUnmodifiableObservableList();
+    }
+
+    @Override
+    public ObservableList<DegreePlanner> getDegreePlannerList() {
+        return degreePlanners.asUnmodifiableObservableList();
+    }
+
+    @Override
+    public ObservableList<RequirementCategory> getRequirementCategoryList() {
+        return requirementCategories.asUnmodifiableObservableList();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof Application // instanceof handles nulls
+                && modules.equals(((Application) other).modules)
+                && degreePlanners.equals(((Application) other).degreePlanners)
+                && requirementCategories.equals(((Application) other).requirementCategories));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(modules.hashCode(), degreePlanners.hashCode(), requirementCategories.hashCode());
+    }
+}
diff --git a/src/main/java/pwe/planner/model/Model.java b/src/main/java/pwe/planner/model/Model.java
new file mode 100644
index 000000000000..40191dd48c15
--- /dev/null
+++ b/src/main/java/pwe/planner/model/Model.java
@@ -0,0 +1,304 @@
+package pwe.planner.model;
+
+import java.nio.file.Path;
+import java.util.function.Predicate;
+
+import javafx.beans.property.ReadOnlyProperty;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * The API of the Model component.
+ */
+public interface Model {
+    /** {@code Predicate} that always evaluate to true */
+    Predicate<Module> PREDICATE_SHOW_ALL_MODULES = unused -> true;
+
+    /** {@code Predicate} that always evaluate to true */
+    Predicate<RequirementCategory> PREDICATE_SHOW_ALL_REQUIREMENT_CATEGORIES = unused -> true;
+
+    /** {@code Predicate} that always evaluate to true */
+    Predicate<DegreePlanner> PREDICATE_SHOW_ALL_DEGREE_PLANNERS = unused -> true;
+
+    /**
+     * Replaces user prefs data with the data in {@code userPrefs}.
+     */
+    void setUserPrefs(ReadOnlyUserPrefs userPrefs);
+
+    /**
+     * Returns the user prefs.
+     */
+    ReadOnlyUserPrefs getUserPrefs();
+
+    /**
+     * Returns the user prefs' GUI settings.
+     */
+    GuiSettings getGuiSettings();
+
+    /**
+     * Sets the user prefs' GUI settings.
+     */
+    void setGuiSettings(GuiSettings guiSettings);
+
+    /**
+     * Returns the user prefs' module list file path.
+     */
+    Path getModuleListFilePath();
+
+    /**
+     * Sets the user prefs' module list file path.
+     */
+    void setModuleListFilePath(Path moduleListFilePath);
+
+    /**
+     * Returns the user prefs' degreePlanner list file path.
+     */
+    Path getDegreePlannerListFilePath();
+
+    /**
+     * Sets the user prefs' degreePlanner list file path.
+     */
+    void setDegreePlannerListFilePath(Path degreePlannerListFilePath);
+
+    /** Returns the Application */
+    ReadOnlyApplication getApplication();
+
+    /**
+     * Returns the user prefs' requirement list file path.
+     */
+    Path getRequirementCategoryListFilePath();
+
+    /**
+     * Sets the user prefs' degreePlanner list file path.
+     */
+    void setRequirementCategoryListFilePath(Path requirementCategoryListFilePath);
+
+    /**
+     * Replaces application data with the data in {@code application}.
+     */
+    void setApplication(ReadOnlyApplication application);
+
+    /**
+     * Reset the Requirement Categories in {@code application}
+     */
+    void resetRequirement();
+
+    /**
+     * Reset the Degree Planner in {@code application}
+     */
+    void resetPlanner();
+
+    /**
+     * Returns true if a module with the same identity as {@code module} exists in the application.
+     */
+    boolean hasModule(Module module);
+
+    /**
+     * Returns a module object if a module with the same module code as {@code code} exists in the application.
+     */
+    Module getModuleByCode(Code code);
+
+    /**
+     * Returns true if a {@code Module} with the specified {@code Code} exists in the application.
+     */
+    boolean hasModuleCode(Code code);
+
+    /**
+     * Deletes the given module.
+     * The module must exist in the application.
+     */
+    void deleteModule(Module target);
+
+    /**
+     * Adds the given module.
+     * {@code module} must not already exist in the application.
+     */
+    void addModule(Module module);
+
+    /**
+     * Replaces the given module {@code target} with {@code editedModule}.
+     * {@code target} must exist in the application.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the application.
+     * This method also cascades changes to {@code DegreePlanner} and {@code RequirementCategory}.
+     */
+    void editModule(Module target, Module editedModule);
+
+    /**
+     * Replaces the given module {@code target} with {@code editedModule}.
+     * {@code target} must exist in the application.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the application.
+     */
+    void setModule(Module target, Module editedModule);
+
+    /** Returns an unmodifiable view of the filtered module list */
+    ObservableList<Module> getFilteredModuleList();
+
+    /**
+     * Updates the filter of the filtered module list to filter by the given {@code predicate}.
+     *
+     * @throws NullPointerException if {@code predicate} is null.
+     */
+    void updateFilteredModuleList(Predicate<Module> predicate);
+
+    /**
+     * Returns true if the model has previous application states to restore.
+     */
+    boolean canUndoApplication();
+
+    /**
+     * Returns true if the model has undone application states to restore.
+     */
+    boolean canRedoApplication();
+
+    /**
+     * Restores the model's application to its previous state.
+     */
+    void undoApplication();
+
+    /**
+     * Restores the model's application to its previously undone state.
+     */
+    void redoApplication();
+
+    /**
+     * Saves the current application state for undo/redo.
+     */
+    void commitApplication();
+
+    /**
+     * Selected module in the filtered module list.
+     * null if no module is selected.
+     */
+    ReadOnlyProperty<Module> selectedModuleProperty();
+
+    /**
+     * Returns the selected module in the filtered module list.
+     * null if no module is selected.
+     */
+    Module getSelectedModule();
+
+    /**
+     * Sets the selected module in the filtered module list.
+     */
+    void setSelectedModule(Module module);
+
+    ///// DegreePlanner Methods
+
+    /**
+     * Returns true if a degreePlanner with the same identity as {@code degreePlanner} exists in the application.
+     */
+    boolean hasDegreePlanner(DegreePlanner degreePlanner);
+
+    /**
+     * Return the degree planner which contains the given {@code code}, otherwise returns null.
+     */
+    DegreePlanner getDegreePlannerByCode(Code code);
+
+    /**
+     * Deletes the given degreePlanner.
+     * The degreePlanner must exist in the degreePlaner list.
+     */
+    void deleteDegreePlanner(DegreePlanner degreePlanner);
+
+    /**
+     * Adds the given degreePlanner.
+     * {@code degreePlanner} must not already exist in the application.
+     */
+    void addDegreePlanner(DegreePlanner degreePlanner);
+
+    /**
+     * Replaces the given degreePlanner {@code target} with {@code editedDegreePlanner}.
+     * {@code target} must exist in the degreePlanner list.
+     * The degreePlanner identity of {@code editedDegreePlanner} must not be the same as another existing
+     * degreePlanner in the degreePlanner List.
+     */
+    void setDegreePlanner(DegreePlanner target, DegreePlanner editedDegreePlanner);
+
+    /**
+     * Moves the given module code {@code code} from {@code sourcePlanner} to {@code destinationPlanner} along
+     * with its corequisites.
+     * {@code code} must exist in the {@code sourcePlanner}.
+     */
+    void moveModuleBetweenPlanner(DegreePlanner sourcePlanner, DegreePlanner destinationPlanner, Code code);
+
+    /** Returns an unmodifiable view of the filtered degreePlanner list */
+    ObservableList<DegreePlanner> getFilteredDegreePlannerList();
+
+    /**
+     * Updates the filter of the filtered degreePlanner list to filter by the given {@code predicate}.
+     *
+     * @throws NullPointerException if {@code predicate} is null.
+     */
+    void updateFilteredDegreePlannerList(Predicate<DegreePlanner> predicate);
+
+
+    ///// RequirementCategory Methods
+
+    /**
+     * Returns true if a requirement with the name as {@code requirement} exists in the
+     * requirement list.
+     */
+    boolean hasRequirementCategory(Name requirementCategoryName);
+
+    /**
+     * Returns true if a requirement with the name as {@code requirement} exists in the
+     * requirement list.
+     */
+    boolean hasRequirementCategory(RequirementCategory requirementCategory);
+
+    /**
+     * Returns true if a requirement with the code as {@code requirement} exists in the
+     * requirement list.
+     */
+    RequirementCategory getRequirementCategory(Name requirementCategoryName);
+
+    /**
+     * Adds the given requirement.
+     * {@code requirement} must not already exist in the requirementCategoryList.
+     */
+    void addRequirementCategory(RequirementCategory requirementCategory);
+
+    /**
+     * Replaces the given requirement {@code target} with {@code editedRequirementCategory}.
+     * {@code target} must exist in the requirement list.
+     * The planner identity of {@code editedRequirementCategory} must not be the same as another existing
+     * requirement in the
+     * requirement list.
+     */
+    void setRequirementCategory(RequirementCategory target, RequirementCategory editedRequirementCategory);
+
+    /**
+     * Returns an unmodifiable view of the filtered requirement list
+     */
+    ObservableList<RequirementCategory> getFilteredRequirementCategoryList();
+
+    /**
+     * Updates the filter of the filtered requirement list to filter by the given {@code predicate}.
+     *
+     * @throws NullPointerException if {@code predicate} is null.
+     */
+    void updateFilteredRequirementCategoryList(Predicate<RequirementCategory> predicate);
+
+    /**
+     * Selected requirementCategory in the filtered requirementCategory list.
+     * null if no requirementCategory is selected.
+     */
+    ReadOnlyProperty<RequirementCategory> selectedRequirementCategoryProperty();
+
+    /**
+     * Returns the selected requirementCategory in the filtered requirementCategory list.
+     * null if no requirementCategory is selected.
+     */
+    RequirementCategory getSelectedRequirementCategory();
+
+    /**
+     * Sets the selected requirementCategory in the filtered requirementCategory list.
+     */
+    void setSelectedRequirementCategory(RequirementCategory requirementCategory);
+
+}
diff --git a/src/main/java/pwe/planner/model/ModelManager.java b/src/main/java/pwe/planner/model/ModelManager.java
new file mode 100644
index 000000000000..8b42259e9a94
--- /dev/null
+++ b/src/main/java/pwe/planner/model/ModelManager.java
@@ -0,0 +1,475 @@
+package pwe.planner.model;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+
+import javafx.beans.property.ReadOnlyProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.module.exceptions.ModuleNotFoundException;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Represents the in-memory model of the application data.
+ */
+public class ModelManager implements Model {
+    private static final Logger logger = LogsCenter.getLogger(ModelManager.class);
+
+    private final VersionedApplication versionedApplication;
+    private final UserPrefs userPrefs;
+
+    private final FilteredList<Module> filteredModules;
+    private final FilteredList<DegreePlanner> filteredDegreePlanners;
+    private final FilteredList<RequirementCategory> filteredRequirementCategory;
+
+    private final SimpleObjectProperty<Module> selectedModule = new SimpleObjectProperty<>();
+    private final SimpleObjectProperty<RequirementCategory> selectedRequirementCategory = new SimpleObjectProperty<>();
+
+    /**
+     * Initializes a ModelManager with the given application and userPrefs.
+     */
+    public ModelManager(ReadOnlyApplication application, ReadOnlyUserPrefs userPrefs) {
+        super();
+        requireAllNonNull(application, userPrefs);
+
+        logger.fine("Initializing with application: " + application + " and user prefs " + userPrefs);
+
+        versionedApplication = new VersionedApplication(application);
+        this.userPrefs = new UserPrefs(userPrefs);
+
+        filteredModules = new FilteredList<>(versionedApplication.getModuleList());
+        filteredDegreePlanners = new FilteredList<>((versionedApplication.getDegreePlannerList()));
+        filteredRequirementCategory = new FilteredList<>(versionedApplication.getRequirementCategoryList());
+
+        filteredModules.addListener(this::ensureSelectedModuleIsValid);
+        filteredRequirementCategory.addListener(this::ensureSelectedRequirementCategoryIsValid);
+    }
+
+    public ModelManager() {
+        this(new Application(), new UserPrefs());
+    }
+
+    public ModelManager(ReadOnlyApplication application) {
+        this(application, new UserPrefs());
+    }
+
+    //=========== UserPrefs ==================================================================================
+
+    @Override
+    public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
+        requireNonNull(userPrefs);
+
+        this.userPrefs.resetData(userPrefs);
+    }
+
+    @Override
+    public ReadOnlyUserPrefs getUserPrefs() {
+        return userPrefs;
+    }
+
+    @Override
+    public GuiSettings getGuiSettings() {
+        return userPrefs.getGuiSettings();
+    }
+
+    @Override
+    public void setGuiSettings(GuiSettings guiSettings) {
+        requireNonNull(guiSettings);
+
+        userPrefs.setGuiSettings(guiSettings);
+    }
+
+    @Override
+    public Path getModuleListFilePath() {
+        return userPrefs.getModuleListFilePath();
+    }
+
+    @Override
+    public void setModuleListFilePath(Path moduleListFilePath) {
+        requireNonNull(moduleListFilePath);
+
+        userPrefs.setModuleListFilePath(moduleListFilePath);
+    }
+
+    @Override
+    public Path getDegreePlannerListFilePath() {
+        return userPrefs.getDegreePlannerListFilePath();
+    }
+
+    @Override
+    public void setDegreePlannerListFilePath(Path degreePlannerListFilePath) {
+        requireNonNull(degreePlannerListFilePath);
+
+        userPrefs.setDegreePlannerListFilePath(degreePlannerListFilePath);
+    }
+
+    @Override
+    public Path getRequirementCategoryListFilePath() {
+        return userPrefs.getRequirementCategoryListFilePath();
+    }
+
+    @Override
+    public void setRequirementCategoryListFilePath(Path requirementCategoryListFilePath) {
+        requireNonNull(requirementCategoryListFilePath);
+
+        userPrefs.setDegreePlannerListFilePath(requirementCategoryListFilePath);
+    }
+
+    //=========== Application ================================================================================
+
+    @Override
+    public void setApplication(ReadOnlyApplication application) {
+        requireNonNull(application);
+
+        versionedApplication.resetData(application);
+    }
+
+    @Override
+    public void resetRequirement() {
+        versionedApplication.resetRequirement();
+    }
+
+    @Override
+    public void resetPlanner() {
+        versionedApplication.resetPlanner();
+    }
+
+    @Override
+    public ReadOnlyApplication getApplication() {
+        return versionedApplication;
+    }
+
+    @Override
+    public boolean hasModule(Module module) {
+        requireNonNull(module);
+
+        return versionedApplication.hasModule(module);
+    }
+
+    @Override
+    public Module getModuleByCode(Code code) {
+        requireNonNull(code);
+
+        return versionedApplication.getModuleByCode(code);
+    }
+
+    @Override
+    public boolean hasModuleCode(Code code) {
+        requireNonNull(code);
+
+        return versionedApplication.hasModuleCode(code);
+    }
+
+    @Override
+    public void deleteModule(Module target) {
+        requireNonNull(target);
+
+        versionedApplication.removeModule(target);
+    }
+
+    @Override
+    public void addModule(Module module) {
+        requireNonNull(module);
+
+        versionedApplication.addModule(module);
+        updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
+    }
+
+    @Override
+    public void editModule(Module target, Module editedModule) {
+        requireAllNonNull(target, editedModule);
+
+        versionedApplication.editModule(target, editedModule);
+    }
+
+    @Override
+    public void setModule(Module target, Module editedModule) {
+        requireAllNonNull(target, editedModule);
+
+        versionedApplication.setModule(target, editedModule);
+    }
+
+    //=========== Filtered Module List Accessors =============================================================
+
+    /**
+     * Returns an unmodifiable view of the list of {@code Module} backed by the internal list of
+     * {@code versionedApplication}
+     */
+    @Override
+    public ObservableList<Module> getFilteredModuleList() {
+        return filteredModules;
+    }
+
+    @Override
+    public void updateFilteredModuleList(Predicate<Module> predicate) {
+        requireNonNull(predicate);
+
+        filteredModules.setPredicate(predicate);
+    }
+
+    //=========== Undo/Redo =================================================================================
+
+    @Override
+    public boolean canUndoApplication() {
+        return versionedApplication.canUndo();
+    }
+
+    @Override
+    public boolean canRedoApplication() {
+        return versionedApplication.canRedo();
+    }
+
+    @Override
+    public void undoApplication() {
+        versionedApplication.undo();
+    }
+
+    @Override
+    public void redoApplication() {
+        versionedApplication.redo();
+    }
+
+    @Override
+    public void commitApplication() {
+        versionedApplication.commit();
+    }
+
+    //=========== Selected module ===========================================================================
+
+    @Override
+    public ReadOnlyProperty<Module> selectedModuleProperty() {
+        return selectedModule;
+    }
+
+    @Override
+    public Module getSelectedModule() {
+        return selectedModule.getValue();
+    }
+
+    @Override
+    public void setSelectedModule(Module module) {
+        if (module != null && !filteredModules.contains(module)) {
+            throw new ModuleNotFoundException();
+        }
+        selectedModule.setValue(module);
+    }
+
+    /**
+     * Ensures {@code selectedModule} is a valid module in {@code filteredModules}.
+     */
+    private void ensureSelectedModuleIsValid(ListChangeListener.Change<? extends Module> change) {
+        assert change != null;
+
+        while (change.next()) {
+            if (selectedModule.getValue() == null) {
+                // null is always a valid selected module, so we do not need to check that it is valid anymore.
+                return;
+            }
+
+            boolean wasSelectedModuleReplaced = change.wasReplaced() && change.getAddedSize() == change.getRemovedSize()
+                    && change.getRemoved().contains(selectedModule.getValue());
+            if (wasSelectedModuleReplaced) {
+                // Update selectedModule to its new value.
+                int index = change.getRemoved().indexOf(selectedModule.getValue());
+                selectedModule.setValue(change.getAddedSubList().get(index));
+                continue;
+            }
+
+            boolean wasSelectedModuleRemoved = change.getRemoved().stream()
+                    .anyMatch(removedModule -> selectedModule.getValue().isSameModule(removedModule));
+            if (wasSelectedModuleRemoved) {
+                // Select the module that came before it in the list,
+                // or clear the selection if there is no such module.
+                selectedModule.setValue(change.getFrom() > 0 ? change.getList().get(change.getFrom() - 1) : null);
+            }
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        // short circuit if same object
+        if (obj == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(obj instanceof ModelManager)) {
+            return false;
+        }
+
+        // state check
+        ModelManager other = (ModelManager) obj;
+        return versionedApplication.equals(other.versionedApplication)
+                && userPrefs.equals(other.userPrefs)
+                && filteredModules.equals(other.filteredModules)
+                && Objects.equals(selectedModule.get(), other.selectedModule.get())
+                && Objects.equals(selectedRequirementCategory.get(), other.selectedRequirementCategory.get());
+    }
+
+    //=========== DegreePlannerList Methods =================================================================
+
+    @Override
+    public boolean hasDegreePlanner(DegreePlanner planner) {
+        requireNonNull(planner);
+        return versionedApplication.hasDegreePlanner(planner);
+    }
+
+    @Override
+    public void deleteDegreePlanner(DegreePlanner target) {
+        versionedApplication.removeDegreePlanner(target);
+    }
+
+    @Override
+    public void addDegreePlanner(DegreePlanner degreePlanner) {
+        versionedApplication.addDegreePlanner(degreePlanner);
+    }
+
+    @Override
+    public DegreePlanner getDegreePlannerByCode(Code code) {
+        requireNonNull(code);
+        return versionedApplication.getDegreePlannerByCode(code);
+    }
+
+    @Override
+    public void setDegreePlanner(DegreePlanner target, DegreePlanner editedDegreePlanner) {
+        requireAllNonNull(target, editedDegreePlanner);
+
+        versionedApplication.setDegreePlanner(target, editedDegreePlanner);
+    }
+
+    @Override
+    public void moveModuleBetweenPlanner(DegreePlanner sourcePlanner, DegreePlanner destinationPlanner, Code code) {
+        requireAllNonNull(sourcePlanner, destinationPlanner, code);
+
+        versionedApplication.moveModuleBetweenPlanner(sourcePlanner, destinationPlanner, code);
+    }
+
+    @Override
+    public ObservableList<DegreePlanner> getFilteredDegreePlannerList() {
+        return filteredDegreePlanners;
+    }
+
+    @Override
+    public void updateFilteredDegreePlannerList(Predicate<DegreePlanner> predicate) {
+        requireNonNull(predicate);
+
+        filteredDegreePlanners.setPredicate(predicate);
+    }
+
+    //=========== RequirementCategoryList Methods =================================================================
+
+    @Override
+    public boolean hasRequirementCategory(Name requirementCategoryName) {
+        requireNonNull(requirementCategoryName);
+
+        return versionedApplication.hasRequirementCategory(requirementCategoryName);
+    }
+
+    @Override
+    public boolean hasRequirementCategory(RequirementCategory requirementCategory) {
+        requireNonNull(requirementCategory);
+
+        return versionedApplication.hasRequirementCategory(requirementCategory);
+    }
+
+    @Override
+    public RequirementCategory getRequirementCategory(Name requirementCategoryName) {
+        requireNonNull(requirementCategoryName);
+
+        return versionedApplication.getRequirementCategory(requirementCategoryName);
+    }
+
+    @Override
+    public void addRequirementCategory(RequirementCategory requirementCategory) {
+        requireNonNull(requirementCategory);
+
+        versionedApplication.addRequirementCategory(requirementCategory);
+        updateFilteredRequirementCategoryList(PREDICATE_SHOW_ALL_REQUIREMENT_CATEGORIES);
+    }
+
+    @Override
+    public void setRequirementCategory(RequirementCategory target, RequirementCategory editedRequirementCategory) {
+        requireAllNonNull(target, editedRequirementCategory);
+
+        versionedApplication.setRequirementCategory(target, editedRequirementCategory);
+    }
+
+    @Override
+    public ObservableList<RequirementCategory> getFilteredRequirementCategoryList() {
+        return filteredRequirementCategory;
+    }
+
+    @Override
+    public void updateFilteredRequirementCategoryList(Predicate<RequirementCategory> predicate) {
+        requireNonNull(predicate);
+
+        filteredRequirementCategory.setPredicate(predicate);
+    }
+
+    @Override
+    public ReadOnlyProperty<RequirementCategory> selectedRequirementCategoryProperty() {
+        return selectedRequirementCategory;
+    }
+
+    @Override
+    public RequirementCategory getSelectedRequirementCategory() {
+        return selectedRequirementCategory.getValue();
+    }
+
+    @Override
+    public void setSelectedRequirementCategory(RequirementCategory requirementCategory) {
+        if (requirementCategory != null && !filteredRequirementCategory.contains(requirementCategory)) {
+            throw new ModuleNotFoundException();
+        }
+        selectedRequirementCategory.setValue(requirementCategory);
+    }
+
+    /**
+     * Ensures {@code selectedRequirementCategory} is a valid module in {@code selectedRequirementCategory}.
+     */
+    private void ensureSelectedRequirementCategoryIsValid(
+            ListChangeListener.Change<? extends RequirementCategory> change) {
+        assert change != null;
+
+        while (change.next()) {
+            if (selectedRequirementCategory.getValue() == null) {
+                // null is always a valid selected module, so we do not need to check that it is valid anymore.
+                return;
+            }
+
+            boolean wasSelectedRequirementCategoryReplaced =
+                    change.wasReplaced() && change.getAddedSize() == change.getRemovedSize()
+                            && change.getRemoved().contains(selectedRequirementCategory.getValue());
+            if (wasSelectedRequirementCategoryReplaced) {
+                // Update selectedModule to its new value.
+                int index = change.getRemoved().indexOf(selectedRequirementCategory.getValue());
+                selectedRequirementCategory.setValue(change.getAddedSubList().get(index));
+                continue;
+            }
+
+            boolean wasSelectedRequirementCategoryRemoved = change.getRemoved().stream()
+                    .anyMatch(removedRequirementCategory -> selectedRequirementCategory.getValue()
+                            .isSameRequirementCategory(removedRequirementCategory));
+            if (wasSelectedRequirementCategoryRemoved) {
+                // Select the module that came before it in the list,
+                // or clear the selection if there is no such module.
+                selectedRequirementCategory
+                        .setValue(change.getFrom() > 0 ? change.getList().get(change.getFrom() - 1) : null);
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/ReadOnlyApplication.java b/src/main/java/pwe/planner/model/ReadOnlyApplication.java
new file mode 100644
index 000000000000..bd78af58a9c2
--- /dev/null
+++ b/src/main/java/pwe/planner/model/ReadOnlyApplication.java
@@ -0,0 +1,32 @@
+package pwe.planner.model;
+
+import javafx.beans.Observable;
+import javafx.collections.ObservableList;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Unmodifiable view of an application
+ */
+public interface ReadOnlyApplication extends Observable {
+
+    /**
+     * Returns an unmodifiable view of the modules list.
+     * This list will not contain any duplicate modules.
+     */
+    ObservableList<Module> getModuleList();
+
+    /**
+     * Returns an unmodifiable view of the degree planner list.
+     * This list will not contain any duplicate degree planner.
+     */
+    ObservableList<DegreePlanner> getDegreePlannerList();
+
+    /**
+     * Returns an unmodifiable view of the requirementCategories list.
+     * This list will not contain any duplicate requirementCategories.
+     */
+    ObservableList<RequirementCategory> getRequirementCategoryList();
+
+}
diff --git a/src/main/java/pwe/planner/model/ReadOnlyUserPrefs.java b/src/main/java/pwe/planner/model/ReadOnlyUserPrefs.java
new file mode 100644
index 000000000000..f94c4b211e9f
--- /dev/null
+++ b/src/main/java/pwe/planner/model/ReadOnlyUserPrefs.java
@@ -0,0 +1,19 @@
+package pwe.planner.model;
+
+import java.nio.file.Path;
+
+import pwe.planner.commons.core.GuiSettings;
+
+/**
+ * Unmodifiable view of user prefs.
+ */
+public interface ReadOnlyUserPrefs {
+
+    GuiSettings getGuiSettings();
+
+    Path getModuleListFilePath();
+
+    Path getDegreePlannerListFilePath();
+
+    Path getRequirementCategoryListFilePath();
+}
diff --git a/src/main/java/pwe/planner/model/UserPrefs.java b/src/main/java/pwe/planner/model/UserPrefs.java
new file mode 100644
index 000000000000..2cbc2ebb5889
--- /dev/null
+++ b/src/main/java/pwe/planner/model/UserPrefs.java
@@ -0,0 +1,129 @@
+package pwe.planner.model;
+
+import static java.util.Objects.requireNonNull;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+import pwe.planner.commons.core.GuiSettings;
+
+/**
+ * Represents User's preferences.
+ */
+public class UserPrefs implements ReadOnlyUserPrefs {
+
+    private GuiSettings guiSettings = new GuiSettings();
+
+    private Path moduleListFilePath = Paths.get("data", "moduleList.json");
+    private Path degreePlannerListFilePath = Paths.get("data", "degreePlannerList.json");
+    private Path requirementCategoryListFilePath = Paths.get("data", "requirementCategoryList.json");
+
+    /**
+     * Creates a {@code UserPrefs} with default values.
+     */
+    public UserPrefs() {}
+
+    /**
+     * Creates a {@code UserPrefs} with the prefs in {@code userPrefs}.
+     */
+    public UserPrefs(ReadOnlyUserPrefs userPrefs) {
+        this();
+        requireNonNull(userPrefs);
+
+        resetData(userPrefs);
+    }
+
+    /**
+     * Resets the existing data of this {@code UserPrefs} with {@code newUserPrefs}.
+     */
+    public void resetData(ReadOnlyUserPrefs newUserPrefs) {
+        requireNonNull(newUserPrefs);
+
+        setGuiSettings(newUserPrefs.getGuiSettings());
+        setModuleListFilePath(newUserPrefs.getModuleListFilePath());
+        setDegreePlannerListFilePath(newUserPrefs.getDegreePlannerListFilePath());
+        setRequirementCategoryListFilePath(newUserPrefs.getRequirementCategoryListFilePath());
+
+    }
+
+    public GuiSettings getGuiSettings() {
+        return guiSettings;
+    }
+
+    public void setGuiSettings(GuiSettings guiSettings) {
+        requireNonNull(guiSettings);
+
+        this.guiSettings = guiSettings;
+    }
+
+    public Path getModuleListFilePath() {
+        return moduleListFilePath;
+    }
+
+    public void setModuleListFilePath(Path moduleListFilePath) {
+        requireNonNull(moduleListFilePath);
+
+        this.moduleListFilePath = moduleListFilePath;
+    }
+
+    public Path getDegreePlannerListFilePath() {
+        return degreePlannerListFilePath;
+    }
+
+    public void setDegreePlannerListFilePath(Path degreePlannerListFilePath) {
+        requireNonNull(degreePlannerListFilePath);
+
+        this.degreePlannerListFilePath = degreePlannerListFilePath;
+    }
+
+    public Path getRequirementCategoryListFilePath() {
+        return requirementCategoryListFilePath;
+    }
+
+    public void setRequirementCategoryListFilePath(Path requirementCategoryListFilePath) {
+        requireNonNull(requirementCategoryListFilePath);
+
+        this.requirementCategoryListFilePath = requirementCategoryListFilePath;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if (!(other instanceof UserPrefs)) { //this handles null as well.
+            return false;
+        }
+
+        UserPrefs o = (UserPrefs) other;
+
+        return guiSettings.equals(o.guiSettings)
+                && moduleListFilePath.toAbsolutePath().equals(o.moduleListFilePath.toAbsolutePath())
+                && degreePlannerListFilePath.toAbsolutePath().equals(o.degreePlannerListFilePath.toAbsolutePath());
+
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(guiSettings, moduleListFilePath, degreePlannerListFilePath);
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder()
+                .append("Gui Settings : ")
+                .append(guiSettings)
+                .append('\n')
+                .append("Local data file location for module list: ")
+                .append(Paths.get("").toAbsolutePath().relativize(moduleListFilePath.toAbsolutePath()))
+                .append('\n')
+                .append("Local data file location for requirement categories list: ")
+                .append(Paths.get("").toAbsolutePath().relativize(requirementCategoryListFilePath.toAbsolutePath()))
+                .append('\n')
+                .append("Local data file location for degree planner list: ")
+                .append(Paths.get("").toAbsolutePath().relativize(degreePlannerListFilePath.toAbsolutePath()))
+                .toString();
+    }
+
+}
diff --git a/src/main/java/seedu/address/model/VersionedAddressBook.java b/src/main/java/pwe/planner/model/VersionedApplication.java
similarity index 50%
rename from src/main/java/seedu/address/model/VersionedAddressBook.java
rename to src/main/java/pwe/planner/model/VersionedApplication.java
index e17a9e3ba4ab..e265e5f0b0ec 100644
--- a/src/main/java/seedu/address/model/VersionedAddressBook.java
+++ b/src/main/java/pwe/planner/model/VersionedApplication.java
@@ -1,73 +1,76 @@
-package seedu.address.model;
+package pwe.planner.model;
+
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * {@code AddressBook} that keeps track of its own history.
+ * {@code Application} that keeps track of its own history.
  */
-public class VersionedAddressBook extends AddressBook {
+public class VersionedApplication extends Application {
 
-    private final List<ReadOnlyAddressBook> addressBookStateList;
+    private final List<ReadOnlyApplication> applicationStateList;
     private int currentStatePointer;
 
-    public VersionedAddressBook(ReadOnlyAddressBook initialState) {
+    public VersionedApplication(ReadOnlyApplication initialState) {
         super(initialState);
+        requireNonNull(initialState);
 
-        addressBookStateList = new ArrayList<>();
-        addressBookStateList.add(new AddressBook(initialState));
+        applicationStateList = new ArrayList<>();
+        applicationStateList.add(new Application(initialState));
         currentStatePointer = 0;
     }
 
     /**
-     * Saves a copy of the current {@code AddressBook} state at the end of the state list.
+     * Saves a copy of the current {@code Application} state at the end of the state list.
      * Undone states are removed from the state list.
      */
     public void commit() {
         removeStatesAfterCurrentPointer();
-        addressBookStateList.add(new AddressBook(this));
+        applicationStateList.add(new Application(this));
         currentStatePointer++;
         indicateModified();
     }
 
     private void removeStatesAfterCurrentPointer() {
-        addressBookStateList.subList(currentStatePointer + 1, addressBookStateList.size()).clear();
+        applicationStateList.subList(currentStatePointer + 1, applicationStateList.size()).clear();
     }
 
     /**
-     * Restores the address book to its previous state.
+     * Restores the application to its previous state.
      */
     public void undo() {
         if (!canUndo()) {
             throw new NoUndoableStateException();
         }
         currentStatePointer--;
-        resetData(addressBookStateList.get(currentStatePointer));
+        resetData(applicationStateList.get(currentStatePointer));
     }
 
     /**
-     * Restores the address book to its previously undone state.
+     * Restores the application to its previously undone state.
      */
     public void redo() {
         if (!canRedo()) {
             throw new NoRedoableStateException();
         }
         currentStatePointer++;
-        resetData(addressBookStateList.get(currentStatePointer));
+        resetData(applicationStateList.get(currentStatePointer));
     }
 
     /**
-     * Returns true if {@code undo()} has address book states to undo.
+     * Returns true if {@code undo()} has application states to undo.
      */
     public boolean canUndo() {
         return currentStatePointer > 0;
     }
 
     /**
-     * Returns true if {@code redo()} has address book states to redo.
+     * Returns true if {@code redo()} has application states to redo.
      */
     public boolean canRedo() {
-        return currentStatePointer < addressBookStateList.size() - 1;
+        return currentStatePointer < applicationStateList.size() - 1;
     }
 
     @Override
@@ -78,16 +81,16 @@ public boolean equals(Object other) {
         }
 
         // instanceof handles nulls
-        if (!(other instanceof VersionedAddressBook)) {
+        if (!(other instanceof VersionedApplication)) {
             return false;
         }
 
-        VersionedAddressBook otherVersionedAddressBook = (VersionedAddressBook) other;
+        VersionedApplication otherVersionedApplication = (VersionedApplication) other;
 
         // state check
-        return super.equals(otherVersionedAddressBook)
-                && addressBookStateList.equals(otherVersionedAddressBook.addressBookStateList)
-                && currentStatePointer == otherVersionedAddressBook.currentStatePointer;
+        return super.equals(otherVersionedApplication)
+                && applicationStateList.equals(otherVersionedApplication.applicationStateList)
+                && currentStatePointer == otherVersionedApplication.currentStatePointer;
     }
 
     /**
@@ -95,7 +98,7 @@ public boolean equals(Object other) {
      */
     public static class NoUndoableStateException extends RuntimeException {
         private NoUndoableStateException() {
-            super("Current state pointer at start of addressBookState list, unable to undo.");
+            super("Current state pointer at start of applicationState list, unable to undo.");
         }
     }
 
@@ -104,7 +107,7 @@ private NoUndoableStateException() {
      */
     public static class NoRedoableStateException extends RuntimeException {
         private NoRedoableStateException() {
-            super("Current state pointer at end of addressBookState list, unable to redo.");
+            super("Current state pointer at end of applicationState list, unable to redo.");
         }
     }
 }
diff --git a/src/main/java/pwe/planner/model/module/Code.java b/src/main/java/pwe/planner/model/module/Code.java
new file mode 100644
index 000000000000..4c5e3a26c9fd
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/Code.java
@@ -0,0 +1,66 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Module's code in the application.
+ * Guarantees: immutable; is valid as declared in {@link #isValidCode(String)}
+ */
+public class Code implements Comparable<Code> {
+
+    public static final String MESSAGE_CONSTRAINTS =
+            "Codes should begin with two alphabets, followed by four digits, and may optionally end with an alphabet. "
+            + "Codes should not be blank";
+
+    /*
+     * The first character of the code must not be a whitespace,
+     * otherwise " " (a blank string) becomes a valid input.
+     */
+    public static final String VALIDATION_REGEX = "[\\p{Alpha}]{2,3}[\\p{Digit}]{4}[\\p{Alpha}]?";
+
+    public final String value;
+
+    /**
+     * Constructs an {@code Code}.
+     *
+     * @param code A valid code.
+     */
+    public Code(String code) {
+        requireNonNull(code);
+        checkArgument(isValidCode(code), MESSAGE_CONSTRAINTS);
+
+        value = code.toUpperCase();
+    }
+
+    /**
+     * Returns true if a given string is a valid code.
+     */
+    public static boolean isValidCode(String test) {
+        requireNonNull(test);
+
+        return test.matches(VALIDATION_REGEX);
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof Code // instanceof handles nulls
+                && value.equals(((Code) other).value)); // state check
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public int compareTo(Code other) {
+        return value.compareTo(other.value);
+    }
+}
diff --git a/src/main/java/pwe/planner/model/module/CodeContainsKeywordsPredicate.java b/src/main/java/pwe/planner/model/module/CodeContainsKeywordsPredicate.java
new file mode 100644
index 000000000000..76edb030a2eb
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/CodeContainsKeywordsPredicate.java
@@ -0,0 +1,34 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.ParserUtil.parseKeyword;
+
+/**
+ * Tests that a {@code Module}'s {@code Code} matches the keyword given.
+ */
+public class CodeContainsKeywordsPredicate<T> implements KeywordsPredicate<T> {
+    private final String keyword;
+
+    public CodeContainsKeywordsPredicate(String keyword) {
+        requireNonNull(keyword);
+
+        this.keyword = keyword;
+    }
+
+    @Override
+    public boolean test(T object) {
+        requireNonNull(object);
+        Module module = (Module) object;
+
+        String moduleCode = module.getCode().toString();
+        return parseKeyword(keyword, moduleCode);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof CodeContainsKeywordsPredicate // instanceof handles nulls
+                && keyword.equals(((CodeContainsKeywordsPredicate) other).keyword)); // state check
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/module/Credits.java b/src/main/java/pwe/planner/model/module/Credits.java
new file mode 100644
index 000000000000..b2e2cb09c050
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/Credits.java
@@ -0,0 +1,55 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Module's credits in the application.
+ * Guarantees: immutable; is valid as declared in {@link #isValidCredits(String)}
+ */
+public class Credits {
+
+    public static final String MESSAGE_CONSTRAINTS =
+            "Credits should only contain numbers between 0 and 999.";
+    public static final String VALIDATION_REGEX = "0|([\\d&&[^0]]{1}[\\d]{0,2})";
+    public final String value;
+
+    /**
+     * Constructs a {@code Credits}.
+     *
+     * @param credits A valid amount of credits.
+     */
+    public Credits(String credits) {
+        requireNonNull(credits);
+        checkArgument(isValidCredits(credits), MESSAGE_CONSTRAINTS);
+
+        value = credits;
+    }
+
+    /**
+     * Returns true if a given string is a valid amount of credits.
+     */
+    public static boolean isValidCredits(String test) {
+        requireNonNull(test);
+
+        return test.matches(VALIDATION_REGEX);
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof Credits // instanceof handles nulls
+                && value.equals(((Credits) other).value)); // state check
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/module/CreditsContainsKeywordsPredicate.java b/src/main/java/pwe/planner/model/module/CreditsContainsKeywordsPredicate.java
new file mode 100644
index 000000000000..c28ad928899c
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/CreditsContainsKeywordsPredicate.java
@@ -0,0 +1,34 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.ParserUtil.parseKeyword;
+
+/**
+ * Tests that a {@code Module}'s {@code Credit} matches keyword given.
+ */
+public class CreditsContainsKeywordsPredicate<T> implements KeywordsPredicate<T> {
+    private final String keyword;
+
+    public CreditsContainsKeywordsPredicate(String keyword) {
+        requireNonNull(keyword);
+
+        this.keyword = keyword;
+    }
+
+    @Override
+    public boolean test(T object) {
+        requireNonNull(object);
+        Module module = (Module) object;
+
+        String moduleCredits = module.getCredits().toString();
+        return parseKeyword(keyword, moduleCredits);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof CreditsContainsKeywordsPredicate // instanceof handles nulls
+                && keyword.equals(((CreditsContainsKeywordsPredicate) other).keyword)); // state check
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/module/KeywordsPredicate.java b/src/main/java/pwe/planner/model/module/KeywordsPredicate.java
new file mode 100644
index 000000000000..fc07ebfccad1
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/KeywordsPredicate.java
@@ -0,0 +1,11 @@
+package pwe.planner.model.module;
+
+import java.util.function.Predicate;
+
+/**
+ * {@inheritDoc}
+ * This interface let us have a list of predicate of different module's attributes
+ */
+@FunctionalInterface
+public interface KeywordsPredicate<T> extends Predicate<T> {
+}
diff --git a/src/main/java/pwe/planner/model/module/Module.java b/src/main/java/pwe/planner/model/module/Module.java
new file mode 100644
index 000000000000..7a56e217748f
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/Module.java
@@ -0,0 +1,139 @@
+package pwe.planner.model.module;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Represents a Module in the application.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class Module {
+    /**
+     * The format string representation of a {@link Module} object used by {@link Module#toString()}.
+     */
+    private static final String STRING_REPRESENTATION = "%1$s %2$s (%3$s Modular Credits)\n"
+            + "Offered in Semesters: %4$s\n"
+            + "Co-requisites: %5$s\n"
+            + "Tags: %6$s";
+
+    // Identity fields
+    private final Code code;
+
+    // Data fields
+    private final Name name;
+    private final Credits credits;
+    private final Set<Tag> tags = new HashSet<>();
+    private final Set<Code> corequisites = new HashSet<>();
+    private final Set<Semester> semesters = new HashSet<>();
+
+    /**
+     * Every field must be present and not null.
+     */
+    public Module(Code code, Name name, Credits credits, Set<Semester> semesters, Set<Code> corequisites,
+            Set<Tag> tags) {
+        requireAllNonNull(code, name, credits, semesters, corequisites, tags);
+
+        this.code = code;
+        this.name = name;
+        this.credits = credits;
+        this.semesters.addAll(semesters);
+        this.corequisites.addAll(corequisites);
+        this.tags.addAll(tags);
+    }
+
+    public Code getCode() {
+        return code;
+    }
+
+    public Name getName() {
+        return name;
+    }
+
+    public Credits getCredits() {
+        return credits;
+    }
+
+    /**
+     * Returns an immutable {@code Semester} set, which throws {@code UnsupportedOperationException}
+     * if modification is attempted.
+     */
+    public Set<Semester> getSemesters() {
+        return Collections.unmodifiableSet(semesters);
+    }
+
+    /**
+     * Returns an immutable {@code Code} set, which throws {@code UnsupportedOperationException}
+     * if modification is attempted.
+     */
+    public Set<Code> getCorequisites() {
+        return Collections.unmodifiableSet(corequisites);
+    }
+
+    /**
+     * Returns an immutable {@code Tag} set, which throws {@code UnsupportedOperationException}
+     * if modification is attempted.
+     */
+    public Set<Tag> getTags() {
+        return Collections.unmodifiableSet(tags);
+    }
+
+    /**
+     * Returns true if both modules of the same name have at least one other identity field that is the same.
+     * This defines a weaker notion of equality between two modules.
+     */
+    public boolean isSameModule(Module otherModule) {
+        if (otherModule == this) {
+            return true;
+        }
+
+        return otherModule != null && otherModule.getCode().equals(getCode());
+    }
+
+    /**
+     * Returns true if both modules have the same identity and data fields.
+     * This defines a stronger notion of equality between two modules.
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof Module)) {
+            return false;
+        }
+
+        Module otherModule = (Module) other;
+        return otherModule.getCode().equals(getCode())
+                && otherModule.getName().equals(getName())
+                && otherModule.getCredits().equals(getCredits())
+                && otherModule.getCorequisites().equals(getCorequisites())
+                && otherModule.getSemesters().equals(getSemesters())
+                && otherModule.getTags().equals(getTags());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(code, name, credits, semesters, corequisites, tags);
+    }
+
+    @Override
+    public String toString() {
+
+        final String allSemesters = StringUtil.joinStreamAsString(semesters.stream().sorted());
+
+        final String allCorequisites = StringUtil.joinStreamAsString(corequisites.stream().sorted());
+
+        final String allTags = StringUtil.joinStreamAsString(tags.stream().sorted());
+
+        return String.format(STRING_REPRESENTATION, code, name, credits, allSemesters, allCorequisites, allTags);
+    }
+}
diff --git a/src/main/java/seedu/address/model/person/Name.java b/src/main/java/pwe/planner/model/module/Name.java
similarity index 62%
rename from src/main/java/seedu/address/model/person/Name.java
rename to src/main/java/pwe/planner/model/module/Name.java
index 79244d71cf73..151b5ab35c48 100644
--- a/src/main/java/seedu/address/model/person/Name.java
+++ b/src/main/java/pwe/planner/model/module/Name.java
@@ -1,23 +1,25 @@
-package seedu.address.model.person;
+package pwe.planner.model.module;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
 
 /**
- * Represents a Person's name in the address book.
+ * Represents a Module's name in the application.
  * Guarantees: immutable; is valid as declared in {@link #isValidName(String)}
  */
 public class Name {
 
     public static final String MESSAGE_CONSTRAINTS =
-            "Names should only contain alphanumeric characters and spaces, and it should not be blank";
+            "Names should only contain alphanumeric characters, punctuations (excluding \"(\", \")\", \"&\", \"|\") "
+            + "and spaces, and it should not be blank.\n"
+            + "If you are using punctuations, perhaps you may want to consider replacing \"()\" with \"[]\", \"&\" with"
+            + " \"and\", and \"|\" with \"l\" (lowercase L) instead!";
 
     /*
-     * The first character of the address must not be a whitespace,
+     * The first character of the name must not be a whitespace,
      * otherwise " " (a blank string) becomes a valid input.
      */
-    public static final String VALIDATION_REGEX = "[\\p{Alnum}][\\p{Alnum} ]*";
-
+    public static final String VALIDATION_REGEX = "^[\\p{Graph}&&[^\\(\\)\\|\\&]][\\p{Print}&&[^\\(\\)\\|\\&]]*$";
     public final String fullName;
 
     /**
@@ -28,6 +30,7 @@ public class Name {
     public Name(String name) {
         requireNonNull(name);
         checkArgument(isValidName(name), MESSAGE_CONSTRAINTS);
+
         fullName = name;
     }
 
@@ -35,10 +38,11 @@ public Name(String name) {
      * Returns true if a given string is a valid name.
      */
     public static boolean isValidName(String test) {
+        requireNonNull(test);
+
         return test.matches(VALIDATION_REGEX);
     }
 
-
     @Override
     public String toString() {
         return fullName;
diff --git a/src/main/java/pwe/planner/model/module/NameContainsKeywordsPredicate.java b/src/main/java/pwe/planner/model/module/NameContainsKeywordsPredicate.java
new file mode 100644
index 000000000000..e23c0a238d06
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/NameContainsKeywordsPredicate.java
@@ -0,0 +1,34 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.ParserUtil.parseKeyword;
+
+/**
+ * Tests that a {@code Module}'s {@code Name} matches the keyword given.
+ */
+public class NameContainsKeywordsPredicate<T> implements KeywordsPredicate<T> {
+    private final String keyword;
+
+    public NameContainsKeywordsPredicate(String keyword) {
+        requireNonNull(keyword);
+
+        this.keyword = keyword;
+    }
+
+    @Override
+    public boolean test(T object) {
+        requireNonNull(object);
+        Module module = (Module) object;
+
+        String moduleName = module.getName().toString();
+        return parseKeyword(keyword, moduleName);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof NameContainsKeywordsPredicate // instanceof handles nulls
+                && keyword.equals(((NameContainsKeywordsPredicate) other).keyword)); // state check
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/module/TagContainsKeywordsPredicate.java b/src/main/java/pwe/planner/model/module/TagContainsKeywordsPredicate.java
new file mode 100644
index 000000000000..7e3277586b80
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/TagContainsKeywordsPredicate.java
@@ -0,0 +1,38 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.ParserUtil.parseKeyword;
+
+import java.util.Set;
+
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Tests that a {@code Module}'s {@code Tag} matches keyword given.
+ */
+public class TagContainsKeywordsPredicate<T> implements KeywordsPredicate<T> {
+    private final String keyword;
+
+    public TagContainsKeywordsPredicate(String keyword) {
+        requireNonNull(keyword);
+
+        this.keyword = keyword;
+    }
+
+    @Override
+    public boolean test(T object) {
+        requireNonNull(object);
+        Module module = (Module) object;
+
+        Set<Tag> tags = module.getTags();
+        return tags.stream().anyMatch(tag -> parseKeyword(keyword, tag.tagName));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof TagContainsKeywordsPredicate // instanceof handles nulls
+                && keyword.equals(((TagContainsKeywordsPredicate) other).keyword)); // state check
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/module/UniqueModuleList.java b/src/main/java/pwe/planner/model/module/UniqueModuleList.java
new file mode 100644
index 000000000000..0bff15f3b5a9
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/UniqueModuleList.java
@@ -0,0 +1,294 @@
+package pwe.planner.model.module;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import pwe.planner.model.module.exceptions.DuplicateModuleException;
+import pwe.planner.model.module.exceptions.ModuleNotFoundException;
+
+/**
+ * A list of modules that enforces uniqueness between its elements and does not allow nulls.
+ * A module is considered unique by comparing using {@code Module#isSameModule(Module)}. As such, adding and updating of
+ * modules uses Module#isSameModule(Module) for equality so as to ensure that the module being added or updated is
+ * unique in terms of identity in the UniqueModuleList. However, the removal of a module uses Module#equals(Object) so
+ * as to ensure that the module with exactly the same fields will be removed.
+ *
+ * Supports a minimal set of list operations.
+ *
+ * @see Module#isSameModule(Module)
+ */
+public class UniqueModuleList implements Iterable<Module> {
+
+    private final ObservableList<Module> internalList = FXCollections.observableArrayList();
+    private final ObservableList<Module> internalUnmodifiableList =
+            FXCollections.unmodifiableObservableList(internalList);
+
+    /**
+     * Returns true if the list contains an equivalent module as the given argument.
+     */
+    public boolean contains(Module toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream().anyMatch(toCheck::isSameModule);
+    }
+
+    /**
+     * Returns a module object if the list contains an equivalent module code as the given argument.
+     */
+    public Module getModuleByCode(Code toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream()
+                .filter(module -> module.getCode().equals(toCheck))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Adds a module to the list.
+     * The module must not already exist in the list.
+     */
+    public void add(Module toAdd) {
+        requireNonNull(toAdd);
+
+        if (contains(toAdd)) {
+            throw new DuplicateModuleException();
+        }
+        internalList.add(toAdd);
+
+        cascadeAddToModuleCorequisites(toAdd);
+    }
+
+    /**
+     * Combines all co-requisites linked to current module into one {@code Set<Code>}, and update all linked modules to
+     * have all-corequisites
+     *
+     * @param moduleToAdd
+     */
+    private void cascadeAddToModuleCorequisites(Module moduleToAdd) {
+        assert moduleToAdd != null;
+
+        // create a union Set<Code> of co-requisites
+        Code currentCode = moduleToAdd.getCode();
+        Set<Code> currentCorequisites = moduleToAdd.getCorequisites();
+        Set<Code> allCorequisites = new HashSet<>(currentCorequisites);
+
+        for (Code codeToAdd : currentCorequisites) {
+            Optional<Module> otherModuleOptional = internalUnmodifiableList.stream()
+                    .filter(module -> module.getCode().equals(codeToAdd))
+                    .findFirst();
+
+            if (otherModuleOptional.isPresent()) {
+                allCorequisites.addAll(otherModuleOptional.get().getCorequisites());
+            }
+        }
+
+        allCorequisites.add(currentCode);
+
+        // update all co-requisite modules with the union set excluding itself
+        for (Code codeToEditCorequisites : allCorequisites) {
+            Optional<Module> otherModuleOptional = internalUnmodifiableList.stream()
+                    .filter(module -> module.getCode().equals(codeToEditCorequisites))
+                    .findFirst();
+
+            if (otherModuleOptional.isPresent()) {
+                Module otherModule = otherModuleOptional.get();
+                Set<Code> editedOtherCorequisites = new HashSet<>(allCorequisites);
+                editedOtherCorequisites.remove(otherModule.getCode());
+
+                Module editedOtherModule = new Module(
+                        otherModule.getCode(),
+                        otherModule.getName(),
+                        otherModule.getCredits(),
+                        otherModule.getSemesters(),
+                        editedOtherCorequisites,
+                        otherModule.getTags()
+                );
+
+                setModule(otherModule, editedOtherModule, false);
+            }
+        }
+    }
+
+    /**
+     * Replaces the module {@code target} in the list with {@code editedModule}.
+     * {@code target} must exist in the list.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the list.
+     */
+    public void setModule(Module target, Module editedModule) {
+        requireAllNonNull(target, editedModule);
+
+        setModule(target, editedModule, true);
+    }
+
+
+    /**
+     * Replaces the module {@code target} in the list with {@code editedModule}.
+     * {@code target} must exist in the list.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the list.
+     */
+    private void setModule(Module target, Module editedModule, boolean cascade) {
+        requireAllNonNull(target, editedModule);
+
+        int index = internalList.indexOf(target);
+        if (index == -1) {
+            throw new ModuleNotFoundException();
+        }
+
+        if (!target.isSameModule(editedModule) && contains(editedModule)) {
+            throw new DuplicateModuleException();
+        }
+
+        internalList.set(index, editedModule);
+
+        if (cascade) {
+            if (!target.getCode().equals(editedModule.getCode())) {
+                cascadeEditToModuleCorequisites(target, editedModule);
+            }
+            cascadeDeleteToModuleCorequisites(target);
+            cascadeAddToModuleCorequisites(editedModule);
+        }
+    }
+
+    /**
+     * Cascades the edited module code by updating {@code UniqueModuleList} accordingly
+     * @param target module code to edit/find
+     * @param editedModule module code to replace with
+     */
+    private void cascadeEditToModuleCorequisites(Module target, Module editedModule) {
+        assert target != null;
+        assert editedModule != null;
+
+        ObservableList<Module> modules = internalUnmodifiableList;
+        Code codeToEdit = target.getCode();
+        Code editedCode = editedModule.getCode();
+
+        for (Module module : modules) {
+            if (module.getCorequisites().contains(codeToEdit)) {
+                Set<Code> editedCorequisiteCodes = new HashSet<>(module.getCorequisites());
+                editedCorequisiteCodes.remove(codeToEdit);
+                editedCorequisiteCodes.add(editedCode);
+
+                Module editedCorequisiteModule = new Module(
+                        module.getCode(),
+                        module.getName(),
+                        module.getCredits(),
+                        module.getSemesters(),
+                        editedCorequisiteCodes,
+                        module.getTags()
+                );
+
+                setModule(module, editedCorequisiteModule, false);
+            }
+        }
+    }
+
+    /**
+     * Removes the equivalent module from the list.
+     * The module must exist in the list.
+     */
+    public void remove(Module toRemove) {
+        requireNonNull(toRemove);
+
+        if (!internalList.remove(toRemove)) {
+            throw new ModuleNotFoundException();
+        }
+
+        cascadeDeleteToModuleCorequisites(toRemove);
+    }
+
+    /**
+     * Cascades the deleted module code by removing it from {@code UniqueModuleList} accordingly
+     * @param moduleToDelete module code to delete
+     */
+    private void cascadeDeleteToModuleCorequisites(Module moduleToDelete) {
+        assert moduleToDelete != null;
+
+        ObservableList<Module> modules = internalUnmodifiableList;
+        Code codeToDelete = moduleToDelete.getCode();
+
+        for (Module module : modules) {
+            if (module.getCorequisites().contains(codeToDelete)) {
+                Set<Code> editedCorequisiteCodes = new HashSet<>(module.getCorequisites());
+                editedCorequisiteCodes.remove(codeToDelete);
+
+                Module editedModule = new Module(
+                        module.getCode(),
+                        module.getName(),
+                        module.getCredits(),
+                        module.getSemesters(),
+                        editedCorequisiteCodes,
+                        module.getTags()
+                );
+
+                setModule(module, editedModule, false);
+            }
+        }
+    }
+
+    public void setModules(UniqueModuleList replacement) {
+        requireNonNull(replacement);
+
+        internalList.setAll(replacement.internalList);
+    }
+
+    /**
+     * Replaces the contents of this list with {@code modules}.
+     * {@code modules} must not contain duplicate modules.
+     */
+    public void setModules(List<Module> modules) {
+        requireAllNonNull(modules);
+
+        if (!modulesAreUnique(modules)) {
+            throw new DuplicateModuleException();
+        }
+
+        internalList.setAll(modules);
+    }
+
+    /**
+     * Returns the backing list as an unmodifiable {@code ObservableList}.
+     */
+    public ObservableList<Module> asUnmodifiableObservableList() {
+        return internalUnmodifiableList;
+    }
+
+    @Override
+    public Iterator<Module> iterator() {
+        return internalList.iterator();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof UniqueModuleList // instanceof handles nulls
+                    && internalList.equals(((UniqueModuleList) other).internalList));
+    }
+
+    @Override
+    public int hashCode() {
+        return internalList.hashCode();
+    }
+
+    /**
+     * Returns true if {@code modules} contains only unique modules.
+     */
+    private boolean modulesAreUnique(List<Module> modules) {
+        for (int i = 0; i < modules.size() - 1; i++) {
+            for (int j = i + 1; j < modules.size(); j++) {
+                if (modules.get(i).isSameModule(modules.get(j))) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/pwe/planner/model/module/exceptions/DuplicateModuleException.java b/src/main/java/pwe/planner/model/module/exceptions/DuplicateModuleException.java
new file mode 100644
index 000000000000..15fb9044c7af
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/exceptions/DuplicateModuleException.java
@@ -0,0 +1,11 @@
+package pwe.planner.model.module.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate Modules (Modules are considered duplicates if they have the same
+ * identity).
+ */
+public class DuplicateModuleException extends RuntimeException {
+    public DuplicateModuleException() {
+        super("Operation would result in duplicate modules");
+    }
+}
diff --git a/src/main/java/pwe/planner/model/module/exceptions/ModuleNotFoundException.java b/src/main/java/pwe/planner/model/module/exceptions/ModuleNotFoundException.java
new file mode 100644
index 000000000000..14ea142c851c
--- /dev/null
+++ b/src/main/java/pwe/planner/model/module/exceptions/ModuleNotFoundException.java
@@ -0,0 +1,6 @@
+package pwe.planner.model.module.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified module.
+ */
+public class ModuleNotFoundException extends RuntimeException {}
diff --git a/src/main/java/pwe/planner/model/planner/DegreePlanner.java b/src/main/java/pwe/planner/model/planner/DegreePlanner.java
new file mode 100644
index 000000000000..15ecbd99635d
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/DegreePlanner.java
@@ -0,0 +1,109 @@
+package pwe.planner.model.planner;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.model.module.Code;
+
+/**
+ * Represents a DegreePlanner in the degreePlanner list.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class DegreePlanner implements Comparable<DegreePlanner> {
+    /**
+     * The format string representation of a {@link DegreePlanner} object used by {@link DegreePlanner#toString()}.
+     */
+    private static final String STRING_REPRESENTATION = "Year %1$s Semester %2$s: %3$s";
+
+    // Identity fields
+    private final Year year;
+    private final Semester semester;
+
+    // Data fields
+    private final Set<Code> codes = new HashSet<>();
+
+    /**
+     * Every field must be present and not null.
+     */
+    public DegreePlanner(Year year, Semester semester, Set<Code> codes) {
+        requireAllNonNull(year, semester, codes);
+
+        this.year = year;
+        this.semester = semester;
+        this.codes.addAll(codes);
+    }
+
+    public Set<Code> getCodes() {
+        return Collections.unmodifiableSet(codes);
+    }
+
+    public Year getYear() {
+        return year;
+    }
+
+    public Semester getSemester() {
+        return semester;
+    }
+
+    /**
+     * Returns true if both degreePlanners in planner have same year and semester.
+     * This defines a weaker notion of equality between two degreePlaners.
+     */
+    public boolean isSameDegreePlanner(DegreePlanner otherDegreePlanner) {
+        if (otherDegreePlanner == this) {
+            return true;
+        }
+
+        return otherDegreePlanner != null
+                && otherDegreePlanner.getYear().equals(getYear())
+                && otherDegreePlanner.getSemester().equals(getSemester());
+    }
+
+    /**
+     * Returns true if both degreePlanners in planner have the same identity and data fields.
+     * This defines a stronger notion of equality between two degreePlanners.
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof DegreePlanner)) {
+            return false;
+        }
+
+        DegreePlanner otherDegreePlanner = (DegreePlanner) other;
+        return otherDegreePlanner.getYear().equals(getYear())
+                && otherDegreePlanner.getSemester().equals(getSemester())
+                && otherDegreePlanner.getCodes().equals(getCodes());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(codes, year, semester);
+    }
+
+    @Override
+    public String toString() {
+        final String allCodes = codes.isEmpty()
+                ? "No modules"
+                : StringUtil.joinStreamAsString(codes.stream().sorted());
+
+        return String.format(STRING_REPRESENTATION, year, semester, allCodes);
+    }
+
+    @Override
+    public int compareTo(DegreePlanner other) {
+        int differenceInYear = year.compareTo(other.year);
+        if (differenceInYear == 0) {
+            return semester.compareTo(other.semester);
+        }
+        return differenceInYear;
+    }
+}
diff --git a/src/main/java/pwe/planner/model/planner/Semester.java b/src/main/java/pwe/planner/model/planner/Semester.java
new file mode 100644
index 000000000000..9945022322cb
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/Semester.java
@@ -0,0 +1,65 @@
+package pwe.planner.model.planner;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a DegreePlanner's Semester in the degreePlanner list.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class Semester implements Comparable<Semester> {
+
+    public static final String MESSAGE_SEMESTER_CONSTRAINTS =
+            "Semester should only be either 1, 2, 3 or 4. Semester should not be blank";
+
+    /*
+     * The semester should be valid and in the correct S format.
+     */
+    public static final String SEMESTER_VALIDATION_REGEX =
+            "[1-4]{1}";
+
+    public final String plannerSemester;
+
+    /**
+     * Constructs a {@code Semester}.
+     *
+     * @param semester A valid semester.
+     */
+    public Semester(String semester) {
+        requireNonNull(semester);
+        checkArgument(isValidSemester(semester), MESSAGE_SEMESTER_CONSTRAINTS);
+
+        plannerSemester = semester;
+    }
+
+    /**
+     * Returns true if a given string is a valid date.
+     */
+    public static boolean isValidSemester(String test) {
+        requireNonNull(test);
+
+        return test.matches(SEMESTER_VALIDATION_REGEX);
+    }
+
+    @Override
+    public String toString() {
+        return plannerSemester;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof Semester // instanceof handles nulls
+                && plannerSemester.equals(((Semester) other).plannerSemester)); // state check
+    }
+
+    @Override
+    public int hashCode() {
+        return plannerSemester.hashCode();
+    }
+
+    @Override
+    public int compareTo(Semester other) {
+        return plannerSemester.compareTo(other.plannerSemester);
+    }
+}
diff --git a/src/main/java/pwe/planner/model/planner/SemesterContainsKeywordPredicate.java b/src/main/java/pwe/planner/model/planner/SemesterContainsKeywordPredicate.java
new file mode 100644
index 000000000000..af27a95c6c1a
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/SemesterContainsKeywordPredicate.java
@@ -0,0 +1,46 @@
+package pwe.planner.model.planner;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.ParserUtil.parseKeyword;
+
+import java.util.Set;
+
+import pwe.planner.model.module.KeywordsPredicate;
+import pwe.planner.model.module.Module;
+
+/**
+ * Tests that a {@code DegreePlanner}'s {@code Semester} matches any of the keyword given.
+ */
+public class SemesterContainsKeywordPredicate<T> implements KeywordsPredicate<T> {
+    private final String keyword;
+
+    public SemesterContainsKeywordPredicate(String keyword) {
+        requireNonNull(keyword);
+
+        this.keyword = keyword;
+    }
+
+    @Override
+    public boolean test(T object) {
+        requireNonNull(object);
+
+        if (object instanceof DegreePlanner) {
+            DegreePlanner degreePlanner = (DegreePlanner) object;
+            String semester = degreePlanner.getSemester().toString();
+
+            return parseKeyword(keyword, semester);
+        } else { // we are assuming that only DegreePlanner and Module will be using this method.
+            Module module = (Module) object;
+            Set<Semester> semesters = module.getSemesters();
+
+            return semesters.stream().anyMatch(semester -> parseKeyword(keyword, semester.toString()));
+        }
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof SemesterContainsKeywordPredicate // instanceof handles nulls
+                && keyword.equals(((SemesterContainsKeywordPredicate) other).keyword)); // state check
+    }
+}
diff --git a/src/main/java/pwe/planner/model/planner/UniqueDegreePlannerList.java b/src/main/java/pwe/planner/model/planner/UniqueDegreePlannerList.java
new file mode 100644
index 000000000000..fa50212b4215
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/UniqueDegreePlannerList.java
@@ -0,0 +1,158 @@
+package pwe.planner.model.planner;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.exceptions.DegreePlannerNotFoundException;
+import pwe.planner.model.planner.exceptions.DuplicateDegreePlannerException;
+
+/**
+ * A list of degreePlanners that enforces uniqueness between its elements and does not allow nulls.
+ * A code is considered unique by comparing using {@code DegreePlanner#isSameDegreePlanner(DegreePlanner)}. As such,
+ * adding and updating of degreePlanners uses DegreePlanner#isSameDegreePlanner(DegreePlanner) for equality so as to
+ * ensure that the degreePlanner being added or updated is unique in terms of identity in the UniqueDegreePlannerList.
+ * However, the removal of a module uses DegreePlanner#equals(Object) so as to ensure that the module with exactly
+ * the same fields will be removed.
+ * <p>
+ * Supports a minimal set of list operations.
+ *
+ * @see DegreePlanner#isSameDegreePlanner(DegreePlanner)
+ */
+public class UniqueDegreePlannerList implements Iterable<DegreePlanner> {
+
+    private final ObservableList<DegreePlanner> internalList = FXCollections.observableArrayList();
+    private final ObservableList<DegreePlanner> internalUnmodifiableList =
+            FXCollections.unmodifiableObservableList(internalList);
+
+    /**
+     * Returns true if the list contains an equivalent degree planner as the given argument.
+     */
+    public boolean contains(DegreePlanner toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream().anyMatch(toCheck::isSameDegreePlanner);
+    }
+
+    /**
+     * Returns a DegreePlanner object of the degree planner in the internalList if degree planner contains the given
+     * code.
+     */
+    public DegreePlanner getDegreePlannerByCode(Code toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream()
+                .filter(degreePlanner -> degreePlanner.getCodes().contains(toCheck))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Adds a planner module to the list.
+     * The planner module must not already exist in the list.
+     */
+    public void add(DegreePlanner toAdd) {
+        requireNonNull(toAdd);
+
+        if (contains(toAdd)) {
+            throw new DuplicateDegreePlannerException();
+        }
+        internalList.add(toAdd);
+    }
+
+    /**
+     * Replaces the degreePlanner {@code target} in the list with {@code editedDegreePlanner}.
+     * {@code target} must exist in the list.
+     * The planner module identity of {@code editedDegreePlanner} must not be the same as another existing degreePlanner
+     * in the list.
+     */
+    public void setDegreePlanner(DegreePlanner target, DegreePlanner editedDegreePlanner) {
+        requireAllNonNull(target, editedDegreePlanner);
+
+        int index = internalList.indexOf(target);
+        if (index == -1) {
+            throw new DegreePlannerNotFoundException();
+        }
+
+        if (!target.isSameDegreePlanner(editedDegreePlanner) && contains(editedDegreePlanner)) {
+            throw new DuplicateDegreePlannerException();
+        }
+
+        internalList.set(index, editedDegreePlanner);
+    }
+
+    /**
+     * Removes the equivalent degreePlanner from the list.
+     * The planner module must exist in the list.
+     */
+    public void remove(DegreePlanner toRemove) {
+        requireNonNull(toRemove);
+
+        if (!internalList.remove(toRemove)) {
+            throw new DegreePlannerNotFoundException();
+        }
+    }
+
+    public void setDegreePlanners(UniqueDegreePlannerList replacement) {
+        requireNonNull(replacement);
+
+        internalList.setAll(replacement.internalList);
+    }
+
+    /**
+     * Replaces the contents of this list with {@code degreePlanners}.
+     * {@code degreePlanners} must not contain duplicate degreePlanners.
+     */
+    public void setDegreePlanners(List<DegreePlanner> degreePlanners) {
+        requireAllNonNull(degreePlanners);
+
+        if (!degreePlannersAreUnique(degreePlanners)) {
+            throw new DuplicateDegreePlannerException();
+        }
+
+        internalList.setAll(degreePlanners);
+    }
+
+    /**
+     * Returns the backing list as an unmodifiable {@code ObservableList}.
+     */
+    public ObservableList<DegreePlanner> asUnmodifiableObservableList() {
+        return internalUnmodifiableList;
+    }
+
+    @Override
+    public Iterator<DegreePlanner> iterator() {
+        return internalList.iterator();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof UniqueDegreePlannerList // instanceof handles nulls
+                && internalList.equals(((UniqueDegreePlannerList) other).internalList));
+    }
+
+    @Override
+    public int hashCode() {
+        return internalList.hashCode();
+    }
+
+    /**
+     * Returns true if {@code degreePlanners} contains only unique degreePlanner.
+     */
+    private boolean degreePlannersAreUnique(List<DegreePlanner> degreePlanners) {
+        for (int i = 0; i < degreePlanners.size() - 1; i++) {
+            for (int j = i + 1; j < degreePlanners.size(); j++) {
+                if (degreePlanners.get(i).isSameDegreePlanner(degreePlanners.get(j))) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/pwe/planner/model/planner/Year.java b/src/main/java/pwe/planner/model/planner/Year.java
new file mode 100644
index 000000000000..2bacf787bbc9
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/Year.java
@@ -0,0 +1,65 @@
+package pwe.planner.model.planner;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a DegreePlanner's Year in the degreePlanner list.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class Year implements Comparable<Year> {
+
+    public static final String MESSAGE_YEAR_CONSTRAINTS =
+            "Year should only be either 1, 2, 3 or 4. Year should not be blank";
+
+    /*
+     * The date should be valid and in the correct Year format.
+     */
+    public static final String YEAR_VALIDATION_REGEX =
+            "[1-4]{1}";
+
+    public final String year;
+
+    /**
+     * Constructs a {@code Year}.
+     *
+     * @param year A valid year.
+     */
+    public Year(String year) {
+        requireNonNull(year);
+        checkArgument(isValidYear(year), MESSAGE_YEAR_CONSTRAINTS);
+
+        this.year = year;
+    }
+
+    /**
+     * Returns true if a given string is a valid year.
+     */
+    public static boolean isValidYear(String test) {
+        requireNonNull(test);
+
+        return test.matches(YEAR_VALIDATION_REGEX);
+    }
+
+    @Override
+    public String toString() {
+        return year;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof Year // instanceof handles nulls
+                && year.equals(((Year) other).year)); // state check
+    }
+
+    @Override
+    public int hashCode() {
+        return year.hashCode();
+    }
+
+    @Override
+    public int compareTo(Year other) {
+        return year.compareTo(other.year);
+    }
+}
diff --git a/src/main/java/pwe/planner/model/planner/YearContainsKeywordPredicate.java b/src/main/java/pwe/planner/model/planner/YearContainsKeywordPredicate.java
new file mode 100644
index 000000000000..fbb494cbadc5
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/YearContainsKeywordPredicate.java
@@ -0,0 +1,35 @@
+package pwe.planner.model.planner;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.logic.parser.ParserUtil.parseKeyword;
+
+import pwe.planner.model.module.KeywordsPredicate;
+
+/**
+ * Tests that a {@code DegreePlanner}'s {@code Year} matches any of the keywords given.
+ */
+public class YearContainsKeywordPredicate<T> implements KeywordsPredicate<T> {
+    private final String keyword;
+
+    public YearContainsKeywordPredicate(String keyword) {
+        requireNonNull(keyword);
+
+        this.keyword = keyword;
+    }
+
+    @Override
+    public boolean test(T object) {
+        requireNonNull(object);
+        DegreePlanner degreePlanner = (DegreePlanner) object;
+
+        String year = degreePlanner.getYear().toString();
+        return parseKeyword(keyword, year);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof YearContainsKeywordPredicate // instanceof handles nulls
+                && keyword.equals(((YearContainsKeywordPredicate) other).keyword)); // state check
+    }
+}
diff --git a/src/main/java/pwe/planner/model/planner/exceptions/DegreePlannerNotFoundException.java b/src/main/java/pwe/planner/model/planner/exceptions/DegreePlannerNotFoundException.java
new file mode 100644
index 000000000000..97ab07e6bad8
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/exceptions/DegreePlannerNotFoundException.java
@@ -0,0 +1,7 @@
+package pwe.planner.model.planner.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified degreePlanner.
+ */
+public class DegreePlannerNotFoundException extends RuntimeException {
+}
diff --git a/src/main/java/pwe/planner/model/planner/exceptions/DuplicateDegreePlannerException.java b/src/main/java/pwe/planner/model/planner/exceptions/DuplicateDegreePlannerException.java
new file mode 100644
index 000000000000..c6501ef56dd8
--- /dev/null
+++ b/src/main/java/pwe/planner/model/planner/exceptions/DuplicateDegreePlannerException.java
@@ -0,0 +1,11 @@
+package pwe.planner.model.planner.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate DegreePlanners (DegreePlanners are considered duplicates if
+ * they have the same identity).
+ */
+public class DuplicateDegreePlannerException extends RuntimeException {
+    public DuplicateDegreePlannerException() {
+        super("Operation would result in duplicate degreePlanners");
+    }
+}
diff --git a/src/main/java/pwe/planner/model/requirement/RequirementCategory.java b/src/main/java/pwe/planner/model/requirement/RequirementCategory.java
new file mode 100644
index 000000000000..6032df269ccb
--- /dev/null
+++ b/src/main/java/pwe/planner/model/requirement/RequirementCategory.java
@@ -0,0 +1,114 @@
+package pwe.planner.model.requirement;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+
+/**
+ * Represents a RequirementCategory in the requirement list.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class RequirementCategory {
+
+    // Identity fields
+    private final Name name;
+
+    // Data fields
+    private final Credits credits;
+    private final Set<Code> codeSet = new HashSet<>();
+
+    /**
+     * Every field must be present and not null.
+     */
+    public RequirementCategory(Name name, Credits credits, Set<Code> codeSet) {
+        requireAllNonNull(name, credits, codeSet);
+
+        this.name = name;
+        this.credits = credits;
+        this.codeSet.addAll(codeSet);
+    }
+
+    public Name getName() {
+        return name;
+    }
+
+    public Credits getCredits() {
+        return credits;
+    }
+
+    /**
+     * Returns an immutable setCode, which throws {@code UnsupportedOperationException}
+     * if modification is attempted.
+     */
+    public Set<Code> getCodeSet() {
+        return Collections.unmodifiableSet(codeSet);
+    }
+
+    /**
+     * Returns true if both requirement in PWE have same code.
+     * This defines a weaker notion of equality between two requirement.
+     */
+    public boolean isSameRequirementCategory(RequirementCategory otherRequirementCategory) {
+        if (otherRequirementCategory == this) {
+            return true;
+        }
+
+        return otherRequirementCategory != null
+                && otherRequirementCategory.getName().equals(getName());
+    }
+
+    /**
+     * Returns true if the current codeSet contains an equivalent code in the parameter toCheck
+     */
+    public boolean hasModuleCode(Set<Code> codeSetToCheck) {
+        requireNonNull(codeSetToCheck);
+
+        return codeSetToCheck.stream().anyMatch(codeSet::contains);
+    }
+
+    /**
+     * Returns true if both requirement in PWE have the same identity and data fields.
+     * This defines a stronger notion of equality between two requirement.
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof RequirementCategory)) {
+            return false;
+        }
+
+        RequirementCategory otherRequirementCategory = (RequirementCategory) other;
+        return otherRequirementCategory.getName().equals(getName())
+                && otherRequirementCategory.getCredits().equals(getCredits())
+                && otherRequirementCategory.getCodeSet().equals(getCodeSet());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, credits, codeSet);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append(" Name: ")
+                .append(getName())
+                .append(" Credits: ")
+                .append(getCredits())
+                .append(" Module Codes: ")
+                .append(getCodeSet());
+        return builder.toString();
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/requirement/UniqueRequirementCategoryList.java b/src/main/java/pwe/planner/model/requirement/UniqueRequirementCategoryList.java
new file mode 100644
index 000000000000..ac798f7206da
--- /dev/null
+++ b/src/main/java/pwe/planner/model/requirement/UniqueRequirementCategoryList.java
@@ -0,0 +1,174 @@
+package pwe.planner.model.requirement;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.exceptions.DuplicateRequirementCategoryException;
+import pwe.planner.model.requirement.exceptions.RequirementCategoryNotFoundException;
+
+/**
+ * A list of requirement that enforces uniqueness between its elements and does not allow nulls.
+ * A code is considered unique by comparing using {@code RequirementCategory#isSameRequirementCategory
+ * (RequirementCategory)}. As such,
+ * adding and updating of requirement uses RequirementCategory#isSameRequirementCategory(RequirementCategory)
+ * for equality so as to
+ * ensure that the requirement being added or updated is unique in terms of identity in the
+ * UniqueRequirementCategoryList.
+ * However, the removal of a requirement uses RequirementCategory#equals(Object) so as to ensure that the
+ * requirement with
+ * exactly
+ * the same fields will be removed.
+ * <p>
+ * Supports a minimal set of list operations.
+ *
+ * @see RequirementCategory#isSameRequirementCategory(RequirementCategory)
+ */
+public class UniqueRequirementCategoryList implements Iterable<RequirementCategory> {
+
+    private final ObservableList<RequirementCategory> internalList = FXCollections.observableArrayList();
+    private final ObservableList<RequirementCategory> internalUnmodifiableList =
+            FXCollections.unmodifiableObservableList(internalList);
+
+    /**
+     * Returns true if the list contains an equivalent Name as the given argument.
+     */
+    public boolean contains(Name toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream().map(RequirementCategory::getName).anyMatch(toCheck::equals);
+    }
+
+    /**
+     * Returns true if the list contains an equivalent RequirementCategory as the given argument.
+     */
+    public boolean contains(RequirementCategory toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream().anyMatch(toCheck::isSameRequirementCategory);
+    }
+
+    /**
+     * Returns a RequirementCategory object of the requirementCategory in the internalList.
+     */
+    public RequirementCategory getRequirementCategory(Name toCheck) {
+        requireNonNull(toCheck);
+
+        return internalList.stream()
+                .filter(requirementCategory -> StringUtil
+                        .compareEqualsIgnoreCase(requirementCategory.getName().toString(), toCheck.toString()))
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * Adds a requirement to the list.
+     * The requirement must not already exist in the list.
+     */
+    public void add(RequirementCategory toAdd) {
+        requireNonNull(toAdd);
+
+        if (contains(toAdd)) {
+            throw new DuplicateRequirementCategoryException();
+        }
+        internalList.add(toAdd);
+    }
+
+    /**
+     * Replaces the requirement {@code target} in the list with {@code editedRequirementCategory}.
+     * {@code target} must exist in the list.
+     * The requirement identity of {@code editedRequirementCategory} must not be the same as another existing
+     * requirement
+     * in the list.
+     */
+    public void setRequirementCategory(RequirementCategory target, RequirementCategory editedRequirementCategory) {
+        requireAllNonNull(target, editedRequirementCategory);
+
+        int index = internalList.indexOf(target);
+        if (index == -1) {
+            throw new RequirementCategoryNotFoundException();
+        }
+
+        if (!target.isSameRequirementCategory(editedRequirementCategory) && contains(editedRequirementCategory)) {
+            throw new DuplicateRequirementCategoryException();
+        }
+
+        internalList.set(index, editedRequirementCategory);
+    }
+
+    /**
+     * Removes the equivalent requirement from the list.
+     * The requirement module must exist in the list.
+     */
+    public void remove(RequirementCategory toRemove) {
+        requireNonNull(toRemove);
+
+        if (!internalList.remove(toRemove)) {
+            throw new RequirementCategoryNotFoundException();
+        }
+    }
+
+    public void setRequirementCategories(UniqueRequirementCategoryList replacement) {
+        requireNonNull(replacement);
+
+        internalList.setAll(replacement.internalList);
+    }
+
+    /**
+     * Replaces the contents of this list with {@code requirement}.
+     * {@code requirement} must not contain duplicate requirement.
+     */
+    public void setRequirementCategories(List<RequirementCategory> requirementCategories) {
+        requireAllNonNull(requirementCategories);
+
+        if (!requirementCategoriesAreUnique(requirementCategories)) {
+            throw new DuplicateRequirementCategoryException();
+        }
+
+        internalList.setAll(requirementCategories);
+    }
+
+    /**
+     * Returns the backing list as an unmodifiable {@code ObservableList}.
+     */
+    public ObservableList<RequirementCategory> asUnmodifiableObservableList() {
+        return internalUnmodifiableList;
+    }
+
+    @Override
+    public Iterator<RequirementCategory> iterator() {
+        return internalList.iterator();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof UniqueRequirementCategoryList // instanceof handles nulls
+                && internalList.equals(((UniqueRequirementCategoryList) other).internalList));
+    }
+
+    @Override
+    public int hashCode() {
+        return internalList.hashCode();
+    }
+
+    /**
+     * Returns true if {@code requirement} contains only unique requirement modules.
+     */
+    private boolean requirementCategoriesAreUnique(List<RequirementCategory> requirementCategories) {
+        for (int i = 0; i < requirementCategories.size() - 1; i++) {
+            for (int j = i + 1; j < requirementCategories.size(); j++) {
+                if (requirementCategories.get(i).isSameRequirementCategory(requirementCategories.get(j))) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/pwe/planner/model/requirement/exceptions/DuplicateRequirementCategoryException.java b/src/main/java/pwe/planner/model/requirement/exceptions/DuplicateRequirementCategoryException.java
new file mode 100644
index 000000000000..8ac46fda7d0a
--- /dev/null
+++ b/src/main/java/pwe/planner/model/requirement/exceptions/DuplicateRequirementCategoryException.java
@@ -0,0 +1,11 @@
+package pwe.planner.model.requirement.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate RequirementCategory (RequirementCategory are considered
+ * duplicates if they have the same identity).
+ */
+public class DuplicateRequirementCategoryException extends RuntimeException {
+    public DuplicateRequirementCategoryException() {
+        super("Operation would result in duplicate requirement");
+    }
+}
diff --git a/src/main/java/pwe/planner/model/requirement/exceptions/RequirementCategoryNotFoundException.java b/src/main/java/pwe/planner/model/requirement/exceptions/RequirementCategoryNotFoundException.java
new file mode 100644
index 000000000000..92eb92685901
--- /dev/null
+++ b/src/main/java/pwe/planner/model/requirement/exceptions/RequirementCategoryNotFoundException.java
@@ -0,0 +1,7 @@
+package pwe.planner.model.requirement.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified requirement.
+ */
+public class RequirementCategoryNotFoundException extends RuntimeException {
+}
diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/pwe/planner/model/tag/Tag.java
similarity index 80%
rename from src/main/java/seedu/address/model/tag/Tag.java
rename to src/main/java/pwe/planner/model/tag/Tag.java
index b0ea7e7dad7f..78e620ce138e 100644
--- a/src/main/java/seedu/address/model/tag/Tag.java
+++ b/src/main/java/pwe/planner/model/tag/Tag.java
@@ -1,13 +1,13 @@
-package seedu.address.model.tag;
+package pwe.planner.model.tag;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
+import static pwe.planner.commons.util.AppUtil.checkArgument;
 
 /**
- * Represents a Tag in the address book.
+ * Represents a Tag in the application.
  * Guarantees: immutable; name is valid as declared in {@link #isValidTagName(String)}
  */
-public class Tag {
+public class Tag implements Comparable<Tag> {
 
     public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric";
     public static final String VALIDATION_REGEX = "\\p{Alnum}+";
@@ -22,6 +22,7 @@ public class Tag {
     public Tag(String tagName) {
         requireNonNull(tagName);
         checkArgument(isValidTagName(tagName), MESSAGE_CONSTRAINTS);
+
         this.tagName = tagName;
     }
 
@@ -29,6 +30,8 @@ public Tag(String tagName) {
      * Returns true if a given string is a valid tag name.
      */
     public static boolean isValidTagName(String test) {
+        requireNonNull(test);
+
         return test.matches(VALIDATION_REGEX);
     }
 
@@ -51,4 +54,8 @@ public String toString() {
         return '[' + tagName + ']';
     }
 
+    @Override
+    public int compareTo(Tag other) {
+        return tagName.compareTo(other.tagName);
+    }
 }
diff --git a/src/main/java/pwe/planner/model/util/InitialDataUtil.java b/src/main/java/pwe/planner/model/util/InitialDataUtil.java
new file mode 100644
index 000000000000..eccb3f68d9f8
--- /dev/null
+++ b/src/main/java/pwe/planner/model/util/InitialDataUtil.java
@@ -0,0 +1,205 @@
+package pwe.planner.model.util;
+
+import static pwe.planner.model.util.SampleDataUtil.getCodeSet;
+
+import pwe.planner.model.Application;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Contains utility methods for populating {@code Application} with sample data.
+ */
+public class InitialDataUtil {
+    private static final DegreePlanner YEAR_1_SEMESTER_1 = new DegreePlanner(
+            new Year("1"),
+            new Semester("1"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_1_SEMESTER_2 = new DegreePlanner(
+            new Year("1"),
+            new Semester("2"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_1_SEMESTER_3 = new DegreePlanner(
+            new Year("1"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_1_SEMESTER_4 = new DegreePlanner(
+            new Year("1"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_1 = new DegreePlanner(
+            new Year("2"),
+            new Semester("1"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_2 = new DegreePlanner(
+            new Year("2"),
+            new Semester("2"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_3 = new DegreePlanner(
+            new Year("2"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_4 = new DegreePlanner(
+            new Year("2"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_1 = new DegreePlanner(
+            new Year("3"),
+            new Semester("1"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_2 = new DegreePlanner(
+            new Year("3"),
+            new Semester("2"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_3 = new DegreePlanner(
+            new Year("3"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_4 = new DegreePlanner(
+            new Year("3"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_1 = new DegreePlanner(
+            new Year("4"),
+            new Semester("1"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_2 = new DegreePlanner(
+            new Year("4"),
+            new Semester("2"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_3 = new DegreePlanner(
+            new Year("4"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_4 = new DegreePlanner(
+            new Year("4"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory COMPUTING_FOUNDATION = new RequirementCategory(
+            new Name("Computing Foundation"),
+            new Credits("36"),
+            getCodeSet()
+    );
+    private static final RequirementCategory INFORMATION_SECURITY_REQUIREMENTS = new RequirementCategory(
+            new Name("Information Security Requirements"),
+            new Credits("20"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory INFORMATION_SECURITY_ELECTIVES = new RequirementCategory(
+            new Name("Information Security Electives"),
+            new Credits("12"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory COMPUTING_BREADTH = new RequirementCategory(
+            new Name("Computing Breadth"),
+            new Credits("20"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory IT_PROFESSIONALISM = new RequirementCategory(
+            new Name("IT Professionalism"),
+            new Credits("8"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory MATHEMATICS = new RequirementCategory(
+            new Name("Mathematics"),
+            new Credits("12"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory GENERAL_EDUCATION = new RequirementCategory(
+            new Name("General Education"),
+            new Credits("20"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory UNRESTRICTED_ELECTIVES = new RequirementCategory(
+            new Name("Unrestricted Electives"),
+            new Credits("32"),
+            getCodeSet()
+    );
+
+    public static RequirementCategory[] getInitialRequirementCategories() {
+        return new RequirementCategory[] {
+            COMPUTING_FOUNDATION,
+            INFORMATION_SECURITY_REQUIREMENTS,
+            INFORMATION_SECURITY_ELECTIVES,
+            COMPUTING_BREADTH,
+            IT_PROFESSIONALISM,
+            MATHEMATICS,
+            GENERAL_EDUCATION,
+            UNRESTRICTED_ELECTIVES
+        };
+    }
+
+    public static DegreePlanner[] getInitialDegreePlanners() {
+        return new DegreePlanner[] {
+            YEAR_1_SEMESTER_1,
+            YEAR_1_SEMESTER_2,
+            YEAR_1_SEMESTER_3,
+            YEAR_1_SEMESTER_4,
+            YEAR_2_SEMESTER_1,
+            YEAR_2_SEMESTER_2,
+            YEAR_2_SEMESTER_3,
+            YEAR_2_SEMESTER_4,
+            YEAR_3_SEMESTER_1,
+            YEAR_3_SEMESTER_2,
+            YEAR_3_SEMESTER_3,
+            YEAR_3_SEMESTER_4,
+            YEAR_4_SEMESTER_1,
+            YEAR_4_SEMESTER_2,
+            YEAR_4_SEMESTER_3,
+            YEAR_4_SEMESTER_4
+        };
+    }
+
+    public static ReadOnlyApplication getInitialApplication() {
+        Application initialAb = new Application();
+        for (RequirementCategory initialRequirementCategory : getInitialRequirementCategories()) {
+            initialAb.addRequirementCategory(initialRequirementCategory);
+        }
+        for (DegreePlanner initialDegreePlanner : getInitialDegreePlanners()) {
+            initialAb.addDegreePlanner(initialDegreePlanner);
+        }
+        return initialAb;
+    }
+}
diff --git a/src/main/java/pwe/planner/model/util/RequirementCategoryUtil.java b/src/main/java/pwe/planner/model/util/RequirementCategoryUtil.java
new file mode 100644
index 000000000000..a6c5e1edccef
--- /dev/null
+++ b/src/main/java/pwe/planner/model/util/RequirementCategoryUtil.java
@@ -0,0 +1,68 @@
+package pwe.planner.model.util;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import pwe.planner.model.module.Code;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * A utility class for RequirementCategory.
+ */
+public class RequirementCategoryUtil {
+
+    /**
+     * Returns a new requirement category object with the specified code {@code toMove} removed from the
+     * requirement category provided {@code reqCat}
+     */
+    public static RequirementCategory getRequirementCategoryWithCodeRemoved(RequirementCategory reqCat, Code toMove) {
+        Set<Code> newCodeSet = new HashSet<>(reqCat.getCodeSet());
+        newCodeSet.remove(toMove);
+        RequirementCategory requirementCategory = new RequirementCategory(reqCat.getName(), reqCat.getCredits(),
+                newCodeSet);
+
+        return requirementCategory;
+    }
+
+    /**
+     * Returns a new requirement category object with the specified code set {@code toMove} removed from the
+     * requirement category provided {@code reqCat}
+     */
+    public static RequirementCategory getRequirementCategoryWithCodesRemoved(RequirementCategory reqCat,
+            Set<Code> setToMove) {
+        Set<Code> newCodeSet = new HashSet<>(reqCat.getCodeSet());
+        newCodeSet.removeAll(setToMove);
+        RequirementCategory requirementCategory = new RequirementCategory(reqCat.getName(), reqCat.getCredits(),
+                newCodeSet);
+
+        return requirementCategory;
+    }
+
+    /**
+     * Returns a new requirement category object with the specified code {@code toMove} added from the
+     * requirement category provided {@code reqCat}
+     */
+    public static RequirementCategory getRequirementCategoryWithCodeAdded(RequirementCategory reqCat, Code toMove) {
+        Set<Code> newCodeSet = new HashSet<>(reqCat.getCodeSet());
+        newCodeSet.add(toMove);
+        RequirementCategory requirementCategory = new RequirementCategory(reqCat.getName(), reqCat.getCredits(),
+                newCodeSet);
+
+        return requirementCategory;
+    }
+
+    /**
+     * Returns a new requirement category object with the specified code set {@code toMove} added from the
+     * requirement category provided {@code reqCat}
+     */
+    public static RequirementCategory getRequirementCategoryWithCodesAdded(RequirementCategory reqCat,
+            Set<Code> setToMove) {
+        Set<Code> newCodeSet = new HashSet<>(reqCat.getCodeSet());
+        newCodeSet.addAll(setToMove);
+        RequirementCategory requirementCategory = new RequirementCategory(reqCat.getName(), reqCat.getCredits(),
+                newCodeSet);
+
+        return requirementCategory;
+    }
+
+}
diff --git a/src/main/java/pwe/planner/model/util/SampleDataUtil.java b/src/main/java/pwe/planner/model/util/SampleDataUtil.java
new file mode 100644
index 000000000000..9e3be3328763
--- /dev/null
+++ b/src/main/java/pwe/planner/model/util/SampleDataUtil.java
@@ -0,0 +1,467 @@
+package pwe.planner.model.util;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import pwe.planner.model.Application;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Contains utility methods for populating {@code Application} with sample data.
+ */
+public class SampleDataUtil {
+    // Sample modules that can be used
+    private static final Module CS1010 = new Module(
+            new Code("CS1010"),
+            new Name("Programming Methodology"),
+            new Credits("4"),
+            getSemesterSet("1", "2", "4"),
+            getCorequisiteSet(),
+            getTagSet("programming", "algorithms", "c", "imperative")
+    );
+
+    private static final Module CS1231 = new Module(
+            new Code("CS1231"),
+            new Name("Discrete Structures"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("math", "logic", "proving")
+    );
+
+    private static final Module CS2040C = new Module(
+            new Code("CS2040C"),
+            new Name("Data Structures and Algorithms"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("algorithm", "linkedlist", "stack", "queue", "hashtable", "heap", "avltree", "graph", "sssp")
+    );
+
+    private static final Module CS2100 = new Module(
+            new Code("CS2100"),
+            new Name("Computer Organisation"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("boolean", "mips", "assembly", "circuit", "flipflop", "pipelining", "cache")
+    );
+
+    private static final Module CS2101 = new Module(
+            new Code("CS2101"),
+            new Name("Effective Communication for Computing Professionals"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet("CS2113T"),
+            getTagSet("communication", "presentation", "negotiation", "documentation", "reflection")
+    );
+
+    private static final Module CS2102 = new Module(
+            new Code("CS2102"),
+            new Name("Database Systems"),
+            new Credits("4"),
+            getSemesterSet("1", "2", "4"),
+            getCorequisiteSet(),
+            getTagSet("database", "rdbms", "entity", "sql", "normalisation")
+    );
+
+    private static final Module CS2105 = new Module(
+            new Code("CS2105"),
+            new Name("Introduction to Computer Networks"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("network", "tcp", "ip", "udp", "rdt")
+    );
+
+    private static final Module CS2106 = new Module(
+            new Code("CS2106"),
+            new Name("Introduction to Operating Systems"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("os", "syscall", "process", "scheduling", "memory")
+    );
+
+    private static final Module CS2107 = new Module(
+            new Code("CS2107"),
+            new Name("Introduction to Information Security"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("infosec", "crypto", "law")
+    );
+
+    private static final Module CS2113T = new Module(
+            new Code("CS2113T"),
+            new Name("Software Engineering and Object-Oriented Programming"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet("CS2101"),
+            getTagSet("oop", "rcs", "uml", "junit", "design", "architecture")
+    );
+
+    private static final Module CS3235 = new Module(
+            new Code("CS3235"),
+            new Name("Introduction to Computer Security"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("crypto", "appsec", "memory", "overflow", "sandbox", "netsec", "websec")
+    );
+
+    private static final Module CS4238 = new Module(
+            new Code("CS4238"),
+            new Name("Computer Security Practices"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("appsec", "binary", "exploit", "memory", "overflow", "netsec", "websec")
+    );
+
+    private static final Module CS5331 = new Module(
+            new Code("CS5331"),
+            new Name("Web Security"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("websec", "xss", "sqli", "clickjacking", "sop", "cors", "oauth")
+    );
+
+    private static final Module GER1000 = new Module(
+            new Code("GER1000"),
+            new Name("Quantitative Reasoning"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("quantitative", "association", "measurement", "risk", "rate", "probability")
+    );
+
+    private static final Module GEQ1000 = new Module(
+            new Code("GEQ1000"),
+            new Name("Asking Questions"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("thinking", "philosophy", "design", "engineering", "science", "economics")
+    );
+
+    private static final Module IFS4205 = new Module(
+            new Code("IFS4205"),
+            new Name("Information Security Capstone Project"),
+            new Credits("8"),
+            getSemesterSet("1"),
+            getCorequisiteSet(),
+            getTagSet("capstone", "infosec", "project", "design", "systems")
+    );
+
+    private static final Module IS1103 = new Module(
+            new Code("IS1103"),
+            new Name("IS Innovations in Organisations and Society"),
+            new Credits("4"),
+            getSemesterSet("1"),
+            getCorequisiteSet(),
+            getTagSet("law", "ethics", "professionalism", "decision", "social", "privacy")
+    );
+
+    private static final Module IS3103 = new Module(
+            new Code("IS3103"),
+            new Name("Information Systems Leadership and Communication"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("business", "leadership", "communication", "interview")
+    );
+
+    private static final Module IS4231 = new Module(
+            new Code("IS4231"),
+            new Name("Information Security Management"),
+            new Credits("4"),
+            getSemesterSet("1"),
+            getCorequisiteSet(),
+            getTagSet("infosec", "business", "policies", "continuity", "risk", "management")
+    );
+
+    private static final Module MA1301 = new Module(
+            new Code("MA1301"),
+            new Name("Introductory Mathematics"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("sequence", "series", "functions", "derivatives", "integrals", "vectors")
+    );
+
+    private static final Module MA1101R = new Module(
+            new Code("MA1101R"),
+            new Name("Linear Algebra I"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("proving", "vectors", "matrices", "determinants", "euclidean")
+    );
+
+    private static final Module MA1521 = new Module(
+            new Code("MA1521"),
+            new Name("Calculus for Computing"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("calculus", "derivatives", "integrals", "sequence", "series")
+    );
+
+    private static final Module ST2334 = new Module(
+            new Code("ST2334"),
+            new Name("Probability and Statistics"),
+            new Credits("4"),
+            getSemesterSet("1", "2"),
+            getCorequisiteSet(),
+            getTagSet("probability", "statistics", "variance", "distribution", "hypothesis")
+    );
+
+    // Sample requirement categories that can be used
+    private static final RequirementCategory COMPUTING_FOUNDATION = new RequirementCategory(
+            new Name("Computing Foundation"),
+            new Credits("36"),
+            getCodeSet("CS1010", "CS1231", "CS2040C", "CS2100", "CS2102", "CS2105", "CS2106", "CS2113T", "IS3103")
+    );
+
+    private static final RequirementCategory INFORMATION_SECURITY_REQUIREMENTS = new RequirementCategory(
+            new Name("Information Security Requirements"),
+            new Credits("20"),
+            getCodeSet("CS2107", "CS3235", "IFS4205", "IS4231")
+    );
+
+    private static final RequirementCategory INFORMATION_SECURITY_ELECTIVES = new RequirementCategory(
+            new Name("Information Security Electives"),
+            new Credits("12"),
+            getCodeSet("CS4238", "CS5331")
+    );
+
+    private static final RequirementCategory COMPUTING_BREADTH = new RequirementCategory(
+            new Name("Computing Breadth"),
+            new Credits("20"),
+            getCodeSet()
+    );
+
+    private static final RequirementCategory IT_PROFESSIONALISM = new RequirementCategory(
+            new Name("IT Professionalism"),
+            new Credits("8"),
+            getCodeSet("IS1103", "CS2101")
+    );
+
+    private static final RequirementCategory MATHEMATICS = new RequirementCategory(
+            new Name("Mathematics"),
+            new Credits("12"),
+            getCodeSet("MA1101R", "MA1521", "ST2334")
+    );
+
+    private static final RequirementCategory GENERAL_EDUCATION = new RequirementCategory(
+            new Name("General Education"),
+            new Credits("20"),
+            getCodeSet("GER1000", "GEQ1000")
+    );
+
+    private static final RequirementCategory UNRESTRICTED_ELECTIVES = new RequirementCategory(
+            new Name("Unrestricted Electives"),
+            new Credits("32"),
+            getCodeSet("MA1301")
+    );
+
+    // Sample degree planners that can be used
+    private static final DegreePlanner YEAR_1_SEMESTER_1 = new DegreePlanner(
+            new Year("1"),
+            new Semester("1"),
+            getCodeSet("CS1010", "MA1301", "GER1000")
+    );
+
+    private static final DegreePlanner YEAR_1_SEMESTER_2 = new DegreePlanner(
+            new Year("1"),
+            new Semester("2"),
+            getCodeSet("CS1231", "CS2040C", "CS2100", "CS2107")
+    );
+
+    private static final DegreePlanner YEAR_1_SEMESTER_3 = new DegreePlanner(
+            new Year("1"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_1_SEMESTER_4 = new DegreePlanner(
+            new Year("1"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_1 = new DegreePlanner(
+            new Year("2"),
+            new Semester("1"),
+            getCodeSet("CS2102", "CS2105", "CS2106", "CS2101", "CS2113T")
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_2 = new DegreePlanner(
+            new Year("2"),
+            new Semester("2"),
+            getCodeSet("CS3235")
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_3 = new DegreePlanner(
+            new Year("2"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_2_SEMESTER_4 = new DegreePlanner(
+            new Year("2"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_1 = new DegreePlanner(
+            new Year("3"),
+            new Semester("1"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_2 = new DegreePlanner(
+            new Year("3"),
+            new Semester("2"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_3 = new DegreePlanner(
+            new Year("3"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_3_SEMESTER_4 = new DegreePlanner(
+            new Year("3"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_1 = new DegreePlanner(
+            new Year("4"),
+            new Semester("1"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_2 = new DegreePlanner(
+            new Year("4"),
+            new Semester("2"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_3 = new DegreePlanner(
+            new Year("4"),
+            new Semester("3"),
+            getCodeSet()
+    );
+
+    private static final DegreePlanner YEAR_4_SEMESTER_4 = new DegreePlanner(
+            new Year("4"),
+            new Semester("4"),
+            getCodeSet()
+    );
+
+    public static Module[] getSampleModules() {
+        return new Module[] {
+            CS1010, CS1231, CS2040C, CS2100, CS2101, CS2102, CS2105, CS2106, CS2107, CS2113T, CS3235, CS4238, CS5331,
+            GER1000, GEQ1000,
+            IFS4205, IS1103, IS3103, IS4231,
+            MA1301, MA1101R, MA1521, ST2334
+        };
+    }
+
+    // Getter to retrieve all sample requirement categories
+    public static RequirementCategory[] getSampleRequirementCategories() {
+        return new RequirementCategory[] {
+            COMPUTING_FOUNDATION,
+            INFORMATION_SECURITY_REQUIREMENTS,
+            INFORMATION_SECURITY_ELECTIVES,
+            COMPUTING_BREADTH,
+            IT_PROFESSIONALISM,
+            MATHEMATICS,
+            GENERAL_EDUCATION,
+            UNRESTRICTED_ELECTIVES
+        };
+    }
+
+    // Getter to retrieve all sample degree planners
+    public static DegreePlanner[] getSampleDegreePlanners() {
+        return new DegreePlanner[] {
+            YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_2, YEAR_1_SEMESTER_3, YEAR_1_SEMESTER_4,
+            YEAR_2_SEMESTER_1, YEAR_2_SEMESTER_2, YEAR_2_SEMESTER_3, YEAR_2_SEMESTER_4,
+            YEAR_3_SEMESTER_1, YEAR_3_SEMESTER_2, YEAR_3_SEMESTER_3, YEAR_3_SEMESTER_4,
+            YEAR_4_SEMESTER_1, YEAR_4_SEMESTER_2, YEAR_4_SEMESTER_3, YEAR_4_SEMESTER_4
+        };
+    }
+
+    public static ReadOnlyApplication getSampleApplication() {
+        Application sampleAb = new Application();
+        for (Module sampleModule : getSampleModules()) {
+            sampleAb.addModule(sampleModule);
+        }
+        for (RequirementCategory sampleRequirementCategory : getSampleRequirementCategories()) {
+            sampleAb.addRequirementCategory(sampleRequirementCategory);
+        }
+        for (DegreePlanner sampleDegreePlanner : getSampleDegreePlanners()) {
+            sampleAb.addDegreePlanner(sampleDegreePlanner);
+        }
+        return sampleAb;
+    }
+
+    /**
+     * Returns a semester set containing the list of strings given.
+     */
+    public static Set<Semester> getSemesterSet(String... strings) {
+        requireNonNull(strings);
+
+        return Arrays.stream(strings)
+                .map(Semester::new)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns a code set containing the list of strings given.
+     */
+    public static Set<Code> getCodeSet(String... strings) {
+        requireNonNull(strings);
+
+        return Arrays.stream(strings)
+                .map(Code::new)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Returns a code set containing the list of strings given.
+     * Syntactic sugar for {@link #getCodeSet(String...)}
+     */
+    public static Set<Code> getCorequisiteSet(String... strings) {
+        return getCodeSet(strings);
+    }
+
+    /**
+     * Returns a tag set containing the list of strings given.
+     */
+    public static Set<Tag> getTagSet(String... strings) {
+        requireNonNull(strings);
+
+        return Arrays.stream(strings)
+                .map(Tag::new)
+                .collect(Collectors.toSet());
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/ApplicationStorage.java b/src/main/java/pwe/planner/storage/ApplicationStorage.java
new file mode 100644
index 000000000000..c55a170b65e5
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/ApplicationStorage.java
@@ -0,0 +1,132 @@
+package pwe.planner.storage;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.Application;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Represents a storage for {@link Application}.
+ */
+public interface ApplicationStorage {
+
+    /**
+     * Returns the file path of the data file.
+     */
+    Path getModuleListFilePath();
+
+    Path getDegreePlannerListFilePath();
+
+    Path getRequirementCategoryListFilePath();
+
+    /**
+     * Returns Application data as a {@link ReadOnlyApplication}.
+     * Returns {@code Optional.empty()} if storage file is not found.
+     *
+     * @throws DataConversionException if the data in storage is not in the expected format.
+     * @throws IOException             if there was any problem when reading from the storage.
+     */
+    Optional<ObservableList<Module>> readModuleList() throws DataConversionException, IOException;
+
+    /**
+     * @see #getModuleListFilePath()
+     * @see #getDegreePlannerListFilePath()
+     */
+    Optional<ObservableList<Module>> readModuleList(Path filePath) throws DataConversionException, IOException;
+
+    Optional<ReadOnlyApplication> readApplication() throws DataConversionException, IOException;
+
+    /**
+     * @see #getModuleListFilePath()
+     * @see #getDegreePlannerListFilePath()
+     */
+    Optional<ReadOnlyApplication> readApplication(Path moduleListFilePath, Path degreePlannerListFilePath,
+            Path requirementCategoryListFilePath)
+            throws DataConversionException, IOException;
+
+    /**
+     * Saves the given {@link ReadOnlyApplication} to the storage.
+     *
+     * @param application cannot be null.
+     * @throws IOException if there was any problem writing to the file.
+     */
+    void saveApplication(ReadOnlyApplication application) throws IOException;
+
+    /**
+     * Saves the given {@link ReadOnlyApplication} to the storage.
+     *
+     * @param application cannot be null.
+     * @throws IOException if there was any problem writing to the file.
+     */
+    void saveModuleList(ReadOnlyApplication application) throws IOException;
+
+    /**
+     * @see #saveApplication(ReadOnlyApplication)
+     */
+    void saveModuleList(ReadOnlyApplication application, Path filePath) throws IOException;
+
+    /**
+     * Returns degree planner list data as a {@link ReadOnlyApplication}.
+     * Returns {@code Optional.empty()} if storage file is not found.
+     *
+     * @throws DataConversionException if the data in storage is not in the expected format.
+     * @throws IOException             if there was any problem when reading from the storage.
+     */
+    Optional<ObservableList<DegreePlanner>> readDegreePlannerList()
+            throws DataConversionException, IOException;
+
+    /**
+     * @see #getDegreePlannerListFilePath()
+     */
+    Optional<ObservableList<DegreePlanner>> readDegreePlannerList(Path filePath)
+            throws DataConversionException, IOException;
+
+    /**
+     * Saves the given {@link ReadOnlyApplication} to the storage.
+     *
+     * @param degreePlannerList cannot be null.
+     * @throws IOException if there was any problem writing to the file.
+     */
+    void saveDegreePlannerList(ReadOnlyApplication degreePlannerList) throws IOException;
+
+    /**
+     * @see #saveDegreePlannerList(ReadOnlyApplication)
+     */
+    void saveDegreePlannerList(ReadOnlyApplication application, Path filePath) throws IOException;
+
+    /**
+     * Returns RequirementList data as a {@link ReadOnlyApplication}.
+     * Returns {@code Optional.empty()} if storage file is not found.
+     *
+     * @throws DataConversionException if the data in storage is not in the expected format.
+     * @throws IOException             if there was any problem when reading from the storage.
+     */
+    Optional<ObservableList<RequirementCategory>> readRequirementCategoryList()
+            throws DataConversionException, IOException;
+
+    /**
+     * @see #getRequirementCategoryListFilePath() ()
+     */
+    Optional<ObservableList<RequirementCategory>> readRequirementCategoryList(Path filePath)
+            throws DataConversionException, IOException;
+
+    /**
+     * Saves the given {@link ReadOnlyApplication} to the storage.
+     *
+     * @param requirementCategoryList cannot be null.
+     * @throws IOException if there was any problem writing to the file.
+     */
+    void saveRequirementCategoryList(ReadOnlyApplication requirementCategoryList) throws IOException;
+
+    /**
+     * @see #saveRequirementCategoryList(ReadOnlyApplication)
+     */
+    void saveRequirementCategoryList(ReadOnlyApplication application, Path filePath) throws IOException;
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedCode.java b/src/main/java/pwe/planner/storage/JsonAdaptedCode.java
new file mode 100644
index 000000000000..b94fbc0ff300
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedCode.java
@@ -0,0 +1,54 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+
+/**
+ * Jackson-friendly version of {@link Code}.
+ */
+public class JsonAdaptedCode {
+
+    private final String codeValue;
+
+    /**
+     * Constructs a {@code JsonAdaptedCode} with the given {@code codeValue}.
+     */
+    @JsonCreator
+    public JsonAdaptedCode(String codeValue) {
+        requireNonNull(codeValue);
+
+        this.codeValue = codeValue;
+    }
+
+    /**
+     * Converts a given {@link Code} into this class for Jackson use.
+     */
+    public JsonAdaptedCode(Code source) {
+        requireNonNull(source);
+
+        codeValue = source.value;
+    }
+
+    @JsonValue
+    public String getCodeValue() {
+        return codeValue;
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted code object into the model's {@link Code} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted code.
+     */
+    public Code toModelType() throws IllegalValueException {
+        if (!Code.isValidCode(codeValue)) {
+            throw new IllegalValueException(Code.MESSAGE_CONSTRAINTS);
+        }
+        return new Code(codeValue);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedCredits.java b/src/main/java/pwe/planner/storage/JsonAdaptedCredits.java
new file mode 100644
index 000000000000..dbf6a5d83a82
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedCredits.java
@@ -0,0 +1,54 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Credits;
+
+/**
+ * Jackson-friendly version of {@link Credits}.
+ */
+public class JsonAdaptedCredits {
+
+    private final String creditsValue;
+
+    /**
+     * Constructs a {@code JsonAdaptedCredits} with the given {@code creditsValue}.
+     */
+    @JsonCreator
+    public JsonAdaptedCredits(String creditsValue) {
+        requireNonNull(creditsValue);
+
+        this.creditsValue = creditsValue;
+    }
+
+    /**
+     * Converts a given {@link Credits} into this class for Jackson use.
+     */
+    public JsonAdaptedCredits(Credits source) {
+        requireNonNull(source);
+
+        creditsValue = source.value;
+    }
+
+    @JsonValue
+    public String getCreditsValue() {
+        return creditsValue;
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted credits object into the model's {@link Credits} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted credits.
+     */
+    public Credits toModelType() throws IllegalValueException {
+        if (!Credits.isValidCredits(creditsValue)) {
+            throw new IllegalValueException(Credits.MESSAGE_CONSTRAINTS);
+        }
+        return new Credits(creditsValue);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedDegreePlanner.java b/src/main/java/pwe/planner/storage/JsonAdaptedDegreePlanner.java
new file mode 100644
index 000000000000..bfddda79ebe8
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedDegreePlanner.java
@@ -0,0 +1,82 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+/**
+ * Jackson-friendly version of {@link DegreePlanner}.
+ */
+public class JsonAdaptedDegreePlanner {
+
+    public static final String MISSING_FIELD_MESSAGE_FORMAT = "Degree Planner's %s field is missing!";
+
+    private final JsonAdaptedYear year;
+    private final JsonAdaptedSemester semester;
+    private final List<JsonAdaptedCode> codes = new ArrayList<>();
+
+    /**
+     * Constructs a {@link JsonAdaptedDegreePlanner} with the given degree planner details.
+     */
+    @JsonCreator
+    public JsonAdaptedDegreePlanner(@JsonProperty("year") JsonAdaptedYear year,
+            @JsonProperty("semester") JsonAdaptedSemester semester,
+            @JsonProperty("codes") List<JsonAdaptedCode> codes) {
+        this.year = year;
+        this.semester = semester;
+        this.codes.addAll(codes);
+    }
+
+    /**
+     * Converts a given {@link DegreePlanner} into this class for Jackson use.
+     */
+    public JsonAdaptedDegreePlanner(DegreePlanner source) {
+        requireNonNull(source);
+
+        year = new JsonAdaptedYear(source.getYear());
+        semester = new JsonAdaptedSemester(source.getSemester());
+        codes.addAll(source.getCodes().stream().map(JsonAdaptedCode::new).collect(Collectors.toList()));
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted degree planner object into the model's {@link DegreePlanner} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted degree planner.
+     */
+    public DegreePlanner toModelType() throws IllegalValueException {
+        // Check valid Year
+        if (year == null) {
+            throw new IllegalValueException(
+                    String.format(MISSING_FIELD_MESSAGE_FORMAT, Year.class.getSimpleName()));
+        }
+        final Year modelYear = year.toModelType();
+
+        // Check valid Semester
+        if (semester == null) {
+            throw new IllegalValueException(
+                    String.format(MISSING_FIELD_MESSAGE_FORMAT, Semester.class.getSimpleName()));
+        }
+        final Semester modelSemester = semester.toModelType();
+
+        // Check valid Codes
+        final Set<Code> modelCodes = new HashSet<>();
+        for (JsonAdaptedCode code : codes) {
+            modelCodes.add(code.toModelType());
+        }
+
+        return new DegreePlanner(modelYear, modelSemester, modelCodes);
+    }
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedModule.java b/src/main/java/pwe/planner/storage/JsonAdaptedModule.java
new file mode 100644
index 000000000000..532818182210
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedModule.java
@@ -0,0 +1,139 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * Jackson-friendly version of {@link Module}.
+ */
+class JsonAdaptedModule {
+
+    public static final String MISSING_FIELD_MESSAGE_FORMAT = "Module's %s field is missing!";
+    public static final String MESSAGE_INVALID_COREQUISITE =
+            "The module code (%1$s) cannot be a co-requisite of itself!";
+
+    private final JsonAdaptedCode code;
+    private final JsonAdaptedName name;
+    private final JsonAdaptedCredits credits;
+    private final List<JsonAdaptedSemester> semesters = new ArrayList<>();
+    private final List<JsonAdaptedCode> corequisites = new ArrayList<>();
+    private final List<JsonAdaptedTag> tags = new ArrayList<>();
+
+    /**
+     * Constructs a {@link JsonAdaptedModule} with the given module details.
+     */
+    @JsonCreator
+    public JsonAdaptedModule(@JsonProperty("code") JsonAdaptedCode code,
+            @JsonProperty("name") JsonAdaptedName name,
+            @JsonProperty("credits") JsonAdaptedCredits credits,
+            @JsonProperty("semesters") List<JsonAdaptedSemester> semesters,
+            @JsonProperty("corequisites") List<JsonAdaptedCode> corequisites,
+            @JsonProperty("tagged") List<JsonAdaptedTag> tags) {
+        this.code = code;
+        this.name = name;
+        this.credits = credits;
+
+        if (semesters != null) {
+            this.semesters.addAll(semesters);
+        }
+
+        if (corequisites != null) {
+            this.corequisites.addAll(corequisites);
+        }
+
+        if (tags != null) {
+            this.tags.addAll(tags);
+        }
+    }
+
+    /**
+     * Converts a given {@link Module} into this class for Jackson use.
+     */
+    public JsonAdaptedModule(Module source) {
+        requireNonNull(source);
+
+        code = new JsonAdaptedCode(source.getCode());
+        name = new JsonAdaptedName(source.getName());
+        credits = new JsonAdaptedCredits(source.getCredits());
+        semesters.addAll(source.getSemesters().stream().map(JsonAdaptedSemester::new).collect(Collectors.toList()));
+        corequisites.addAll(source.getCorequisites().stream().map(JsonAdaptedCode::new).collect(Collectors.toList()));
+        tags.addAll(source.getTags().stream().map(JsonAdaptedTag::new).collect(Collectors.toList()));
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted module object into the model's {@link Module} object.
+     * <br><br>
+     * Data constraints:<br>
+     * - Module code must be valid.<br>
+     * - Module name must be valid.<br>
+     * - Module credits must be valid.<br>
+     * - Semesters offering module must be valid.<br>
+     * - Module co-requisites must not contain current module code.<br>
+     * - Module tags must be valid.<br>
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted module.
+     */
+    public Module toModelType() throws IllegalValueException {
+        // Check valid Code
+        if (code == null) {
+            String exceptionMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Code.class.getSimpleName());
+            throw new IllegalValueException(exceptionMessage);
+        }
+        final Code modelCode = code.toModelType();
+
+        // Check valid Name
+        if (name == null) {
+            String exceptionMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
+            throw new IllegalValueException(exceptionMessage);
+        }
+        final Name modelName = name.toModelType();
+
+        // Check valid Credits
+        if (credits == null) {
+            String exceptionMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Credits.class.getSimpleName());
+            throw new IllegalValueException(exceptionMessage);
+        }
+        final Credits modelCredits = credits.toModelType();
+
+        // Check valid Semesters
+        final Set<Semester> modelSemesters = new HashSet<>();
+        for (JsonAdaptedSemester semester : semesters) {
+            modelSemesters.add(semester.toModelType());
+        }
+
+        // Check valid Corequisites
+        final Set<Code> modelCorequisites = new HashSet<>();
+        for (JsonAdaptedCode corequisite : corequisites) {
+            Code corequisiteCode = corequisite.toModelType();
+            if (corequisiteCode.equals(modelCode)) {
+                throw new IllegalValueException(String.format(MESSAGE_INVALID_COREQUISITE, corequisiteCode));
+            }
+            modelCorequisites.add(corequisiteCode);
+        }
+
+        // Check valid Tags
+        final Set<Tag> modelTags = new HashSet<>();
+        for (JsonAdaptedTag tag : tags) {
+            modelTags.add(tag.toModelType());
+        }
+
+        return new Module(modelCode, modelName, modelCredits, modelSemesters, modelCorequisites, modelTags);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedName.java b/src/main/java/pwe/planner/storage/JsonAdaptedName.java
new file mode 100644
index 000000000000..1e1093694f0c
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedName.java
@@ -0,0 +1,54 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Name;
+
+/**
+ * Jackson-friendly version of {@link Name}.
+ */
+public class JsonAdaptedName {
+
+    private final String nameValue;
+
+    /**
+     * Constructs a {@link JsonAdaptedName} with the given {@code nameValue}.
+     */
+    @JsonCreator
+    public JsonAdaptedName(String nameValue) {
+        requireNonNull(nameValue);
+
+        this.nameValue = nameValue;
+    }
+
+    /**
+     * Converts a given {@link Name} into this class for Jackson use.
+     */
+    public JsonAdaptedName(Name source) {
+        requireNonNull(source);
+
+        nameValue = source.fullName;
+    }
+
+    @JsonValue
+    public String getNameValue() {
+        return nameValue;
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted name object into the model's {@link Name} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted name.
+     */
+    public Name toModelType() throws IllegalValueException {
+        if (!Name.isValidName(nameValue)) {
+            throw new IllegalValueException(Name.MESSAGE_CONSTRAINTS);
+        }
+        return new Name(nameValue);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedRequirementCategory.java b/src/main/java/pwe/planner/storage/JsonAdaptedRequirementCategory.java
new file mode 100644
index 000000000000..a76017897154
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedRequirementCategory.java
@@ -0,0 +1,80 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Jackson-friendly version of {@link RequirementCategory}.
+ */
+public class JsonAdaptedRequirementCategory {
+
+    public static final String MISSING_FIELD_MESSAGE_FORMAT = "Requirement Category's %s field is missing!";
+
+    private final JsonAdaptedName name;
+    private final JsonAdaptedCredits credits;
+    private final List<JsonAdaptedCode> codeList = new ArrayList<>();
+
+    /**
+     * Constructs a {@link JsonAdaptedRequirementCategory} with the given requirement category details.
+     */
+    @JsonCreator
+    public JsonAdaptedRequirementCategory(@JsonProperty("name") JsonAdaptedName name,
+            @JsonProperty("credits") JsonAdaptedCredits credits,
+            @JsonProperty("codeList") List<JsonAdaptedCode> codeList) {
+        this.name = name;
+        this.credits = credits;
+        if (codeList != null) {
+            this.codeList.addAll(codeList);
+        }
+    }
+
+    /**
+     * Converts a given {@link RequirementCategory} into this class for Jackson use.
+     */
+    public JsonAdaptedRequirementCategory(RequirementCategory source) {
+        requireNonNull(source);
+
+        name = new JsonAdaptedName(source.getName());
+        credits = new JsonAdaptedCredits(source.getCredits());
+        codeList.addAll(source.getCodeSet().stream().map(JsonAdaptedCode::new).collect(Collectors.toList()));
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted requirement catergory object into the model's {@link RequirementCategory}
+     * object.
+     * @throws IllegalValueException if there were any data constraints violated in the adapted requirement category.
+     */
+    public RequirementCategory toModelType() throws IllegalValueException {
+        final List<Code> codes = new ArrayList<>();
+        for (JsonAdaptedCode code : codeList) {
+            codes.add(code.toModelType());
+        }
+
+        if (name == null) {
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()));
+        }
+        final Name modelName = name.toModelType();
+
+        if (credits == null) {
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Credits.class.getSimpleName()));
+        }
+        final Credits modelCredits = credits.toModelType();
+
+        final Set<Code> modelCodes = new HashSet<>(codes);
+        return new RequirementCategory(modelName, modelCredits, modelCodes);
+    }
+}
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedSemester.java b/src/main/java/pwe/planner/storage/JsonAdaptedSemester.java
new file mode 100644
index 000000000000..db0767e5e77b
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedSemester.java
@@ -0,0 +1,54 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.planner.Semester;
+
+/**
+ * Jackson-friendly version of {@link Semester}.
+ */
+public class JsonAdaptedSemester {
+
+    private final String semesterValue;
+
+    /**
+     * Constructs a {@link JsonAdaptedSemester} with the given {@code semesterValue}.
+     */
+    @JsonCreator
+    public JsonAdaptedSemester(String semesterValue) {
+        requireNonNull(semesterValue);
+
+        this.semesterValue = semesterValue;
+    }
+
+    /**
+     * Converts a given {@link Semester} into this class for Jackson use.
+     */
+    public JsonAdaptedSemester(Semester source) {
+        requireNonNull(source);
+
+        semesterValue = source.plannerSemester;
+    }
+
+    @JsonValue
+    public String getSemesterValue() {
+        return semesterValue;
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted tag object into the model's {@link Semester} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted semester.
+     */
+    public Semester toModelType() throws IllegalValueException {
+        if (!Semester.isValidSemester(semesterValue)) {
+            throw new IllegalValueException(Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+        }
+        return new Semester(semesterValue);
+    }
+
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/pwe/planner/storage/JsonAdaptedTag.java
similarity index 70%
rename from src/main/java/seedu/address/storage/JsonAdaptedTag.java
rename to src/main/java/pwe/planner/storage/JsonAdaptedTag.java
index 0df22bdb7546..01119ec36da2 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedTag.java
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedTag.java
@@ -1,10 +1,12 @@
-package seedu.address.storage;
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.tag.Tag;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.tag.Tag;
 
 /**
  * Jackson-friendly version of {@link Tag}.
@@ -14,17 +16,21 @@ class JsonAdaptedTag {
     private final String tagName;
 
     /**
-     * Constructs a {@code JsonAdaptedTag} with the given {@code tagName}.
+     * Constructs a {@link JsonAdaptedTag} with the given {@code tagName}.
      */
     @JsonCreator
     public JsonAdaptedTag(String tagName) {
+        requireNonNull(tagName);
+
         this.tagName = tagName;
     }
 
     /**
-     * Converts a given {@code Tag} into this class for Jackson use.
+     * Converts a given {@link Tag} into this class for Jackson use.
      */
     public JsonAdaptedTag(Tag source) {
+        requireNonNull(source);
+
         tagName = source.tagName;
     }
 
@@ -34,7 +40,7 @@ public String getTagName() {
     }
 
     /**
-     * Converts this Jackson-friendly adapted tag object into the model's {@code Tag} object.
+     * Converts this Jackson-friendly adapted tag object into the model's {@link Tag} object.
      *
      * @throws IllegalValueException if there were any data constraints violated in the adapted tag.
      */
diff --git a/src/main/java/pwe/planner/storage/JsonAdaptedYear.java b/src/main/java/pwe/planner/storage/JsonAdaptedYear.java
new file mode 100644
index 000000000000..a30c4cd08a13
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonAdaptedYear.java
@@ -0,0 +1,54 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.planner.Year;
+
+/**
+ * Jackson-friendly version of {@link Year}.
+ */
+public class JsonAdaptedYear {
+
+    private final String yearValue;
+
+    /**
+     * Constructs a {@link JsonAdaptedYear} with the given {@code yearValue}.
+     */
+    @JsonCreator
+    public JsonAdaptedYear(String yearValue) {
+        requireNonNull(yearValue);
+
+        this.yearValue = yearValue;
+    }
+
+    /**
+     * Converts a given {@link Year} into this class for Jackson use.
+     */
+    public JsonAdaptedYear(Year source) {
+        requireNonNull(source);
+
+        yearValue = source.year;
+    }
+
+    @JsonValue
+    public String getYearValue() {
+        return yearValue;
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted year object into the model's {@link Year} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted year.
+     */
+    public Year toModelType() throws IllegalValueException {
+        if (!Year.isValidYear(yearValue)) {
+            throw new IllegalValueException(Year.MESSAGE_YEAR_CONSTRAINTS);
+        }
+        return new Year(yearValue);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonApplicationStorage.java b/src/main/java/pwe/planner/storage/JsonApplicationStorage.java
new file mode 100644
index 000000000000..cb7243b95bf0
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonApplicationStorage.java
@@ -0,0 +1,243 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.FileUtil;
+import pwe.planner.commons.util.JsonUtil;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * A class to call JsonSerializableApplication methods
+ */
+public class JsonApplicationStorage implements ApplicationStorage {
+
+    private static final Logger logger = LogsCenter.getLogger(JsonSerializableApplication.class);
+
+    private Path moduleListFilePath;
+    private Path degreePlannerListFilePath;
+    private Path requirementCategoryListFilePath;
+
+    public JsonApplicationStorage(Path moduleListFilePath, Path degreePlannerListFilePath,
+            Path requirementCategoryListFilePath) {
+        requireAllNonNull(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath);
+
+        this.moduleListFilePath = moduleListFilePath;
+        this.degreePlannerListFilePath = degreePlannerListFilePath;
+        this.requirementCategoryListFilePath = requirementCategoryListFilePath;
+    }
+
+    public Path getModuleListFilePath() {
+        return moduleListFilePath;
+    }
+
+    public Path getDegreePlannerListFilePath() {
+        return degreePlannerListFilePath;
+    }
+
+    public Path getRequirementCategoryListFilePath() {
+        return requirementCategoryListFilePath;
+    }
+
+    @Override
+    public void saveApplication(ReadOnlyApplication application) throws IOException {
+        requireNonNull(application);
+
+        saveModuleList(application, getModuleListFilePath());
+        saveDegreePlannerList(application, getDegreePlannerListFilePath());
+        saveRequirementCategoryList(application, getRequirementCategoryListFilePath());
+    }
+
+    @Override
+    public Optional<ReadOnlyApplication> readApplication() throws DataConversionException {
+        return readApplication(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath);
+    }
+
+    /**
+     * @param moduleListFilePath cannot be null
+     * @param degreePlannerListFilePath cannot be null
+     * @param requirementCategoryListFilePath cannot be null
+     */
+    public Optional<ReadOnlyApplication> readApplication(Path moduleListFilePath, Path degreePlannerListFilePath,
+            Path requirementCategoryListFilePath)
+            throws DataConversionException {
+        requireAllNonNull(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath);
+
+        Optional<ObservableList<Module>> optionalModuleObservableList = readModuleList(moduleListFilePath);
+        Optional<ObservableList<DegreePlanner>> optionalDegreePlannerObservableList =
+                readDegreePlannerList(degreePlannerListFilePath);
+        Optional<ObservableList<RequirementCategory>> optionalRequirementCategoryObservableList =
+                readRequirementCategoryList(requirementCategoryListFilePath);
+
+        if (!optionalModuleObservableList.isPresent()) {
+            return Optional.empty();
+        } else if (!optionalDegreePlannerObservableList.isPresent()) {
+            return Optional.empty();
+        } else if (!optionalRequirementCategoryObservableList.isPresent()) {
+            return Optional.empty();
+        }
+
+        try {
+            JsonSerializableApplication application =
+                    new JsonSerializableApplication(optionalModuleObservableList.get(),
+                            optionalDegreePlannerObservableList.get(),
+                            optionalRequirementCategoryObservableList.get());
+            ReadOnlyApplication jsonApplication = application.toModelType();
+            return Optional.of(jsonApplication);
+        } catch (IllegalValueException ive) {
+            logger.info("Illegal values found in " + moduleListFilePath + ": " + ive.getMessage());
+            logger.info("Illegal values found in " + degreePlannerListFilePath + ": " + ive.getMessage());
+            logger.info("Illegal values found in " + requirementCategoryListFilePath + ": " + ive.getMessage());
+            throw new DataConversionException(ive);
+        }
+    }
+
+    @Override
+    public Optional<ObservableList<Module>> readModuleList() throws DataConversionException {
+        return readModuleList(moduleListFilePath);
+    }
+
+    /**
+     * @param filePath location of the data. Cannot be null.
+     */
+    public Optional<ObservableList<Module>> readModuleList(Path filePath) throws DataConversionException {
+        requireNonNull(filePath);
+
+        Optional<JsonSerializableModuleList> jsonAppliction = JsonUtil.readJsonFile(
+                filePath, JsonSerializableApplication.getJsonSerializableModuleListClass());
+        if (!jsonAppliction.isPresent()) {
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.of(jsonAppliction.get().toModelType());
+        } catch (IllegalValueException ive) {
+            logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
+            throw new DataConversionException(ive);
+        }
+    }
+
+    @Override
+    public void saveModuleList(ReadOnlyApplication application) throws IOException {
+        requireNonNull(application);
+
+        saveModuleList(application, moduleListFilePath);
+    }
+
+    /**
+     * @param filePath location of the data. Cannot be null.
+     */
+    public void saveModuleList(ReadOnlyApplication application, Path filePath) throws IOException {
+        requireAllNonNull(application, filePath);
+
+        FileUtil.createIfMissing(filePath);
+        JsonUtil.saveJsonFile(new JsonSerializableModuleList(application), filePath);
+    }
+
+    @Override
+    public Optional<ObservableList<DegreePlanner>> readDegreePlannerList() throws DataConversionException {
+        return readDegreePlannerList(degreePlannerListFilePath);
+    }
+
+    /**
+     * @param filePath location of the data. Cannot be null.
+     */
+    public Optional<ObservableList<DegreePlanner>> readDegreePlannerList(Path filePath)
+            throws DataConversionException {
+        requireNonNull(filePath);
+
+        Optional<JsonSerializableDegreePlannerList> jsonApplication = JsonUtil.readJsonFile(
+                filePath, JsonSerializableApplication.getJsonSerializableDegreePlannerListClass());
+        if (!jsonApplication.isPresent()) {
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.of(jsonApplication.get().toModelType());
+        } catch (IllegalValueException ive) {
+            logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
+            throw new DataConversionException(ive);
+        }
+    }
+
+    @Override
+    public void saveDegreePlannerList(ReadOnlyApplication degreePlannerList)
+            throws IOException {
+        requireNonNull(degreePlannerList);
+
+        saveDegreePlannerList(degreePlannerList, degreePlannerListFilePath);
+    }
+
+    /**
+     * @param filePath location of the data. Cannot be null.
+     */
+    public void saveDegreePlannerList(ReadOnlyApplication application, Path filePath)
+            throws IOException {
+        requireAllNonNull(application, filePath);
+
+        FileUtil.createIfMissing(filePath);
+        JsonSerializableDegreePlannerList serializedDegreePlannerList =
+                new JsonSerializableDegreePlannerList(application.getDegreePlannerList());
+        JsonUtil.saveJsonFile(serializedDegreePlannerList, filePath);
+    }
+
+    @Override
+    public Optional<ObservableList<RequirementCategory>> readRequirementCategoryList() throws DataConversionException {
+        return readRequirementCategoryList(requirementCategoryListFilePath);
+    }
+
+    /**
+     * @param filePath location of the data. Cannot be null.
+     */
+    public Optional<ObservableList<RequirementCategory>> readRequirementCategoryList(Path filePath)
+            throws DataConversionException {
+        requireNonNull(filePath);
+
+        Optional<JsonSerializableRequirementCategoryList> jsonApplication = JsonUtil.readJsonFile(
+                filePath, JsonSerializableApplication.getJsonSerializableRequirementCategoryListClass());
+        if (!jsonApplication.isPresent()) {
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.of(jsonApplication.get().toModelType());
+        } catch (IllegalValueException ive) {
+            logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
+            throw new DataConversionException(ive);
+        }
+    }
+
+    @Override
+    public void saveRequirementCategoryList(ReadOnlyApplication requirementCategoryList)
+            throws IOException {
+        requireNonNull(requirementCategoryList);
+
+        saveRequirementCategoryList(requirementCategoryList, requirementCategoryListFilePath);
+    }
+
+    /**
+     * @param filePath location of the data. Cannot be null.
+     */
+    public void saveRequirementCategoryList(ReadOnlyApplication application, Path filePath)
+            throws IOException {
+        requireAllNonNull(application, filePath);
+
+        FileUtil.createIfMissing(filePath);
+        JsonSerializableRequirementCategoryList serializedRequirementCategoryList =
+                new JsonSerializableRequirementCategoryList(application.getRequirementCategoryList());
+        JsonUtil.saveJsonFile(serializedRequirementCategoryList, filePath);
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonSerializableApplication.java b/src/main/java/pwe/planner/storage/JsonSerializableApplication.java
new file mode 100644
index 000000000000..6932c5ee87e2
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonSerializableApplication.java
@@ -0,0 +1,153 @@
+package pwe.planner.storage;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Set;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.model.Application;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * A class to access the JsonSerializable* files data stored as a json file on the hard disk.
+ */
+public class JsonSerializableApplication {
+    public static final String MESSAGE_NON_EXISTENT_REQUIREMENT_CATEGORY_CODE =
+            "The module code (%1$s) in requirement category (%2$s) does not exists in the module list!";
+    public static final String MESSAGE_NON_EXISTENT_DEGREE_PLANNER_CODE =
+            "The module code (%1$s) in degree planner (Year %2$s Semester %3$s) does not exists in the module list!";
+    public static final String MESSAGE_INVALID_DEGREE_PLANNER_MODULE_SEMESTER =
+            "The module code (%1$s) is added to Year %2$s Semester %3$s of the degree plan, but the module is offered "
+            + "only in Semesters %4$s!\n";
+    public static final String MESSAGE_INVALID_DEGREE_PLANNER_EMPTY_MODULE_SEMESTERS =
+            "The module code (%1$s) is added to Year %2$s Semester %3$s of the degree plan, but the module is "
+            + "not offered in any semesters!";
+    public static final String MESSAGE_MISSING_COREQUISITES_IN_DEGREE_PLANNER =
+            "The module codes (%1$s) and (%2$s) are co-requisites, but (%2$s) is not added to the degree plan!";
+    public static final String MESSAGE_INVALID_COREQUISITES_IN_DEGREE_PLANNER =
+            "The module codes (%1$s) and (%2$s) are co-requisites, but are not added to the same year/semester in the "
+            + "degree plan!\n"
+            + "Module code %1$s is in Year %3$s Semester %4$s, and module code (%2$s) is in Year %5$s Semester %6$s.";
+
+    private ObservableList<Module> moduleObservableList;
+    private ObservableList<DegreePlanner> degreeObservableList;
+    private ObservableList<RequirementCategory> requirementCategoryObservableList;
+
+    public JsonSerializableApplication(ObservableList<Module> moduleObservableList,
+            ObservableList<DegreePlanner> degreeObservableList,
+            ObservableList<RequirementCategory> requirementCategoryObservableList) {
+        requireAllNonNull(moduleObservableList, degreeObservableList, requirementCategoryObservableList);
+
+        this.moduleObservableList = moduleObservableList;
+        this.degreeObservableList = degreeObservableList;
+        this.requirementCategoryObservableList = requirementCategoryObservableList;
+    }
+
+    public ObservableList<Module> getModuleObservableList() {
+        return moduleObservableList;
+    }
+
+    public ObservableList<DegreePlanner> getDegreePlannerObservableList() {
+        return degreeObservableList;
+    }
+
+    public ObservableList<RequirementCategory> getRequirementCategoryObservableList() {
+        return requirementCategoryObservableList;
+    }
+
+    public static Class<JsonSerializableModuleList> getJsonSerializableModuleListClass() {
+        return JsonSerializableModuleList.class;
+    }
+
+    public static Class<JsonSerializableRequirementCategoryList> getJsonSerializableRequirementCategoryListClass() {
+        return JsonSerializableRequirementCategoryList.class;
+    }
+
+    public static Class<JsonSerializableDegreePlannerList> getJsonSerializableDegreePlannerListClass() {
+        return JsonSerializableDegreePlannerList.class;
+    }
+
+    /**
+     * Converts the application into the model's {@link Application} object.<br>
+     * Checks for additional data constraints on top of {@link JsonSerializableModuleList#toModelType()},
+     * {@link JsonSerializableRequirementCategoryList#toModelType()} and
+     * {@link JsonSerializableDegreePlannerList#toModelType()}.
+     * <br><br>
+     * Data constraints:<br>
+     * 1. All codes in requirement categories must exist in module list.<br>
+     * 2. All codes in degree planners must exist in module list.<br>
+     * 3. All modules in degree planners must be taken only in semesters the module is offered in.<br>
+     * 4. All modules in degree planners must have all their co-requisites in the same semester.<br>
+     *
+     * @throws IllegalValueException if there were any data constraints violated.
+     */
+    public Application toModelType() throws IllegalValueException {
+        ObservableList<Module> modules = getModuleObservableList();
+        ObservableList<RequirementCategory> requirementCategories = getRequirementCategoryObservableList();
+        ObservableList<DegreePlanner> degreePlanners = getDegreePlannerObservableList();
+
+        Application application = new Application();
+        application.setModules(modules);
+        application.setRequirementCategories(requirementCategories);
+        application.setDegreePlanners(degreePlanners);
+
+        // 1. Ensure that all codes in requirement categories exist in module list
+        for (RequirementCategory requirementCategory : requirementCategories) {
+            for (Code code : requirementCategory.getCodeSet()) {
+                if (!application.hasModuleCode(code)) {
+                    throw new IllegalValueException(String.format(MESSAGE_NON_EXISTENT_REQUIREMENT_CATEGORY_CODE, code,
+                            requirementCategory.getName()));
+                }
+            }
+        }
+
+        // 2. Ensure that all codes in degree planner exist in module list
+        for (DegreePlanner degreePlanner : degreePlanners) {
+            for (Code code : degreePlanner.getCodes()) {
+                if (!application.hasModuleCode(code)) {
+                    throw new IllegalValueException(String.format(MESSAGE_NON_EXISTENT_DEGREE_PLANNER_CODE, code,
+                            degreePlanner.getYear(), degreePlanner.getSemester()
+                    ));
+                }
+
+                // 3. Ensure that all modules in degree planners are taken only in semesters the module is offered in.
+                Module module = application.getModuleByCode(code);
+                Set<Semester> semesters = module.getSemesters();
+
+                if (!semesters.contains(degreePlanner.getSemester())) {
+                    if (semesters.isEmpty()) {
+                        throw new IllegalValueException(String.format(
+                                MESSAGE_INVALID_DEGREE_PLANNER_EMPTY_MODULE_SEMESTERS, code, degreePlanner.getYear(),
+                                degreePlanner.getSemester()));
+                    } else {
+                        String semestersOfferingModule = StringUtil.joinStreamAsString(semesters.stream().sorted());
+                        throw new IllegalValueException(String.format(MESSAGE_INVALID_DEGREE_PLANNER_MODULE_SEMESTER,
+                                code, degreePlanner.getYear(), degreePlanner.getSemester(), semestersOfferingModule));
+                    }
+                }
+
+                // 4. Ensure that all modules in degree planners have all their co-requisites in the same semester.
+                Set<Code> corequisites = module.getCorequisites();
+                for (Code corequisite : corequisites) {
+                    DegreePlanner corequisiteDegreePlanner = application.getDegreePlannerByCode(corequisite);
+                    if (corequisiteDegreePlanner == null) {
+                        throw new IllegalValueException(String.format(MESSAGE_MISSING_COREQUISITES_IN_DEGREE_PLANNER,
+                                code, corequisite));
+                    } else if (!degreePlanner.isSameDegreePlanner(corequisiteDegreePlanner)) {
+                        throw new IllegalValueException(String.format(MESSAGE_INVALID_COREQUISITES_IN_DEGREE_PLANNER,
+                                code, corequisite, degreePlanner.getYear(), degreePlanner.getSemester(),
+                                corequisiteDegreePlanner.getYear(), corequisiteDegreePlanner.getSemester()));
+                    }
+                }
+            }
+        }
+
+        return application;
+    }
+}
diff --git a/src/main/java/pwe/planner/storage/JsonSerializableDegreePlannerList.java b/src/main/java/pwe/planner/storage/JsonSerializableDegreePlannerList.java
new file mode 100644
index 000000000000..bc8414ff6565
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonSerializableDegreePlannerList.java
@@ -0,0 +1,95 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import javafx.collections.ObservableList;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.UniqueDegreePlannerList;
+
+/**
+ * An immutable list of degree planners that is serializable to JSON format.
+ */
+@JsonRootName(value = "degreePlannerList")
+public class JsonSerializableDegreePlannerList {
+
+    public static final String MESSAGE_DUPLICATE_DEGREE_PLANNER =
+            "DegreePlanner list contains duplicate degreePlanner(s).";
+
+    public static final String MESSAGE_DUPLICATE_DEGREE_PLANNER_CODE =
+            "The module code (%1$s) is added to more than one year/semester!";
+
+    private final List<JsonAdaptedDegreePlanner> degreePlanners = new ArrayList<>();
+
+    /**
+     * Constructs a {@link JsonSerializableDegreePlannerList} with the given list of {@link JsonAdaptedDegreePlanner}
+     */
+    @JsonCreator
+    public JsonSerializableDegreePlannerList(
+            @JsonProperty("degreePlanners") List<JsonAdaptedDegreePlanner> degreePlanners) {
+        requireNonNull(degreePlanners);
+
+        this.degreePlanners.addAll(degreePlanners);
+    }
+
+    /**
+     * Converts a given {@link ObservableList} of {@link DegreePlanner} into this class for Jackson use.
+     *
+     * @param source future changes to this will not affect the created {@link JsonSerializableDegreePlannerList}.
+     */
+
+    public JsonSerializableDegreePlannerList(ObservableList<DegreePlanner> source) {
+        requireNonNull(source);
+
+        source.stream().map(JsonAdaptedDegreePlanner::new).forEach(degreePlanners::add);
+    }
+
+    /**
+     * Converts the list of {@link JsonAdaptedDegreePlanner} into the model's
+     * {@code ObservableList<DegreePlanner>} object.
+     * <br><br>
+     * Data constraints:<br>
+     * - All degree planners must be unique.<br>
+     * - All codes within requirement categories must be unique (cannot appear in multiple degree planners).
+     *
+     * @throws IllegalValueException if there were any data constraints violated.
+     */
+    public ObservableList<DegreePlanner> toModelType() throws IllegalValueException {
+        // Ensure all degree planners are unique
+        UniqueDegreePlannerList uniqueDegreePlannerList = new UniqueDegreePlannerList();
+        for (JsonAdaptedDegreePlanner jsonAdaptedDegreePlanner : degreePlanners) {
+            DegreePlanner degreePlanner = jsonAdaptedDegreePlanner.toModelType();
+            if (uniqueDegreePlannerList.contains(degreePlanner)) {
+                throw new IllegalValueException(MESSAGE_DUPLICATE_DEGREE_PLANNER);
+            }
+            uniqueDegreePlannerList.add(degreePlanner);
+        }
+
+        // Ensure that all module codes appears at most once
+        ObservableList<DegreePlanner> degreePlannerList = uniqueDegreePlannerList.asUnmodifiableObservableList();
+        List<Code> allDegreePlannerCodes = degreePlannerList.stream().map(DegreePlanner::getCodes)
+                .flatMap(Collection::stream).collect(Collectors.toList());
+        for (Code code : allDegreePlannerCodes) {
+            long codeAppearanceInDegreePlanners = allDegreePlannerCodes.stream()
+                    .filter(degreePlannerCode -> degreePlannerCode.equals(code))
+                    .count();
+
+            if (codeAppearanceInDegreePlanners > 1) {
+                throw new IllegalValueException(String.format(MESSAGE_DUPLICATE_DEGREE_PLANNER_CODE, code));
+            }
+        }
+
+        return degreePlannerList;
+    }
+}
diff --git a/src/main/java/pwe/planner/storage/JsonSerializableModuleList.java b/src/main/java/pwe/planner/storage/JsonSerializableModuleList.java
new file mode 100644
index 000000000000..a1c18741c2ee
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonSerializableModuleList.java
@@ -0,0 +1,100 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.UniqueModuleList;
+
+/**
+ * An immutable list of {@link Module modules} that is serializable to JSON format.
+ */
+@JsonRootName(value = "modules")
+class JsonSerializableModuleList {
+    public static final String MESSAGE_DUPLICATE_MODULE = "Modules list contains duplicate module(s).";
+    public static final String MESSAGE_NON_EXISTENT_COREQUISITE =
+            "The corequisite module code (%1$s) does not exists in the module list";
+    public static final String MESSAGE_ONE_WAY_COREQUISITE =
+            "The module code (%1$s) is a corequisite of module code (%2$s), but not the other way round!";
+
+    private final List<JsonAdaptedModule> modules = new ArrayList<>();
+
+    /**
+     * Constructs a {@link JsonSerializableModuleList} with the given list of {@link JsonAdaptedModule}.
+     */
+    @JsonCreator
+    public JsonSerializableModuleList(@JsonProperty("modules") List<JsonAdaptedModule> modules) {
+        requireNonNull(modules);
+
+        this.modules.addAll(modules);
+    }
+
+    /**
+     * Converts a given {@link ObservableList} of {@link Module} into this class for Jackson use.
+     *
+     * @param source future changes to this will not affect the created {@link JsonSerializableRequirementCategoryList}.
+     */
+    public JsonSerializableModuleList(ReadOnlyApplication source) {
+        requireNonNull(source);
+
+        modules.addAll(source.getModuleList().stream().map(JsonAdaptedModule::new).collect(Collectors.toList()));
+    }
+
+    /**
+     * Converts the list of {@link JsonAdaptedModule} into the model's {@code ObservableList<Module>} object.<br>
+     * Checks for additional data constraints on top of {@link JsonAdaptedModule#toModelType()}.
+     * <br><br>
+     * Data constraints:<br>
+     * - All modules must be unique.<br>
+     * - All module co-requisites must refer to existing modules in module list.<br>
+     * - All module co-requisites must be two-way<br>
+     *   (A has B as a co-requisite, and vice versa).<br>
+     *
+     * @throws IllegalValueException if there were any data constraints violated.
+     */
+    public ObservableList<Module> toModelType() throws IllegalValueException {
+        // Ensure all modules are unique
+        UniqueModuleList uniqueModuleList = new UniqueModuleList();
+        for (JsonAdaptedModule jsonAdaptedModule : modules) {
+            Module module = jsonAdaptedModule.toModelType();
+            if (uniqueModuleList.contains(module)) {
+                throw new IllegalValueException(MESSAGE_DUPLICATE_MODULE);
+            }
+            uniqueModuleList.add(module);
+        }
+
+        ObservableList<Module> moduleList = uniqueModuleList.asUnmodifiableObservableList();
+        for (Module module : moduleList) {
+            for (Code corequisite : module.getCorequisites()) {
+                Optional<Module> corequisiteModuleOptional = moduleList.stream()
+                        .filter(currentModule -> currentModule.getCode().equals(corequisite))
+                        .findFirst();
+
+                // Ensure that all module co-requisites refers to existing modules in module list
+                if (!corequisiteModuleOptional.isPresent()) {
+                    throw new IllegalValueException(String.format(MESSAGE_NON_EXISTENT_COREQUISITE, corequisite));
+                }
+                // Ensure that module co-requisites must be two-way (A has B as a co-requisite, and vice versa)
+                if (!corequisiteModuleOptional.get().getCorequisites().contains(module.getCode())) {
+                    throw new IllegalValueException(String.format(MESSAGE_ONE_WAY_COREQUISITE, module.getCode(),
+                            corequisite));
+                }
+            }
+        }
+
+        return moduleList;
+    }
+
+}
diff --git a/src/main/java/pwe/planner/storage/JsonSerializableRequirementCategoryList.java b/src/main/java/pwe/planner/storage/JsonSerializableRequirementCategoryList.java
new file mode 100644
index 000000000000..1ba9c0e98cd9
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/JsonSerializableRequirementCategoryList.java
@@ -0,0 +1,96 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import javafx.collections.ObservableList;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.model.requirement.UniqueRequirementCategoryList;
+
+/**
+ * An immutable list of requirement categories that is serializable to JSON format.
+ */
+@JsonRootName(value = "requirementCategoryList")
+public class JsonSerializableRequirementCategoryList {
+
+    public static final String MESSAGE_DUPLICATE_REQUIREMENT_CATEGORY =
+            "Requirement category list contains duplicate requirement categories.";
+
+    public static final String MESSAGE_DUPLICATE_REQUIREMENT_CATEGORY_CODE =
+            "The module code (%1$s) is added to more than one requirement category!";
+
+    private final List<JsonAdaptedRequirementCategory> requirementCategories = new ArrayList<>();
+
+    /**
+     * Constructs a {@link JsonSerializableRequirementCategoryList} with the given list of
+     * {@link JsonAdaptedRequirementCategory}.
+     */
+    @JsonCreator
+    public JsonSerializableRequirementCategoryList(
+            @JsonProperty("requirementCategories") List<JsonAdaptedRequirementCategory> requirementCategories) {
+        requireNonNull(requirementCategories);
+
+        this.requirementCategories.addAll(requirementCategories);
+    }
+
+    /**
+     * Converts a given {@link ObservableList} of {@link RequirementCategory} into this class for Jackson use.
+     *
+     * @param source future changes to this will not affect the created {@link JsonSerializableModuleList}.
+     */
+    public JsonSerializableRequirementCategoryList(ObservableList<RequirementCategory> source) {
+        requireNonNull(source);
+
+        source.stream().map(JsonAdaptedRequirementCategory::new).forEach(requirementCategories::add);
+    }
+
+    /**
+     * Converts the list of {@link JsonAdaptedRequirementCategory} into the model's
+     * {@code ObservableList<RequirementCategory>} object.
+     * <br><br>
+     * Data constraints:<br>
+     * - All requirement categories must be unique.<br>
+     * - All codes within requirement categories must be unique (cannot appear in multiple requirement categories).
+     *
+     * @throws IllegalValueException if there were any data constraints violated.
+     */
+    public ObservableList<RequirementCategory> toModelType() throws IllegalValueException {
+        // Ensure all requirement categories are unique
+        UniqueRequirementCategoryList uniqueRequirementCategoryList = new UniqueRequirementCategoryList();
+        for (JsonAdaptedRequirementCategory jsonAdaptedRequirementCategory : requirementCategories) {
+            RequirementCategory requirementCategory = jsonAdaptedRequirementCategory.toModelType();
+            if (uniqueRequirementCategoryList.contains(requirementCategory)) {
+                throw new IllegalValueException(MESSAGE_DUPLICATE_REQUIREMENT_CATEGORY);
+            }
+            uniqueRequirementCategoryList.add(requirementCategory);
+        }
+
+        // Ensure that all module codes appears at most once
+        ObservableList<RequirementCategory> requirementCategories = uniqueRequirementCategoryList
+                .asUnmodifiableObservableList();
+        List<Code> allRequirementCategoryCodes = requirementCategories.stream().map(RequirementCategory::getCodeSet)
+                .flatMap(Collection::stream).collect(Collectors.toList());
+        for (Code code : allRequirementCategoryCodes) {
+            long codeAppearanceInRequirementCategories = allRequirementCategoryCodes.stream()
+                    .filter(requirementCategoryCode -> requirementCategoryCode.equals(code))
+                    .count();
+
+            if (codeAppearanceInRequirementCategories > 1) {
+                throw new IllegalValueException(String.format(MESSAGE_DUPLICATE_REQUIREMENT_CATEGORY_CODE, code));
+            }
+        }
+
+        return requirementCategories;
+    }
+}
diff --git a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java b/src/main/java/pwe/planner/storage/JsonUserPrefsStorage.java
similarity index 74%
rename from src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
rename to src/main/java/pwe/planner/storage/JsonUserPrefsStorage.java
index bc2bbad84aa3..18f998ec2f5a 100644
--- a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
+++ b/src/main/java/pwe/planner/storage/JsonUserPrefsStorage.java
@@ -1,13 +1,15 @@
-package seedu.address.storage;
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.commons.util.JsonUtil;
+import pwe.planner.model.ReadOnlyUserPrefs;
+import pwe.planner.model.UserPrefs;
 
 /**
  * A class to access UserPrefs stored in the hard disk as a json file
@@ -17,6 +19,8 @@ public class JsonUserPrefsStorage implements UserPrefsStorage {
     private Path filePath;
 
     public JsonUserPrefsStorage(Path filePath) {
+        requireNonNull(filePath);
+
         this.filePath = filePath;
     }
 
@@ -36,11 +40,15 @@ public Optional<UserPrefs> readUserPrefs() throws DataConversionException {
      * @throws DataConversionException if the file format is not as expected.
      */
     public Optional<UserPrefs> readUserPrefs(Path prefsFilePath) throws DataConversionException {
+        requireNonNull(prefsFilePath);
+
         return JsonUtil.readJsonFile(prefsFilePath, UserPrefs.class);
     }
 
     @Override
     public void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException {
+        requireNonNull(userPrefs);
+
         JsonUtil.saveJsonFile(userPrefs, filePath);
     }
 
diff --git a/src/main/java/pwe/planner/storage/Storage.java b/src/main/java/pwe/planner/storage/Storage.java
new file mode 100644
index 000000000000..d252fdf292b4
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/Storage.java
@@ -0,0 +1,62 @@
+package pwe.planner.storage;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.ReadOnlyUserPrefs;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * API of the Storage component
+ */
+
+public interface Storage extends ApplicationStorage, UserPrefsStorage {
+
+    @Override
+    Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
+
+    @Override
+    void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException;
+
+    @Override
+    Optional<ReadOnlyApplication> readApplication() throws DataConversionException, IOException;
+
+    @Override
+    void saveApplication(ReadOnlyApplication application) throws IOException;
+
+    @Override
+    Path getModuleListFilePath();
+
+    @Override
+    Optional<ObservableList<Module>> readModuleList() throws DataConversionException, IOException;
+
+    @Override
+    void saveModuleList(ReadOnlyApplication application) throws IOException;
+
+    @Override
+    Path getDegreePlannerListFilePath();
+
+    @Override
+    Optional<ObservableList<DegreePlanner>> readDegreePlannerList() throws DataConversionException, IOException;
+
+    @Override
+    void saveDegreePlannerList(ReadOnlyApplication degreePlannerList) throws IOException;
+
+    @Override
+    Path getRequirementCategoryListFilePath();
+
+    @Override
+    Optional<ObservableList<RequirementCategory>> readRequirementCategoryList()
+            throws DataConversionException, IOException;
+
+    @Override
+    void saveRequirementCategoryList(ReadOnlyApplication requirementCategoryList) throws IOException;
+
+}
diff --git a/src/main/java/pwe/planner/storage/StorageManager.java b/src/main/java/pwe/planner/storage/StorageManager.java
new file mode 100644
index 000000000000..f2d64e7700b5
--- /dev/null
+++ b/src/main/java/pwe/planner/storage/StorageManager.java
@@ -0,0 +1,196 @@
+package pwe.planner.storage;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.ReadOnlyUserPrefs;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Manages storage of Application data in local storage.
+ */
+public class StorageManager implements Storage {
+
+    private static final Logger logger = LogsCenter.getLogger(StorageManager.class);
+    private ApplicationStorage applicationStorage;
+    private UserPrefsStorage userPrefsStorage;
+
+    public StorageManager(ApplicationStorage applicationStorage,
+            UserPrefsStorage userPrefsStorage) {
+        super();
+
+        requireAllNonNull(applicationStorage, userPrefsStorage);
+        this.applicationStorage = applicationStorage;
+        this.userPrefsStorage = userPrefsStorage;
+    }
+
+    // ================ UserPrefs methods ==============================
+
+    @Override
+    public Path getUserPrefsFilePath() {
+        return userPrefsStorage.getUserPrefsFilePath();
+    }
+
+    @Override
+    public Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException {
+        return userPrefsStorage.readUserPrefs();
+    }
+
+    @Override
+    public void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException {
+        requireNonNull(userPrefs);
+
+        userPrefsStorage.saveUserPrefs(userPrefs);
+    }
+
+    @Override
+    public Optional<ReadOnlyApplication> readApplication() throws DataConversionException, IOException {
+        return readApplication(applicationStorage.getModuleListFilePath(),
+                applicationStorage.getDegreePlannerListFilePath(),
+                applicationStorage.getRequirementCategoryListFilePath());
+    }
+
+    @Override
+    public Optional<ReadOnlyApplication> readApplication(Path moduleListFilePath, Path degreePlannerListFilePath,
+            Path requirementCategoryListFilePath)
+            throws DataConversionException, IOException {
+        requireAllNonNull(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath);
+
+        logger.fine("Attempting to read data from file: " + moduleListFilePath);
+        logger.fine("Attempting to read data from file: " + degreePlannerListFilePath);
+        logger.fine("Attempting to read data from file: " + requirementCategoryListFilePath);
+        return applicationStorage
+                .readApplication(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath);
+    }
+
+    @Override
+    public void saveApplication(ReadOnlyApplication application) throws IOException {
+        requireNonNull(application);
+
+        saveModuleList(application, applicationStorage.getModuleListFilePath());
+        saveDegreePlannerList(application, applicationStorage.getDegreePlannerListFilePath());
+        saveRequirementCategoryList(application, applicationStorage.getRequirementCategoryListFilePath());
+    }
+
+
+    // ================ Application methods ==============================
+
+    @Override
+    public Path getModuleListFilePath() {
+        return applicationStorage.getModuleListFilePath();
+    }
+
+    @Override
+    public Optional<ObservableList<Module>> readModuleList() throws DataConversionException, IOException {
+        return readModuleList(applicationStorage.getModuleListFilePath());
+    }
+
+    @Override
+    public Optional<ObservableList<Module>> readModuleList(Path filePath) throws DataConversionException, IOException {
+        requireNonNull(filePath);
+
+        logger.fine("Attempting to read data from file: " + filePath);
+        return applicationStorage.readModuleList(filePath);
+    }
+
+    @Override
+    public void saveModuleList(ReadOnlyApplication application) throws IOException {
+        requireNonNull(application);
+
+        saveModuleList(application, applicationStorage.getModuleListFilePath());
+    }
+
+    @Override
+    public void saveModuleList(ReadOnlyApplication application, Path filePath) throws IOException {
+        requireAllNonNull(application, filePath);
+
+        logger.fine("Attempting to write to data file: " + filePath);
+        applicationStorage.saveModuleList(application, filePath);
+    }
+
+    // ================ DegreePlannerList methods ========================
+
+    @Override
+    public Path getDegreePlannerListFilePath() {
+        return applicationStorage.getDegreePlannerListFilePath();
+    }
+
+    @Override
+    public Optional<ObservableList<DegreePlanner>> readDegreePlannerList() throws DataConversionException, IOException {
+        return readDegreePlannerList(applicationStorage.getDegreePlannerListFilePath());
+    }
+
+    @Override
+    public Optional<ObservableList<DegreePlanner>> readDegreePlannerList(Path filePath)
+            throws DataConversionException, IOException {
+        requireNonNull(filePath);
+
+        logger.fine("Attempting to read data from file: " + filePath);
+        return applicationStorage.readDegreePlannerList(filePath);
+    }
+
+    @Override
+    public void saveDegreePlannerList(ReadOnlyApplication degreePlannerList) throws IOException {
+        requireNonNull(degreePlannerList);
+
+        saveDegreePlannerList(degreePlannerList, applicationStorage.getDegreePlannerListFilePath());
+    }
+
+    @Override
+    public void saveDegreePlannerList(ReadOnlyApplication application, Path filePath) throws IOException {
+        requireAllNonNull(application, filePath);
+
+        logger.fine("Attempting to write to data file: " + filePath);
+        applicationStorage.saveDegreePlannerList(application, filePath);
+    }
+
+    // ================ RequirementCategoryList methods ============================================================
+
+    @Override
+    public Path getRequirementCategoryListFilePath() {
+        return applicationStorage.getRequirementCategoryListFilePath();
+    }
+
+    @Override
+    public Optional<ObservableList<RequirementCategory>> readRequirementCategoryList()
+            throws DataConversionException, IOException {
+        return readRequirementCategoryList(applicationStorage.getRequirementCategoryListFilePath());
+    }
+
+    @Override
+    public Optional<ObservableList<RequirementCategory>> readRequirementCategoryList(Path filePath)
+            throws DataConversionException, IOException {
+        requireNonNull(filePath);
+
+        logger.fine("Attempting to read data from file: " + filePath);
+        return applicationStorage.readRequirementCategoryList(filePath);
+    }
+
+    @Override
+    public void saveRequirementCategoryList(ReadOnlyApplication requirementCategoryList) throws IOException {
+        requireNonNull(requirementCategoryList);
+
+        saveRequirementCategoryList(requirementCategoryList,
+                applicationStorage.getRequirementCategoryListFilePath());
+    }
+
+    @Override
+    public void saveRequirementCategoryList(ReadOnlyApplication application, Path filePath) throws IOException {
+        requireAllNonNull(application, filePath);
+
+        logger.fine("Attempting to write to data file: " + filePath);
+        applicationStorage.saveRequirementCategoryList(application, filePath);
+    }
+}
diff --git a/src/main/java/seedu/address/storage/UserPrefsStorage.java b/src/main/java/pwe/planner/storage/UserPrefsStorage.java
similarity index 71%
rename from src/main/java/seedu/address/storage/UserPrefsStorage.java
rename to src/main/java/pwe/planner/storage/UserPrefsStorage.java
index 29eef178dbc4..7ad6b33c8362 100644
--- a/src/main/java/seedu/address/storage/UserPrefsStorage.java
+++ b/src/main/java/pwe/planner/storage/UserPrefsStorage.java
@@ -1,15 +1,15 @@
-package seedu.address.storage;
+package pwe.planner.storage;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.ReadOnlyUserPrefs;
+import pwe.planner.model.UserPrefs;
 
 /**
- * Represents a storage for {@link seedu.address.model.UserPrefs}.
+ * Represents a storage for {@link UserPrefs}.
  */
 public interface UserPrefsStorage {
 
@@ -27,7 +27,7 @@ public interface UserPrefsStorage {
     Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
 
     /**
-     * Saves the given {@link seedu.address.model.ReadOnlyUserPrefs} to the storage.
+     * Saves the given {@link ReadOnlyUserPrefs} to the storage.
      * @param userPrefs cannot be null.
      * @throws IOException if there was any problem writing to the file.
      */
diff --git a/src/main/java/seedu/address/ui/BrowserPanel.java b/src/main/java/pwe/planner/ui/BrowserPanel.java
similarity index 74%
rename from src/main/java/seedu/address/ui/BrowserPanel.java
rename to src/main/java/pwe/planner/ui/BrowserPanel.java
index 53876e01c8d1..ef987920490f 100644
--- a/src/main/java/seedu/address/ui/BrowserPanel.java
+++ b/src/main/java/pwe/planner/ui/BrowserPanel.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static java.util.Objects.requireNonNull;
 
@@ -11,9 +11,9 @@
 import javafx.fxml.FXML;
 import javafx.scene.layout.Region;
 import javafx.scene.web.WebView;
-import seedu.address.MainApp;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
+import pwe.planner.MainApp;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.model.module.Module;
 
 /**
  * The Browser Panel of the App.
@@ -31,26 +31,26 @@ public class BrowserPanel extends UiPart<Region> {
     @FXML
     private WebView browser;
 
-    public BrowserPanel(ObservableValue<Person> selectedPerson) {
+    public BrowserPanel(ObservableValue<Module> selectedModule) {
         super(FXML);
 
         // To prevent triggering events for typing inside the loaded Web page.
         getRoot().setOnKeyPressed(Event::consume);
 
-        // Load person page when selected person changes.
-        selectedPerson.addListener((observable, oldValue, newValue) -> {
+        // Load module page when selected module changes.
+        selectedModule.addListener((observable, oldValue, newValue) -> {
             if (newValue == null) {
                 loadDefaultPage();
                 return;
             }
-            loadPersonPage(newValue);
+            loadModulePage(newValue);
         });
 
         loadDefaultPage();
     }
 
-    private void loadPersonPage(Person person) {
-        loadPage(SEARCH_PAGE_URL + person.getName().fullName);
+    private void loadModulePage(Module module) {
+        loadPage(SEARCH_PAGE_URL + module.getName().fullName);
     }
 
     public void loadPage(String url) {
diff --git a/src/main/java/seedu/address/ui/CommandBox.java b/src/main/java/pwe/planner/ui/CommandBox.java
similarity index 90%
rename from src/main/java/seedu/address/ui/CommandBox.java
rename to src/main/java/pwe/planner/ui/CommandBox.java
index bf09f3dcbea6..0e0e7ce08d6a 100644
--- a/src/main/java/seedu/address/ui/CommandBox.java
+++ b/src/main/java/pwe/planner/ui/CommandBox.java
@@ -1,4 +1,6 @@
-package seedu.address.ui;
+package pwe.planner.ui;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.util.List;
 
@@ -7,9 +9,10 @@
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Region;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
+import pwe.planner.logic.Logic;
+import pwe.planner.logic.commands.CommandResult;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.logic.parser.exceptions.ParseException;
 
 /**
  * The UI component that is responsible for receiving user command inputs.
@@ -28,6 +31,8 @@ public class CommandBox extends UiPart<Region> {
 
     public CommandBox(CommandExecutor commandExecutor, List<String> history) {
         super(FXML);
+        requireAllNonNull(commandExecutor, history);
+
         this.commandExecutor = commandExecutor;
         this.history = history;
         // calls #setStyleToDefault() whenever there is a change to the text of the command box.
@@ -40,6 +45,8 @@ public CommandBox(CommandExecutor commandExecutor, List<String> history) {
      */
     @FXML
     private void handleKeyPress(KeyEvent keyEvent) {
+        assert keyEvent != null;
+
         switch (keyEvent.getCode()) {
         case UP:
             // As up and down buttons will alter the position of the caret,
@@ -63,6 +70,7 @@ private void handleKeyPress(KeyEvent keyEvent) {
      */
     private void navigateToPreviousInput() {
         assert historySnapshot != null;
+
         if (!historySnapshot.hasPrevious()) {
             return;
         }
@@ -76,6 +84,7 @@ private void navigateToPreviousInput() {
      */
     private void navigateToNextInput() {
         assert historySnapshot != null;
+
         if (!historySnapshot.hasNext()) {
             return;
         }
@@ -88,6 +97,8 @@ private void navigateToNextInput() {
      * positions the caret to the end of the {@code text}.
      */
     private void replaceText(String text) {
+        assert text != null;
+
         commandTextField.setText(text);
         commandTextField.positionCaret(commandTextField.getText().length());
     }
@@ -146,7 +157,7 @@ public interface CommandExecutor {
         /**
          * Executes the command and returns the result.
          *
-         * @see seedu.address.logic.Logic#execute(String)
+         * @see Logic#execute(String)
          */
         CommandResult execute(String commandText) throws CommandException, ParseException;
     }
diff --git a/src/main/java/pwe/planner/ui/DegreePlannerCard.java b/src/main/java/pwe/planner/ui/DegreePlannerCard.java
new file mode 100644
index 000000000000..67e93499813c
--- /dev/null
+++ b/src/main/java/pwe/planner/ui/DegreePlannerCard.java
@@ -0,0 +1,114 @@
+package pwe.planner.ui;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * An UI component that displays information of a {@code DegreePlanner}.
+ */
+public class DegreePlannerCard extends UiPart<Region> {
+
+    private static final String FXML = "DegreePlannerListCard.fxml";
+    private static final Integer MINIMUM_LOAD = 18;
+    private static final Integer OVER_LOAD = 24;
+
+    public final DegreePlanner degreePlanner;
+
+    @FXML
+    private StackPane degreePlannerCardPane;
+
+    @FXML
+    private Label year;
+
+    @FXML
+    private Label semester;
+
+    @FXML
+    private Label credits;
+
+    @FXML
+    private VBox degreePlannerListView;
+
+    public DegreePlannerCard(DegreePlanner degreePlanner, ObservableList<Module> moduleList) {
+        super(FXML);
+        requireAllNonNull(degreePlanner, moduleList);
+
+        this.degreePlanner = degreePlanner;
+
+        year.setText("Year " + degreePlanner.getYear().year);
+        year.setPadding(new Insets(0, 0, 0, 5));
+
+        String degreePlannerSemester = degreePlanner.getSemester().plannerSemester;
+        StringBuilder plannerSemesterContent = new StringBuilder();
+        plannerSemesterContent.append(" Semester ").append(degreePlannerSemester);
+        if ("3".equals(degreePlannerSemester)) {
+            plannerSemesterContent.append(" (Special Semester Term 1)");
+        } else if ("4".equals(degreePlannerSemester)) {
+            plannerSemesterContent.append(" (Special Semester Term 2)");
+        }
+
+        semester.setText(plannerSemesterContent.toString());
+
+        List<Module> modulesInDegreePlanner = degreePlanner.getCodes().stream()
+                .map(code -> moduleList.stream().filter(module -> module.getCode().equals(code))
+                        .findFirst().get()).collect(Collectors.toList());
+
+        int currentCredits = modulesInDegreePlanner.stream().map(Module::getCredits).map(Credits::toString)
+                .map(Integer::parseInt).reduce(0, (totalCredits, credit) -> totalCredits + credit);
+
+        credits.setText("Total Credits: " + currentCredits + " MCs");
+        credits.setPadding(new Insets(0, 0, 0, 5));
+        credits.getStyleClass().clear();
+        if (currentCredits < MINIMUM_LOAD) {
+            credits.getStyleClass().add("orange");
+        } else if (currentCredits < OVER_LOAD) {
+            credits.getStyleClass().add("green");
+        } else {
+            credits.getStyleClass().add("red");
+        }
+
+        modulesInDegreePlanner.stream().sorted(Comparator.comparing(Module::getCode))
+                .forEach(module -> {
+                    VBox vbox = new VBox();
+                    VBox.setMargin(vbox, new Insets(1, 1, 1, 1));
+                    vbox.getChildren().add(new Label(
+                            module.getCode().value + " " + module.getName().toString()));
+                    vbox.getStyleClass().add("myModule");
+                    degreePlannerListView.getChildren().add(vbox);
+                });
+
+        degreePlannerCardPane.setOnMouseClicked(null);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        // short circuit if same object
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof DegreePlannerCard)) {
+            return false;
+        }
+
+        // state check
+        DegreePlannerCard card = (DegreePlannerCard) other;
+        return year.getText().equals(card.year.getText());
+    }
+}
+
diff --git a/src/main/java/pwe/planner/ui/DegreePlannerListPanel.java b/src/main/java/pwe/planner/ui/DegreePlannerListPanel.java
new file mode 100644
index 000000000000..81206be61ca6
--- /dev/null
+++ b/src/main/java/pwe/planner/ui/DegreePlannerListPanel.java
@@ -0,0 +1,51 @@
+package pwe.planner.ui;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * Panel containing the list of degreePlanners.
+ */
+public class DegreePlannerListPanel extends UiPart<Region> {
+
+    private static final String FXML = "DegreePlannerListPanel.fxml";
+    private ObservableList<Module> modules;
+
+    @FXML
+    private ListView<DegreePlanner> degreePlanners;
+
+    public DegreePlannerListPanel(ObservableList<DegreePlanner> degreePlannerList,
+            ObservableList<Module> moduleList) {
+        super(FXML);
+        requireAllNonNull(degreePlannerList, moduleList);
+
+        modules = moduleList;
+        degreePlanners.setItems(degreePlannerList);
+        degreePlanners.setCellFactory(listView -> new DegreePlannerViewCell());
+    }
+
+    /**
+     * Custom {@code ListCell} that displays the graphics of a {@code DegreePlanner}
+     * using a {@code DegreePlannerListCard}.
+     */
+    class DegreePlannerViewCell extends ListCell<DegreePlanner> {
+        @Override
+        protected void updateItem(DegreePlanner degreePlanner, boolean empty) {
+            super.updateItem(degreePlanner, empty);
+
+            if (empty || degreePlanner == null) {
+                setGraphic(null);
+                setText(null);
+            } else {
+                setGraphic(new DegreePlannerCard(degreePlanner, modules).getRoot());
+            }
+        }
+    }
+}
diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/pwe/planner/ui/HelpWindow.java
similarity index 96%
rename from src/main/java/seedu/address/ui/HelpWindow.java
rename to src/main/java/pwe/planner/ui/HelpWindow.java
index 22606d102f83..f174cbbf9167 100644
--- a/src/main/java/seedu/address/ui/HelpWindow.java
+++ b/src/main/java/pwe/planner/ui/HelpWindow.java
@@ -1,11 +1,11 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import java.util.logging.Logger;
 
 import javafx.fxml.FXML;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import seedu.address.commons.core.LogsCenter;
+import pwe.planner.commons.core.LogsCenter;
 
 /**
  * Controller for a help page
diff --git a/src/main/java/seedu/address/ui/ListElementPointer.java b/src/main/java/pwe/planner/ui/ListElementPointer.java
similarity index 97%
rename from src/main/java/seedu/address/ui/ListElementPointer.java
rename to src/main/java/pwe/planner/ui/ListElementPointer.java
index 54db5ae7efee..0172fc8d37c9 100644
--- a/src/main/java/seedu/address/ui/ListElementPointer.java
+++ b/src/main/java/pwe/planner/ui/ListElementPointer.java
@@ -1,4 +1,6 @@
-package seedu.address.ui;
+package pwe.planner.ui;
+
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,6 +23,8 @@ public class ListElementPointer {
      * The cursor points to the last element in {@code list}.
      */
     public ListElementPointer(List<String> list) {
+        requireNonNull(list);
+
         this.list = new ArrayList<>(list);
         index = this.list.size() - 1;
     }
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/pwe/planner/ui/MainWindow.java
similarity index 74%
rename from src/main/java/seedu/address/ui/MainWindow.java
rename to src/main/java/pwe/planner/ui/MainWindow.java
index ac165736001d..6a43247a1964 100644
--- a/src/main/java/seedu/address/ui/MainWindow.java
+++ b/src/main/java/pwe/planner/ui/MainWindow.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import java.util.logging.Logger;
 
@@ -10,12 +10,12 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.logic.Logic;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.logic.Logic;
+import pwe.planner.logic.commands.CommandResult;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.logic.parser.exceptions.ParseException;
 
 /**
  * The Main Window. Provides the basic application layout containing
@@ -32,13 +32,18 @@ public class MainWindow extends UiPart<Stage> {
 
     // Independent Ui parts residing in this Ui container
     private BrowserPanel browserPanel;
-    private PersonListPanel personListPanel;
+    private DegreePlannerListPanel degreePlannerListPanel;
+    private ModuleListPanel moduleListPanel;
+    private RequirementCategoryListPanel requirementCategoryListPanel;
     private ResultDisplay resultDisplay;
     private HelpWindow helpWindow;
 
     @FXML
     private StackPane browserPlaceholder;
 
+    @FXML
+    private StackPane degreePlannerListPanelPlaceholder;
+
     @FXML
     private StackPane commandBoxPlaceholder;
 
@@ -46,11 +51,14 @@ public class MainWindow extends UiPart<Stage> {
     private MenuItem helpMenuItem;
 
     @FXML
-    private StackPane personListPanelPlaceholder;
+    private StackPane moduleListPanelPlaceholder;
 
     @FXML
     private StackPane resultDisplayPlaceholder;
 
+    @FXML
+    private StackPane requirementCategoryListPanelPlaceholder;
+
     @FXML
     private StackPane statusbarPlaceholder;
 
@@ -79,6 +87,7 @@ private void setAccelerators() {
 
     /**
      * Sets the accelerator of a MenuItem.
+     *
      * @param keyCombination the KeyCombination value of the accelerator
      */
     private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
@@ -111,17 +120,25 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
      * Fills up all the placeholders of this window.
      */
     void fillInnerParts() {
-        browserPanel = new BrowserPanel(logic.selectedPersonProperty());
+        browserPanel = new BrowserPanel(logic.selectedModuleProperty());
         browserPlaceholder.getChildren().add(browserPanel.getRoot());
 
-        personListPanel = new PersonListPanel(logic.getFilteredPersonList(), logic.selectedPersonProperty(),
-                logic::setSelectedPerson);
-        personListPanelPlaceholder.getChildren().add(personListPanel.getRoot());
+        moduleListPanel = new ModuleListPanel(logic.getFilteredModuleList(), logic.selectedModuleProperty(),
+                logic::setSelectedModule);
+        moduleListPanelPlaceholder.getChildren().add(moduleListPanel.getRoot());
+
+        degreePlannerListPanel = new DegreePlannerListPanel(logic.getFilteredDegreePlannerList(),
+                logic.getApplication().getModuleList());
+        degreePlannerListPanelPlaceholder.getChildren().add(degreePlannerListPanel.getRoot());
 
         resultDisplay = new ResultDisplay();
         resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
 
-        StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getAddressBookFilePath(), logic.getAddressBook());
+        requirementCategoryListPanel = new RequirementCategoryListPanel(logic.getFilteredRequirementCategoryList(),
+                logic.getApplication().getModuleList());
+        requirementCategoryListPanelPlaceholder.getChildren().add(requirementCategoryListPanel.getRoot());
+
+        StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getModuleListFilePath(), logic.getApplication());
         statusbarPlaceholder.getChildren().add(statusBarFooter.getRoot());
 
         CommandBox commandBox = new CommandBox(this::executeCommand, logic.getHistory());
@@ -168,16 +185,26 @@ private void handleExit() {
         primaryStage.hide();
     }
 
-    public PersonListPanel getPersonListPanel() {
-        return personListPanel;
+    public ModuleListPanel getModuleListPanel() {
+        return moduleListPanel;
+    }
+
+    public DegreePlannerListPanel getDegreePlannerListPanel() {
+        return degreePlannerListPanel;
+    }
+
+    public RequirementCategoryListPanel getRequirementCategoryListPanel() {
+        return requirementCategoryListPanel;
     }
 
     /**
      * Executes the command and returns the result.
      *
-     * @see seedu.address.logic.Logic#execute(String)
+     * @see Logic#execute(String)
      */
     private CommandResult executeCommand(String commandText) throws CommandException, ParseException {
+        assert commandText != null;
+
         try {
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
diff --git a/src/main/java/pwe/planner/ui/ModuleCard.java b/src/main/java/pwe/planner/ui/ModuleCard.java
new file mode 100644
index 000000000000..9ad1e3bbfa1f
--- /dev/null
+++ b/src/main/java/pwe/planner/ui/ModuleCard.java
@@ -0,0 +1,81 @@
+package pwe.planner.ui;
+
+import static java.util.Objects.requireNonNull;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.model.module.Module;
+
+/**
+ * An UI component that displays information of a {@code Module}.
+ */
+public class ModuleCard extends UiPart<Region> {
+
+    private static final String FXML = "ModuleListCard.fxml";
+
+    /**
+     * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
+     * As a consequence, UI elements' variable names cannot be set to such keywords
+     * or an exception will be thrown by JavaFX during runtime.
+     * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
+     */
+
+    public final Module module;
+
+    @FXML
+    private HBox cardPane;
+    @FXML
+    private Label id;
+    @FXML
+    private Label code;
+    @FXML
+    private Label name;
+    @FXML
+    private Label credits;
+    @FXML
+    private Label semesters;
+    @FXML
+    private Label corequisites;
+    @FXML
+    private FlowPane tags;
+
+    public ModuleCard(Module module, int displayedIndex) {
+        super(FXML);
+        requireNonNull(module);
+
+        this.module = module;
+        id.setText(displayedIndex + ". ");
+        name.setText(module.getName().fullName);
+        credits.setText("Modular Credits: " + module.getCredits().value);
+        code.setText(module.getCode().value);
+
+        String semestersText = StringUtil.joinStreamAsString(module.getSemesters().stream().sorted());
+        semesters.setText("Offered in Semesters: " + semestersText);
+
+        String corequisitesText = StringUtil.joinStreamAsString(module.getCorequisites().stream().sorted());
+        corequisites.setText("Co-requisites: " + corequisitesText);
+        module.getTags().stream().sorted().forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        // short circuit if same object
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof ModuleCard)) {
+            return false;
+        }
+
+        // state check
+        ModuleCard card = (ModuleCard) other;
+        return id.getText().equals(card.id.getText())
+                && module.equals(card.module);
+    }
+}
diff --git a/src/main/java/pwe/planner/ui/ModuleListPanel.java b/src/main/java/pwe/planner/ui/ModuleListPanel.java
new file mode 100644
index 000000000000..7205153e5fdf
--- /dev/null
+++ b/src/main/java/pwe/planner/ui/ModuleListPanel.java
@@ -0,0 +1,75 @@
+package pwe.planner.ui;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
+
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.model.module.Module;
+
+/**
+ * Panel containing the list of modules.
+ */
+public class ModuleListPanel extends UiPart<Region> {
+    private static final String FXML = "ModuleListPanel.fxml";
+    private final Logger logger = LogsCenter.getLogger(ModuleListPanel.class);
+
+    @FXML
+    private ListView<Module> moduleListView;
+
+    public ModuleListPanel(ObservableList<Module> moduleList, ObservableValue<Module> selectedModule,
+            Consumer<Module> onSelectedModuleChange) {
+        super(FXML);
+        requireAllNonNull(moduleList, selectedModule, onSelectedModuleChange);
+
+        moduleListView.setItems(moduleList);
+        moduleListView.setCellFactory(listView -> new ModuleListViewCell());
+        moduleListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            logger.fine("Selection in module list panel changed to : '" + newValue + "'");
+            onSelectedModuleChange.accept(newValue);
+        });
+        selectedModule.addListener((observable, oldValue, newValue) -> {
+            logger.fine("Selected module changed to: " + newValue);
+
+            // Don't modify selection if we are already selecting the selected module,
+            // otherwise we would have an infinite loop.
+            if (Objects.equals(moduleListView.getSelectionModel().getSelectedItem(), newValue)) {
+                return;
+            }
+
+            if (newValue == null) {
+                moduleListView.getSelectionModel().clearSelection();
+            } else {
+                int index = moduleListView.getItems().indexOf(newValue);
+                moduleListView.scrollTo(index);
+                moduleListView.getSelectionModel().clearAndSelect(index);
+            }
+        });
+    }
+
+    /**
+     * Custom {@code ListCell} that displays the graphics of a {@code Module} using a {@code ModuleCard}.
+     */
+    class ModuleListViewCell extends ListCell<Module> {
+        @Override
+        protected void updateItem(Module module, boolean empty) {
+            super.updateItem(module, empty);
+
+            if (empty || module == null) {
+                setGraphic(null);
+                setText(null);
+            } else {
+                setGraphic(new ModuleCard(module, getIndex() + 1).getRoot());
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/pwe/planner/ui/RequirementCategoryCard.java b/src/main/java/pwe/planner/ui/RequirementCategoryCard.java
new file mode 100644
index 000000000000..f335d9325e68
--- /dev/null
+++ b/src/main/java/pwe/planner/ui/RequirementCategoryCard.java
@@ -0,0 +1,98 @@
+package pwe.planner.ui;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.stream.Stream;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+import javafx.scene.text.Text;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * An UI component that displays information of a {@code RequirementCategory}.
+ */
+public class RequirementCategoryCard extends UiPart<Region> {
+
+    private static final String FXML = "RequirementCategoryListCard.fxml";
+
+    public final RequirementCategory requirementCategory;
+
+    @FXML
+    private HBox requirementCategoryCardPane;
+
+    @FXML
+    private Label requirementCategoryName;
+
+    @FXML
+    private Label requirementCategoryCredit;
+
+    @FXML
+    private FlowPane codes;
+
+    public RequirementCategoryCard(RequirementCategory requirementCategory, ObservableList<Module> moduleList) {
+        super(FXML);
+        requireAllNonNull(requirementCategory, moduleList);
+
+        this.requirementCategory = requirementCategory;
+
+        requirementCategoryName.setText(requirementCategory.getName().fullName);
+
+        Stream<Module> modulesInRequirementCategory = requirementCategory.getCodeSet().stream()
+                .map(code -> moduleList.stream().filter(module -> module.getCode().equals(code)).findFirst().get());
+
+        int currentCredits = modulesInRequirementCategory.map(Module::getCredits).map(Credits::toString)
+                .map(Integer::parseInt).reduce(0, (totalCredits, credit) -> totalCredits + credit);
+
+        String creditsRequired = requirementCategory.getCredits().toString();
+
+        requirementCategoryCredit.setText("Modular Credits Fulfilled: " + currentCredits + "/" + creditsRequired);
+
+        if (currentCredits == Integer.parseInt(creditsRequired)) {
+            requirementCategoryCredit.getStyleClass().clear();
+            requirementCategoryCredit.getStyleClass().add("green");
+        }
+
+        if (currentCredits > Integer.parseInt(creditsRequired)) {
+            requirementCategoryCredit.getStyleClass().clear();
+            requirementCategoryCredit.getStyleClass().add("red");
+        }
+
+        if (requirementCategory.getCodeSet().isEmpty()) {
+            Text noCodes = new Text("No modules in this category!");
+            noCodes.getStyleClass().clear();
+            noCodes.getStyleClass().add("noModules");
+            codes.getChildren().add(noCodes);
+        } else {
+            requirementCategory.getCodeSet().stream().sorted()
+                    .forEach(code -> codes.getChildren().add(new Label(code.value)));
+        }
+
+        requirementCategoryCardPane.setOnMouseClicked(null);
+
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        // short circuit if same object
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof RequirementCategoryCard)) {
+            return false;
+        }
+
+        // state check
+        RequirementCategoryCard card = (RequirementCategoryCard) other;
+        return requirementCategoryName.getText().equals(card.requirementCategoryName.getText());
+    }
+}
+
diff --git a/src/main/java/pwe/planner/ui/RequirementCategoryListPanel.java b/src/main/java/pwe/planner/ui/RequirementCategoryListPanel.java
new file mode 100644
index 000000000000..9848654d5fdb
--- /dev/null
+++ b/src/main/java/pwe/planner/ui/RequirementCategoryListPanel.java
@@ -0,0 +1,56 @@
+package pwe.planner.ui;
+
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * Panel containing the list of requirement categories to be displayed.
+ * This class takes in an ObservableModule list for the sole purpose of having the ObservableModule list as a
+ * reference object.
+ * As the ObservableRequirementCategory list only contains the module code, the ObservableModule list is necessary
+ * to be able to compute the total amount of credits.
+ */
+public class RequirementCategoryListPanel extends UiPart<Region> {
+    private static final String FXML = "RequirementCategoryListPanel.fxml";
+    private ObservableList<Module> modules;
+
+
+    @FXML
+    private ListView<RequirementCategory> requirementCategories;
+
+    public RequirementCategoryListPanel(ObservableList<RequirementCategory> requirementCategoryList,
+            ObservableList<Module> moduleList) {
+        super(FXML);
+        requireAllNonNull(requirementCategoryList, moduleList);
+
+        modules = moduleList;
+        requirementCategories.setItems(requirementCategoryList);
+        requirementCategories.setCellFactory(listView -> new RequirementCategoryViewCell());
+    }
+
+    /**
+     * Custom {@code ListCell} that displays the graphics of a {@code RequirementCategory}
+     * using a {@code RequirementCategoryListCard}.
+     */
+    class RequirementCategoryViewCell extends ListCell<RequirementCategory> {
+        @Override
+        protected void updateItem(RequirementCategory requirementCategory, boolean empty) {
+            super.updateItem(requirementCategory, empty);
+
+            if (empty || requirementCategory == null) {
+                setGraphic(null);
+                setText(null);
+            } else {
+                setGraphic(new RequirementCategoryCard(requirementCategory, modules).getRoot());
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/seedu/address/ui/ResultDisplay.java b/src/main/java/pwe/planner/ui/ResultDisplay.java
similarity index 95%
rename from src/main/java/seedu/address/ui/ResultDisplay.java
rename to src/main/java/pwe/planner/ui/ResultDisplay.java
index 7d98e84eedf0..ac1748930609 100644
--- a/src/main/java/seedu/address/ui/ResultDisplay.java
+++ b/src/main/java/pwe/planner/ui/ResultDisplay.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/src/main/java/seedu/address/ui/StatusBarFooter.java b/src/main/java/pwe/planner/ui/StatusBarFooter.java
similarity index 75%
rename from src/main/java/seedu/address/ui/StatusBarFooter.java
rename to src/main/java/pwe/planner/ui/StatusBarFooter.java
index b22e1f525256..874c231ad0ba 100644
--- a/src/main/java/seedu/address/ui/StatusBarFooter.java
+++ b/src/main/java/pwe/planner/ui/StatusBarFooter.java
@@ -1,4 +1,7 @@
-package seedu.address.ui;
+package pwe.planner.ui;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -8,7 +11,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
-import seedu.address.model.ReadOnlyAddressBook;
+import pwe.planner.model.ReadOnlyApplication;
 
 /**
  * A ui for the status bar that is displayed at the footer of the application.
@@ -36,17 +39,22 @@ public class StatusBarFooter extends UiPart<Region> {
     private Label saveLocationStatus;
 
 
-    public StatusBarFooter(Path saveLocation, ReadOnlyAddressBook addressBook) {
+    public StatusBarFooter(Path saveLocation, ReadOnlyApplication application) {
         super(FXML);
-        addressBook.addListener(observable -> updateSyncStatus());
+        requireAllNonNull(saveLocation, application);
+
+        application.addListener(observable -> updateSyncStatus());
         syncStatus.setText(SYNC_STATUS_INITIAL);
-        saveLocationStatus.setText(Paths.get(".").resolve(saveLocation).toString());
+        saveLocationStatus.setText(Paths.get("").toAbsolutePath().relativize(
+                saveLocation.toAbsolutePath()).toString());
     }
 
     /**
      * Sets the clock used to determine the current time.
      */
     public static void setClock(Clock clock) {
+        requireNonNull(clock);
+
         StatusBarFooter.clock = clock;
     }
 
diff --git a/src/main/java/seedu/address/ui/Ui.java b/src/main/java/pwe/planner/ui/Ui.java
similarity index 86%
rename from src/main/java/seedu/address/ui/Ui.java
rename to src/main/java/pwe/planner/ui/Ui.java
index 17aa0b494fe3..9d00c0accf83 100644
--- a/src/main/java/seedu/address/ui/Ui.java
+++ b/src/main/java/pwe/planner/ui/Ui.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import javafx.stage.Stage;
 
diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/pwe/planner/ui/UiManager.java
similarity index 76%
rename from src/main/java/seedu/address/ui/UiManager.java
rename to src/main/java/pwe/planner/ui/UiManager.java
index 876621d79b94..3f080041117b 100644
--- a/src/main/java/seedu/address/ui/UiManager.java
+++ b/src/main/java/pwe/planner/ui/UiManager.java
@@ -1,16 +1,18 @@
-package seedu.address.ui;
+package pwe.planner.ui;
+
+import static java.util.Objects.requireNonNull;
+import static pwe.planner.commons.util.AppUtil.getImage;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.util.logging.Logger;
 
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.image.Image;
 import javafx.stage.Stage;
-import seedu.address.MainApp;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.util.StringUtil;
-import seedu.address.logic.Logic;
+import pwe.planner.commons.core.LogsCenter;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.Logic;
 
 /**
  * The manager of the UI component.
@@ -20,18 +22,22 @@ public class UiManager implements Ui {
     public static final String ALERT_DIALOG_PANE_FIELD_ID = "alertDialogPane";
 
     private static final Logger logger = LogsCenter.getLogger(UiManager.class);
-    private static final String ICON_APPLICATION = "/images/address_book_32.png";
+    private static final String ICON_APPLICATION = "/images/plan_with_ease_32.png";
 
     private Logic logic;
     private MainWindow mainWindow;
 
     public UiManager(Logic logic) {
         super();
+        requireNonNull(logic);
+
         this.logic = logic;
     }
 
     @Override
     public void start(Stage primaryStage) {
+        requireNonNull(primaryStage);
+
         logger.info("Starting UI...");
 
         //Set the application icon.
@@ -48,11 +54,9 @@ public void start(Stage primaryStage) {
         }
     }
 
-    private Image getImage(String imagePath) {
-        return new Image(MainApp.class.getResourceAsStream(imagePath));
-    }
-
     void showAlertDialogAndWait(Alert.AlertType type, String title, String headerText, String contentText) {
+        requireAllNonNull(type, title, headerText, contentText);
+
         showAlertDialogAndWait(mainWindow.getPrimaryStage(), type, title, headerText, contentText);
     }
 
@@ -61,7 +65,12 @@ void showAlertDialogAndWait(Alert.AlertType type, String title, String headerTex
      * This method only returns after the user has closed the alert dialog.
      */
     private static void showAlertDialogAndWait(Stage owner, AlertType type, String title, String headerText,
-                                               String contentText) {
+            String contentText) {
+        assert owner != null;
+        assert type != null;
+        assert title != null;
+        assert headerText != null;
+
         final Alert alert = new Alert(type);
         alert.getDialogPane().getStylesheets().add("view/DarkTheme.css");
         alert.initOwner(owner);
@@ -77,6 +86,9 @@ private static void showAlertDialogAndWait(Stage owner, AlertType type, String t
      * and exits the application after the user has closed the alert dialog.
      */
     private void showFatalErrorDialogAndShutdown(String title, Throwable e) {
+        assert title != null;
+        assert e != null;
+
         logger.severe(title + " " + e.getMessage() + StringUtil.getDetails(e));
         showAlertDialogAndWait(Alert.AlertType.ERROR, title, e.getMessage(), e.toString());
         Platform.exit();
diff --git a/src/main/java/seedu/address/ui/UiPart.java b/src/main/java/pwe/planner/ui/UiPart.java
similarity index 97%
rename from src/main/java/seedu/address/ui/UiPart.java
rename to src/main/java/pwe/planner/ui/UiPart.java
index fc820e01a9c3..05f2cba6c99a 100644
--- a/src/main/java/seedu/address/ui/UiPart.java
+++ b/src/main/java/pwe/planner/ui/UiPart.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static java.util.Objects.requireNonNull;
 
@@ -6,7 +6,7 @@
 import java.net.URL;
 
 import javafx.fxml.FXMLLoader;
-import seedu.address.MainApp;
+import pwe.planner.MainApp;
 
 /**
  * Represents a distinct part of the UI. e.g. Windows, dialogs, panels, status bars, etc.
diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
deleted file mode 100644
index 60369e2074e4..000000000000
--- a/src/main/java/seedu/address/logic/Logic.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package seedu.address.logic;
-
-import java.nio.file.Path;
-
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * API of the Logic component
- */
-public interface Logic {
-    /**
-     * Executes the command and returns the result.
-     * @param commandText The command as entered by the user.
-     * @return the result of the command execution.
-     * @throws CommandException If an error occurs during command execution.
-     * @throws ParseException If an error occurs during parsing.
-     */
-    CommandResult execute(String commandText) throws CommandException, ParseException;
-
-    /**
-     * Returns the AddressBook.
-     *
-     * @see seedu.address.model.Model#getAddressBook()
-     */
-    ReadOnlyAddressBook getAddressBook();
-
-    /** Returns an unmodifiable view of the filtered list of persons */
-    ObservableList<Person> getFilteredPersonList();
-
-    /**
-     * Returns an unmodifiable view of the list of commands entered by the user.
-     * The list is ordered from the least recent command to the most recent command.
-     */
-    ObservableList<String> getHistory();
-
-    /**
-     * Returns the user prefs' address book file path.
-     */
-    Path getAddressBookFilePath();
-
-    /**
-     * Returns the user prefs' GUI settings.
-     */
-    GuiSettings getGuiSettings();
-
-    /**
-     * Set the user prefs' GUI settings.
-     */
-    void setGuiSettings(GuiSettings guiSettings);
-
-    /**
-     * Selected person in the filtered person list.
-     * null if no person is selected.
-     *
-     * @see seedu.address.model.Model#selectedPersonProperty()
-     */
-    ReadOnlyProperty<Person> selectedPersonProperty();
-
-    /**
-     * Sets the selected person in the filtered person list.
-     *
-     * @see seedu.address.model.Model#setSelectedPerson(Person)
-     */
-    void setSelectedPerson(Person person);
-}
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
deleted file mode 100644
index 5cb24a617beb..000000000000
--- a/src/main/java/seedu/address/logic/LogicManager.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package seedu.address.logic;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.logging.Logger;
-
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.AddressBookParser;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.Model;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-import seedu.address.storage.Storage;
-
-/**
- * The main LogicManager of the app.
- */
-public class LogicManager implements Logic {
-    public static final String FILE_OPS_ERROR_MESSAGE = "Could not save data to file: ";
-    private final Logger logger = LogsCenter.getLogger(LogicManager.class);
-
-    private final Model model;
-    private final Storage storage;
-    private final CommandHistory history;
-    private final AddressBookParser addressBookParser;
-    private boolean addressBookModified;
-
-    public LogicManager(Model model, Storage storage) {
-        this.model = model;
-        this.storage = storage;
-        history = new CommandHistory();
-        addressBookParser = new AddressBookParser();
-
-        // Set addressBookModified to true whenever the models' address book is modified.
-        model.getAddressBook().addListener(observable -> addressBookModified = true);
-    }
-
-    @Override
-    public CommandResult execute(String commandText) throws CommandException, ParseException {
-        logger.info("----------------[USER COMMAND][" + commandText + "]");
-        addressBookModified = false;
-
-        CommandResult commandResult;
-        try {
-            Command command = addressBookParser.parseCommand(commandText);
-            commandResult = command.execute(model, history);
-        } finally {
-            history.add(commandText);
-        }
-
-        if (addressBookModified) {
-            logger.info("Address book modified, saving to file.");
-            try {
-                storage.saveAddressBook(model.getAddressBook());
-            } catch (IOException ioe) {
-                throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
-            }
-        }
-
-        return commandResult;
-    }
-
-    @Override
-    public ReadOnlyAddressBook getAddressBook() {
-        return model.getAddressBook();
-    }
-
-    @Override
-    public ObservableList<Person> getFilteredPersonList() {
-        return model.getFilteredPersonList();
-    }
-
-    @Override
-    public ObservableList<String> getHistory() {
-        return history.getHistory();
-    }
-
-    @Override
-    public Path getAddressBookFilePath() {
-        return model.getAddressBookFilePath();
-    }
-
-    @Override
-    public GuiSettings getGuiSettings() {
-        return model.getGuiSettings();
-    }
-
-    @Override
-    public void setGuiSettings(GuiSettings guiSettings) {
-        model.setGuiSettings(guiSettings);
-    }
-
-    @Override
-    public ReadOnlyProperty<Person> selectedPersonProperty() {
-        return model.selectedPersonProperty();
-    }
-
-    @Override
-    public void setSelectedPerson(Person person) {
-        model.setSelectedPerson(person);
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
deleted file mode 100644
index d88e831ff1ce..000000000000
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
-
-/**
- * Adds a person to the address book.
- */
-public class AddCommand extends Command {
-
-    public static final String COMMAND_WORD = "add";
-
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
-            + "Parameters: "
-            + PREFIX_NAME + "NAME "
-            + PREFIX_PHONE + "PHONE "
-            + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_ADDRESS + "ADDRESS "
-            + "[" + PREFIX_TAG + "TAG]...\n"
-            + "Example: " + COMMAND_WORD + " "
-            + PREFIX_NAME + "John Doe "
-            + PREFIX_PHONE + "98765432 "
-            + PREFIX_EMAIL + "johnd@example.com "
-            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
-            + PREFIX_TAG + "friends "
-            + PREFIX_TAG + "owesMoney";
-
-    public static final String MESSAGE_SUCCESS = "New person added: %1$s";
-    public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
-
-    private final Person toAdd;
-
-    /**
-     * Creates an AddCommand to add the specified {@code Person}
-     */
-    public AddCommand(Person person) {
-        requireNonNull(person);
-        toAdd = person;
-    }
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
-        requireNonNull(model);
-
-        if (model.hasPerson(toAdd)) {
-            throw new CommandException(MESSAGE_DUPLICATE_PERSON);
-        }
-
-        model.addPerson(toAdd);
-        model.commitAddressBook();
-        return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof AddCommand // instanceof handles nulls
-                && toAdd.equals(((AddCommand) other).toAdd));
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
deleted file mode 100644
index a22219ad76ad..000000000000
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-
-/**
- * Clears the address book.
- */
-public class ClearCommand extends Command {
-
-    public static final String COMMAND_WORD = "clear";
-    public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
-
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) {
-        requireNonNull(model);
-        model.setAddressBook(new AddressBook());
-        model.commitAddressBook();
-        return new CommandResult(MESSAGE_SUCCESS);
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
deleted file mode 100644
index a20e9d49eac7..000000000000
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
-
-/**
- * Deletes a person identified using it's displayed index from the address book.
- */
-public class DeleteCommand extends Command {
-
-    public static final String COMMAND_WORD = "delete";
-
-    public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Deletes the person identified by the index number used in the displayed person list.\n"
-            + "Parameters: INDEX (must be a positive integer)\n"
-            + "Example: " + COMMAND_WORD + " 1";
-
-    public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
-
-    private final Index targetIndex;
-
-    public DeleteCommand(Index targetIndex) {
-        this.targetIndex = targetIndex;
-    }
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
-        requireNonNull(model);
-        List<Person> lastShownList = model.getFilteredPersonList();
-
-        if (targetIndex.getZeroBased() >= lastShownList.size()) {
-            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-        }
-
-        Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
-        model.deletePerson(personToDelete);
-        model.commitAddressBook();
-        return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, personToDelete));
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof DeleteCommand // instanceof handles nulls
-                && targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
deleted file mode 100644
index 952a9e7e7f2b..000000000000
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.commons.util.CollectionUtil;
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Edits the details of an existing person in the address book.
- */
-public class EditCommand extends Command {
-
-    public static final String COMMAND_WORD = "edit";
-
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
-            + "by the index number used in the displayed person list. "
-            + "Existing values will be overwritten by the input values.\n"
-            + "Parameters: INDEX (must be a positive integer) "
-            + "[" + PREFIX_NAME + "NAME] "
-            + "[" + PREFIX_PHONE + "PHONE] "
-            + "[" + PREFIX_EMAIL + "EMAIL] "
-            + "[" + PREFIX_ADDRESS + "ADDRESS] "
-            + "[" + PREFIX_TAG + "TAG]...\n"
-            + "Example: " + COMMAND_WORD + " 1 "
-            + PREFIX_PHONE + "91234567 "
-            + PREFIX_EMAIL + "johndoe@example.com";
-
-    public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
-    public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
-    public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book.";
-
-    private final Index index;
-    private final EditPersonDescriptor editPersonDescriptor;
-
-    /**
-     * @param index of the person in the filtered person list to edit
-     * @param editPersonDescriptor details to edit the person with
-     */
-    public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
-        requireNonNull(index);
-        requireNonNull(editPersonDescriptor);
-
-        this.index = index;
-        this.editPersonDescriptor = new EditPersonDescriptor(editPersonDescriptor);
-    }
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
-        requireNonNull(model);
-        List<Person> lastShownList = model.getFilteredPersonList();
-
-        if (index.getZeroBased() >= lastShownList.size()) {
-            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-        }
-
-        Person personToEdit = lastShownList.get(index.getZeroBased());
-        Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
-
-        if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
-            throw new CommandException(MESSAGE_DUPLICATE_PERSON);
-        }
-
-        model.setPerson(personToEdit, editedPerson);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-        model.commitAddressBook();
-        return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedPerson));
-    }
-
-    /**
-     * Creates and returns a {@code Person} with the details of {@code personToEdit}
-     * edited with {@code editPersonDescriptor}.
-     */
-    private static Person createEditedPerson(Person personToEdit, EditPersonDescriptor editPersonDescriptor) {
-        assert personToEdit != null;
-
-        Name updatedName = editPersonDescriptor.getName().orElse(personToEdit.getName());
-        Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
-        Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
-        Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
-        Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
-
-        return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        // short circuit if same object
-        if (other == this) {
-            return true;
-        }
-
-        // instanceof handles nulls
-        if (!(other instanceof EditCommand)) {
-            return false;
-        }
-
-        // state check
-        EditCommand e = (EditCommand) other;
-        return index.equals(e.index)
-                && editPersonDescriptor.equals(e.editPersonDescriptor);
-    }
-
-    /**
-     * Stores the details to edit the person with. Each non-empty field value will replace the
-     * corresponding field value of the person.
-     */
-    public static class EditPersonDescriptor {
-        private Name name;
-        private Phone phone;
-        private Email email;
-        private Address address;
-        private Set<Tag> tags;
-
-        public EditPersonDescriptor() {}
-
-        /**
-         * Copy constructor.
-         * A defensive copy of {@code tags} is used internally.
-         */
-        public EditPersonDescriptor(EditPersonDescriptor toCopy) {
-            setName(toCopy.name);
-            setPhone(toCopy.phone);
-            setEmail(toCopy.email);
-            setAddress(toCopy.address);
-            setTags(toCopy.tags);
-        }
-
-        /**
-         * Returns true if at least one field is edited.
-         */
-        public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags);
-        }
-
-        public void setName(Name name) {
-            this.name = name;
-        }
-
-        public Optional<Name> getName() {
-            return Optional.ofNullable(name);
-        }
-
-        public void setPhone(Phone phone) {
-            this.phone = phone;
-        }
-
-        public Optional<Phone> getPhone() {
-            return Optional.ofNullable(phone);
-        }
-
-        public void setEmail(Email email) {
-            this.email = email;
-        }
-
-        public Optional<Email> getEmail() {
-            return Optional.ofNullable(email);
-        }
-
-        public void setAddress(Address address) {
-            this.address = address;
-        }
-
-        public Optional<Address> getAddress() {
-            return Optional.ofNullable(address);
-        }
-
-        /**
-         * Sets {@code tags} to this object's {@code tags}.
-         * A defensive copy of {@code tags} is used internally.
-         */
-        public void setTags(Set<Tag> tags) {
-            this.tags = (tags != null) ? new HashSet<>(tags) : null;
-        }
-
-        /**
-         * Returns an unmodifiable tag set, which throws {@code UnsupportedOperationException}
-         * if modification is attempted.
-         * Returns {@code Optional#empty()} if {@code tags} is null.
-         */
-        public Optional<Set<Tag>> getTags() {
-            return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            // short circuit if same object
-            if (other == this) {
-                return true;
-            }
-
-            // instanceof handles nulls
-            if (!(other instanceof EditPersonDescriptor)) {
-                return false;
-            }
-
-            // state check
-            EditPersonDescriptor e = (EditPersonDescriptor) other;
-
-            return getName().equals(e.getName())
-                    && getPhone().equals(e.getPhone())
-                    && getEmail().equals(e.getEmail())
-                    && getAddress().equals(e.getAddress())
-                    && getTags().equals(e.getTags());
-        }
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/FindCommand.java b/src/main/java/seedu/address/logic/commands/FindCommand.java
deleted file mode 100644
index beb178e3a3f5..000000000000
--- a/src/main/java/seedu/address/logic/commands/FindCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-/**
- * Finds and lists all persons in address book whose name contains any of the argument keywords.
- * Keyword matching is case insensitive.
- */
-public class FindCommand extends Command {
-
-    public static final String COMMAND_WORD = "find";
-
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of "
-            + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
-            + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
-            + "Example: " + COMMAND_WORD + " alice bob charlie";
-
-    private final NameContainsKeywordsPredicate predicate;
-
-    public FindCommand(NameContainsKeywordsPredicate predicate) {
-        this.predicate = predicate;
-    }
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) {
-        requireNonNull(model);
-        model.updateFilteredPersonList(predicate);
-        return new CommandResult(
-                String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size()));
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof FindCommand // instanceof handles nulls
-                && predicate.equals(((FindCommand) other).predicate)); // state check
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/seedu/address/logic/commands/ListCommand.java
deleted file mode 100644
index 6d44824c7d1b..000000000000
--- a/src/main/java/seedu/address/logic/commands/ListCommand.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-
-/**
- * Lists all persons in the address book to the user.
- */
-public class ListCommand extends Command {
-
-    public static final String COMMAND_WORD = "list";
-
-    public static final String MESSAGE_SUCCESS = "Listed all persons";
-
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) {
-        requireNonNull(model);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-        return new CommandResult(MESSAGE_SUCCESS);
-    }
-}
diff --git a/src/main/java/seedu/address/logic/commands/SelectCommand.java b/src/main/java/seedu/address/logic/commands/SelectCommand.java
deleted file mode 100644
index baa3c1f30bb4..000000000000
--- a/src/main/java/seedu/address/logic/commands/SelectCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
-
-/**
- * Selects a person identified using it's displayed index from the address book.
- */
-public class SelectCommand extends Command {
-
-    public static final String COMMAND_WORD = "select";
-
-    public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Selects the person identified by the index number used in the displayed person list.\n"
-            + "Parameters: INDEX (must be a positive integer)\n"
-            + "Example: " + COMMAND_WORD + " 1";
-
-    public static final String MESSAGE_SELECT_PERSON_SUCCESS = "Selected Person: %1$s";
-
-    private final Index targetIndex;
-
-    public SelectCommand(Index targetIndex) {
-        this.targetIndex = targetIndex;
-    }
-
-    @Override
-    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
-        requireNonNull(model);
-
-        List<Person> filteredPersonList = model.getFilteredPersonList();
-
-        if (targetIndex.getZeroBased() >= filteredPersonList.size()) {
-            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-        }
-
-        model.setSelectedPerson(filteredPersonList.get(targetIndex.getZeroBased()));
-        return new CommandResult(String.format(MESSAGE_SELECT_PERSON_SUCCESS, targetIndex.getOneBased()));
-
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof SelectCommand // instanceof handles nulls
-                && targetIndex.equals(((SelectCommand) other).targetIndex)); // state check
-    }
-}
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
deleted file mode 100644
index 3b8bfa035e83..000000000000
--- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import java.util.Set;
-import java.util.stream.Stream;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Parses input arguments and creates a new AddCommand object
- */
-public class AddCommandParser implements Parser<AddCommand> {
-
-    /**
-     * Parses the given {@code String} of arguments in the context of the AddCommand
-     * and returns an AddCommand object for execution.
-     * @throws ParseException if the user input does not conform the expected format
-     */
-    public AddCommand parse(String args) throws ParseException {
-        ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
-
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE, PREFIX_EMAIL)
-                || !argMultimap.getPreamble().isEmpty()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
-        }
-
-        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
-        Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
-        Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
-
-        Person person = new Person(name, phone, email, address, tagList);
-
-        return new AddCommand(person);
-    }
-
-    /**
-     * Returns true if none of the prefixes contains empty {@code Optional} values in the given
-     * {@code ArgumentMultimap}.
-     */
-    private static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
-        return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
-    }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
deleted file mode 100644
index b7d57f5db86a..000000000000
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.ExitCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.HistoryCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-
-/**
- * Parses user input.
- */
-public class AddressBookParser {
-
-    /**
-     * Used for initial separation of command word and args.
-     */
-    private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");
-
-    /**
-     * Parses user input into command for execution.
-     *
-     * @param userInput full user input string
-     * @return the command based on the user input
-     * @throws ParseException if the user input does not conform the expected format
-     */
-    public Command parseCommand(String userInput) throws ParseException {
-        final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
-        if (!matcher.matches()) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
-        }
-
-        final String commandWord = matcher.group("commandWord");
-        final String arguments = matcher.group("arguments");
-        switch (commandWord) {
-
-        case AddCommand.COMMAND_WORD:
-            return new AddCommandParser().parse(arguments);
-
-        case EditCommand.COMMAND_WORD:
-            return new EditCommandParser().parse(arguments);
-
-        case SelectCommand.COMMAND_WORD:
-            return new SelectCommandParser().parse(arguments);
-
-        case DeleteCommand.COMMAND_WORD:
-            return new DeleteCommandParser().parse(arguments);
-
-        case ClearCommand.COMMAND_WORD:
-            return new ClearCommand();
-
-        case FindCommand.COMMAND_WORD:
-            return new FindCommandParser().parse(arguments);
-
-        case ListCommand.COMMAND_WORD:
-            return new ListCommand();
-
-        case HistoryCommand.COMMAND_WORD:
-            return new HistoryCommand();
-
-        case ExitCommand.COMMAND_WORD:
-            return new ExitCommand();
-
-        case HelpCommand.COMMAND_WORD:
-            return new HelpCommand();
-
-        case UndoCommand.COMMAND_WORD:
-            return new UndoCommand();
-
-        case RedoCommand.COMMAND_WORD:
-            return new RedoCommand();
-
-        default:
-            throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
-        }
-    }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
deleted file mode 100644
index 75b1a9bf1190..000000000000
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package seedu.address.logic.parser;
-
-/**
- * Contains Command Line Interface (CLI) syntax definitions common to multiple commands
- */
-public class CliSyntax {
-
-    /* Prefix definitions */
-    public static final Prefix PREFIX_NAME = new Prefix("n/");
-    public static final Prefix PREFIX_PHONE = new Prefix("p/");
-    public static final Prefix PREFIX_EMAIL = new Prefix("e/");
-    public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
-    public static final Prefix PREFIX_TAG = new Prefix("t/");
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java b/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
deleted file mode 100644
index 4d1f4bb0e4ec..000000000000
--- a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-
-/**
- * Parses input arguments and creates a new DeleteCommand object
- */
-public class DeleteCommandParser implements Parser<DeleteCommand> {
-
-    /**
-     * Parses the given {@code String} of arguments in the context of the DeleteCommand
-     * and returns an DeleteCommand object for execution.
-     * @throws ParseException if the user input does not conform the expected format
-     */
-    public DeleteCommand parse(String args) throws ParseException {
-        try {
-            Index index = ParserUtil.parseIndex(args);
-            return new DeleteCommand(index);
-        } catch (ParseException pe) {
-            throw new ParseException(
-                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), pe);
-        }
-    }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
deleted file mode 100644
index 845644b7dea1..000000000000
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package seedu.address.logic.parser;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.Set;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.tag.Tag;
-
-/**
- * Parses input arguments and creates a new EditCommand object
- */
-public class EditCommandParser implements Parser<EditCommand> {
-
-    /**
-     * Parses the given {@code String} of arguments in the context of the EditCommand
-     * and returns an EditCommand object for execution.
-     * @throws ParseException if the user input does not conform the expected format
-     */
-    public EditCommand parse(String args) throws ParseException {
-        requireNonNull(args);
-        ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
-
-        Index index;
-
-        try {
-            index = ParserUtil.parseIndex(argMultimap.getPreamble());
-        } catch (ParseException pe) {
-            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
-        }
-
-        EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
-        if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
-            editPersonDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
-        }
-        if (argMultimap.getValue(PREFIX_PHONE).isPresent()) {
-            editPersonDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
-        }
-        if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
-            editPersonDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
-        }
-        if (argMultimap.getValue(PREFIX_ADDRESS).isPresent()) {
-            editPersonDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
-        }
-        parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
-
-        if (!editPersonDescriptor.isAnyFieldEdited()) {
-            throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
-        }
-
-        return new EditCommand(index, editPersonDescriptor);
-    }
-
-    /**
-     * Parses {@code Collection<String> tags} into a {@code Set<Tag>} if {@code tags} is non-empty.
-     * If {@code tags} contain only one element which is an empty string, it will be parsed into a
-     * {@code Set<Tag>} containing zero tags.
-     */
-    private Optional<Set<Tag>> parseTagsForEdit(Collection<String> tags) throws ParseException {
-        assert tags != null;
-
-        if (tags.isEmpty()) {
-            return Optional.empty();
-        }
-        Collection<String> tagSet = tags.size() == 1 && tags.contains("") ? Collections.emptySet() : tags;
-        return Optional.of(ParserUtil.parseTags(tagSet));
-    }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/FindCommandParser.java b/src/main/java/seedu/address/logic/parser/FindCommandParser.java
deleted file mode 100644
index b186a967cb94..000000000000
--- a/src/main/java/seedu/address/logic/parser/FindCommandParser.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-
-import java.util.Arrays;
-
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-/**
- * Parses input arguments and creates a new FindCommand object
- */
-public class FindCommandParser implements Parser<FindCommand> {
-
-    /**
-     * Parses the given {@code String} of arguments in the context of the FindCommand
-     * and returns an FindCommand object for execution.
-     * @throws ParseException if the user input does not conform the expected format
-     */
-    public FindCommand parse(String args) throws ParseException {
-        String trimmedArgs = args.trim();
-        if (trimmedArgs.isEmpty()) {
-            throw new ParseException(
-                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
-        }
-
-        String[] nameKeywords = trimmedArgs.split("\\s+");
-
-        return new FindCommand(new NameContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
-    }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
deleted file mode 100644
index b117acb9c55b..000000000000
--- a/src/main/java/seedu/address/logic/parser/ParserUtil.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package seedu.address.logic.parser;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.commons.util.StringUtil;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Contains utility methods used for parsing strings in the various *Parser classes.
- */
-public class ParserUtil {
-
-    public static final String MESSAGE_INVALID_INDEX = "Index is not a non-zero unsigned integer.";
-
-    /**
-     * Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
-     * trimmed.
-     * @throws ParseException if the specified index is invalid (not non-zero unsigned integer).
-     */
-    public static Index parseIndex(String oneBasedIndex) throws ParseException {
-        String trimmedIndex = oneBasedIndex.trim();
-        if (!StringUtil.isNonZeroUnsignedInteger(trimmedIndex)) {
-            throw new ParseException(MESSAGE_INVALID_INDEX);
-        }
-        return Index.fromOneBased(Integer.parseInt(trimmedIndex));
-    }
-
-    /**
-     * Parses a {@code String name} into a {@code Name}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code name} is invalid.
-     */
-    public static Name parseName(String name) throws ParseException {
-        requireNonNull(name);
-        String trimmedName = name.trim();
-        if (!Name.isValidName(trimmedName)) {
-            throw new ParseException(Name.MESSAGE_CONSTRAINTS);
-        }
-        return new Name(trimmedName);
-    }
-
-    /**
-     * Parses a {@code String phone} into a {@code Phone}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code phone} is invalid.
-     */
-    public static Phone parsePhone(String phone) throws ParseException {
-        requireNonNull(phone);
-        String trimmedPhone = phone.trim();
-        if (!Phone.isValidPhone(trimmedPhone)) {
-            throw new ParseException(Phone.MESSAGE_CONSTRAINTS);
-        }
-        return new Phone(trimmedPhone);
-    }
-
-    /**
-     * Parses a {@code String address} into an {@code Address}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code address} is invalid.
-     */
-    public static Address parseAddress(String address) throws ParseException {
-        requireNonNull(address);
-        String trimmedAddress = address.trim();
-        if (!Address.isValidAddress(trimmedAddress)) {
-            throw new ParseException(Address.MESSAGE_CONSTRAINTS);
-        }
-        return new Address(trimmedAddress);
-    }
-
-    /**
-     * Parses a {@code String email} into an {@code Email}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code email} is invalid.
-     */
-    public static Email parseEmail(String email) throws ParseException {
-        requireNonNull(email);
-        String trimmedEmail = email.trim();
-        if (!Email.isValidEmail(trimmedEmail)) {
-            throw new ParseException(Email.MESSAGE_CONSTRAINTS);
-        }
-        return new Email(trimmedEmail);
-    }
-
-    /**
-     * Parses a {@code String tag} into a {@code Tag}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code tag} is invalid.
-     */
-    public static Tag parseTag(String tag) throws ParseException {
-        requireNonNull(tag);
-        String trimmedTag = tag.trim();
-        if (!Tag.isValidTagName(trimmedTag)) {
-            throw new ParseException(Tag.MESSAGE_CONSTRAINTS);
-        }
-        return new Tag(trimmedTag);
-    }
-
-    /**
-     * Parses {@code Collection<String> tags} into a {@code Set<Tag>}.
-     */
-    public static Set<Tag> parseTags(Collection<String> tags) throws ParseException {
-        requireNonNull(tags);
-        final Set<Tag> tagSet = new HashSet<>();
-        for (String tagName : tags) {
-            tagSet.add(parseTag(tagName));
-        }
-        return tagSet;
-    }
-}
diff --git a/src/main/java/seedu/address/logic/parser/SelectCommandParser.java b/src/main/java/seedu/address/logic/parser/SelectCommandParser.java
deleted file mode 100644
index 565b7f04bfe1..000000000000
--- a/src/main/java/seedu/address/logic/parser/SelectCommandParser.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-
-/**
- * Parses input arguments and creates a new SelectCommand object
- */
-public class SelectCommandParser implements Parser<SelectCommand> {
-
-    /**
-     * Parses the given {@code String} of arguments in the context of the SelectCommand
-     * and returns an SelectCommand object for execution.
-     * @throws ParseException if the user input does not conform the expected format
-     */
-    public SelectCommand parse(String args) throws ParseException {
-        try {
-            Index index = ParserUtil.parseIndex(args);
-            return new SelectCommand(index);
-        } catch (ParseException pe) {
-            throw new ParseException(
-                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, SelectCommand.MESSAGE_USAGE), pe);
-        }
-    }
-}
diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
deleted file mode 100644
index 30557cf81ee7..000000000000
--- a/src/main/java/seedu/address/model/AddressBook.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package seedu.address.model;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import javafx.beans.InvalidationListener;
-import javafx.collections.ObservableList;
-import seedu.address.commons.util.InvalidationListenerManager;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.UniquePersonList;
-
-/**
- * Wraps all data at the address-book level
- * Duplicates are not allowed (by .isSamePerson comparison)
- */
-public class AddressBook implements ReadOnlyAddressBook {
-
-    private final UniquePersonList persons;
-    private final InvalidationListenerManager invalidationListenerManager = new InvalidationListenerManager();
-
-    /*
-     * The 'unusual' code block below is an non-static initialization block, sometimes used to avoid duplication
-     * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
-     *
-     * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
-     *   among constructors.
-     */
-    {
-        persons = new UniquePersonList();
-    }
-
-    public AddressBook() {}
-
-    /**
-     * Creates an AddressBook using the Persons in the {@code toBeCopied}
-     */
-    public AddressBook(ReadOnlyAddressBook toBeCopied) {
-        this();
-        resetData(toBeCopied);
-    }
-
-    //// list overwrite operations
-
-    /**
-     * Replaces the contents of the person list with {@code persons}.
-     * {@code persons} must not contain duplicate persons.
-     */
-    public void setPersons(List<Person> persons) {
-        this.persons.setPersons(persons);
-        indicateModified();
-    }
-
-    /**
-     * Resets the existing data of this {@code AddressBook} with {@code newData}.
-     */
-    public void resetData(ReadOnlyAddressBook newData) {
-        requireNonNull(newData);
-
-        setPersons(newData.getPersonList());
-    }
-
-    //// person-level operations
-
-    /**
-     * Returns true if a person with the same identity as {@code person} exists in the address book.
-     */
-    public boolean hasPerson(Person person) {
-        requireNonNull(person);
-        return persons.contains(person);
-    }
-
-    /**
-     * Adds a person to the address book.
-     * The person must not already exist in the address book.
-     */
-    public void addPerson(Person p) {
-        persons.add(p);
-        indicateModified();
-    }
-
-    /**
-     * Replaces the given person {@code target} in the list with {@code editedPerson}.
-     * {@code target} must exist in the address book.
-     * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
-     */
-    public void setPerson(Person target, Person editedPerson) {
-        requireNonNull(editedPerson);
-
-        persons.setPerson(target, editedPerson);
-        indicateModified();
-    }
-
-    /**
-     * Removes {@code key} from this {@code AddressBook}.
-     * {@code key} must exist in the address book.
-     */
-    public void removePerson(Person key) {
-        persons.remove(key);
-        indicateModified();
-    }
-
-    @Override
-    public void addListener(InvalidationListener listener) {
-        invalidationListenerManager.addListener(listener);
-    }
-
-    @Override
-    public void removeListener(InvalidationListener listener) {
-        invalidationListenerManager.removeListener(listener);
-    }
-
-    /**
-     * Notifies listeners that the address book has been modified.
-     */
-    protected void indicateModified() {
-        invalidationListenerManager.callListeners(this);
-    }
-
-    //// util methods
-
-    @Override
-    public String toString() {
-        return persons.asUnmodifiableObservableList().size() + " persons";
-        // TODO: refine later
-    }
-
-    @Override
-    public ObservableList<Person> getPersonList() {
-        return persons.asUnmodifiableObservableList();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof AddressBook // instanceof handles nulls
-                && persons.equals(((AddressBook) other).persons));
-    }
-
-    @Override
-    public int hashCode() {
-        return persons.hashCode();
-    }
-}
diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
deleted file mode 100644
index e857533821b6..000000000000
--- a/src/main/java/seedu/address/model/Model.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package seedu.address.model;
-
-import java.nio.file.Path;
-import java.util.function.Predicate;
-
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.Person;
-
-/**
- * The API of the Model component.
- */
-public interface Model {
-    /** {@code Predicate} that always evaluate to true */
-    Predicate<Person> PREDICATE_SHOW_ALL_PERSONS = unused -> true;
-
-    /**
-     * Replaces user prefs data with the data in {@code userPrefs}.
-     */
-    void setUserPrefs(ReadOnlyUserPrefs userPrefs);
-
-    /**
-     * Returns the user prefs.
-     */
-    ReadOnlyUserPrefs getUserPrefs();
-
-    /**
-     * Returns the user prefs' GUI settings.
-     */
-    GuiSettings getGuiSettings();
-
-    /**
-     * Sets the user prefs' GUI settings.
-     */
-    void setGuiSettings(GuiSettings guiSettings);
-
-    /**
-     * Returns the user prefs' address book file path.
-     */
-    Path getAddressBookFilePath();
-
-    /**
-     * Sets the user prefs' address book file path.
-     */
-    void setAddressBookFilePath(Path addressBookFilePath);
-
-    /**
-     * Replaces address book data with the data in {@code addressBook}.
-     */
-    void setAddressBook(ReadOnlyAddressBook addressBook);
-
-    /** Returns the AddressBook */
-    ReadOnlyAddressBook getAddressBook();
-
-    /**
-     * Returns true if a person with the same identity as {@code person} exists in the address book.
-     */
-    boolean hasPerson(Person person);
-
-    /**
-     * Deletes the given person.
-     * The person must exist in the address book.
-     */
-    void deletePerson(Person target);
-
-    /**
-     * Adds the given person.
-     * {@code person} must not already exist in the address book.
-     */
-    void addPerson(Person person);
-
-    /**
-     * Replaces the given person {@code target} with {@code editedPerson}.
-     * {@code target} must exist in the address book.
-     * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
-     */
-    void setPerson(Person target, Person editedPerson);
-
-    /** Returns an unmodifiable view of the filtered person list */
-    ObservableList<Person> getFilteredPersonList();
-
-    /**
-     * Updates the filter of the filtered person list to filter by the given {@code predicate}.
-     * @throws NullPointerException if {@code predicate} is null.
-     */
-    void updateFilteredPersonList(Predicate<Person> predicate);
-
-    /**
-     * Returns true if the model has previous address book states to restore.
-     */
-    boolean canUndoAddressBook();
-
-    /**
-     * Returns true if the model has undone address book states to restore.
-     */
-    boolean canRedoAddressBook();
-
-    /**
-     * Restores the model's address book to its previous state.
-     */
-    void undoAddressBook();
-
-    /**
-     * Restores the model's address book to its previously undone state.
-     */
-    void redoAddressBook();
-
-    /**
-     * Saves the current address book state for undo/redo.
-     */
-    void commitAddressBook();
-
-    /**
-     * Selected person in the filtered person list.
-     * null if no person is selected.
-     */
-    ReadOnlyProperty<Person> selectedPersonProperty();
-
-    /**
-     * Returns the selected person in the filtered person list.
-     * null if no person is selected.
-     */
-    Person getSelectedPerson();
-
-    /**
-     * Sets the selected person in the filtered person list.
-     */
-    void setSelectedPerson(Person person);
-}
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
deleted file mode 100644
index b56806232814..000000000000
--- a/src/main/java/seedu/address/model/ModelManager.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package seedu.address.model;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.nio.file.Path;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.logging.Logger;
-
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.transformation.FilteredList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-
-/**
- * Represents the in-memory model of the address book data.
- */
-public class ModelManager implements Model {
-    private static final Logger logger = LogsCenter.getLogger(ModelManager.class);
-
-    private final VersionedAddressBook versionedAddressBook;
-    private final UserPrefs userPrefs;
-    private final FilteredList<Person> filteredPersons;
-    private final SimpleObjectProperty<Person> selectedPerson = new SimpleObjectProperty<>();
-
-    /**
-     * Initializes a ModelManager with the given addressBook and userPrefs.
-     */
-    public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs) {
-        super();
-        requireAllNonNull(addressBook, userPrefs);
-
-        logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
-
-        versionedAddressBook = new VersionedAddressBook(addressBook);
-        this.userPrefs = new UserPrefs(userPrefs);
-        filteredPersons = new FilteredList<>(versionedAddressBook.getPersonList());
-        filteredPersons.addListener(this::ensureSelectedPersonIsValid);
-    }
-
-    public ModelManager() {
-        this(new AddressBook(), new UserPrefs());
-    }
-
-    //=========== UserPrefs ==================================================================================
-
-    @Override
-    public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
-        requireNonNull(userPrefs);
-        this.userPrefs.resetData(userPrefs);
-    }
-
-    @Override
-    public ReadOnlyUserPrefs getUserPrefs() {
-        return userPrefs;
-    }
-
-    @Override
-    public GuiSettings getGuiSettings() {
-        return userPrefs.getGuiSettings();
-    }
-
-    @Override
-    public void setGuiSettings(GuiSettings guiSettings) {
-        requireNonNull(guiSettings);
-        userPrefs.setGuiSettings(guiSettings);
-    }
-
-    @Override
-    public Path getAddressBookFilePath() {
-        return userPrefs.getAddressBookFilePath();
-    }
-
-    @Override
-    public void setAddressBookFilePath(Path addressBookFilePath) {
-        requireNonNull(addressBookFilePath);
-        userPrefs.setAddressBookFilePath(addressBookFilePath);
-    }
-
-    //=========== AddressBook ================================================================================
-
-    @Override
-    public void setAddressBook(ReadOnlyAddressBook addressBook) {
-        versionedAddressBook.resetData(addressBook);
-    }
-
-    @Override
-    public ReadOnlyAddressBook getAddressBook() {
-        return versionedAddressBook;
-    }
-
-    @Override
-    public boolean hasPerson(Person person) {
-        requireNonNull(person);
-        return versionedAddressBook.hasPerson(person);
-    }
-
-    @Override
-    public void deletePerson(Person target) {
-        versionedAddressBook.removePerson(target);
-    }
-
-    @Override
-    public void addPerson(Person person) {
-        versionedAddressBook.addPerson(person);
-        updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-    }
-
-    @Override
-    public void setPerson(Person target, Person editedPerson) {
-        requireAllNonNull(target, editedPerson);
-
-        versionedAddressBook.setPerson(target, editedPerson);
-    }
-
-    //=========== Filtered Person List Accessors =============================================================
-
-    /**
-     * Returns an unmodifiable view of the list of {@code Person} backed by the internal list of
-     * {@code versionedAddressBook}
-     */
-    @Override
-    public ObservableList<Person> getFilteredPersonList() {
-        return filteredPersons;
-    }
-
-    @Override
-    public void updateFilteredPersonList(Predicate<Person> predicate) {
-        requireNonNull(predicate);
-        filteredPersons.setPredicate(predicate);
-    }
-
-    //=========== Undo/Redo =================================================================================
-
-    @Override
-    public boolean canUndoAddressBook() {
-        return versionedAddressBook.canUndo();
-    }
-
-    @Override
-    public boolean canRedoAddressBook() {
-        return versionedAddressBook.canRedo();
-    }
-
-    @Override
-    public void undoAddressBook() {
-        versionedAddressBook.undo();
-    }
-
-    @Override
-    public void redoAddressBook() {
-        versionedAddressBook.redo();
-    }
-
-    @Override
-    public void commitAddressBook() {
-        versionedAddressBook.commit();
-    }
-
-    //=========== Selected person ===========================================================================
-
-    @Override
-    public ReadOnlyProperty<Person> selectedPersonProperty() {
-        return selectedPerson;
-    }
-
-    @Override
-    public Person getSelectedPerson() {
-        return selectedPerson.getValue();
-    }
-
-    @Override
-    public void setSelectedPerson(Person person) {
-        if (person != null && !filteredPersons.contains(person)) {
-            throw new PersonNotFoundException();
-        }
-        selectedPerson.setValue(person);
-    }
-
-    /**
-     * Ensures {@code selectedPerson} is a valid person in {@code filteredPersons}.
-     */
-    private void ensureSelectedPersonIsValid(ListChangeListener.Change<? extends Person> change) {
-        while (change.next()) {
-            if (selectedPerson.getValue() == null) {
-                // null is always a valid selected person, so we do not need to check that it is valid anymore.
-                return;
-            }
-
-            boolean wasSelectedPersonReplaced = change.wasReplaced() && change.getAddedSize() == change.getRemovedSize()
-                    && change.getRemoved().contains(selectedPerson.getValue());
-            if (wasSelectedPersonReplaced) {
-                // Update selectedPerson to its new value.
-                int index = change.getRemoved().indexOf(selectedPerson.getValue());
-                selectedPerson.setValue(change.getAddedSubList().get(index));
-                continue;
-            }
-
-            boolean wasSelectedPersonRemoved = change.getRemoved().stream()
-                    .anyMatch(removedPerson -> selectedPerson.getValue().isSamePerson(removedPerson));
-            if (wasSelectedPersonRemoved) {
-                // Select the person that came before it in the list,
-                // or clear the selection if there is no such person.
-                selectedPerson.setValue(change.getFrom() > 0 ? change.getList().get(change.getFrom() - 1) : null);
-            }
-        }
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        // short circuit if same object
-        if (obj == this) {
-            return true;
-        }
-
-        // instanceof handles nulls
-        if (!(obj instanceof ModelManager)) {
-            return false;
-        }
-
-        // state check
-        ModelManager other = (ModelManager) obj;
-        return versionedAddressBook.equals(other.versionedAddressBook)
-                && userPrefs.equals(other.userPrefs)
-                && filteredPersons.equals(other.filteredPersons)
-                && Objects.equals(selectedPerson.get(), other.selectedPerson.get());
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
deleted file mode 100644
index 6a301434b33b..000000000000
--- a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package seedu.address.model;
-
-import javafx.beans.Observable;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-
-/**
- * Unmodifiable view of an address book
- */
-public interface ReadOnlyAddressBook extends Observable {
-
-    /**
-     * Returns an unmodifiable view of the persons list.
-     * This list will not contain any duplicate persons.
-     */
-    ObservableList<Person> getPersonList();
-
-}
diff --git a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java b/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
deleted file mode 100644
index befd58a4c739..000000000000
--- a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package seedu.address.model;
-
-import java.nio.file.Path;
-
-import seedu.address.commons.core.GuiSettings;
-
-/**
- * Unmodifiable view of user prefs.
- */
-public interface ReadOnlyUserPrefs {
-
-    GuiSettings getGuiSettings();
-
-    Path getAddressBookFilePath();
-
-}
diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/seedu/address/model/UserPrefs.java
deleted file mode 100644
index 25a5fd6eab9e..000000000000
--- a/src/main/java/seedu/address/model/UserPrefs.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package seedu.address.model;
-
-import static java.util.Objects.requireNonNull;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-
-import seedu.address.commons.core.GuiSettings;
-
-/**
- * Represents User's preferences.
- */
-public class UserPrefs implements ReadOnlyUserPrefs {
-
-    private GuiSettings guiSettings = new GuiSettings();
-    private Path addressBookFilePath = Paths.get("data" , "addressbook.json");
-
-    /**
-     * Creates a {@code UserPrefs} with default values.
-     */
-    public UserPrefs() {}
-
-    /**
-     * Creates a {@code UserPrefs} with the prefs in {@code userPrefs}.
-     */
-    public UserPrefs(ReadOnlyUserPrefs userPrefs) {
-        this();
-        resetData(userPrefs);
-    }
-
-    /**
-     * Resets the existing data of this {@code UserPrefs} with {@code newUserPrefs}.
-     */
-    public void resetData(ReadOnlyUserPrefs newUserPrefs) {
-        requireNonNull(newUserPrefs);
-        setGuiSettings(newUserPrefs.getGuiSettings());
-        setAddressBookFilePath(newUserPrefs.getAddressBookFilePath());
-    }
-
-    public GuiSettings getGuiSettings() {
-        return guiSettings;
-    }
-
-    public void setGuiSettings(GuiSettings guiSettings) {
-        requireNonNull(guiSettings);
-        this.guiSettings = guiSettings;
-    }
-
-    public Path getAddressBookFilePath() {
-        return addressBookFilePath;
-    }
-
-    public void setAddressBookFilePath(Path addressBookFilePath) {
-        requireNonNull(addressBookFilePath);
-        this.addressBookFilePath = addressBookFilePath;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if (!(other instanceof UserPrefs)) { //this handles null as well.
-            return false;
-        }
-
-        UserPrefs o = (UserPrefs) other;
-
-        return guiSettings.equals(o.guiSettings)
-                && addressBookFilePath.equals(o.addressBookFilePath);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(guiSettings, addressBookFilePath);
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Gui Settings : " + guiSettings);
-        sb.append("\nLocal data file location : " + addressBookFilePath);
-        return sb.toString();
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Address.java b/src/main/java/seedu/address/model/person/Address.java
deleted file mode 100644
index 60472ca22a09..000000000000
--- a/src/main/java/seedu/address/model/person/Address.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's address in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidAddress(String)}
- */
-public class Address {
-
-    public static final String MESSAGE_CONSTRAINTS = "Addresses can take any values, and it should not be blank";
-
-    /*
-     * The first character of the address must not be a whitespace,
-     * otherwise " " (a blank string) becomes a valid input.
-     */
-    public static final String VALIDATION_REGEX = "[^\\s].*";
-
-    public final String value;
-
-    /**
-     * Constructs an {@code Address}.
-     *
-     * @param address A valid address.
-     */
-    public Address(String address) {
-        requireNonNull(address);
-        checkArgument(isValidAddress(address), MESSAGE_CONSTRAINTS);
-        value = address;
-    }
-
-    /**
-     * Returns true if a given string is a valid email.
-     */
-    public static boolean isValidAddress(String test) {
-        return test.matches(VALIDATION_REGEX);
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof Address // instanceof handles nulls
-                && value.equals(((Address) other).value)); // state check
-    }
-
-    @Override
-    public int hashCode() {
-        return value.hashCode();
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Email.java b/src/main/java/seedu/address/model/person/Email.java
deleted file mode 100644
index a5bbe0b6a5fc..000000000000
--- a/src/main/java/seedu/address/model/person/Email.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's email in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidEmail(String)}
- */
-public class Email {
-
-    private static final String SPECIAL_CHARACTERS = "!#$%&'*+/=?`{|}~^.-";
-    public static final String MESSAGE_CONSTRAINTS = "Emails should be of the format local-part@domain "
-            + "and adhere to the following constraints:\n"
-            + "1. The local-part should only contain alphanumeric characters and these special characters, excluding "
-            + "the parentheses, (" + SPECIAL_CHARACTERS + ") .\n"
-            + "2. This is followed by a '@' and then a domain name. "
-            + "The domain name must:\n"
-            + "    - be at least 2 characters long\n"
-            + "    - start and end with alphanumeric characters\n"
-            + "    - consist of alphanumeric characters, a period or a hyphen for the characters in between, if any.";
-    // alphanumeric and special characters
-    private static final String LOCAL_PART_REGEX = "^[\\w" + SPECIAL_CHARACTERS + "]+";
-    private static final String DOMAIN_FIRST_CHARACTER_REGEX = "[^\\W_]"; // alphanumeric characters except underscore
-    private static final String DOMAIN_MIDDLE_REGEX = "[a-zA-Z0-9.-]*"; // alphanumeric, period and hyphen
-    private static final String DOMAIN_LAST_CHARACTER_REGEX = "[^\\W_]$";
-    public static final String VALIDATION_REGEX = LOCAL_PART_REGEX + "@"
-            + DOMAIN_FIRST_CHARACTER_REGEX + DOMAIN_MIDDLE_REGEX + DOMAIN_LAST_CHARACTER_REGEX;
-
-    public final String value;
-
-    /**
-     * Constructs an {@code Email}.
-     *
-     * @param email A valid email address.
-     */
-    public Email(String email) {
-        requireNonNull(email);
-        checkArgument(isValidEmail(email), MESSAGE_CONSTRAINTS);
-        value = email;
-    }
-
-    /**
-     * Returns if a given string is a valid email.
-     */
-    public static boolean isValidEmail(String test) {
-        return test.matches(VALIDATION_REGEX);
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof Email // instanceof handles nulls
-                && value.equals(((Email) other).value)); // state check
-    }
-
-    @Override
-    public int hashCode() {
-        return value.hashCode();
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java
deleted file mode 100644
index c9b5868427ca..000000000000
--- a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package seedu.address.model.person;
-
-import java.util.List;
-import java.util.function.Predicate;
-
-import seedu.address.commons.util.StringUtil;
-
-/**
- * Tests that a {@code Person}'s {@code Name} matches any of the keywords given.
- */
-public class NameContainsKeywordsPredicate implements Predicate<Person> {
-    private final List<String> keywords;
-
-    public NameContainsKeywordsPredicate(List<String> keywords) {
-        this.keywords = keywords;
-    }
-
-    @Override
-    public boolean test(Person person) {
-        return keywords.stream()
-                .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(person.getName().fullName, keyword));
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof NameContainsKeywordsPredicate // instanceof handles nulls
-                && keywords.equals(((NameContainsKeywordsPredicate) other).keywords)); // state check
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
deleted file mode 100644
index 557a7a60cd51..000000000000
--- a/src/main/java/seedu/address/model/person/Person.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package seedu.address.model.person;
-
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import seedu.address.model.tag.Tag;
-
-/**
- * Represents a Person in the address book.
- * Guarantees: details are present and not null, field values are validated, immutable.
- */
-public class Person {
-
-    // Identity fields
-    private final Name name;
-    private final Phone phone;
-    private final Email email;
-
-    // Data fields
-    private final Address address;
-    private final Set<Tag> tags = new HashSet<>();
-
-    /**
-     * Every field must be present and not null.
-     */
-    public Person(Name name, Phone phone, Email email, Address address, Set<Tag> tags) {
-        requireAllNonNull(name, phone, email, address, tags);
-        this.name = name;
-        this.phone = phone;
-        this.email = email;
-        this.address = address;
-        this.tags.addAll(tags);
-    }
-
-    public Name getName() {
-        return name;
-    }
-
-    public Phone getPhone() {
-        return phone;
-    }
-
-    public Email getEmail() {
-        return email;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    /**
-     * Returns an immutable tag set, which throws {@code UnsupportedOperationException}
-     * if modification is attempted.
-     */
-    public Set<Tag> getTags() {
-        return Collections.unmodifiableSet(tags);
-    }
-
-    /**
-     * Returns true if both persons of the same name have at least one other identity field that is the same.
-     * This defines a weaker notion of equality between two persons.
-     */
-    public boolean isSamePerson(Person otherPerson) {
-        if (otherPerson == this) {
-            return true;
-        }
-
-        return otherPerson != null
-                && otherPerson.getName().equals(getName())
-                && (otherPerson.getPhone().equals(getPhone()) || otherPerson.getEmail().equals(getEmail()));
-    }
-
-    /**
-     * Returns true if both persons have the same identity and data fields.
-     * This defines a stronger notion of equality between two persons.
-     */
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-
-        if (!(other instanceof Person)) {
-            return false;
-        }
-
-        Person otherPerson = (Person) other;
-        return otherPerson.getName().equals(getName())
-                && otherPerson.getPhone().equals(getPhone())
-                && otherPerson.getEmail().equals(getEmail())
-                && otherPerson.getAddress().equals(getAddress())
-                && otherPerson.getTags().equals(getTags());
-    }
-
-    @Override
-    public int hashCode() {
-        // use this method for custom fields hashing instead of implementing your own
-        return Objects.hash(name, phone, email, address, tags);
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append(getName())
-                .append(" Phone: ")
-                .append(getPhone())
-                .append(" Email: ")
-                .append(getEmail())
-                .append(" Address: ")
-                .append(getAddress())
-                .append(" Tags: ");
-        getTags().forEach(builder::append);
-        return builder.toString();
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Phone.java b/src/main/java/seedu/address/model/person/Phone.java
deleted file mode 100644
index 872c76b382fd..000000000000
--- a/src/main/java/seedu/address/model/person/Phone.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's phone number in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
- */
-public class Phone {
-
-
-    public static final String MESSAGE_CONSTRAINTS =
-            "Phone numbers should only contain numbers, and it should be at least 3 digits long";
-    public static final String VALIDATION_REGEX = "\\d{3,}";
-    public final String value;
-
-    /**
-     * Constructs a {@code Phone}.
-     *
-     * @param phone A valid phone number.
-     */
-    public Phone(String phone) {
-        requireNonNull(phone);
-        checkArgument(isValidPhone(phone), MESSAGE_CONSTRAINTS);
-        value = phone;
-    }
-
-    /**
-     * Returns true if a given string is a valid phone number.
-     */
-    public static boolean isValidPhone(String test) {
-        return test.matches(VALIDATION_REGEX);
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof Phone // instanceof handles nulls
-                && value.equals(((Phone) other).value)); // state check
-    }
-
-    @Override
-    public int hashCode() {
-        return value.hashCode();
-    }
-
-}
diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/seedu/address/model/person/UniquePersonList.java
deleted file mode 100644
index 0fee4fe57e6b..000000000000
--- a/src/main/java/seedu/address/model/person/UniquePersonList.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-
-/**
- * A list of persons that enforces uniqueness between its elements and does not allow nulls.
- * A person is considered unique by comparing using {@code Person#isSamePerson(Person)}. As such, adding and updating of
- * persons uses Person#isSamePerson(Person) for equality so as to ensure that the person being added or updated is
- * unique in terms of identity in the UniquePersonList. However, the removal of a person uses Person#equals(Object) so
- * as to ensure that the person with exactly the same fields will be removed.
- *
- * Supports a minimal set of list operations.
- *
- * @see Person#isSamePerson(Person)
- */
-public class UniquePersonList implements Iterable<Person> {
-
-    private final ObservableList<Person> internalList = FXCollections.observableArrayList();
-    private final ObservableList<Person> internalUnmodifiableList =
-            FXCollections.unmodifiableObservableList(internalList);
-
-    /**
-     * Returns true if the list contains an equivalent person as the given argument.
-     */
-    public boolean contains(Person toCheck) {
-        requireNonNull(toCheck);
-        return internalList.stream().anyMatch(toCheck::isSamePerson);
-    }
-
-    /**
-     * Adds a person to the list.
-     * The person must not already exist in the list.
-     */
-    public void add(Person toAdd) {
-        requireNonNull(toAdd);
-        if (contains(toAdd)) {
-            throw new DuplicatePersonException();
-        }
-        internalList.add(toAdd);
-    }
-
-    /**
-     * Replaces the person {@code target} in the list with {@code editedPerson}.
-     * {@code target} must exist in the list.
-     * The person identity of {@code editedPerson} must not be the same as another existing person in the list.
-     */
-    public void setPerson(Person target, Person editedPerson) {
-        requireAllNonNull(target, editedPerson);
-
-        int index = internalList.indexOf(target);
-        if (index == -1) {
-            throw new PersonNotFoundException();
-        }
-
-        if (!target.isSamePerson(editedPerson) && contains(editedPerson)) {
-            throw new DuplicatePersonException();
-        }
-
-        internalList.set(index, editedPerson);
-    }
-
-    /**
-     * Removes the equivalent person from the list.
-     * The person must exist in the list.
-     */
-    public void remove(Person toRemove) {
-        requireNonNull(toRemove);
-        if (!internalList.remove(toRemove)) {
-            throw new PersonNotFoundException();
-        }
-    }
-
-    public void setPersons(UniquePersonList replacement) {
-        requireNonNull(replacement);
-        internalList.setAll(replacement.internalList);
-    }
-
-    /**
-     * Replaces the contents of this list with {@code persons}.
-     * {@code persons} must not contain duplicate persons.
-     */
-    public void setPersons(List<Person> persons) {
-        requireAllNonNull(persons);
-        if (!personsAreUnique(persons)) {
-            throw new DuplicatePersonException();
-        }
-
-        internalList.setAll(persons);
-    }
-
-    /**
-     * Returns the backing list as an unmodifiable {@code ObservableList}.
-     */
-    public ObservableList<Person> asUnmodifiableObservableList() {
-        return internalUnmodifiableList;
-    }
-
-    @Override
-    public Iterator<Person> iterator() {
-        return internalList.iterator();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof UniquePersonList // instanceof handles nulls
-                        && internalList.equals(((UniquePersonList) other).internalList));
-    }
-
-    @Override
-    public int hashCode() {
-        return internalList.hashCode();
-    }
-
-    /**
-     * Returns true if {@code persons} contains only unique persons.
-     */
-    private boolean personsAreUnique(List<Person> persons) {
-        for (int i = 0; i < persons.size() - 1; i++) {
-            for (int j = i + 1; j < persons.size(); j++) {
-                if (persons.get(i).isSamePerson(persons.get(j))) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java b/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
deleted file mode 100644
index d7290f594423..000000000000
--- a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation will result in duplicate Persons (Persons are considered duplicates if they have the same
- * identity).
- */
-public class DuplicatePersonException extends RuntimeException {
-    public DuplicatePersonException() {
-        super("Operation would result in duplicate persons");
-    }
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java b/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
deleted file mode 100644
index fa764426ca73..000000000000
--- a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation is unable to find the specified person.
- */
-public class PersonNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
deleted file mode 100644
index 1806da4facfa..000000000000
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.model.util;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Contains utility methods for populating {@code AddressBook} with sample data.
- */
-public class SampleDataUtil {
-    public static Person[] getSamplePersons() {
-        return new Person[] {
-            new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
-                new Address("Blk 30 Geylang Street 29, #06-40"),
-                getTagSet("friends")),
-            new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
-                new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
-                getTagSet("colleagues", "friends")),
-            new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
-                new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
-                getTagSet("neighbours")),
-            new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
-                new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
-                getTagSet("family")),
-            new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
-                new Address("Blk 47 Tampines Street 20, #17-35"),
-                getTagSet("classmates")),
-            new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
-                new Address("Blk 45 Aljunied Street 85, #11-31"),
-                getTagSet("colleagues"))
-        };
-    }
-
-    public static ReadOnlyAddressBook getSampleAddressBook() {
-        AddressBook sampleAb = new AddressBook();
-        for (Person samplePerson : getSamplePersons()) {
-            sampleAb.addPerson(samplePerson);
-        }
-        return sampleAb;
-    }
-
-    /**
-     * Returns a tag set containing the list of strings given.
-     */
-    public static Set<Tag> getTagSet(String... strings) {
-        return Arrays.stream(strings)
-                .map(Tag::new)
-                .collect(Collectors.toSet());
-    }
-
-}
diff --git a/src/main/java/seedu/address/storage/AddressBookStorage.java b/src/main/java/seedu/address/storage/AddressBookStorage.java
deleted file mode 100644
index 4599182b3f92..000000000000
--- a/src/main/java/seedu/address/storage/AddressBookStorage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package seedu.address.storage;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
-
-/**
- * Represents a storage for {@link seedu.address.model.AddressBook}.
- */
-public interface AddressBookStorage {
-
-    /**
-     * Returns the file path of the data file.
-     */
-    Path getAddressBookFilePath();
-
-    /**
-     * Returns AddressBook data as a {@link ReadOnlyAddressBook}.
-     *   Returns {@code Optional.empty()} if storage file is not found.
-     * @throws DataConversionException if the data in storage is not in the expected format.
-     * @throws IOException if there was any problem when reading from the storage.
-     */
-    Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException;
-
-    /**
-     * @see #getAddressBookFilePath()
-     */
-    Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException, IOException;
-
-    /**
-     * Saves the given {@link ReadOnlyAddressBook} to the storage.
-     * @param addressBook cannot be null.
-     * @throws IOException if there was any problem writing to the file.
-     */
-    void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
-
-    /**
-     * @see #saveAddressBook(ReadOnlyAddressBook)
-     */
-    void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException;
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
deleted file mode 100644
index a6321cec2eac..000000000000
--- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package seedu.address.storage;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Jackson-friendly version of {@link Person}.
- */
-class JsonAdaptedPerson {
-
-    public static final String MISSING_FIELD_MESSAGE_FORMAT = "Person's %s field is missing!";
-
-    private final String name;
-    private final String phone;
-    private final String email;
-    private final String address;
-    private final List<JsonAdaptedTag> tagged = new ArrayList<>();
-
-    /**
-     * Constructs a {@code JsonAdaptedPerson} with the given person details.
-     */
-    @JsonCreator
-    public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
-            @JsonProperty("email") String email, @JsonProperty("address") String address,
-            @JsonProperty("tagged") List<JsonAdaptedTag> tagged) {
-        this.name = name;
-        this.phone = phone;
-        this.email = email;
-        this.address = address;
-        if (tagged != null) {
-            this.tagged.addAll(tagged);
-        }
-    }
-
-    /**
-     * Converts a given {@code Person} into this class for Jackson use.
-     */
-    public JsonAdaptedPerson(Person source) {
-        name = source.getName().fullName;
-        phone = source.getPhone().value;
-        email = source.getEmail().value;
-        address = source.getAddress().value;
-        tagged.addAll(source.getTags().stream()
-                .map(JsonAdaptedTag::new)
-                .collect(Collectors.toList()));
-    }
-
-    /**
-     * Converts this Jackson-friendly adapted person object into the model's {@code Person} object.
-     *
-     * @throws IllegalValueException if there were any data constraints violated in the adapted person.
-     */
-    public Person toModelType() throws IllegalValueException {
-        final List<Tag> personTags = new ArrayList<>();
-        for (JsonAdaptedTag tag : tagged) {
-            personTags.add(tag.toModelType());
-        }
-
-        if (name == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()));
-        }
-        if (!Name.isValidName(name)) {
-            throw new IllegalValueException(Name.MESSAGE_CONSTRAINTS);
-        }
-        final Name modelName = new Name(name);
-
-        if (phone == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName()));
-        }
-        if (!Phone.isValidPhone(phone)) {
-            throw new IllegalValueException(Phone.MESSAGE_CONSTRAINTS);
-        }
-        final Phone modelPhone = new Phone(phone);
-
-        if (email == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName()));
-        }
-        if (!Email.isValidEmail(email)) {
-            throw new IllegalValueException(Email.MESSAGE_CONSTRAINTS);
-        }
-        final Email modelEmail = new Email(email);
-
-        if (address == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName()));
-        }
-        if (!Address.isValidAddress(address)) {
-            throw new IllegalValueException(Address.MESSAGE_CONSTRAINTS);
-        }
-        final Address modelAddress = new Address(address);
-
-        final Set<Tag> modelTags = new HashSet<>(personTags);
-        return new Person(modelName, modelPhone, modelEmail, modelAddress, modelTags);
-    }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java b/src/main/java/seedu/address/storage/JsonAddressBookStorage.java
deleted file mode 100644
index dfab9daaa0d3..000000000000
--- a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package seedu.address.storage;
-
-import static java.util.Objects.requireNonNull;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.logging.Logger;
-
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.commons.util.FileUtil;
-import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.ReadOnlyAddressBook;
-
-/**
- * A class to access AddressBook data stored as a json file on the hard disk.
- */
-public class JsonAddressBookStorage implements AddressBookStorage {
-
-    private static final Logger logger = LogsCenter.getLogger(JsonAddressBookStorage.class);
-
-    private Path filePath;
-
-    public JsonAddressBookStorage(Path filePath) {
-        this.filePath = filePath;
-    }
-
-    public Path getAddressBookFilePath() {
-        return filePath;
-    }
-
-    @Override
-    public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException {
-        return readAddressBook(filePath);
-    }
-
-    /**
-     * Similar to {@link #readAddressBook()}.
-     *
-     * @param filePath location of the data. Cannot be null.
-     * @throws DataConversionException if the file is not in the correct format.
-     */
-    public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException {
-        requireNonNull(filePath);
-
-        Optional<JsonSerializableAddressBook> jsonAddressBook = JsonUtil.readJsonFile(
-                filePath, JsonSerializableAddressBook.class);
-        if (!jsonAddressBook.isPresent()) {
-            return Optional.empty();
-        }
-
-        try {
-            return Optional.of(jsonAddressBook.get().toModelType());
-        } catch (IllegalValueException ive) {
-            logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
-            throw new DataConversionException(ive);
-        }
-    }
-
-    @Override
-    public void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException {
-        saveAddressBook(addressBook, filePath);
-    }
-
-    /**
-     * Similar to {@link #saveAddressBook(ReadOnlyAddressBook)}.
-     *
-     * @param filePath location of the data. Cannot be null.
-     */
-    public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
-        requireNonNull(addressBook);
-        requireNonNull(filePath);
-
-        FileUtil.createIfMissing(filePath);
-        JsonUtil.saveJsonFile(new JsonSerializableAddressBook(addressBook), filePath);
-    }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java b/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
deleted file mode 100644
index 5efd834091d4..000000000000
--- a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.storage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * An Immutable AddressBook that is serializable to JSON format.
- */
-@JsonRootName(value = "addressbook")
-class JsonSerializableAddressBook {
-
-    public static final String MESSAGE_DUPLICATE_PERSON = "Persons list contains duplicate person(s).";
-
-    private final List<JsonAdaptedPerson> persons = new ArrayList<>();
-
-    /**
-     * Constructs a {@code JsonSerializableAddressBook} with the given persons.
-     */
-    @JsonCreator
-    public JsonSerializableAddressBook(@JsonProperty("persons") List<JsonAdaptedPerson> persons) {
-        this.persons.addAll(persons);
-    }
-
-    /**
-     * Converts a given {@code ReadOnlyAddressBook} into this class for Jackson use.
-     *
-     * @param source future changes to this will not affect the created {@code JsonSerializableAddressBook}.
-     */
-    public JsonSerializableAddressBook(ReadOnlyAddressBook source) {
-        persons.addAll(source.getPersonList().stream().map(JsonAdaptedPerson::new).collect(Collectors.toList()));
-    }
-
-    /**
-     * Converts this address book into the model's {@code AddressBook} object.
-     *
-     * @throws IllegalValueException if there were any data constraints violated.
-     */
-    public AddressBook toModelType() throws IllegalValueException {
-        AddressBook addressBook = new AddressBook();
-        for (JsonAdaptedPerson jsonAdaptedPerson : persons) {
-            Person person = jsonAdaptedPerson.toModelType();
-            if (addressBook.hasPerson(person)) {
-                throw new IllegalValueException(MESSAGE_DUPLICATE_PERSON);
-            }
-            addressBook.addPerson(person);
-        }
-        return addressBook;
-    }
-
-}
diff --git a/src/main/java/seedu/address/storage/Storage.java b/src/main/java/seedu/address/storage/Storage.java
deleted file mode 100644
index beda8bd9f11b..000000000000
--- a/src/main/java/seedu/address/storage/Storage.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package seedu.address.storage;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
-
-/**
- * API of the Storage component
- */
-public interface Storage extends AddressBookStorage, UserPrefsStorage {
-
-    @Override
-    Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
-
-    @Override
-    void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException;
-
-    @Override
-    Path getAddressBookFilePath();
-
-    @Override
-    Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException;
-
-    @Override
-    void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
-
-}
diff --git a/src/main/java/seedu/address/storage/StorageManager.java b/src/main/java/seedu/address/storage/StorageManager.java
deleted file mode 100644
index e4f452b6cbf4..000000000000
--- a/src/main/java/seedu/address/storage/StorageManager.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package seedu.address.storage;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.logging.Logger;
-
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
-
-/**
- * Manages storage of AddressBook data in local storage.
- */
-public class StorageManager implements Storage {
-
-    private static final Logger logger = LogsCenter.getLogger(StorageManager.class);
-    private AddressBookStorage addressBookStorage;
-    private UserPrefsStorage userPrefsStorage;
-
-
-    public StorageManager(AddressBookStorage addressBookStorage, UserPrefsStorage userPrefsStorage) {
-        super();
-        this.addressBookStorage = addressBookStorage;
-        this.userPrefsStorage = userPrefsStorage;
-    }
-
-    // ================ UserPrefs methods ==============================
-
-    @Override
-    public Path getUserPrefsFilePath() {
-        return userPrefsStorage.getUserPrefsFilePath();
-    }
-
-    @Override
-    public Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException {
-        return userPrefsStorage.readUserPrefs();
-    }
-
-    @Override
-    public void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException {
-        userPrefsStorage.saveUserPrefs(userPrefs);
-    }
-
-
-    // ================ AddressBook methods ==============================
-
-    @Override
-    public Path getAddressBookFilePath() {
-        return addressBookStorage.getAddressBookFilePath();
-    }
-
-    @Override
-    public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException {
-        return readAddressBook(addressBookStorage.getAddressBookFilePath());
-    }
-
-    @Override
-    public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException, IOException {
-        logger.fine("Attempting to read data from file: " + filePath);
-        return addressBookStorage.readAddressBook(filePath);
-    }
-
-    @Override
-    public void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException {
-        saveAddressBook(addressBook, addressBookStorage.getAddressBookFilePath());
-    }
-
-    @Override
-    public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
-        logger.fine("Attempting to write to data file: " + filePath);
-        addressBookStorage.saveAddressBook(addressBook, filePath);
-    }
-
-}
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
deleted file mode 100644
index f6727ea83abd..000000000000
--- a/src/main/java/seedu/address/ui/PersonCard.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package seedu.address.ui;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.layout.FlowPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
-import seedu.address.model.person.Person;
-
-/**
- * An UI component that displays information of a {@code Person}.
- */
-public class PersonCard extends UiPart<Region> {
-
-    private static final String FXML = "PersonListCard.fxml";
-
-    /**
-     * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
-     * As a consequence, UI elements' variable names cannot be set to such keywords
-     * or an exception will be thrown by JavaFX during runtime.
-     *
-     * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
-     */
-
-    public final Person person;
-
-    @FXML
-    private HBox cardPane;
-    @FXML
-    private Label name;
-    @FXML
-    private Label id;
-    @FXML
-    private Label phone;
-    @FXML
-    private Label address;
-    @FXML
-    private Label email;
-    @FXML
-    private FlowPane tags;
-
-    public PersonCard(Person person, int displayedIndex) {
-        super(FXML);
-        this.person = person;
-        id.setText(displayedIndex + ". ");
-        name.setText(person.getName().fullName);
-        phone.setText(person.getPhone().value);
-        address.setText(person.getAddress().value);
-        email.setText(person.getEmail().value);
-        person.getTags().forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        // short circuit if same object
-        if (other == this) {
-            return true;
-        }
-
-        // instanceof handles nulls
-        if (!(other instanceof PersonCard)) {
-            return false;
-        }
-
-        // state check
-        PersonCard card = (PersonCard) other;
-        return id.getText().equals(card.id.getText())
-                && person.equals(card.person);
-    }
-}
diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/seedu/address/ui/PersonListPanel.java
deleted file mode 100644
index 5ca3fa4fc671..000000000000
--- a/src/main/java/seedu/address/ui/PersonListPanel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package seedu.address.ui;
-
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.logging.Logger;
-
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.Region;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
-
-/**
- * Panel containing the list of persons.
- */
-public class PersonListPanel extends UiPart<Region> {
-    private static final String FXML = "PersonListPanel.fxml";
-    private final Logger logger = LogsCenter.getLogger(PersonListPanel.class);
-
-    @FXML
-    private ListView<Person> personListView;
-
-    public PersonListPanel(ObservableList<Person> personList, ObservableValue<Person> selectedPerson,
-            Consumer<Person> onSelectedPersonChange) {
-        super(FXML);
-        personListView.setItems(personList);
-        personListView.setCellFactory(listView -> new PersonListViewCell());
-        personListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            logger.fine("Selection in person list panel changed to : '" + newValue + "'");
-            onSelectedPersonChange.accept(newValue);
-        });
-        selectedPerson.addListener((observable, oldValue, newValue) -> {
-            logger.fine("Selected person changed to: " + newValue);
-
-            // Don't modify selection if we are already selecting the selected person,
-            // otherwise we would have an infinite loop.
-            if (Objects.equals(personListView.getSelectionModel().getSelectedItem(), newValue)) {
-                return;
-            }
-
-            if (newValue == null) {
-                personListView.getSelectionModel().clearSelection();
-            } else {
-                int index = personListView.getItems().indexOf(newValue);
-                personListView.scrollTo(index);
-                personListView.getSelectionModel().clearAndSelect(index);
-            }
-        });
-    }
-
-    /**
-     * Custom {@code ListCell} that displays the graphics of a {@code Person} using a {@code PersonCard}.
-     */
-    class PersonListViewCell extends ListCell<Person> {
-        @Override
-        protected void updateItem(Person person, boolean empty) {
-            super.updateItem(person, empty);
-
-            if (empty || person == null) {
-                setGraphic(null);
-                setText(null);
-            } else {
-                setGraphic(new PersonCard(person, getIndex() + 1).getRoot());
-            }
-        }
-    }
-
-}
diff --git a/src/main/resources/images/address_book_32.png b/src/main/resources/images/address_book_32.png
deleted file mode 100644
index 29810cf1fd93..000000000000
Binary files a/src/main/resources/images/address_book_32.png and /dev/null differ
diff --git a/src/main/resources/images/plan_with_ease_32.png b/src/main/resources/images/plan_with_ease_32.png
new file mode 100644
index 000000000000..80edd710b7a3
Binary files /dev/null and b/src/main/resources/images/plan_with_ease_32.png differ
diff --git a/src/main/resources/view/BrowserPanel.fxml b/src/main/resources/view/BrowserPanel.fxml
index 31670827e3da..0f3a67b56447 100644
--- a/src/main/resources/view/BrowserPanel.fxml
+++ b/src/main/resources/view/BrowserPanel.fxml
@@ -3,6 +3,6 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.web.WebView?>
 
-<StackPane xmlns:fx="http://javafx.com/fxml/1">
-  <WebView fx:id="browser"/>
+<StackPane xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1">
+  <WebView fx:id="browser" prefHeight="0.0" prefWidth="0.0" visible="false" />
 </StackPane>
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 36e6b001cd8d..01985e3a9575 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -107,15 +107,38 @@
     -fx-background-color: #515658;
 }
 
-.list-cell:filled:selected {
-    -fx-background-color: #424d5f;
-}
-
 .list-cell:filled:selected #cardPane {
+    -fx-background-color: #424d5f;
     -fx-border-color: #3e7b91;
     -fx-border-width: 1;
 }
 
+.plannerPane .list-cell .label {
+    -fx-font-size: 18px;
+}
+
+.plannerPane .list-cell:filled:even {
+    -fx-background-color: #3c3e3f;
+    -fx-outer-border: 2px;
+}
+
+.plannerPane .list-cell:filled:odd {
+    -fx-background-color: #404344;
+}
+
+.plannerCard .list-cell:filled {
+    -fx-text-fill: white;
+    -fx-font-size: 15px;
+}
+
+.plannerCard .list-cell:filled:even {
+    -fx-background-color: #424d51;
+}
+
+.plannerCard .list-cell:filled:odd {
+    -fx-background-color: #586063;
+}
+
 .list-cell .label {
     -fx-text-fill: white;
 }
@@ -308,9 +331,9 @@
 }
 
 #cardPane {
-    -fx-background-color: transparent;
-    -fx-border-width: 0;
-}
+     -fx-background-color: transparent;
+     -fx-border-width: 0;
+ }
 
 #commandTypeLabel {
     -fx-font-size: 11px;
@@ -328,7 +351,7 @@
     -fx-text-fill: white;
 }
 
-#filterField, #personListPanel, #personWebpage {
+#filterField, #moduleListPanel, #personWebpage {
     -fx-effect: innershadow(gaussian, black, 10, 0, 0, 0);
 }
 
@@ -337,7 +360,7 @@
     -fx-background-radius: 0;
 }
 
-#tags {
+#tags, #codes {
     -fx-hgap: 7;
     -fx-vgap: 3;
 }
@@ -350,3 +373,24 @@
     -fx-background-radius: 2;
     -fx-font-size: 11;
 }
+
+#codes .label {
+    -fx-text-fill: white;
+    -fx-background-color: #34911c;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 15;
+}
+
+.fulfilled {
+    -fx-text-fill: green;
+}
+
+.overAllocate {
+    -fx-text-fill: red;
+}
+
+.noModules {
+    -fx-fill: white;
+}
diff --git a/src/main/resources/view/DegreePlannerListCard.fxml b/src/main/resources/view/DegreePlannerListCard.fxml
new file mode 100644
index 000000000000..e87654037cad
--- /dev/null
+++ b/src/main/resources/view/DegreePlannerListCard.fxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+<StackPane fx:id="degreePlannerCardPane" xmlns="http://javafx.com/javafx/8.0.172-ea"
+           xmlns:fx="http://javafx.com/fxml/1">
+    <VBox prefHeight="150" prefWidth="150" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1">
+        <VBox>
+            <HBox>
+                <Label fx:id="year" styleClass="cell_big_label"/>
+                <Label fx:id="semester" styleClass="cell_big_label"/>
+            </HBox>
+            <VBox>
+                <Label fx:id="credits" styleClass="cell_small_label"/>
+            </VBox>
+        </VBox>
+        <VBox fx:id="degreePlannerListView" alignment="CENTER_LEFT">
+        </VBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/view/DegreePlannerListPanel.fxml b/src/main/resources/view/DegreePlannerListPanel.fxml
new file mode 100644
index 000000000000..e38c3cb7142a
--- /dev/null
+++ b/src/main/resources/view/DegreePlannerListPanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.VBox?>
+<VBox fx:id="placeHolder" xmlns="http://javafx.com/javafx/9"
+      xmlns:fx="http://javafx.com/fxml/1">
+    <ListView fx:id="degreePlanners" VBox.vgrow="ALWAYS"/>
+</VBox>
diff --git a/src/main/resources/view/Extensions.css b/src/main/resources/view/Extensions.css
index bfe82a85964d..a828bcffcb86 100644
--- a/src/main/resources/view/Extensions.css
+++ b/src/main/resources/view/Extensions.css
@@ -5,7 +5,7 @@
 
 .list-cell:empty {
     /* Empty cells will not have alternating colours */
-    -fx-background: #383838;
+    -fx-background: #fffdfb;
 }
 
 .tag-selector {
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index 601ddabf2b5e..1808d9afae18 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -3,6 +3,7 @@
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.Scene?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
@@ -12,18 +13,18 @@
 <?import javafx.scene.layout.VBox?>
 
 <fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-         title="Address App" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
+         title="PlanWithEase" minWidth="960" minHeight="600" onCloseRequest="#handleExit">
   <icons>
-    <Image url="@/images/address_book_32.png" />
+    <Image url="@/images/plan_with_ease_32.png" />
   </icons>
   <scene>
     <Scene>
       <stylesheets>
-        <URL value="@DarkTheme.css" />
+        <URL value="@WhiteTheme.css" />
         <URL value="@Extensions.css" />
       </stylesheets>
 
-      <VBox>
+      <VBox styleClass="background">
         <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
           <Menu mnemonicParsing="false" text="File">
             <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
@@ -33,34 +34,61 @@
           </Menu>
         </MenuBar>
 
-        <StackPane VBox.vgrow="NEVER" fx:id="commandBoxPlaceholder" styleClass="pane-with-border">
+        <StackPane fx:id="commandBoxPlaceholder" styleClass="pane-with-border" VBox.vgrow="NEVER">
           <padding>
             <Insets top="5" right="10" bottom="5" left="10" />
           </padding>
         </StackPane>
 
-        <StackPane VBox.vgrow="NEVER" fx:id="resultDisplayPlaceholder" styleClass="pane-with-border"
-                   minHeight="100" prefHeight="100" maxHeight="100">
+        <StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="100" prefHeight="100" styleClass="pane-with-border" VBox.vgrow="NEVER">
           <padding>
             <Insets top="5" right="10" bottom="5" left="10" />
           </padding>
         </StackPane>
 
-        <SplitPane id="splitPane" fx:id="splitPane" dividerPositions="0.4" VBox.vgrow="ALWAYS">
-          <VBox fx:id="personList" minWidth="340" prefWidth="340" SplitPane.resizableWithParent="false">
+        <SplitPane id="splitPane" fx:id="splitPane" dividerPositions="0.4, 0.5" VBox.vgrow="ALWAYS">
+          <VBox fx:id="moduleList" alignment="CENTER" minWidth="290" prefWidth="310">
+                <Label alignment="CENTER" contentDisplay="CENTER" lineSpacing="9.0" text="Module List"
+                       underline="true" styleClass="title_header">
+                    <padding>
+                        <Insets bottom="10" left="10" right="10" top="10" />
+                    </padding>
+                </Label>
+            <StackPane fx:id="moduleListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
             <padding>
               <Insets top="10" right="10" bottom="10" left="10" />
             </padding>
-            <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
           </VBox>
 
-          <StackPane fx:id="browserPlaceholder" prefWidth="340" >
+          <VBox fx:id="requirementCategories" alignment="CENTER" minWidth="340" prefWidth="340" VBox.vgrow="ALWAYS">
+              <Label alignment="CENTER" contentDisplay="CENTER" lineSpacing="9.0" text="Requirement Categories"
+                     underline="true" styleClass="title_header">
+                  <padding>
+                      <Insets bottom="10" left="10" right="10" top="10" />
+                  </padding>
+              </Label>
             <padding>
               <Insets top="10" right="10" bottom="10" left="10" />
             </padding>
-          </StackPane>
-        </SplitPane>
+            <StackPane fx:id="requirementCategoryListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
+          </VBox>
 
+          <VBox fx:id="degreePlan" minWidth="300" alignment="CENTER" prefWidth="310" VBox.vgrow="ALWAYS">
+              <Label alignment="CENTER" contentDisplay="CENTER" lineSpacing="9.0" text="Degree Plan"
+                     underline="true" styleClass="title_header">
+                  <padding>
+                      <Insets top="10" right="10" bottom="10" left="10" />
+                  </padding>
+              </Label>
+              <padding>
+                  <Insets top="10" right="10" bottom="10" left="10" />
+              </padding>
+              <StackPane id="plannerStackPane" fx:id="degreePlannerListPanelPlaceholder" VBox.vgrow="ALWAYS">
+              </StackPane>
+          </VBox>
+        </SplitPane>
+        <StackPane fx:id="browserPlaceholder" prefWidth="0" >
+        </StackPane>
         <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
       </VBox>
     </Scene>
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/ModuleListCard.fxml
similarity index 74%
rename from src/main/resources/view/PersonListCard.fxml
rename to src/main/resources/view/ModuleListCard.fxml
index f08ea32ad558..f80759af4468 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/ModuleListCard.fxml
@@ -25,12 +25,13 @@
             <Region fx:constant="USE_PREF_SIZE" />
           </minWidth>
         </Label>
-        <Label fx:id="name" text="\$first" styleClass="cell_big_label" />
+        <Label fx:id="code" styleClass="cell_big_label" text="\$code" />
       </HBox>
+      <Label fx:id="name" styleClass="cell_big_label" text="\$first" />
+      <Label fx:id="credits" styleClass="cell_small_label" text="\$credits" />
+      <Label fx:id="semesters" styleClass="cell_small_label" text="\$semesters" />
+      <Label fx:id="corequisites" styleClass="cell_small_label" text="\$corequisites" />
       <FlowPane fx:id="tags" />
-      <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
-      <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
-      <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
     </VBox>
   </GridPane>
 </HBox>
diff --git a/src/main/resources/view/PersonListPanel.fxml b/src/main/resources/view/ModuleListPanel.fxml
similarity index 77%
rename from src/main/resources/view/PersonListPanel.fxml
rename to src/main/resources/view/ModuleListPanel.fxml
index 8836d323cc5d..88180215379f 100644
--- a/src/main/resources/view/PersonListPanel.fxml
+++ b/src/main/resources/view/ModuleListPanel.fxml
@@ -4,5 +4,5 @@
 <?import javafx.scene.layout.VBox?>
 
 <VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-  <ListView fx:id="personListView" VBox.vgrow="ALWAYS" />
+  <ListView fx:id="moduleListView" VBox.vgrow="ALWAYS" />
 </VBox>
diff --git a/src/main/resources/view/RequirementCategoryListCard.fxml b/src/main/resources/view/RequirementCategoryListCard.fxml
new file mode 100644
index 000000000000..978c2c50447a
--- /dev/null
+++ b/src/main/resources/view/RequirementCategoryListCard.fxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<HBox id="requirementCategoryCardPane" fx:id="requirementCategoryCardPane" xmlns="http://javafx.com/javafx/8"
+      xmlns:fx="http://javafx.com/fxml/1">
+    <GridPane HBox.hgrow="ALWAYS">
+        <columnConstraints>
+            <ColumnConstraints hgrow="ALWAYS" minWidth="5" prefWidth="150" />
+        </columnConstraints>
+        <VBox alignment="CENTER_LEFT" minHeight="80" GridPane.columnIndex="0">
+            <padding>
+                <Insets top="5" right="5" bottom="5" left="5" />
+            </padding>
+            <HBox spacing="5" alignment="CENTER_LEFT">
+                <Label fx:id="requirementCategoryName" styleClass="cell_big_label">
+                    <minWidth>
+                        <!-- Ensures that the label text is never truncated -->
+                        <Region fx:constant="USE_PREF_SIZE" />
+                    </minWidth>
+                </Label>
+            </HBox>
+            <Label fx:id="requirementCategoryCredit" styleClass="cell_small_label"
+                   text="\$requirementCategoryCredit" />
+            <FlowPane id="codes" fx:id="codes" />
+        </VBox>
+    </GridPane>
+</HBox>
diff --git a/src/main/resources/view/RequirementCategoryListPanel.fxml b/src/main/resources/view/RequirementCategoryListPanel.fxml
new file mode 100644
index 000000000000..545fccf021a7
--- /dev/null
+++ b/src/main/resources/view/RequirementCategoryListPanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+        <ListView fx:id="requirementCategories" VBox.vgrow="ALWAYS" />
+</VBox>
diff --git a/src/main/resources/view/WhiteTheme.css b/src/main/resources/view/WhiteTheme.css
new file mode 100644
index 000000000000..c54da6093ffd
--- /dev/null
+++ b/src/main/resources/view/WhiteTheme.css
@@ -0,0 +1,463 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - AGIX | Innovative Engineering
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT 	SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+/*
+ *   This is a Material Design CSS for JavaFX
+ */
+
+/*******************************************************************************
+ *                                                                             *
+ * Root					 				                       				   *
+ *                                                                             *
+ ******************************************************************************/
+.root {
+    /* Swatch Colors - Blue*/
+    -swatch-100: #BBDEFB;
+    -swatch-200: #90CAF9;
+    -swatch-300: #64BEF6;
+    -swatch-400: #42A5F5;
+    -swatch-500: #2196F3;
+    /*default text */
+    -fx-text-base-color: rgb(100.0, 100.0, 100.0);
+    -fx-text-button-normal: -swatch-500;
+    -fx-text-button-colored: rgb(255.0, 255.0, 255.0);
+    -fx-text-button-text: rgb(100.0, 100.0, 100.0);
+    -fx-text-title-color: rgb(45.0, 45.0, 45.0);
+    -fx-text-subtitle-color: rgb(65.0, 65.0, 65.0);
+    -fx-text-control-title-color: rgb(130.0, 130.0, 130.0);
+    -fx-text-fill: -fx-text-base-color;
+    -dark: rgb(47.0, 52.0, 57.0);
+    -fx-background-color: rgb(230.0, 230.0, 230.0);
+    /*default font */
+    -fx-font-family: 'Roboto Medium';
+    -fx-font-size: 14.0px;
+    -fx-disabled-opacity: 0.6;
+    /*default colors */
+    -swatch-grey: rgb(200.0, 200.0, 200.0);
+    -swatch-dark-grey: rgb(150.0, 150.0, 150.0);
+    -swatch-light-grey: rgb(230.0, 230.0, 230.0);
+    -swatch-toolbar: rgb(245.0, 245.0, 245.0);
+    /*
+     Modena colors
+     */
+    -fx-dark-text-color: white; /* Text color when selected*/
+    -fx-mid-text-color: -fx-text-base-color;
+    -fx-light-text-color: -swatch-light-grey;
+    -fx-body-color: white;
+    /* A bright blue for the focus indicator of objects. Typically used as the
+     * first color in -fx-background-color for the "focused" pseudo-class. Also
+     * typically used with insets of -1.4 to provide a glowing effect.
+     */
+    -fx-focus-color: -swatch-400;
+    -fx-faint-focus-color: -swatch-200;
+    /* A bright blue for highlighting/accenting objects.  For example: selected
+     * text; selected items in menus, lists, trees, and tables; progress bars */
+    -fx-accent: -swatch-light-grey;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Material Design - Cards 				                       				   *
+ *                                                                             *
+ ******************************************************************************/
+.card {
+    -fx-background-color: rgb(255.0, 255.0, 255.0);
+    -fx-background-radius: 4.0;
+    -fx-effect: dropshadow(gaussian, rgb(0.0, 0.0, 0.0, 0.15), 6.0, 0.7, 0.0,
+    1.5);
+    -fx-padding: 16 16 16 16;
+}
+
+.card-title {
+    -fx-font-size: 20.0px;
+    -fx-padding: 5 0 5 0;
+}
+
+.card-title .text {
+    -fx-fill: -fx-text-title-color;
+}
+
+.card-subtitle {
+    -fx-font-size: 16.0px;
+    -fx-padding: 5 0 5 0;
+}
+
+.card-subtitle .text {
+    -fx-fill: -fx-text-subtitle-color;
+}
+
+.control-label {
+    -fx-font-size: 12.0px;
+    -fx-padding: 16 0 0 0;
+}
+
+.control-label .text {
+    -fx-fill: -fx-text-control-title-color;
+}
+
+.card-button {
+    -fx-effect: null;
+}
+
+.menu-item:focused {
+    -fx-background-color: -swatch-light-grey;
+}
+
+.menu-bar {
+    -fx-background-color: -swatch-200;
+}
+
+.menu-bar .label {
+    -fx-font-size: 12pt;
+    -fx-font-family: "Segoe UI";
+    -fx-text-fill: black;
+    -fx-opacity: 0.9;
+}
+
+
+.menu .left-container {
+    -fx-background-color: black;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Label                                                                       *
+ *                                                                             *
+ ******************************************************************************/
+.label {
+    -fx-text-fill: -fx-text-base-color;
+}
+
+.label:disabled {
+    -fx-opacity: -fx-disabled-opacity;
+}
+
+.label:show-mnemonics > .mnemonic-underline {
+    -fx-stroke: -fx-text-base-color;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * List, Tree, Table COMMON                                                    *
+ *                                                                             *
+ ******************************************************************************/
+
+
+.list-view {
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+    -fx-background-color: -swatch-light-grey;
+}
+
+.list-cell {
+    -fx-label-padding: 0 0 0 0;
+    -fx-graphic-text-gap: 0;
+    -fx-padding: 0 0 0 0;
+}
+
+.list-cell:filled:even {
+    -fx-background-color: white;
+}
+
+.list-cell:filled:odd {
+    -fx-background-color: whitesmoke;
+}
+
+.list-cell:empty {
+    -fx-background-color: -swatch-light-grey;
+}
+
+.list-cell:filled:selected #cardPane {
+    -fx-background-color: #d8f0ea;
+    -fx-border-color: #3e7b91;
+    -fx-border-width: 1;
+}
+
+.cell_big_label {
+    -fx-font-family: "Segoe UI Semibold";
+    -fx-font-size: 16px;
+}
+
+.cell_small_label {
+    -fx-font-family: "Segoe UI";
+    -fx-font-size: 14px;
+}
+
+.title_header {
+    -fx-font-family: "Segoe UI";
+    -fx-font-size: 28px;
+}
+
+.stack-pane {
+    -fx-background-color: derive(#1d1d1d, 20%);
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Separators		                   	                                       *
+ *                                                                             *
+ ******************************************************************************/
+.separator {
+    -fx-padding: 16 -16 16 -16;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Scroll Bar			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+.scroll-bar:vertical > .track-background, .scroll-bar:horizontal > .track-background {
+    -fx-background-color: -swatch-light-grey;
+    -fx-background-insets: 0.0;
+}
+
+.scroll-bar:vertical > .thumb, .scroll-bar:horizontal > .thumb {
+    -fx-background-color: -swatch-grey;
+    -fx-background-insets: 0.0;
+    -fx-background-radius: 4.0;
+}
+
+.scroll-bar > .increment-button, .scroll-bar > .decrement-button,
+.scroll-bar:hover > .increment-button, .scroll-bar:hover > .decrement-button {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar > .increment-button > .increment-arrow, .scroll-bar > .decrement-button > .decrement-arrow {
+    -fx-background-color: -swatch-dark-grey;
+}
+
+.scroll-bar > .track-background {
+    -fx-background-color: transparent;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Tables								                       				   *
+ *                                                                             *
+ ******************************************************************************/
+.table-view, .tree-table-view {
+    /* Constants used throughout the tableview. */
+    -fx-table-header-border-color: transparent;
+    -fx-table-cell-border-color: -fx-box-border; /* Horizontal Lines*/
+    -fx-background-color: transparent;
+}
+
+/* The column header row is made up of a number of column-header, one for each
+   TableColumn, and a 'filler' area that extends from the right-most column
+   to the edge of the tableview, or up to the 'column control' button. */
+.table-view .filler, .tree-table-view .filler, .table-view .column-header,
+.tree-table-view .column-header {
+    -fx-size: 65;
+    -fx-border-style: null;
+    -fx-border-color: -swatch-grey;
+    -fx-border-width: 0 0 2 0;
+    -fx-background-color: transparent;
+}
+
+.table-view .show-hide-columns-button, .tree-table-view .show-hide-columns-button {
+    -fx-background-color: transparent;
+}
+
+.table-view .column-header .label, .table-view .filler .label,
+.table-view .column-drag-header .label, .tree-table-view .column-header .label,
+.tree-table-view .filler .label, .tree-table-view .column-drag-header .label {
+    -fx-alignment: CENTER_LEFT;
+}
+
+.table-view .column-header-background, .tree-table-view .column-header-background {
+    -fx-background-color: transparent;
+}
+
+.table-row-cell, .tree-table-row-cell {
+    -fx-cell-size: 40px;
+}
+
+.table-cell {
+    -fx-border-color: transparent; /* Vertical Lines*/
+    -fx-border-width: 1;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Text, Text field & Text area                                                *
+ *                                                                             *
+ ******************************************************************************/
+.text {
+    -fx-font-smoothing-type: gray;
+}
+
+.text-area, .text-field {
+    -fx-background-color: transparent;
+    -fx-background-radius: 2.0;
+    -fx-padding: 0.5em 0.5em 0.5em 0.1em;
+    -fx-border-color: -swatch-grey;
+    -fx-border-width: 0 0 2 0;
+    -fx-prompt-text-fill: derive(-dark, 50.0%);
+    -fx-highlight-fill: rgb(94.0, 203.0, 234.0);
+}
+
+.text-area .text, .text-field > * > .text {
+    -fx-effect: null;
+    -fx-fill: -dark;
+}
+
+.text-area {
+    -fx-padding: 0.15em;
+}
+
+.text-area .content {
+    -fx-padding: 0.7em;
+    -fx-border-width: 0.0;
+    -fx-background-color: transparent;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Tool bar	& Menu bar		                       			  				   *
+ *                                                                             *
+ ******************************************************************************/
+.menu-bar { /* top */
+    -fx-background-color: -swatch-toolbar;
+    -fx-border-width: 0 0 2 0;
+    -fx-border-color: -swatch-grey;
+    -fx-min-height: 48;
+    -fx-alignment: CENTER_LEFT;
+}
+
+#cardPane {
+    -fx-background-color: transparent;
+    -fx-border-width: 0;
+}
+
+#commandTypeLabel {
+    -fx-font-size: 11px;
+    -fx-text-fill: #F70D1A;
+}
+
+#commandTextField {
+    -fx-background-color: #fff;
+    -fx-padding: 0.5em 0.5em 0.5em 0.5em;
+    -fx-border-color: -swatch-grey;
+    -fx-border-width: 0 0 2 0;
+    -fx-prompt-text-fill: derive(-dark, 50.0%);
+    -fx-highlight-fill: rgb(94.0, 203.0, 234.0);
+    -fx-font-family: "Segoe UI";
+    -fx-font-size: 12pt;
+}
+
+#commandTextDisplay {
+    -fx-background-color: #fff;
+    -fx-padding: 0.5em 0.5em 0.5em 0.5em;
+    -fx-border-color: -swatch-grey;
+    -fx-border-width: 0 0 2 0;
+    -fx-prompt-text-fill: derive(-dark, 50.0%);
+    -fx-highlight-fill: rgb(94.0, 203.0, 234.0);
+    -fx-font-family: "Segoe UI";
+    -fx-font-size: 12pt;
+}
+
+#resultDisplay .content {
+    -fx-background-color: transparent;
+    -fx-prompt-text-fill: derive(-dark, 50.0%);
+    -fx-highlight-fill: rgb(94.0, 203.0, 234.0);
+}
+
+#resultDisplay:focused {
+    -fx-border-color: -swatch-grey;
+}
+
+.result-display {
+    -fx-background-color: #fff;
+    -fx-font-family: "Segoe UI";
+    -fx-font-size: 12pt;
+}
+
+.result-display .label {
+    -fx-text-fill: black;
+}
+
+#degreePlannerListView .list-cell {
+    -fx-padding: 0 0 0 5;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Tags		                       			  				   				   *
+ *                                                                             *
+ ******************************************************************************/
+
+#tags, #codes {
+    -fx-hgap: 7;
+    -fx-vgap: 3;
+}
+
+#tags .label {
+    -fx-text-fill: white;
+    -fx-background-color: #3e7b91;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 11;
+}
+
+
+.red {
+    -fx-text-fill: #ff7675;
+}
+
+.orange {
+    -fx-text-fill: #FF7F11;
+}
+
+.green {
+    -fx-text-fill: #43845F;
+}
+
+#codes .label {
+    -fx-text-fill: white;
+    -fx-background-color: #47996B;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 13;
+}
+
+.noModules {
+    -fx-fill: black;
+}
+
+.background {
+    -fx-background-color: derive(#f5f5f5, 20%);
+    background-color: white; /* Used in the default.html file */
+}
+
+.myModule .label {
+    -fx-background-color: #D35934;
+    -fx-padding: 10 10 10 10;
+    -fx-background-radius: 2;
+    -fx-font-size: 13;
+    -fx-text-fill: white;
+    -fx-pref-width: 1000;
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
deleted file mode 100644
index 6a4d2b7181c3..000000000000
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "persons": [ {
-    "name": "Valid Person",
-    "phone": "9482424",
-    "email": "hans@example.com",
-    "address": "4th street"
-  }, {
-    "name": "Person With Invalid Phone Field",
-    "phone": "948asdf2424",
-    "email": "hans@example.com",
-    "address": "4th street"
-  } ]
-}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
deleted file mode 100644
index ccd21f7d1a93..000000000000
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "persons": [ {
-    "name": "Person with invalid name field: Ha!ns Mu@ster",
-    "phone": "9482424",
-    "email": "hans@example.com",
-    "address": "4th street"
-  } ]
-}
diff --git a/src/test/data/JsonApplicationStorageTest/invalidAndValidDegreePlannerList.json b/src/test/data/JsonApplicationStorageTest/invalidAndValidDegreePlannerList.json
new file mode 100644
index 000000000000..a57f652e6e7d
--- /dev/null
+++ b/src/test/data/JsonApplicationStorageTest/invalidAndValidDegreePlannerList.json
@@ -0,0 +1,35 @@
+{
+  "degreePlanners" : [ {
+    "year" : "1",
+    "semester" : "1",
+    "codes" : [ "CS1231", "CS2100", "CS1010", "CS2040C", "CS2102" ]
+  }, {
+    "year" : "Invalid",
+    "semester" : "Invalid",
+    "codes" : [ ]
+  }, {
+    "year" : "2",
+    "semester" : "1",
+    "codes" : [ ]
+  }, {
+    "year" : "2",
+    "semester" : "2",
+    "codes" : [ ]
+  }, {
+    "year" : "3",
+    "semester" : "1",
+    "codes" : [ ]
+  }, {
+    "year" : "3",
+    "semester" : "2",
+    "codes" : [ ]
+  }, {
+    "year" : "4",
+    "semester" : "1",
+    "codes" : [ ]
+  }, {
+    "year" : "4",
+    "semester" : "2",
+    "codes" : [ ]
+  } ]
+}
diff --git a/src/test/data/JsonApplicationStorageTest/invalidAndValidModuleList.json b/src/test/data/JsonApplicationStorageTest/invalidAndValidModuleList.json
new file mode 100644
index 000000000000..4e438203814f
--- /dev/null
+++ b/src/test/data/JsonApplicationStorageTest/invalidAndValidModuleList.json
@@ -0,0 +1,11 @@
+{
+  "modules": [ {
+    "name": "Valid Module",
+    "credits": "9482424",
+    "code": "CS1010"
+  }, {
+    "name": "Module With Invalid Credits Field",
+    "credits": "948asdf2424",
+    "code": "CS1231"
+  } ]
+}
diff --git a/src/test/data/JsonApplicationStorageTest/invalidDegreePlannerList.json b/src/test/data/JsonApplicationStorageTest/invalidDegreePlannerList.json
new file mode 100644
index 000000000000..f8cdc7bf329b
--- /dev/null
+++ b/src/test/data/JsonApplicationStorageTest/invalidDegreePlannerList.json
@@ -0,0 +1,7 @@
+{
+  "degreePlanners" : [ {
+    "year" : "Invalid",
+    "semester" : "1",
+    "codes" : [ ]
+  } ]
+}
diff --git a/src/test/data/JsonApplicationStorageTest/invalidModuleList.json b/src/test/data/JsonApplicationStorageTest/invalidModuleList.json
new file mode 100644
index 000000000000..683ee6db5e3c
--- /dev/null
+++ b/src/test/data/JsonApplicationStorageTest/invalidModuleList.json
@@ -0,0 +1,7 @@
+{
+  "modules": [ {
+    "name": "Module with invalid name field: Ha!ns Muäster",
+    "credits": "9482424",
+    "code": "CS1010"
+  } ]
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/notJsonFormatAddressBook.json b/src/test/data/JsonApplicationStorageTest/notJsonFormatList.json
similarity index 100%
rename from src/test/data/JsonAddressBookStorageTest/notJsonFormatAddressBook.json
rename to src/test/data/JsonApplicationStorageTest/notJsonFormatList.json
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
deleted file mode 100644
index 48831cc76744..000000000000
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "persons": [ {
-    "name": "Alice Pauline",
-    "phone": "94351253",
-    "email": "alice@example.com",
-    "address": "123, Jurong West Ave 6, #08-111",
-    "tagged": [ "friends" ]
-  }, {
-    "name": "Alice Pauline",
-    "phone": "94351253",
-    "email": "pauline@example.com",
-    "address": "4th street"
-  } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
deleted file mode 100644
index ad3f135ae428..000000000000
--- a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "persons": [ {
-    "name": "Hans Muster",
-    "phone": "9482424",
-    "email": "invalid@email!3e",
-    "address": "4th street"
-  } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
deleted file mode 100644
index f10eddee12ed..000000000000
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "_comment": "AddressBook save file which contains the same Person values as in TypicalPersons#getTypicalAddressBook()",
-  "persons" : [ {
-    "name" : "Alice Pauline",
-    "phone" : "94351253",
-    "email" : "alice@example.com",
-    "address" : "123, Jurong West Ave 6, #08-111",
-    "tagged" : [ "friends" ]
-  }, {
-    "name" : "Benson Meier",
-    "phone" : "98765432",
-    "email" : "johnd@example.com",
-    "address" : "311, Clementi Ave 2, #02-25",
-    "tagged" : [ "owesMoney", "friends" ]
-  }, {
-    "name" : "Carl Kurz",
-    "phone" : "95352563",
-    "email" : "heinz@example.com",
-    "address" : "wall street",
-    "tagged" : [ ]
-  }, {
-    "name" : "Daniel Meier",
-    "phone" : "87652533",
-    "email" : "cornelia@example.com",
-    "address" : "10th street",
-    "tagged" : [ "friends" ]
-  }, {
-    "name" : "Elle Meyer",
-    "phone" : "9482224",
-    "email" : "werner@example.com",
-    "address" : "michegan ave",
-    "tagged" : [ ]
-  }, {
-    "name" : "Fiona Kunz",
-    "phone" : "9482427",
-    "email" : "lydia@example.com",
-    "address" : "little tokyo",
-    "tagged" : [ ]
-  }, {
-    "name" : "George Best",
-    "phone" : "9482442",
-    "email" : "anna@example.com",
-    "address" : "4th street",
-    "tagged" : [ ]
-  } ]
-}
diff --git a/src/test/data/JsonSerializableApplicationTest/duplicateModuleList.json b/src/test/data/JsonSerializableApplicationTest/duplicateModuleList.json
new file mode 100644
index 000000000000..88078bf3a605
--- /dev/null
+++ b/src/test/data/JsonSerializableApplicationTest/duplicateModuleList.json
@@ -0,0 +1,14 @@
+{
+  "modules": [ {
+    "code": "CS1010",
+    "name": "Alice Pauline",
+    "credits": "123",
+    "semesters": [ "1", "2", "4" ],
+    "tagged": [ "friends" ]
+  }, {
+    "code": "CS1010",
+    "name": "Alice Pauline",
+    "credits": "123",
+    "semesters": [ "1", "2", "4" ]
+  } ]
+}
diff --git a/src/test/data/JsonSerializableApplicationTest/invalidModuleList.json b/src/test/data/JsonSerializableApplicationTest/invalidModuleList.json
new file mode 100644
index 000000000000..28d66bd953d5
--- /dev/null
+++ b/src/test/data/JsonSerializableApplicationTest/invalidModuleList.json
@@ -0,0 +1,7 @@
+{
+  "modules": [ {
+    "name": "Hans Muster",
+    "credits": "9482424z",
+    "code": "AAAA1234BBBB"
+  } ]
+}
diff --git a/src/test/data/JsonSerializableApplicationTest/typicalDegreePlannerList.json b/src/test/data/JsonSerializableApplicationTest/typicalDegreePlannerList.json
new file mode 100644
index 000000000000..b92ce7eb1dba
--- /dev/null
+++ b/src/test/data/JsonSerializableApplicationTest/typicalDegreePlannerList.json
@@ -0,0 +1,27 @@
+{
+  "degreePlanners" : [ {
+    "year" : "1",
+    "semester" : "1",
+    "codes" : [ "CS1231", "CS2100", "CS1010", "CS2040C", "CS2102" ]
+  }, {
+    "year" : "1",
+    "semester" : "2",
+    "codes" : [ ]
+  }, {
+    "year" : "2",
+    "semester" : "1",
+    "codes" : [ ]
+  }, {
+    "year" : "2",
+    "semester" : "2",
+    "codes" : [ ]
+  }, {
+    "year" : "3",
+    "semester" : "1",
+    "codes" : [ ]
+  }, {
+    "year" : "3",
+    "semester" : "2",
+    "codes" : [ ]
+  } ]
+}
diff --git a/src/test/data/JsonSerializableApplicationTest/typicalModulesList.json b/src/test/data/JsonSerializableApplicationTest/typicalModulesList.json
new file mode 100644
index 000000000000..952e8ced621c
--- /dev/null
+++ b/src/test/data/JsonSerializableApplicationTest/typicalModulesList.json
@@ -0,0 +1,53 @@
+{
+  "_comment": "Application save file which contains the same Module values as in TypicalModules#getTypicalApplication()",
+  "modules" : [ {
+    "code" : "CS1010",
+    "name" : "Alice Pauline",
+    "credits" : "0",
+    "semesters" : [ "1", "2", "4" ],
+    "corequisites": [ ],
+    "tagged" : [ "friends" ]
+  }, {
+    "code" : "CS1231",
+    "name" : "Benson Meier",
+    "credits" : "1",
+    "semesters" : [ "1", "2" ],
+    "corequisites": [ "CS2102" ],
+    "tagged" : [ "owesMoney", "friends" ]
+  }, {
+    "code" : "CS2040C",
+    "name" : "Carl Kurz",
+    "credits" : "2",
+    "semesters" : [ "1", "2" ],
+    "corequisites": [ ],
+    "tagged" : [ ]
+  }, {
+    "code" : "CS2100",
+    "name" : "Daniel Meier",
+    "credits" : "3",
+    "semesters" : [ "1", "2" ],
+    "corequisites": [ ],
+    "tagged" : [ "friends" ]
+  }, {
+    "code" : "CS2101",
+    "name" : "Elle Meyer",
+    "credits" : "4",
+    "semesters" : [ "1", "2" ],
+    "corequisites": [ ],
+    "tagged" : [ ]
+  }, {
+    "code" : "CS2102",
+    "name" : "Fiona Kunz",
+    "credits" : "5",
+    "semesters" : [ "1" ],
+    "corequisites": [ "CS1231" ],
+    "tagged" : [ ]
+  }, {
+    "code" : "CS2105",
+    "name" : "George Best",
+    "credits" : "6",
+    "semesters" : [ "1", "2" ],
+    "corequisites": [ ],
+    "tagged" : [ ]
+  } ]
+}
diff --git a/src/test/data/JsonSerializableApplicationTest/typicalRequirementCategoryList.json b/src/test/data/JsonSerializableApplicationTest/typicalRequirementCategoryList.json
new file mode 100644
index 000000000000..f0382eac769a
--- /dev/null
+++ b/src/test/data/JsonSerializableApplicationTest/typicalRequirementCategoryList.json
@@ -0,0 +1,35 @@
+{
+  "requirementCategories" : [ {
+    "name" : "Computing Foundation",
+    "credits" : "36",
+    "codeList" : [ "CS2100" ]
+  }, {
+    "name" : "Information Security Requirements",
+    "credits" : "20",
+    "codeList" : [ ]
+  }, {
+    "name" : "Information Security Electives",
+    "credits" : "12",
+    "codeList" : [ ]
+  }, {
+    "name" : "Computing Breadth",
+    "credits" : "20",
+    "codeList" : [ ]
+  }, {
+    "name" : "IT Professionalism",
+    "credits" : "8",
+    "codeList" : [ ]
+  }, {
+    "name" : "Mathematics",
+    "credits" : "12",
+    "codeList" : [ "CS1231" ]
+  }, {
+    "name" : "General Education",
+    "credits" : "20",
+    "codeList" : [ ]
+  }, {
+    "name" : "Unrestricted Electives",
+    "credits" : "12",
+    "codeList" : [ ]
+  } ]
+}
diff --git a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
index 1037548a9cde..18d240b4e697 100644
--- a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
+++ b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
@@ -9,5 +9,5 @@
       "z" : 99
     }
   },
-  "addressBookFilePath" : "addressbook.json"
+  "moduleListFilePath" : "moduleList.json"
 }
diff --git a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
index b819bed900a1..8e36a45f8d1c 100644
--- a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
+++ b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
@@ -7,5 +7,5 @@
       "y" : 100
     }
   },
-  "addressBookFilePath" : "addressbook.json"
+  "moduleListFilePath" : "moduleList.json"
 }
diff --git a/src/test/java/guitests/guihandles/AlertDialogHandle.java b/src/test/java/guitests/guihandles/AlertDialogHandle.java
index 92150be91837..8923136b131b 100644
--- a/src/test/java/guitests/guihandles/AlertDialogHandle.java
+++ b/src/test/java/guitests/guihandles/AlertDialogHandle.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.control.DialogPane;
 import javafx.stage.Stage;
-import seedu.address.ui.UiManager;
+import pwe.planner.ui.UiManager;
 
 /**
  * A handle for the {@code AlertDialog} of the UI.
diff --git a/src/test/java/guitests/guihandles/MainWindowHandle.java b/src/test/java/guitests/guihandles/MainWindowHandle.java
index 34e36054f4fd..fe3f662f4bbc 100644
--- a/src/test/java/guitests/guihandles/MainWindowHandle.java
+++ b/src/test/java/guitests/guihandles/MainWindowHandle.java
@@ -7,7 +7,7 @@
  */
 public class MainWindowHandle extends StageHandle {
 
-    private final PersonListPanelHandle personListPanel;
+    private final ModuleListPanelHandle moduleListPanel;
     private final ResultDisplayHandle resultDisplay;
     private final CommandBoxHandle commandBox;
     private final StatusBarFooterHandle statusBarFooter;
@@ -17,7 +17,7 @@ public class MainWindowHandle extends StageHandle {
     public MainWindowHandle(Stage stage) {
         super(stage);
 
-        personListPanel = new PersonListPanelHandle(getChildNode(PersonListPanelHandle.PERSON_LIST_VIEW_ID));
+        moduleListPanel = new ModuleListPanelHandle(getChildNode(ModuleListPanelHandle.MODULE_LIST_VIEW_ID));
         resultDisplay = new ResultDisplayHandle(getChildNode(ResultDisplayHandle.RESULT_DISPLAY_ID));
         commandBox = new CommandBoxHandle(getChildNode(CommandBoxHandle.COMMAND_INPUT_FIELD_ID));
         statusBarFooter = new StatusBarFooterHandle(getChildNode(StatusBarFooterHandle.STATUS_BAR_PLACEHOLDER));
@@ -25,8 +25,8 @@ public MainWindowHandle(Stage stage) {
         browserPanel = new BrowserPanelHandle(getChildNode(BrowserPanelHandle.BROWSER_ID));
     }
 
-    public PersonListPanelHandle getPersonListPanel() {
-        return personListPanel;
+    public ModuleListPanelHandle getModuleListPanel() {
+        return moduleListPanel;
     }
 
     public ResultDisplayHandle getResultDisplay() {
diff --git a/src/test/java/guitests/guihandles/ModuleCardHandle.java b/src/test/java/guitests/guihandles/ModuleCardHandle.java
new file mode 100644
index 000000000000..ca3c648a0a4f
--- /dev/null
+++ b/src/test/java/guitests/guihandles/ModuleCardHandle.java
@@ -0,0 +1,101 @@
+package guitests.guihandles;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+
+/**
+ * Provides a handle to a module card in the module list panel.
+ */
+public class ModuleCardHandle extends NodeHandle<Node> {
+    private static final String ID_FIELD_ID = "#id";
+    private static final String NAME_FIELD_ID = "#name";
+    private static final String CODE_FIELD_ID = "#code";
+    private static final String CREDITS_FIELD_ID = "#credits";
+    private static final String TAGS_FIELD_ID = "#tags";
+    private static final String COREQUISITES_FIELD_ID = "#corequisites";
+
+    private final Label idLabel;
+    private final Label nameLabel;
+    private final Label codeLabel;
+    private final Label creditsLabel;
+    private final List<Label> tagLabels;
+    private final Label corequisitesLabel;
+
+    public ModuleCardHandle(Node cardNode) {
+        super(cardNode);
+
+        idLabel = getChildNode(ID_FIELD_ID);
+        nameLabel = getChildNode(NAME_FIELD_ID);
+        codeLabel = getChildNode(CODE_FIELD_ID);
+        creditsLabel = getChildNode(CREDITS_FIELD_ID);
+
+        Region tagsContainer = getChildNode(TAGS_FIELD_ID);
+        tagLabels = tagsContainer
+                .getChildrenUnmodifiable()
+                .stream()
+                .map(Label.class::cast)
+                .collect(Collectors.toList());
+
+        corequisitesLabel = getChildNode(COREQUISITES_FIELD_ID);
+    }
+
+    public String getId() {
+        return idLabel.getText();
+    }
+
+    public String getName() {
+        return nameLabel.getText();
+    }
+
+    public String getCode() {
+        return codeLabel.getText();
+    }
+
+    public String getCredits() {
+        String credits = creditsLabel.getText();
+        if (credits.startsWith("Modular Credits: ")) {
+            credits = credits.substring("Modular Credits: ".length());
+        }
+        return credits;
+    }
+
+    public List<String> getTags() {
+        return tagLabels
+                .stream()
+                .map(Label::getText)
+                .collect(Collectors.toList());
+    }
+
+    public String getCorequisites() {
+        String corequisites = corequisitesLabel.getText();
+        if (corequisites.startsWith("Co-requisites: ")) {
+            corequisites = corequisites.substring("Co-requisites: ".length());
+        }
+
+        if (corequisites.equals("None")) {
+            corequisites = "";
+        }
+        return corequisites;
+    }
+
+    /**
+     * Returns true if this handle contains {@code module}.
+     */
+    public boolean equals(Module module) {
+        return getName().equals(module.getName().fullName)
+                && getCode().equals(module.getCode().value)
+                && getCredits().equals(module.getCredits().value)
+                && getTags().equals(module.getTags().stream()
+                    .map(tag -> tag.tagName)
+                    .sorted()
+                    .collect(Collectors.toList()))
+                && getCorequisites().equals(module.getCorequisites().stream().map(Code::toString)
+                    .collect(Collectors.joining(", ")));
+    }
+}
diff --git a/src/test/java/guitests/guihandles/PersonListPanelHandle.java b/src/test/java/guitests/guihandles/ModuleListPanelHandle.java
similarity index 57%
rename from src/test/java/guitests/guihandles/PersonListPanelHandle.java
rename to src/test/java/guitests/guihandles/ModuleListPanelHandle.java
index d11ed161ecbd..a2db4f730493 100644
--- a/src/test/java/guitests/guihandles/PersonListPanelHandle.java
+++ b/src/test/java/guitests/guihandles/ModuleListPanelHandle.java
@@ -6,38 +6,38 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.ListView;
-import seedu.address.model.person.Person;
+import pwe.planner.model.module.Module;
 
 /**
- * Provides a handle for {@code PersonListPanel} containing the list of {@code PersonCard}.
+ * Provides a handle for {@code ModuleListPanel} containing the list of {@code ModuleCard}.
  */
-public class PersonListPanelHandle extends NodeHandle<ListView<Person>> {
-    public static final String PERSON_LIST_VIEW_ID = "#personListView";
+public class ModuleListPanelHandle extends NodeHandle<ListView<Module>> {
+    public static final String MODULE_LIST_VIEW_ID = "#moduleListView";
 
     private static final String CARD_PANE_ID = "#cardPane";
 
-    private Optional<Person> lastRememberedSelectedPersonCard;
+    private Optional<Module> lastRememberedSelectedModuleCard;
 
-    public PersonListPanelHandle(ListView<Person> personListPanelNode) {
-        super(personListPanelNode);
+    public ModuleListPanelHandle(ListView<Module> moduleListPanelNode) {
+        super(moduleListPanelNode);
     }
 
     /**
-     * Returns a handle to the selected {@code PersonCardHandle}.
+     * Returns a handle to the selected {@code ModuleCardHandle}.
      * A maximum of 1 item can be selected at any time.
      * @throws AssertionError if no card is selected, or more than 1 card is selected.
      * @throws IllegalStateException if the selected card is currently not in the scene graph.
      */
-    public PersonCardHandle getHandleToSelectedCard() {
-        List<Person> selectedPersonList = getRootNode().getSelectionModel().getSelectedItems();
+    public ModuleCardHandle getHandleToSelectedCard() {
+        List<Module> selectedModuleList = getRootNode().getSelectionModel().getSelectedItems();
 
-        if (selectedPersonList.size() != 1) {
-            throw new AssertionError("Person list size expected 1.");
+        if (selectedModuleList.size() != 1) {
+            throw new AssertionError("Module list size expected 1.");
         }
 
         return getAllCardNodes().stream()
-                .map(PersonCardHandle::new)
-                .filter(handle -> handle.equals(selectedPersonList.get(0)))
+                .map(ModuleCardHandle::new)
+                .filter(handle -> handle.equals(selectedModuleList.get(0)))
                 .findFirst()
                 .orElseThrow(IllegalStateException::new);
     }
@@ -53,7 +53,7 @@ public int getSelectedCardIndex() {
      * Returns true if a card is currently selected.
      */
     public boolean isAnyCardSelected() {
-        List<Person> selectedCardsList = getRootNode().getSelectionModel().getSelectedItems();
+        List<Module> selectedCardsList = getRootNode().getSelectionModel().getSelectedItems();
 
         if (selectedCardsList.size() > 1) {
             throw new AssertionError("Card list size expected 0 or 1.");
@@ -63,15 +63,15 @@ public boolean isAnyCardSelected() {
     }
 
     /**
-     * Navigates the listview to display {@code person}.
+     * Navigates the listview to display {@code module}.
      */
-    public void navigateToCard(Person person) {
-        if (!getRootNode().getItems().contains(person)) {
-            throw new IllegalArgumentException("Person does not exist.");
+    public void navigateToCard(Module module) {
+        if (!getRootNode().getItems().contains(module)) {
+            throw new IllegalArgumentException("Module does not exist.");
         }
 
         guiRobot.interact(() -> {
-            getRootNode().scrollTo(person);
+            getRootNode().scrollTo(module);
         });
         guiRobot.pauseForHuman();
     }
@@ -91,25 +91,25 @@ public void navigateToCard(int index) {
     }
 
     /**
-     * Selects the {@code PersonCard} at {@code index} in the list.
+     * Selects the {@code ModuleCard} at {@code index} in the list.
      */
     public void select(int index) {
         getRootNode().getSelectionModel().select(index);
     }
 
     /**
-     * Returns the person card handle of a person associated with the {@code index} in the list.
+     * Returns the module card handle of a module associated with the {@code index} in the list.
      * @throws IllegalStateException if the selected card is currently not in the scene graph.
      */
-    public PersonCardHandle getPersonCardHandle(int index) {
+    public ModuleCardHandle getModuleCardHandle(int index) {
         return getAllCardNodes().stream()
-                .map(PersonCardHandle::new)
-                .filter(handle -> handle.equals(getPerson(index)))
+                .map(ModuleCardHandle::new)
+                .filter(handle -> handle.equals(getModule(index)))
                 .findFirst()
                 .orElseThrow(IllegalStateException::new);
     }
 
-    private Person getPerson(int index) {
+    private Module getModule(int index) {
         return getRootNode().getItems().get(index);
     }
 
@@ -123,30 +123,30 @@ private Set<Node> getAllCardNodes() {
     }
 
     /**
-     * Remembers the selected {@code PersonCard} in the list.
+     * Remembers the selected {@code ModuleCard} in the list.
      */
-    public void rememberSelectedPersonCard() {
-        List<Person> selectedItems = getRootNode().getSelectionModel().getSelectedItems();
+    public void rememberSelectedModuleCard() {
+        List<Module> selectedItems = getRootNode().getSelectionModel().getSelectedItems();
 
         if (selectedItems.size() == 0) {
-            lastRememberedSelectedPersonCard = Optional.empty();
+            lastRememberedSelectedModuleCard = Optional.empty();
         } else {
-            lastRememberedSelectedPersonCard = Optional.of(selectedItems.get(0));
+            lastRememberedSelectedModuleCard = Optional.of(selectedItems.get(0));
         }
     }
 
     /**
-     * Returns true if the selected {@code PersonCard} is different from the value remembered by the most recent
-     * {@code rememberSelectedPersonCard()} call.
+     * Returns true if the selected {@code ModuleCard} is different from the value remembered by the most recent
+     * {@code rememberSelectedModuleCard()} call.
      */
-    public boolean isSelectedPersonCardChanged() {
-        List<Person> selectedItems = getRootNode().getSelectionModel().getSelectedItems();
+    public boolean isSelectedModuleCardChanged() {
+        List<Module> selectedItems = getRootNode().getSelectionModel().getSelectedItems();
 
         if (selectedItems.size() == 0) {
-            return lastRememberedSelectedPersonCard.isPresent();
+            return lastRememberedSelectedModuleCard.isPresent();
         } else {
-            return !lastRememberedSelectedPersonCard.isPresent()
-                    || !lastRememberedSelectedPersonCard.get().equals(selectedItems.get(0));
+            return !lastRememberedSelectedModuleCard.isPresent()
+                    || !lastRememberedSelectedModuleCard.get().equals(selectedItems.get(0));
         }
     }
 
diff --git a/src/test/java/guitests/guihandles/PersonCardHandle.java b/src/test/java/guitests/guihandles/PersonCardHandle.java
deleted file mode 100644
index 1789735e49a8..000000000000
--- a/src/test/java/guitests/guihandles/PersonCardHandle.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package guitests.guihandles;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.ImmutableMultiset;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
-import seedu.address.model.person.Person;
-
-/**
- * Provides a handle to a person card in the person list panel.
- */
-public class PersonCardHandle extends NodeHandle<Node> {
-    private static final String ID_FIELD_ID = "#id";
-    private static final String NAME_FIELD_ID = "#name";
-    private static final String ADDRESS_FIELD_ID = "#address";
-    private static final String PHONE_FIELD_ID = "#phone";
-    private static final String EMAIL_FIELD_ID = "#email";
-    private static final String TAGS_FIELD_ID = "#tags";
-
-    private final Label idLabel;
-    private final Label nameLabel;
-    private final Label addressLabel;
-    private final Label phoneLabel;
-    private final Label emailLabel;
-    private final List<Label> tagLabels;
-
-    public PersonCardHandle(Node cardNode) {
-        super(cardNode);
-
-        idLabel = getChildNode(ID_FIELD_ID);
-        nameLabel = getChildNode(NAME_FIELD_ID);
-        addressLabel = getChildNode(ADDRESS_FIELD_ID);
-        phoneLabel = getChildNode(PHONE_FIELD_ID);
-        emailLabel = getChildNode(EMAIL_FIELD_ID);
-
-        Region tagsContainer = getChildNode(TAGS_FIELD_ID);
-        tagLabels = tagsContainer
-                .getChildrenUnmodifiable()
-                .stream()
-                .map(Label.class::cast)
-                .collect(Collectors.toList());
-    }
-
-    public String getId() {
-        return idLabel.getText();
-    }
-
-    public String getName() {
-        return nameLabel.getText();
-    }
-
-    public String getAddress() {
-        return addressLabel.getText();
-    }
-
-    public String getPhone() {
-        return phoneLabel.getText();
-    }
-
-    public String getEmail() {
-        return emailLabel.getText();
-    }
-
-    public List<String> getTags() {
-        return tagLabels
-                .stream()
-                .map(Label::getText)
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Returns true if this handle contains {@code person}.
-     */
-    public boolean equals(Person person) {
-        return getName().equals(person.getName().fullName)
-                && getAddress().equals(person.getAddress().value)
-                && getPhone().equals(person.getPhone().value)
-                && getEmail().equals(person.getEmail().value)
-                && ImmutableMultiset.copyOf(getTags()).equals(ImmutableMultiset.copyOf(person.getTags().stream()
-                        .map(tag -> tag.tagName)
-                        .collect(Collectors.toList())));
-    }
-}
diff --git a/src/test/java/guitests/guihandles/StageHandle.java b/src/test/java/guitests/guihandles/StageHandle.java
index af379def00ea..e44012f350e0 100644
--- a/src/test/java/guitests/guihandles/StageHandle.java
+++ b/src/test/java/guitests/guihandles/StageHandle.java
@@ -10,7 +10,7 @@
 import guitests.guihandles.exceptions.NodeNotFoundException;
 import javafx.scene.Node;
 import javafx.stage.Stage;
-import seedu.address.commons.core.LogsCenter;
+import pwe.planner.commons.core.LogsCenter;
 
 /**
  * Provides access to a stage in a JavaFx application for GUI testing purposes.
diff --git a/src/test/java/seedu/address/AppParametersTest.java b/src/test/java/pwe/planner/AppParametersTest.java
similarity index 98%
rename from src/test/java/seedu/address/AppParametersTest.java
rename to src/test/java/pwe/planner/AppParametersTest.java
index e6ef73d83b50..c1a56ca0f8b0 100644
--- a/src/test/java/seedu/address/AppParametersTest.java
+++ b/src/test/java/pwe/planner/AppParametersTest.java
@@ -1,4 +1,4 @@
-package seedu.address;
+package pwe.planner;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/pwe/planner/TestApp.java b/src/test/java/pwe/planner/TestApp.java
new file mode 100644
index 000000000000..f25498ee0ec8
--- /dev/null
+++ b/src/test/java/pwe/planner/TestApp.java
@@ -0,0 +1,123 @@
+package pwe.planner;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.function.Supplier;
+
+import javafx.stage.Screen;
+import javafx.stage.Stage;
+import pwe.planner.commons.core.Config;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.storage.JsonApplicationStorage;
+import pwe.planner.storage.UserPrefsStorage;
+import pwe.planner.testutil.TestUtil;
+import systemtests.ModelHelper;
+
+/**
+ * This class is meant to override some properties of MainApp so that it will be suited for
+ * testing
+ */
+public class TestApp extends MainApp {
+
+    public static final Path SAVE_LOCATION_FOR_MODULE_LIST_TESTING =
+            TestUtil.getFilePathInSandboxFolder("sampleModuleListData.json");
+    public static final Path SAVE_LOCATION_FOR_DEGREE_PLANNER_LIST_TESTING =
+            TestUtil.getFilePathInSandboxFolder("sampleDegreePlannerListData.json");
+    public static final Path SAVE_LOCATION_FOR_REQUIREMENT_CATEGORY_LIST_TESTING =
+            TestUtil.getFilePathInSandboxFolder("sampleRequirementCategoryListData.json");
+
+    protected static final Path DEFAULT_PREF_FILE_LOCATION_FOR_TESTING =
+            TestUtil.getFilePathInSandboxFolder("pref_testing.json");
+    protected Supplier<ReadOnlyApplication> initialDataSupplier = () -> null;
+    protected Path saveModuleListFileLocation = SAVE_LOCATION_FOR_MODULE_LIST_TESTING;
+    protected Path saveDegreePlannerListFileLocation = SAVE_LOCATION_FOR_DEGREE_PLANNER_LIST_TESTING;
+    protected Path saveRequirementCategoryListFileLocation = SAVE_LOCATION_FOR_REQUIREMENT_CATEGORY_LIST_TESTING;
+
+    public TestApp() {
+    }
+
+    public TestApp(Supplier<ReadOnlyApplication> initialDataSupplier, Path saveModuleListFileLocation,
+            Path saveDegreePlannerListFileLocation, Path saveRequirementCategoryListFileLocation) {
+        super();
+        this.initialDataSupplier = initialDataSupplier;
+        this.saveModuleListFileLocation = saveModuleListFileLocation;
+        this.saveDegreePlannerListFileLocation = saveDegreePlannerListFileLocation;
+        this.saveRequirementCategoryListFileLocation = saveRequirementCategoryListFileLocation;
+
+        // If some initial local data has been provided, write those to the file
+        if (initialDataSupplier.get() != null) {
+            JsonApplicationStorage jsonApplicationStorage =
+                    new JsonApplicationStorage(saveModuleListFileLocation, saveDegreePlannerListFileLocation,
+                            saveRequirementCategoryListFileLocation);
+            try {
+                jsonApplicationStorage.saveApplication(initialDataSupplier.get());
+            } catch (IOException ioe) {
+                throw new AssertionError(ioe);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    @Override
+    protected Config initConfig(Path configFilePath) {
+        Config config = super.initConfig(configFilePath);
+        config.setUserPrefsFilePath(DEFAULT_PREF_FILE_LOCATION_FOR_TESTING);
+        return config;
+    }
+
+    @Override
+    protected UserPrefs initPrefs(UserPrefsStorage storage) {
+        UserPrefs userPrefs = super.initPrefs(storage);
+        double x = Screen.getPrimary().getVisualBounds().getMinX();
+        double y = Screen.getPrimary().getVisualBounds().getMinY();
+        userPrefs.setGuiSettings(new GuiSettings(600.0, 600.0, (int) x, (int) y));
+        userPrefs.setModuleListFilePath(saveModuleListFileLocation);
+        userPrefs.setRequirementCategoryListFilePath(saveRequirementCategoryListFileLocation);
+        userPrefs.setDegreePlannerListFilePath(saveDegreePlannerListFileLocation);
+        return userPrefs;
+    }
+
+    /**
+     * Returns a defensive copy of the application data stored inside the storage file.
+     */
+    public Application readStorageapplication() {
+        try {
+            return new Application(storage.readApplication().get());
+        } catch (DataConversionException dce) {
+            throw new AssertionError("Encountered invalid format when parsing application save data.", dce);
+        } catch (IOException ioe) {
+            throw new AssertionError("Storage file cannot be found.", ioe);
+        }
+    }
+
+    /**
+     * Returns the file path of the storage file.
+     */
+    public Path getStorageSaveLocation() {
+        return storage.getModuleListFilePath();
+    }
+
+    /**
+     * Returns a defensive copy of the model.
+     */
+    public Model getModel() {
+        Model copy = new ModelManager((model.getApplication()), new UserPrefs());
+        ModelHelper.setFilteredList(copy, model.getFilteredModuleList());
+        return copy;
+    }
+
+    @Override
+    public void start(Stage primaryStage) {
+        ui.start(primaryStage);
+    }
+
+}
diff --git a/src/test/java/seedu/address/commons/core/ConfigTest.java b/src/test/java/pwe/planner/commons/core/ConfigTest.java
similarity index 79%
rename from src/test/java/seedu/address/commons/core/ConfigTest.java
rename to src/test/java/pwe/planner/commons/core/ConfigTest.java
index a9e7ab09648c..76bb975143e2 100644
--- a/src/test/java/seedu/address/commons/core/ConfigTest.java
+++ b/src/test/java/pwe/planner/commons/core/ConfigTest.java
@@ -1,16 +1,12 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class ConfigTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
 
     @Test
     public void toString_defaultObject_stringReturned() {
diff --git a/src/test/java/seedu/address/commons/core/VersionTest.java b/src/test/java/pwe/planner/commons/core/VersionTest.java
similarity index 99%
rename from src/test/java/seedu/address/commons/core/VersionTest.java
rename to src/test/java/pwe/planner/commons/core/VersionTest.java
index 7601efa25893..117bd1845357 100644
--- a/src/test/java/seedu/address/commons/core/VersionTest.java
+++ b/src/test/java/pwe/planner/commons/core/VersionTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package pwe.planner.commons.core;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/seedu/address/commons/core/index/IndexTest.java b/src/test/java/pwe/planner/commons/core/index/IndexTest.java
similarity index 85%
rename from src/test/java/seedu/address/commons/core/index/IndexTest.java
rename to src/test/java/pwe/planner/commons/core/index/IndexTest.java
index 2364e0afbd68..403a69e8d344 100644
--- a/src/test/java/seedu/address/commons/core/index/IndexTest.java
+++ b/src/test/java/pwe/planner/commons/core/index/IndexTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core.index;
+package pwe.planner.commons.core.index;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -71,22 +71,22 @@ private void assertCreateFailure(int invalidIndex, boolean isZeroBased) {
 
     @Test
     public void equals() {
-        final Index fifthPersonIndex = Index.fromOneBased(5);
+        final Index fifthModuleIndex = Index.fromOneBased(5);
 
         // same values -> returns true
-        assertTrue(fifthPersonIndex.equals(Index.fromOneBased(5)));
-        assertTrue(fifthPersonIndex.equals(Index.fromZeroBased(4)));
+        assertTrue(fifthModuleIndex.equals(Index.fromOneBased(5)));
+        assertTrue(fifthModuleIndex.equals(Index.fromZeroBased(4)));
 
         // same object -> returns true
-        assertTrue(fifthPersonIndex.equals(fifthPersonIndex));
+        assertTrue(fifthModuleIndex.equals(fifthModuleIndex));
 
         // null -> returns false
-        assertFalse(fifthPersonIndex.equals(null));
+        assertFalse(fifthModuleIndex.equals(null));
 
         // different types -> returns false
-        assertFalse(fifthPersonIndex.equals(5.0f));
+        assertFalse(fifthModuleIndex.equals(5.0f));
 
         // different index -> returns false
-        assertFalse(fifthPersonIndex.equals(Index.fromOneBased(1)));
+        assertFalse(fifthModuleIndex.equals(Index.fromOneBased(1)));
     }
 }
diff --git a/src/test/java/seedu/address/commons/util/AppUtilTest.java b/src/test/java/pwe/planner/commons/util/AppUtilTest.java
similarity index 91%
rename from src/test/java/seedu/address/commons/util/AppUtilTest.java
rename to src/test/java/pwe/planner/commons/util/AppUtilTest.java
index b81493f4784b..86ecc6d8e479 100644
--- a/src/test/java/seedu/address/commons/util/AppUtilTest.java
+++ b/src/test/java/pwe/planner/commons/util/AppUtilTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -15,7 +15,7 @@ public class AppUtilTest {
 
     @Test
     public void getImage_exitingImage() {
-        assertNotNull(AppUtil.getImage("/images/address_book_32.png"));
+        assertNotNull(AppUtil.getImage("/images/plan_with_ease_32.png"));
     }
 
 
diff --git a/src/test/java/seedu/address/commons/util/CollectionUtilTest.java b/src/test/java/pwe/planner/commons/util/CollectionUtilTest.java
similarity index 97%
rename from src/test/java/seedu/address/commons/util/CollectionUtilTest.java
rename to src/test/java/pwe/planner/commons/util/CollectionUtilTest.java
index 7739103f4f80..afa675228227 100644
--- a/src/test/java/seedu/address/commons/util/CollectionUtilTest.java
+++ b/src/test/java/pwe/planner/commons/util/CollectionUtilTest.java
@@ -1,8 +1,8 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static pwe.planner.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java b/src/test/java/pwe/planner/commons/util/ConfigUtilTest.java
similarity index 96%
rename from src/test/java/seedu/address/commons/util/ConfigUtilTest.java
rename to src/test/java/pwe/planner/commons/util/ConfigUtilTest.java
index fdd4ff86d09f..810f569d3a57 100644
--- a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java
+++ b/src/test/java/pwe/planner/commons/util/ConfigUtilTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -14,8 +14,8 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
-import seedu.address.commons.core.Config;
-import seedu.address.commons.exceptions.DataConversionException;
+import pwe.planner.commons.core.Config;
+import pwe.planner.commons.exceptions.DataConversionException;
 
 public class ConfigUtilTest {
 
diff --git a/src/test/java/seedu/address/commons/util/FileUtilTest.java b/src/test/java/pwe/planner/commons/util/FileUtilTest.java
similarity index 87%
rename from src/test/java/seedu/address/commons/util/FileUtilTest.java
rename to src/test/java/pwe/planner/commons/util/FileUtilTest.java
index 4b30ea91ffcb..3394ec514d32 100644
--- a/src/test/java/seedu/address/commons/util/FileUtilTest.java
+++ b/src/test/java/pwe/planner/commons/util/FileUtilTest.java
@@ -1,11 +1,11 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import seedu.address.testutil.Assert;
+import pwe.planner.testutil.Assert;
 
 public class FileUtilTest {
 
diff --git a/src/test/java/seedu/address/commons/util/InvalidationListenerManagerTest.java b/src/test/java/pwe/planner/commons/util/InvalidationListenerManagerTest.java
similarity index 98%
rename from src/test/java/seedu/address/commons/util/InvalidationListenerManagerTest.java
rename to src/test/java/pwe/planner/commons/util/InvalidationListenerManagerTest.java
index e221cce8b649..95888a29737b 100644
--- a/src/test/java/seedu/address/commons/util/InvalidationListenerManagerTest.java
+++ b/src/test/java/pwe/planner/commons/util/InvalidationListenerManagerTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/seedu/address/commons/util/JsonUtilTest.java b/src/test/java/pwe/planner/commons/util/JsonUtilTest.java
similarity index 92%
rename from src/test/java/seedu/address/commons/util/JsonUtilTest.java
rename to src/test/java/pwe/planner/commons/util/JsonUtilTest.java
index 847b40ad181a..2ba03d2fed89 100644
--- a/src/test/java/seedu/address/commons/util/JsonUtilTest.java
+++ b/src/test/java/pwe/planner/commons/util/JsonUtilTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,8 +7,8 @@
 
 import org.junit.Test;
 
-import seedu.address.testutil.SerializableTestClass;
-import seedu.address.testutil.TestUtil;
+import pwe.planner.testutil.SerializableTestClass;
+import pwe.planner.testutil.TestUtil;
 
 /**
  * Tests JSON Read and Write
diff --git a/src/test/java/seedu/address/commons/util/StringUtilTest.java b/src/test/java/pwe/planner/commons/util/StringUtilTest.java
similarity index 71%
rename from src/test/java/seedu/address/commons/util/StringUtilTest.java
rename to src/test/java/pwe/planner/commons/util/StringUtilTest.java
index c0bbca33e188..8b299a2d7259 100644
--- a/src/test/java/seedu/address/commons/util/StringUtilTest.java
+++ b/src/test/java/pwe/planner/commons/util/StringUtilTest.java
@@ -1,12 +1,14 @@
-package seedu.address.commons.util;
+package pwe.planner.commons.util;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.FileNotFoundException;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -17,10 +19,50 @@ public class StringUtilTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    //---------------- Tests for isUnsignedPositiveInteger --------------------------------------
+    //---------------- Tests for joinStreamAsString --------------------------------------------
 
     @Test
-    public void isUnsignedPositiveInteger() {
+    public void joinStreamAsString_nullStream_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        StringUtil.joinStreamAsString(null);
+    }
+
+    @Test
+    public void joinStreamAsString_nullStreamNonNullDelimiter_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        StringUtil.joinStreamAsString(null, "delimiter");
+    }
+
+    @Test
+    public void joinStreamAsString_nonNullStreamNullDelimiter_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        StringUtil.joinStreamAsString(Stream.of(), null);
+    }
+
+    @Test
+    public void joinStreamAsString_emptyStreamNonEmptyDelimiter_success() {
+        // use default delimiter on empty string -> success
+        assertEquals(StringUtil.joinStreamAsString(Stream.of()), "None");
+        // use custom delimiter on empty string -> success
+        assertEquals(StringUtil.joinStreamAsString(Stream.of(), "delimiter"), "None");
+    }
+
+    @Test
+    public void joinStreamAsString_nonEmptyStreamEmptyDelimiter_success() {
+        assertEquals(StringUtil.joinStreamAsString(Stream.of(), ""), "None");
+        assertEquals(StringUtil.joinStreamAsString(Stream.of("A", "B", "C"), "   "), "A   B   C");
+    }
+
+    @Test
+    public void joinStreamAsString_mixedElementsInStream_success() {
+        assertEquals(StringUtil.joinStreamAsString(Stream.of("A", 'b', 3)), "A, b, 3");
+        assertEquals(StringUtil.joinStreamAsString(Stream.of("A", 'b', 3), "\n"), "A\nb\n3");
+    }
+
+    //---------------- Tests for isNonZeroUnsignedInteger --------------------------------------
+
+    @Test
+    public void isNonZeroUnsignedInteger() {
 
         // EP: empty strings
         assertFalse(StringUtil.isNonZeroUnsignedInteger("")); // Boundary value
@@ -137,6 +179,23 @@ public void containsWordIgnoreCase_validInputs_correctResult() {
         assertTrue(StringUtil.containsWordIgnoreCase("AAA bBb ccc  bbb", "bbB"));
     }
 
+    @Test
+    public void compareEqualsIgnoreCase_validInputs_correctResult() {
+
+        // empty sentence
+
+        // exact match
+        assertTrue(StringUtil.compareEqualsIgnoreCase("xyz", "xyz"));
+
+        // different cases
+        assertTrue(StringUtil.compareEqualsIgnoreCase("XyZ", "xYz"));
+        assertTrue(StringUtil.compareEqualsIgnoreCase("XYZ", "xyz"));
+
+        // with trailing spaces
+        assertTrue(StringUtil.compareEqualsIgnoreCase("        xyz", "xyz          "));
+
+    }
+
     //---------------- Tests for getDetails --------------------------------------
 
     /*
diff --git a/src/test/java/seedu/address/logic/CommandHistoryTest.java b/src/test/java/pwe/planner/logic/CommandHistoryTest.java
similarity index 98%
rename from src/test/java/seedu/address/logic/CommandHistoryTest.java
rename to src/test/java/pwe/planner/logic/CommandHistoryTest.java
index 2cf127e42588..00eb6fce5300 100644
--- a/src/test/java/seedu/address/logic/CommandHistoryTest.java
+++ b/src/test/java/pwe/planner/logic/CommandHistoryTest.java
@@ -1,4 +1,4 @@
-package seedu.address.logic;
+package pwe.planner.logic;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/pwe/planner/logic/LogicManagerTest.java
similarity index 56%
rename from src/test/java/seedu/address/logic/LogicManagerTest.java
rename to src/test/java/pwe/planner/logic/LogicManagerTest.java
index 56eb8d633185..40b6ddb7335d 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/pwe/planner/logic/LogicManagerTest.java
@@ -1,16 +1,19 @@
-package seedu.address.logic;
+package pwe.planner.logic;
 
 import static org.junit.Assert.assertEquals;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.testutil.TypicalPersons.AMY;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTERS_DESC_AMY;
+import static pwe.planner.testutil.TypicalModules.AMY;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.stream.Collectors;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -18,22 +21,23 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.HistoryCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.storage.JsonAddressBookStorage;
-import seedu.address.storage.JsonUserPrefsStorage;
-import seedu.address.storage.StorageManager;
-import seedu.address.testutil.PersonBuilder;
-
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.logic.commands.CommandResult;
+import pwe.planner.logic.commands.HistoryCommand;
+import pwe.planner.logic.commands.ListCommand;
+import pwe.planner.logic.commands.PlannerListCommand;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Module;
+import pwe.planner.storage.JsonApplicationStorage;
+import pwe.planner.storage.JsonUserPrefsStorage;
+import pwe.planner.storage.StorageManager;
+import pwe.planner.testutil.ModuleBuilder;
 
 public class LogicManagerTest {
     private static final IOException DUMMY_IO_EXCEPTION = new IOException("dummy exception");
@@ -49,9 +53,11 @@ public class LogicManagerTest {
 
     @Before
     public void setUp() throws Exception {
-        JsonAddressBookStorage addressBookStorage = new JsonAddressBookStorage(temporaryFolder.newFile().toPath());
+        JsonApplicationStorage applicationStorage =
+                new JsonApplicationStorage(temporaryFolder.newFile().toPath(), temporaryFolder.newFile().toPath(),
+                        temporaryFolder.newFile().toPath());
         JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.newFile().toPath());
-        StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
+        StorageManager storage = new StorageManager(applicationStorage, userPrefsStorage);
         logic = new LogicManager(model, storage);
     }
 
@@ -65,7 +71,7 @@ public void execute_invalidCommandFormat_throwsParseException() {
     @Test
     public void execute_commandExecutionError_throwsCommandException() {
         String deleteCommand = "delete 9";
-        assertCommandException(deleteCommand, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        assertCommandException(deleteCommand, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
         assertHistoryCorrect(deleteCommand);
     }
 
@@ -76,36 +82,50 @@ public void execute_validCommand_success() {
         assertHistoryCorrect(listCommand);
     }
 
+    @Test
+    public void execute_validPlannerListCommand_success() {
+        String plannerListCommand = PlannerListCommand.COMMAND_WORD;
+        String degreePlannerListContent = StringUtil.joinStreamAsString(
+                model.getApplication().getDegreePlannerList().stream().sorted());
+        String expectedMessage = String.format(PlannerListCommand.MESSAGE_SUCCESS, degreePlannerListContent);
+        assertCommandSuccess(plannerListCommand, expectedMessage, model);
+        assertHistoryCorrect(plannerListCommand);
+    }
+
     @Test
     public void execute_storageThrowsIoException_throwsCommandException() throws Exception {
-        // Setup LogicManager with JsonAddressBookIoExceptionThrowingStub
-        JsonAddressBookStorage addressBookStorage =
-                new JsonAddressBookIoExceptionThrowingStub(temporaryFolder.newFile().toPath());
+        // Setup LogicManager with JsonApplicationIoExceptionThrowingStub
+        JsonApplicationStorage applicationStorage =
+                new JsonApplicationIoExceptionThrowingStub(temporaryFolder.newFile().toPath(),
+                        temporaryFolder.newFile().toPath(), temporaryFolder.newFile().toPath());
         JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.newFile().toPath());
-        StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
+
+        StorageManager storage = new StorageManager(applicationStorage, userPrefsStorage);
         logic = new LogicManager(model, storage);
 
         // Execute add command
-        String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
-                + ADDRESS_DESC_AMY;
-        Person expectedPerson = new PersonBuilder(AMY).withTags().build();
+        String addCommand = AddCommand.COMMAND_WORD + CODE_DESC_AMY + NAME_DESC_AMY + CREDITS_DESC_AMY
+                + SEMESTERS_DESC_AMY;
+
+        Module expectedModule = new ModuleBuilder(AMY).withTags().build();
         ModelManager expectedModel = new ModelManager();
-        expectedModel.addPerson(expectedPerson);
-        expectedModel.commitAddressBook();
+        expectedModel.addModule(expectedModule);
+        expectedModel.commitApplication();
         String expectedMessage = LogicManager.FILE_OPS_ERROR_MESSAGE + DUMMY_IO_EXCEPTION;
         assertCommandBehavior(CommandException.class, addCommand, expectedMessage, expectedModel);
         assertHistoryCorrect(addCommand);
     }
 
     @Test
-    public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
+    public void getFilteredModuleList_modifyList_throwsUnsupportedOperationException() {
         thrown.expect(UnsupportedOperationException.class);
-        logic.getFilteredPersonList().remove(0);
+        logic.getFilteredModuleList().remove(0);
     }
 
     /**
      * Executes the command, confirms that no exceptions are thrown and that the result message is correct.
      * Also confirms that {@code expectedModel} is as specified.
+     *
      * @see #assertCommandBehavior(Class, String, String, Model)
      */
     private void assertCommandSuccess(String inputCommand, String expectedMessage, Model expectedModel) {
@@ -114,6 +134,7 @@ private void assertCommandSuccess(String inputCommand, String expectedMessage, M
 
     /**
      * Executes the command, confirms that a ParseException is thrown and that the result message is correct.
+     *
      * @see #assertCommandBehavior(Class, String, String, Model)
      */
     private void assertParseException(String inputCommand, String expectedMessage) {
@@ -122,6 +143,7 @@ private void assertParseException(String inputCommand, String expectedMessage) {
 
     /**
      * Executes the command, confirms that a CommandException is thrown and that the result message is correct.
+     *
      * @see #assertCommandBehavior(Class, String, String, Model)
      */
     private void assertCommandException(String inputCommand, String expectedMessage) {
@@ -130,21 +152,22 @@ private void assertCommandException(String inputCommand, String expectedMessage)
 
     /**
      * Executes the command, confirms that the exception is thrown and that the result message is correct.
+     *
      * @see #assertCommandBehavior(Class, String, String, Model)
      */
     private void assertCommandFailure(String inputCommand, Class<?> expectedException, String expectedMessage) {
-        Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
         assertCommandBehavior(expectedException, inputCommand, expectedMessage, expectedModel);
     }
 
     /**
      * Executes the command, confirms that the result message is correct and that the expected exception is thrown,
      * and also confirms that the following two parts of the LogicManager object's state are as expected:<br>
-     *      - the internal model manager data are same as those in the {@code expectedModel} <br>
-     *      - {@code expectedModel}'s address book was saved to the storage file.
+     * - the internal model manager data are same as those in the {@code expectedModel} <br>
+     * - {@code expectedModel}'s application was saved to the storage file.
      */
     private void assertCommandBehavior(Class<?> expectedException, String inputCommand,
-                                           String expectedMessage, Model expectedModel) {
+            String expectedMessage, Model expectedModel) {
 
         try {
             CommandResult result = logic.execute(inputCommand);
@@ -166,7 +189,11 @@ private void assertHistoryCorrect(String... expectedCommands) {
         try {
             CommandResult result = logic.execute(HistoryCommand.COMMAND_WORD);
             String expectedMessage = String.format(
-                    HistoryCommand.MESSAGE_SUCCESS, String.join("\n", expectedCommands));
+                    HistoryCommand.MESSAGE_SUCCESS, Arrays.stream(expectedCommands)
+                            .sorted(Collections.reverseOrder())
+                            .map(command -> "- " + command)
+                            .collect(Collectors.joining("\n"))
+            );
             assertEquals(expectedMessage, result.getFeedbackToUser());
         } catch (ParseException | CommandException e) {
             throw new AssertionError("Parsing and execution of HistoryCommand.COMMAND_WORD should succeed.", e);
@@ -176,13 +203,14 @@ private void assertHistoryCorrect(String... expectedCommands) {
     /**
      * A stub class to throw an {@code IOException} when the save method is called.
      */
-    private static class JsonAddressBookIoExceptionThrowingStub extends JsonAddressBookStorage {
-        private JsonAddressBookIoExceptionThrowingStub(Path filePath) {
-            super(filePath);
+    private static class JsonApplicationIoExceptionThrowingStub extends JsonApplicationStorage {
+        private JsonApplicationIoExceptionThrowingStub(Path moduleListFilePath, Path degreePlannerListFilePath,
+                Path requirementCategoryListFilePath) {
+            super(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath);
         }
 
         @Override
-        public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
+        public void saveModuleList(ReadOnlyApplication application, Path filePath) throws IOException {
             throw DUMMY_IO_EXCEPTION;
         }
     }
diff --git a/src/test/java/pwe/planner/logic/commands/AddCommandIntegrationTest.java b/src/test/java/pwe/planner/logic/commands/AddCommandIntegrationTest.java
new file mode 100644
index 000000000000..934859326922
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/AddCommandIntegrationTest.java
@@ -0,0 +1,68 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.util.SampleDataUtil;
+import pwe.planner.testutil.ModuleBuilder;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code AddCommand}.
+ */
+public class AddCommandIntegrationTest {
+
+    private Model model;
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Before
+    public void setUp() {
+        model = new ModelManager(SampleDataUtil.getSampleApplication(), new UserPrefs());
+    }
+
+    @Test
+    public void execute_newModule_success() {
+        Module validModule = new ModuleBuilder().build();
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.addModule(validModule);
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(new AddCommand(validModule), model, commandHistory,
+                String.format(AddCommand.MESSAGE_SUCCESS, validModule), expectedModel);
+    }
+
+    @Test
+    public void execute_duplicateModule_throwsCommandException() {
+        Module moduleInList = model.getApplication().getModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        assertCommandFailure(new AddCommand(moduleInList), model, commandHistory,
+                String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, moduleInList.getCode())
+        );
+    }
+
+    @Test
+    public void execute_nonExistentCorequisites_throwsCommandException() {
+        String nonExistentCorequisite = "ZYX9876W";
+        Module moduleWithOnlyInvalidCorequisites = new ModuleBuilder().withCorequisites(nonExistentCorequisite).build();
+        String expectedMessage = String.format(AddCommand.MESSAGE_NON_EXISTENT_COREQUISITE,
+                moduleWithOnlyInvalidCorequisites.getCode(), nonExistentCorequisite);
+        assertCommandFailure(new AddCommand(moduleWithOnlyInvalidCorequisites), model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_corequisitesExistsInDegreePlanner_throwsCommandException() {
+        Module moduleInList = model.getApplication().getModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Module moduleWithInvalidCorequisite = new ModuleBuilder()
+                .withCorequisites(moduleInList.getCode().toString()).build();
+        String expectedMessage = String.format(AddCommand.MESSAGE_EXISTING_COREQUISITES_IN_DEGREE_PLAN,
+                moduleWithInvalidCorequisite.getCode(), moduleInList.getCode());
+        assertCommandFailure(new AddCommand(moduleWithInvalidCorequisite), model, commandHistory, expectedMessage);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/AddCommandTest.java b/src/test/java/pwe/planner/logic/commands/AddCommandTest.java
new file mode 100644
index 000000000000..c68c119d8f73
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/AddCommandTest.java
@@ -0,0 +1,439 @@
+package pwe.planner.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.function.Predicate;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import javafx.beans.property.ReadOnlyProperty;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.ReadOnlyUserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class AddCommandTest {
+
+    private static final CommandHistory EMPTY_COMMAND_HISTORY = new CommandHistory();
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Test
+    public void constructor_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        new AddCommand(null);
+    }
+
+    @Test
+    public void execute_moduleAcceptedByModel_addSuccessful() throws Exception {
+        ModelStubAcceptingModuleAdded modelStub = new ModelStubAcceptingModuleAdded();
+        Module validModule = new ModuleBuilder().build();
+
+        CommandResult commandResult = new AddCommand(validModule).execute(modelStub, commandHistory);
+
+        assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, validModule), commandResult.getFeedbackToUser());
+        assertEquals(Arrays.asList(validModule), modelStub.modulesAdded);
+        assertEquals(EMPTY_COMMAND_HISTORY, commandHistory);
+    }
+
+    @Test
+    public void execute_duplicateModule_throwsCommandException() throws Exception {
+        Module validModule = new ModuleBuilder().build();
+        AddCommand addCommand = new AddCommand(validModule);
+        ModelStub modelStub = new ModelStubWithModule(validModule);
+
+        thrown.expect(CommandException.class);
+        thrown.expectMessage(String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, validModule.getCode()));
+        addCommand.execute(modelStub, commandHistory);
+    }
+
+    @Test
+    public void execute_nonExistentCorequisites_throwsCommandException() throws Exception {
+        String nonExistentCorequisite = "ZYX9876W";
+        Module invalidModule = new ModuleBuilder().withCorequisites(nonExistentCorequisite).build();
+        AddCommand addCommand = new AddCommand(invalidModule);
+        ModelStub modelStub = new ModelStubWithModule(invalidModule);
+        String expectedMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, invalidModule.getCode(),
+                nonExistentCorequisite);
+
+        thrown.expect(CommandException.class);
+        thrown.expectMessage(expectedMessage);
+        addCommand.execute(modelStub, commandHistory);
+    }
+
+    @Test
+    public void execute_addMultipleValidCorequisites_successful() throws CommandException {
+        ModelStubAcceptingModuleAdded modelStub = new ModelStubAcceptingModuleAdded();
+        Module moduleA = new ModuleBuilder().withCode("AA1111").build();
+        Module moduleB = new ModuleBuilder().withCode("BB2222").build();
+        modelStub.addModule(moduleA);
+        modelStub.addModule(moduleB);
+
+        Module moduleWithCorequisites = new ModuleBuilder().withCode("CC3333").withCorequisites("AA1111", "BB2222")
+                .build();
+
+        AddCommand addCommand = new AddCommand(moduleWithCorequisites);
+        addCommand.execute(modelStub, commandHistory);
+    }
+
+    @Test
+    public void equals() {
+        Module cs1010 = new ModuleBuilder().withName("Programming Methodology").build();
+        Module cs1231 = new ModuleBuilder().withName("Data Structures").build();
+        AddCommand addCS1010Command = new AddCommand(cs1010);
+        AddCommand addCS1231Command = new AddCommand(cs1231);
+
+        // same object -> returns true
+        assertTrue(addCS1010Command.equals(addCS1010Command));
+
+        // same values -> returns true
+        AddCommand addCS1010CommandCopy = new AddCommand(cs1010);
+        assertTrue(addCS1010Command.equals(addCS1010CommandCopy));
+
+        // different types -> returns false
+        assertFalse(addCS1010Command.equals(1));
+
+        // null -> returns false
+        assertFalse(addCS1010Command.equals(null));
+
+        // different module -> returns false
+        assertFalse(addCS1010Command.equals(addCS1231Command));
+    }
+
+    /**
+     * A default model stub that have all of the methods failing.
+     */
+    private class ModelStub implements Model {
+        @Override
+        public ReadOnlyUserPrefs getUserPrefs() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public GuiSettings getGuiSettings() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setGuiSettings(GuiSettings guiSettings) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public Path getModuleListFilePath() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setModuleListFilePath(Path moduleListFilePath) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public Path getDegreePlannerListFilePath() {
+            //ToDo: implement error check
+            return null;
+        }
+
+        @Override
+        public void setDegreePlannerListFilePath(Path degreePlannerListFilePath) {
+            //ToDo: implement error check
+        }
+
+        @Override
+        public Path getRequirementCategoryListFilePath() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setRequirementCategoryListFilePath(Path requirementCategoryListFilePath) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void addModule(Module module) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ReadOnlyApplication getApplication() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setApplication(ReadOnlyApplication application) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void resetPlanner() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void resetRequirement() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public boolean hasModule(Module module) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public Module getModuleByCode(Code code) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public boolean hasModuleCode(Code code) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void deleteModule(Module target) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void editModule(Module target, Module editedModule) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setModule(Module target, Module editedModule) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ObservableList<Module> getFilteredModuleList() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void updateFilteredModuleList(Predicate<Module> predicate) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public boolean canUndoApplication() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public boolean canRedoApplication() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void undoApplication() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void redoApplication() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void commitApplication() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ReadOnlyProperty<Module> selectedModuleProperty() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public Module getSelectedModule() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setSelectedModule(Module module) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public boolean hasDegreePlanner(DegreePlanner degreePlanner) {
+            return false;
+        }
+
+        @Override
+        public DegreePlanner getDegreePlannerByCode(Code toCheck) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void deleteDegreePlanner(DegreePlanner degreePlanner) {
+            //ToDo: implement AssertionError
+        }
+
+        @Override
+        public void addDegreePlanner(DegreePlanner degreePlanner) {
+            //ToDo: implement error check
+        }
+
+        @Override
+        public void setDegreePlanner(DegreePlanner target, DegreePlanner editedDegreePlanner) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void moveModuleBetweenPlanner(DegreePlanner sourcePlanner, DegreePlanner destinationPlanner, Code code) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ObservableList<DegreePlanner> getFilteredDegreePlannerList() {
+            return null;
+        }
+
+        @Override
+        public void updateFilteredDegreePlannerList(Predicate<DegreePlanner> predicate) {
+            //ToDo: implement error check
+        }
+
+        @Override
+        public boolean hasRequirementCategory(Name requirementCategoryName) {
+            return false;
+        }
+
+        @Override
+        public boolean hasRequirementCategory(RequirementCategory requirementCategory) {
+            return false;
+        }
+
+        @Override
+        public RequirementCategory getRequirementCategory(Name requirementCategoryName) {
+            //ToDo: implement error check
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void addRequirementCategory(RequirementCategory requirementCategory) {
+            //ToDo: implement error check
+        }
+
+        @Override
+        public void setRequirementCategory(RequirementCategory target,
+                RequirementCategory editedRequirementCategory) {
+            //ToDo: implement error check
+        }
+
+        @Override
+        public ObservableList<RequirementCategory> getFilteredRequirementCategoryList() {
+            return null;
+        }
+
+        @Override
+        public void updateFilteredRequirementCategoryList(Predicate<RequirementCategory> predicate) {
+            //ToDo: implement error check
+        }
+
+        @Override
+        public RequirementCategory getSelectedRequirementCategory() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void setSelectedRequirementCategory(RequirementCategory requirementCategory) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public ReadOnlyProperty<RequirementCategory> selectedRequirementCategoryProperty() {
+            throw new AssertionError("This method should not be called.");
+        }
+
+    }
+
+    /**
+     * A Model stub that contains a single module.
+     */
+    private class ModelStubWithModule extends ModelStub {
+        private final Module module;
+
+        ModelStubWithModule(Module module) {
+            requireNonNull(module);
+            this.module = module;
+        }
+
+        @Override
+        public boolean hasModule(Module module) {
+            requireNonNull(module);
+            return this.module.isSameModule(module);
+        }
+    }
+
+    /**
+     * A Model stub that always accept the module being added.
+     */
+    private class ModelStubAcceptingModuleAdded extends ModelStub {
+        final ArrayList<Module> modulesAdded = new ArrayList<>();
+
+        @Override
+        public boolean hasModule(Module module) {
+            requireNonNull(module);
+
+            return modulesAdded.stream().anyMatch(module::isSameModule);
+        }
+
+        @Override
+        public boolean hasModuleCode(Code code) {
+            requireNonNull(code);
+
+            return modulesAdded.stream().map(Module::getCode).anyMatch(code::equals);
+        }
+
+        @Override
+        public void addModule(Module module) {
+            requireNonNull(module);
+            modulesAdded.add(module);
+        }
+
+        @Override
+        public DegreePlanner getDegreePlannerByCode(Code toCheck) {
+            requireNonNull(toCheck);
+            return null;
+        }
+
+        @Override
+        public void commitApplication() {
+            // called by {@code AddCommand#execute()}
+        }
+
+        @Override
+        public ReadOnlyApplication getApplication() {
+            return new Application();
+        }
+    }
+
+}
diff --git a/src/test/java/pwe/planner/logic/commands/ClearCommandTest.java b/src/test/java/pwe/planner/logic/commands/ClearCommandTest.java
new file mode 100644
index 000000000000..d06886c336eb
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/ClearCommandTest.java
@@ -0,0 +1,81 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.ClearCommand.PLANNER;
+import static pwe.planner.logic.commands.ClearCommand.REQUIREMENT;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.model.util.InitialDataUtil.getInitialApplication;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.storage.JsonSerializableApplication;
+import pwe.planner.testutil.TypicalDegreePlanners;
+import pwe.planner.testutil.TypicalModules;
+import pwe.planner.testutil.TypicalRequirementCategories;
+
+public class ClearCommandTest {
+
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Test
+    public void execute_emptyapplication_success() {
+        Model model = new ModelManager();
+        Model expectedModel = new ModelManager();
+        expectedModel.setApplication(getInitialApplication());
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(new ClearCommand(), model, commandHistory,
+                ClearCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_clearRequirementCategoriesAndDegreePlanners() {
+        Model model = new ModelManager();
+        Model expectedModel = new ModelManager();
+        // only module is empty
+        TypicalDegreePlanners.getTypicalDegreePlanners().forEach(expectedModel::addDegreePlanner);
+        TypicalRequirementCategories.getTypicalRequirementCategories().forEach(
+                expectedModel::addRequirementCategory);
+        TypicalModules.getTypicalModules().forEach(expectedModel::addModule);
+        // actual model having all 3 sets of data
+        TypicalDegreePlanners.getTypicalDegreePlanners().forEach(model::addDegreePlanner);
+        TypicalRequirementCategories.getTypicalRequirementCategories().forEach(
+                model::addRequirementCategory);
+        TypicalModules.getTypicalModules().forEach(model::addModule);
+
+        expectedModel.resetRequirement();
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(new ClearCommand(REQUIREMENT), model, commandHistory,
+                ClearCommand.MESSAGE_SUCCESS, expectedModel);
+
+        expectedModel.resetPlanner();
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(new ClearCommand(PLANNER), model, commandHistory,
+                ClearCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_nonEmptyapplication_success() throws IllegalValueException {
+        Model model =
+                new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+        Model expectedModel =
+                new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+        expectedModel.setApplication(getInitialApplication());
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(new ClearCommand(), model, commandHistory, ClearCommand.MESSAGE_SUCCESS,
+                expectedModel);
+    }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/pwe/planner/logic/commands/CommandResultTest.java
similarity index 98%
rename from src/test/java/seedu/address/logic/commands/CommandResultTest.java
rename to src/test/java/pwe/planner/logic/commands/CommandResultTest.java
index fc8d80228100..9d65883ab607 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/pwe/planner/logic/commands/CommandResultTest.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/pwe/planner/logic/commands/CommandTestUtil.java b/src/test/java/pwe/planner/logic/commands/CommandTestUtil.java
new file mode 100644
index 000000000000..c5bc4956e701
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/CommandTestUtil.java
@@ -0,0 +1,174 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_COREQUISITE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.NameContainsKeywordsPredicate;
+import pwe.planner.testutil.EditModuleDescriptorBuilder;
+
+/**
+ * Contains helper methods for testing commands.
+ */
+public class CommandTestUtil {
+    // Generic valid attributes
+    public static final String VALID_SEMESTER_ONE = "1";
+    public static final String VALID_SEMESTER_TWO = "2";
+    public static final String VALID_SEMESTER_THREE = "3";
+    public static final String VALID_SEMESTER_FOUR = "4";
+    public static final String VALID_TAG_HUSBAND = "husband";
+    public static final String VALID_TAG_FRIEND = "friend";
+
+    public static final String VALID_CODE_AMY = "AAA0000A";
+    public static final String VALID_CODE_BOB = "BBB1111B";
+    public static final String VALID_NAME_AMY = "Amy Bee";
+    public static final String VALID_NAME_BOB = "Bob Choo";
+    public static final String VALID_CREDITS_AMY = "0";
+    public static final String VALID_CREDITS_BOB = "999";
+    public static final String VALID_SEMESTER_AMY_ONE = VALID_SEMESTER_ONE;
+    public static final String VALID_SEMESTER_AMY_TWO = VALID_SEMESTER_TWO;
+    public static final String VALID_SEMESTER_BOB_THREE = VALID_SEMESTER_THREE;
+    public static final String VALID_SEMESTER_BOB_FOUR = VALID_SEMESTER_FOUR;
+
+    public static final String CODE_DESC_AMY = " " + PREFIX_CODE + VALID_CODE_AMY;
+    public static final String CODE_DESC_BOB = " " + PREFIX_CODE + VALID_CODE_BOB;
+    public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY;
+    public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB;
+    public static final String CREDITS_DESC_AMY = " " + PREFIX_CREDITS + VALID_CREDITS_AMY;
+    public static final String CREDITS_DESC_BOB = " " + PREFIX_CREDITS + VALID_CREDITS_BOB;
+    public static final String SEMESTER_DESC_AMY_ONE = " " + PREFIX_SEMESTER + VALID_SEMESTER_AMY_ONE;
+    public static final String SEMESTER_DESC_AMY_TWO = " " + PREFIX_SEMESTER + VALID_SEMESTER_AMY_TWO;
+    public static final String SEMESTERS_DESC_AMY = SEMESTER_DESC_AMY_ONE + SEMESTER_DESC_AMY_TWO;
+    public static final String SEMESTER_DESC_BOB_THREE = " " + PREFIX_SEMESTER + VALID_SEMESTER_BOB_THREE;
+    public static final String SEMESTER_DESC_BOB_FOUR = " " + PREFIX_SEMESTER + VALID_SEMESTER_BOB_FOUR;
+    public static final String SEMESTERS_DESC_BOB = SEMESTER_DESC_BOB_THREE + SEMESTER_DESC_BOB_FOUR;
+    public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_FRIEND;
+    public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_HUSBAND;
+
+    public static final String INVALID_CODE_DESC = " " + PREFIX_CODE; // empty string not allowed for codes
+    public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "Jame§"; // '§' not allowed in names
+    public static final String INVALID_CREDITS_DESC = " " + PREFIX_CREDITS + "1a"; // 'a' not allowed in credits
+    public static final String INVALID_SEMESTER_DESC_ZERO = " " + PREFIX_SEMESTER + "0"; // 0 is out of range (1-4)
+    public static final String INVALID_SEMESTER_DESC_FIVE = " " + PREFIX_SEMESTER + "5"; // 5 is out of range (1-4)
+    public static final String INVALID_COREQUISITE_DESC = " " + PREFIX_COREQUISITE + "1000";
+    public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
+
+    public static final String PREAMBLE_WHITESPACE = "\t  \r  \n";
+    public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
+
+    public static final EditCommand.EditModuleDescriptor DESC_AMY;
+    public static final EditCommand.EditModuleDescriptor DESC_BOB;
+
+    static {
+        DESC_AMY = new EditModuleDescriptorBuilder()
+                .withCode(VALID_CODE_AMY)
+                .withName(VALID_NAME_AMY)
+                .withCredits(VALID_CREDITS_AMY)
+                .withSemesters(VALID_SEMESTER_AMY_ONE, VALID_SEMESTER_AMY_TWO)
+                .withTags(VALID_TAG_FRIEND)
+                .build();
+
+        DESC_BOB = new EditModuleDescriptorBuilder()
+                .withName(VALID_NAME_BOB)
+                .withCredits(VALID_CREDITS_BOB)
+                .withCode(VALID_CODE_BOB)
+                .withSemesters(VALID_SEMESTER_BOB_THREE, VALID_SEMESTER_BOB_FOUR)
+                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
+                .build();
+    }
+
+    /**
+     * Executes the given {@code command}, confirms that <br>
+     * - the returned {@link CommandResult} matches {@code expectedCommandResult} <br>
+     * - the {@code actualModel} matches {@code expectedModel} <br>
+     * - the {@code actualCommandHistory} remains unchanged.
+     */
+    public static void assertCommandSuccess(Command command, Model actualModel, CommandHistory actualCommandHistory,
+            CommandResult expectedCommandResult, Model expectedModel) {
+        CommandHistory expectedCommandHistory = new CommandHistory(actualCommandHistory);
+        try {
+            CommandResult result = command.execute(actualModel, actualCommandHistory);
+            assertEquals(expectedCommandResult, result);
+            assertEquals(expectedModel, actualModel);
+            assertEquals(expectedCommandHistory, actualCommandHistory);
+        } catch (CommandException ce) {
+            throw new AssertionError("Execution of command should not fail.", ce);
+        }
+    }
+
+    /**
+     * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandHistory, CommandResult, Model)}
+     * that takes a string {@code expectedMessage}.
+     */
+    public static void assertCommandSuccess(Command command, Model actualModel, CommandHistory actualCommandHistory,
+            String expectedMessage, Model expectedModel) {
+        CommandResult expectedCommandResult = new CommandResult(expectedMessage);
+        assertCommandSuccess(command, actualModel, actualCommandHistory, expectedCommandResult, expectedModel);
+    }
+
+    /**
+     * Executes the given {@code command}, confirms that <br>
+     * - a {@code CommandException} is thrown <br>
+     * - the CommandException message matches {@code expectedMessage} <br>
+     * - the application, filtered module list and selected module in {@code actualModel} remain unchanged <br>
+     * - {@code actualCommandHistory} remains unchanged.
+     */
+    public static void assertCommandFailure(Command command, Model actualModel, CommandHistory actualCommandHistory,
+            String expectedMessage) {
+        // we are unable to defensively copy the model for comparison later, so we can
+        // only do so by copying its components.
+        Application expectedApplication = new Application(actualModel.getApplication());
+        List<Module> expectedFilteredList = new ArrayList<>(actualModel.getFilteredModuleList());
+        Module expectedSelectedModule = actualModel.getSelectedModule();
+
+        CommandHistory expectedCommandHistory = new CommandHistory(actualCommandHistory);
+
+        try {
+            command.execute(actualModel, actualCommandHistory);
+            throw new AssertionError("The expected CommandException was not thrown.");
+        } catch (CommandException e) {
+            assertEquals(expectedMessage, e.getMessage());
+            assertEquals(expectedApplication, actualModel.getApplication());
+            assertEquals(expectedFilteredList, actualModel.getFilteredModuleList());
+            assertEquals(expectedSelectedModule, actualModel.getSelectedModule());
+            assertEquals(expectedCommandHistory, actualCommandHistory);
+        }
+    }
+
+    /**
+     * Updates {@code model}'s filtered list to show only the module at the given {@code targetIndex} in the
+     * {@code model}'s application.
+     */
+    public static void showModuleAtIndex(Model model, Index targetIndex) {
+        assertTrue(targetIndex.getZeroBased() < model.getFilteredModuleList().size());
+
+        Module module = model.getFilteredModuleList().get(targetIndex.getZeroBased());
+        model.updateFilteredModuleList(new NameContainsKeywordsPredicate<>(module.getName().toString()));
+
+        assertEquals(1, model.getFilteredModuleList().size());
+    }
+
+    /**
+     * Deletes the first module in {@code model}'s filtered list from {@code model}'s application.
+     */
+    public static void deleteFirstModule(Model model) {
+        Module firstModule = model.getFilteredModuleList().get(0);
+        model.deleteModule(firstModule);
+        model.commitApplication();
+    }
+
+}
diff --git a/src/test/java/pwe/planner/logic/commands/DeleteCommandTest.java b/src/test/java/pwe/planner/logic/commands/DeleteCommandTest.java
new file mode 100644
index 000000000000..9ef369c63cad
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/DeleteCommandTest.java
@@ -0,0 +1,186 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.showModuleAtIndex;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_SECOND_MODULE;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Test;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Module;
+import pwe.planner.storage.JsonSerializableApplication;
+
+/**
+ * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for
+ * {@code DeleteCommand}.
+ */
+public class DeleteCommandTest {
+    private Model model =
+            new ModelManager(
+                    new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                            getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private CommandHistory commandHistory = new CommandHistory();
+
+    public DeleteCommandTest() throws IllegalValueException {}
+
+    @Test
+    public void execute_validIndexUnfilteredList_success() {
+        Module moduleToDelete = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_MODULE);
+
+        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_MODULE_SUCCESS, moduleToDelete);
+
+        ModelManager expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.deleteModule(moduleToDelete);
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(deleteCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredModuleList().size() + 1);
+        DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+
+        assertCommandFailure(deleteCommand, model, commandHistory, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void execute_validIndexFilteredList_success() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToDelete = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_MODULE);
+
+        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_MODULE_SUCCESS, moduleToDelete);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.deleteModule(moduleToDelete);
+        expectedModel.commitApplication();
+        showNoModule(expectedModel);
+
+        assertCommandSuccess(deleteCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_invalidIndexFilteredList_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Index outOfBoundIndex = INDEX_SECOND_MODULE;
+        // ensures that outOfBoundIndex is still in bounds of application list
+        assertTrue(outOfBoundIndex.getZeroBased() < model.getApplication().getModuleList().size());
+
+        DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+
+        assertCommandFailure(deleteCommand, model, commandHistory, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void executeUndoRedo_validIndexUnfilteredList_success() throws Exception {
+        Module moduleToDelete = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_MODULE);
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.deleteModule(moduleToDelete);
+        expectedModel.commitApplication();
+
+        // delete -> first module deleted
+        deleteCommand.execute(model, commandHistory);
+
+        // undo -> reverts application back to previous state and filtered module list to show all modules
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // redo -> same first module deleted again
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void executeUndoRedo_invalidIndexUnfilteredList_failure() {
+        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredModuleList().size() + 1);
+        DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+
+        // execution failed -> application state not added into model
+        assertCommandFailure(deleteCommand, model, commandHistory, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+
+        // single application state in model -> undoCommand and redoCommand fail
+        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
+        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
+    }
+
+    /**
+     * 1. Deletes a {@code Module} from a filtered list.
+     * 2. Undo the deletion.
+     * 3. The unfiltered list should be shown now. Verify that the index of the previously deleted module in the
+     * unfiltered list is different from the index at the filtered list.
+     * 4. Redo the deletion. This ensures {@code RedoCommand} deletes the module object regardless of indexing.
+     */
+    @Test
+    public void executeUndoRedo_validIndexFilteredList_sameModuleDeleted() throws Exception {
+        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_MODULE);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+
+        showModuleAtIndex(model, INDEX_SECOND_MODULE);
+        Module moduleToDelete = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        expectedModel.deleteModule(moduleToDelete);
+        expectedModel.commitApplication();
+
+        // delete -> deletes second module in unfiltered module list / first module in filtered module list
+        deleteCommand.execute(model, commandHistory);
+
+        // undo -> reverts application back to previous state and filtered module list to show all modules
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        assertNotEquals(moduleToDelete, model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased()));
+        // redo -> deletes same second module in unfiltered module list
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void equals() {
+        DeleteCommand deleteFirstCommand = new DeleteCommand(INDEX_FIRST_MODULE);
+        DeleteCommand deleteSecondCommand = new DeleteCommand(INDEX_SECOND_MODULE);
+
+        // same object -> returns true
+        assertTrue(deleteFirstCommand.equals(deleteFirstCommand));
+
+        // same values -> returns true
+        DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST_MODULE);
+        assertTrue(deleteFirstCommand.equals(deleteFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(deleteFirstCommand.equals(1));
+
+        // null -> returns false
+        assertFalse(deleteFirstCommand.equals(null));
+
+        // different module -> returns false
+        assertFalse(deleteFirstCommand.equals(deleteSecondCommand));
+    }
+
+    /**
+     * Updates {@code model}'s filtered list to show no one.
+     */
+    private void showNoModule(Model model) {
+        model.updateFilteredModuleList(p -> false);
+
+        assertTrue(model.getFilteredModuleList().isEmpty());
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/EditCommandTest.java b/src/test/java/pwe/planner/logic/commands/EditCommandTest.java
new file mode 100644
index 000000000000..75c535e12739
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/EditCommandTest.java
@@ -0,0 +1,445 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.commons.util.StringUtil.joinStreamAsString;
+import static pwe.planner.logic.commands.CommandTestUtil.DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.showModuleAtIndex;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_SECOND_MODULE;
+
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.util.SampleDataUtil;
+import pwe.planner.testutil.EditModuleDescriptorBuilder;
+import pwe.planner.testutil.ModuleBuilder;
+
+/**
+ * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for EditCommand.
+ */
+public class EditCommandTest {
+    private Model model = new ModelManager(SampleDataUtil.getSampleApplication(), new UserPrefs());
+    private CommandHistory commandHistory = new CommandHistory();
+
+    public EditCommandTest() {}
+
+    @Test
+    public void execute_allFieldsSpecifiedUnfilteredList_success() {
+        Module moduleInFilteredList =
+                model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Module editedModule = new ModuleBuilder().build();
+        EditCommand.EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder(editedModule).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, descriptor);
+
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_EDIT_MODULE_SUCCESS, moduleInFilteredList.getCode(), editedModule
+        );
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+
+        expectedModel.editModule(model.getFilteredModuleList().get(0), editedModule);
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_someFieldsSpecifiedUnfilteredList_success() {
+        Index indexLastModule = Index.fromOneBased(model.getFilteredModuleList().size());
+        Module lastModule = model.getFilteredModuleList().get(indexLastModule.getZeroBased());
+
+        ModuleBuilder moduleInList = new ModuleBuilder(lastModule);
+        Module editedModule = moduleInList.withName(VALID_NAME_BOB).withCredits(VALID_CREDITS_BOB)
+                .withTags(VALID_TAG_HUSBAND).build();
+
+        EditCommand.EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder().withName(VALID_NAME_BOB)
+                .withCredits(VALID_CREDITS_BOB).withTags(VALID_TAG_HUSBAND).build();
+        EditCommand editCommand = new EditCommand(indexLastModule, descriptor);
+
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_EDIT_MODULE_SUCCESS, lastModule.getCode(), editedModule
+        );
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.editModule(lastModule, editedModule);
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_noFieldSpecifiedUnfilteredList_success() {
+        Module firstModule = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, new EditCommand.EditModuleDescriptor());
+        Module editedModule = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_EDIT_MODULE_SUCCESS, firstModule.getCode(), editedModule
+        );
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_filteredList_success() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleInFilteredList = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Module editedModule = new ModuleBuilder(moduleInFilteredList).withName(VALID_NAME_BOB).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE,
+                new EditModuleDescriptorBuilder().withName(VALID_NAME_BOB).build());
+
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_EDIT_MODULE_SUCCESS, moduleInFilteredList.getCode(), editedModule
+        );
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.editModule(model.getFilteredModuleList().get(0), editedModule);
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_duplicateModuleUnfilteredList_failure() {
+        Module firstModule = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Module secondModule = model.getFilteredModuleList().get(INDEX_SECOND_MODULE.getZeroBased());
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder(firstModule).build();
+        EditCommand editCommand = new EditCommand(INDEX_SECOND_MODULE, descriptor);
+
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_DUPLICATE_MODULE, secondModule.getCode(), firstModule.getCode()
+        );
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_duplicateModuleFilteredList_failure() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        // edit module in filtered list into a duplicate in application
+        Module moduleToEdit = model.getApplication().getModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Module moduleToClone = model.getApplication().getModuleList().get(INDEX_SECOND_MODULE.getZeroBased());
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE,
+                new EditModuleDescriptorBuilder(moduleToClone).build());
+        String expectedMessage = String.format(EditCommand.MESSAGE_DUPLICATE_MODULE, moduleToEdit.getCode(),
+                moduleToClone.getCode());
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_invalidModuleIndexUnfilteredList_failure() {
+        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredModuleList().size() + 1);
+        EditCommand.EditModuleDescriptor descriptor =
+                new EditModuleDescriptorBuilder().withName(VALID_NAME_BOB).build();
+        EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
+
+        assertCommandFailure(editCommand, model, commandHistory, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+    }
+
+    /**
+     * Edit filtered list where index is larger than size of filtered list,
+     * but smaller than size of application
+     */
+    @Test
+    public void execute_invalidModuleIndexFilteredList_failure() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+        Index outOfBoundIndex = INDEX_SECOND_MODULE;
+        // ensures that outOfBoundIndex is still in bounds of application list
+        assertTrue(outOfBoundIndex.getZeroBased() < model.getApplication().getModuleList().size());
+
+        EditCommand editCommand = new EditCommand(outOfBoundIndex,
+                new EditModuleDescriptorBuilder().withName(VALID_NAME_BOB).build());
+
+        assertCommandFailure(editCommand, model, commandHistory, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void executeUndoRedo_validIndexUnfilteredList_success() throws Exception {
+        Module editedModule = new ModuleBuilder().build();
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        EditCommand.EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder(editedModule).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, descriptor);
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.editModule(moduleToEdit, editedModule);
+        expectedModel.commitApplication();
+
+        // edit -> first module edited
+        editCommand.execute(model, commandHistory);
+
+        // undo -> reverts application back to previous state and filtered module list to show all modules
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // redo -> same first module edited again
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void executeUndoRedo_invalidIndexUnfilteredList_failure() {
+        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredModuleList().size() + 1);
+        EditCommand.EditModuleDescriptor descriptor =
+                new EditModuleDescriptorBuilder().withName(VALID_NAME_BOB).build();
+        EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
+
+        // execution failed -> application state not added into model
+        assertCommandFailure(editCommand, model, commandHistory,
+                MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+
+        // single application state in model -> undoCommand and redoCommand fail
+        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
+        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
+    }
+
+    /**
+     * 1. Edits a {@code Module} from a filtered list.
+     * 2. Undo the edit.
+     * 3. The unfiltered list should be shown now. Verify that the index of the previously edited module in the
+     * unfiltered list is different from the index at the filtered list.
+     * 4. Redo the edit. This ensures {@code RedoCommand} edits the module object regardless of indexing.
+     */
+    @Test
+    public void executeUndoRedo_validIndexFilteredList_sameModuleEdited() throws Exception {
+        showModuleAtIndex(model, INDEX_SECOND_MODULE);
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+
+        Module editedModule = new ModuleBuilder().withCorequisites(moduleToEdit.getCorequisites()).build();
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder(editedModule).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, descriptor);
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+
+        expectedModel.editModule(moduleToEdit, editedModule);
+        expectedModel.commitApplication();
+
+        // edit -> edits second module in unfiltered module list / first module in filtered module list
+        editCommand.execute(model, commandHistory);
+
+        // undo -> reverts application back to previous state and filtered module list to show all modules
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        assertNotEquals(model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased()), moduleToEdit);
+        // redo -> edits same second module in unfiltered module list
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    /**
+     * 1. Edits a {@code Module} in the filtered module list to have another module that is not added to the degree plan
+     * as a corequisite -> success
+     */
+    @Test
+    public void execute_nonExistentCorequisites_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        String nonExistentCorequisite = "ZYX9876W";
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCorequisites(nonExistentCorequisite).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+        String expectedMessage = String.format(EditCommand.MESSAGE_NON_EXISTENT_COREQUISITE, moduleToEdit.getCode(),
+                nonExistentCorequisite);
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_directSelfReferencingCorequisites_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        String editedModuleCode = moduleToEdit.getCode().toString();
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCorequisites(editedModuleCode).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+        String expectedMessage = String.format(EditCommand.MESSAGE_SELF_REFERENCING_COREQUISITE, moduleToEdit.getCode(),
+                editedModuleCode);
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_indirectSelfReferencingCorequisites_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        String originalModuleCode = moduleToEdit.getCode().toString();
+        String editedModuleCode = "CS1337";
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCode(editedModuleCode).withCorequisites(originalModuleCode).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+        String expectedMessage = String.format(EditCommand.MESSAGE_SELF_REFERENCING_COREQUISITE, originalModuleCode,
+                editedModuleCode);
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_moduleAndCorequisiteModuleExistsInDifferentSemesters_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Code corequisiteModuleInDifferentSemester = new Code("CS2040C");
+        DegreePlanner originalDegreePlanner = model.getDegreePlannerByCode(corequisiteModuleInDifferentSemester);
+        assert originalDegreePlanner != null;
+        assert !originalDegreePlanner.equals(model.getDegreePlannerByCode(moduleToEdit.getCode()));
+
+        DegreePlanner truncatedDegreePlanner = new DegreePlanner(originalDegreePlanner.getYear(),
+                originalDegreePlanner.getSemester(), Set.of(corequisiteModuleInDifferentSemester));
+
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCorequisites(corequisiteModuleInDifferentSemester.toString()).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+        String expectedMessage = String.format(EditCommand.MESSAGE_MODULE_AND_COREQUISITES_DIFFERENT_SEMESTERS,
+                moduleToEdit.getCode(), truncatedDegreePlanner);
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_moduleAndCorequisiteModulesExistsInDifferentSemesters_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        Code firstCorequisiteModuleInDifferentSemester = new Code("CS2040C");
+        Code secondCorequisiteModuleInDifferentSemester = new Code("GER1000");
+        DegreePlanner firstDegreePlanner = model.getDegreePlannerByCode(firstCorequisiteModuleInDifferentSemester);
+        DegreePlanner secondDegreePlanner = model.getDegreePlannerByCode(secondCorequisiteModuleInDifferentSemester);
+        assert firstDegreePlanner != null;
+        assert secondDegreePlanner != null;
+        assert !firstDegreePlanner.equals(secondDegreePlanner);
+
+        DegreePlanner truncatedFirstDegreePlanner = new DegreePlanner(firstDegreePlanner.getYear(),
+                firstDegreePlanner.getSemester(), Set.of(firstCorequisiteModuleInDifferentSemester));
+        DegreePlanner truncatedSecondDegreePlanner = new DegreePlanner(secondDegreePlanner.getYear(),
+                secondDegreePlanner.getSemester(), Set.of(secondCorequisiteModuleInDifferentSemester));
+
+        Stream<DegreePlanner> stream = Stream.of(truncatedFirstDegreePlanner, truncatedSecondDegreePlanner).sorted();
+
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCorequisites(firstCorequisiteModuleInDifferentSemester.toString(),
+                        secondCorequisiteModuleInDifferentSemester.toString()).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+        String expectedMessage = String.format(EditCommand.MESSAGE_MODULE_AND_COREQUISITES_DIFFERENT_SEMESTERS,
+                moduleToEdit.getCode(), joinStreamAsString(stream, "\n"));
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_moduleNotInDegreePlannerButCorequisiteInDegreePlanner_throwsCommandException() {
+        Index lastModuleIndex = Index.fromOneBased(model.getFilteredModuleList().size());
+        Module moduleToEdit = model.getFilteredModuleList().get(lastModuleIndex.getZeroBased());
+        assert model.getDegreePlannerByCode(moduleToEdit.getCode()) == null;
+
+        Code corequisiteModule = new Code("CS2040C");
+        DegreePlanner degreePlannerContainingCorequisite = model.getDegreePlannerByCode(corequisiteModule);
+
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCorequisites(corequisiteModule.toString()).build();
+        EditCommand editCommand = new EditCommand(lastModuleIndex, editModuleDescriptor);
+
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_MODULE_NOT_IN_DEGREE_PLANNER_BUT_SOME_COREQUISITES_IN_DEGREE_PLANNER,
+                moduleToEdit.getCode(), corequisiteModule,
+                degreePlannerContainingCorequisite.getYear(), degreePlannerContainingCorequisite.getSemester(),
+                joinStreamAsString(editModuleDescriptor.getCorequisites().get().stream().sorted()));
+
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_editExistingModuleInDegreePlannerInvalidSemester_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        DegreePlanner degreePlannerContainingModule = model.getDegreePlannerByCode(moduleToEdit.getCode());
+        Semester editedSemester = new Semester("2");
+        assert degreePlannerContainingModule != null;
+        assert !degreePlannerContainingModule.getSemester().equals(editedSemester);
+
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withSemesters(editedSemester.toString()).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+
+        String expectedMessage = String.format(EditCommand.MESSAGE_INVALID_SEMESTER, moduleToEdit.getCode(),
+                joinStreamAsString(moduleToEdit.getSemesters().stream().sorted()),
+                editedSemester, degreePlannerContainingModule.getYear(), degreePlannerContainingModule.getSemester()
+        );
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_missingCorequisiteInDegreePlanner_throwsCommandException() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+
+        Module moduleToEdit = model.getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased());
+        DegreePlanner degreePlannerContainingModule = model.getDegreePlannerByCode(moduleToEdit.getCode());
+        assert degreePlannerContainingModule != null;
+
+        Code missingCorequisite = new Code("ST2334");
+        assert model.getDegreePlannerByCode(missingCorequisite) == null;
+
+        EditCommand.EditModuleDescriptor editModuleDescriptor = new EditModuleDescriptorBuilder()
+                .withCorequisites(missingCorequisite.toString()).build();
+        EditCommand editCommand = new EditCommand(INDEX_FIRST_MODULE, editModuleDescriptor);
+
+        String expectedMessage = String.format(EditCommand.MESSAGE_COREQUISITES_NOT_IN_DEGREE_PLANNER,
+                moduleToEdit.getCode(), missingCorequisite, degreePlannerContainingModule.getYear(),
+                degreePlannerContainingModule.getSemester(), missingCorequisite);
+        assertCommandFailure(editCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void equals() {
+        final EditCommand standardCommand = new EditCommand(INDEX_FIRST_MODULE, DESC_AMY);
+
+        // same values -> returns true
+        EditCommand.EditModuleDescriptor copyDescriptor = new EditCommand.EditModuleDescriptor(DESC_AMY);
+        EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_MODULE, copyDescriptor);
+        assertTrue(standardCommand.equals(commandWithSameValues));
+
+        // same object -> returns true
+        assertTrue(standardCommand.equals(standardCommand));
+
+        // null -> returns false
+        assertFalse(standardCommand.equals(null));
+
+        // different types -> returns false
+        assertFalse(standardCommand.equals(new ClearCommand()));
+
+        // different index -> returns false
+        assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_MODULE, DESC_AMY)));
+
+        // different descriptor -> returns false
+        assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_MODULE, DESC_BOB)));
+    }
+
+}
diff --git a/src/test/java/pwe/planner/logic/commands/EditModuleDescriptorTest.java b/src/test/java/pwe/planner/logic/commands/EditModuleDescriptorTest.java
new file mode 100644
index 000000000000..da8fd4f38bd9
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/EditModuleDescriptorTest.java
@@ -0,0 +1,53 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import pwe.planner.testutil.EditModuleDescriptorBuilder;
+
+public class EditModuleDescriptorTest {
+
+    @Test
+    public void equals() {
+        // same values -> returns true
+        EditModuleDescriptor descriptorWithSameValues = new EditCommand.EditModuleDescriptor(DESC_AMY);
+        assertTrue(DESC_AMY.equals(descriptorWithSameValues));
+
+        // same object -> returns true
+        assertTrue(DESC_AMY.equals(DESC_AMY));
+
+        // null -> returns false
+        assertFalse(DESC_AMY.equals(null));
+
+        // different types -> returns false
+        assertFalse(DESC_AMY.equals(5));
+
+        // different values -> returns false
+        assertFalse(DESC_AMY.equals(DESC_BOB));
+
+        // different name -> returns false
+        EditModuleDescriptor editedAmy = new EditModuleDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+
+        // different credits -> returns false
+        editedAmy = new EditModuleDescriptorBuilder(DESC_AMY).withCredits(VALID_CREDITS_BOB).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+
+        // different code -> returns false
+        editedAmy = new EditModuleDescriptorBuilder(DESC_AMY).withCode(VALID_CODE_BOB).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+
+        // different tags -> returns false
+        editedAmy = new EditModuleDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+    }
+}
diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/pwe/planner/logic/commands/ExitCommandTest.java
similarity index 60%
rename from src/test/java/seedu/address/logic/commands/ExitCommandTest.java
rename to src/test/java/pwe/planner/logic/commands/ExitCommandTest.java
index 223e5a362b05..4cea37b2848e 100644
--- a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
+++ b/src/test/java/pwe/planner/logic/commands/ExitCommandTest.java
@@ -1,13 +1,13 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT;
 
 import org.junit.Test;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
 
 public class ExitCommandTest {
     private Model model = new ModelManager();
diff --git a/src/test/java/pwe/planner/logic/commands/FindCommandTest.java b/src/test/java/pwe/planner/logic/commands/FindCommandTest.java
new file mode 100644
index 000000000000..3df2f2859bff
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/FindCommandTest.java
@@ -0,0 +1,161 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.commons.core.Messages.MESSAGE_MODULES_LISTED_OVERVIEW;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.BENSON;
+import static pwe.planner.testutil.TypicalModules.CARL;
+import static pwe.planner.testutil.TypicalModules.DANIEL;
+import static pwe.planner.testutil.TypicalModules.ELLE;
+import static pwe.planner.testutil.TypicalModules.FIONA;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.CodeContainsKeywordsPredicate;
+import pwe.planner.model.module.CreditsContainsKeywordsPredicate;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.NameContainsKeywordsPredicate;
+import pwe.planner.model.module.TagContainsKeywordsPredicate;
+import pwe.planner.model.planner.SemesterContainsKeywordPredicate;
+import pwe.planner.storage.JsonSerializableApplication;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindCommand}.
+ */
+public class FindCommandTest {
+    //ToDo: Implement getTypicalDegreePlannerList for DegreePlannerList and update the codes below
+    private Model model = new ModelManager(
+            new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private Model expectedModel = new ModelManager(
+            new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private CommandHistory commandHistory = new CommandHistory();
+
+    public FindCommandTest() throws IllegalValueException {}
+
+    @Test
+    public void equals() {
+        NameContainsKeywordsPredicate<Module> firstPredicate =
+                new NameContainsKeywordsPredicate<>("first");
+        NameContainsKeywordsPredicate<Module> secondPredicate =
+                new NameContainsKeywordsPredicate<>("second");
+
+        FindCommand findFirstCommand = new FindCommand(firstPredicate);
+        FindCommand findSecondCommand = new FindCommand(secondPredicate);
+
+        // same object -> returns true
+        assertTrue(findFirstCommand.equals(findFirstCommand));
+
+        // same values -> returns true
+        FindCommand findFirstCommandCopy = new FindCommand(firstPredicate);
+        assertTrue(findFirstCommand.equals(findFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(findFirstCommand.equals(1));
+
+        // null -> returns false
+        assertFalse(findFirstCommand.equals(null));
+
+        // different module -> returns false
+        assertFalse(findFirstCommand.equals(findSecondCommand));
+    }
+
+    @Test
+    public void execute_oneKeywords_noModuleFound() {
+        String expectedMessage = String.format(MESSAGE_MODULES_LISTED_OVERVIEW, 0);
+        NameContainsKeywordsPredicate<Module> predicate = prepareNamePredicate("doNotExist");
+        FindCommand command = new FindCommand(predicate);
+        expectedModel.updateFilteredModuleList(predicate);
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(Collections.emptyList(), model.getFilteredModuleList());
+    }
+
+    @Test
+    public void execute_nameKeyword_foundModule() {
+        String expectedMessage = String.format(MESSAGE_MODULES_LISTED_OVERVIEW, 1);
+        NameContainsKeywordsPredicate<Module> predicate = prepareNamePredicate("Kurz ");
+        FindCommand command = new FindCommand(predicate);
+        expectedModel.updateFilteredModuleList(predicate);
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(List.of(CARL), model.getFilteredModuleList());
+    }
+
+    @Test
+    public void execute_codeKeyword_foundModule() {
+        String expectedMessage = String.format(MESSAGE_MODULES_LISTED_OVERVIEW, 1);
+        // TODO: update the module code after TypicalModule attribute are updated
+        CodeContainsKeywordsPredicate<Module> predicate = prepareCodePredicate(" CS2101 ");
+        FindCommand command = new FindCommand(predicate);
+        expectedModel.updateFilteredModuleList(predicate);
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(List.of(ELLE), model.getFilteredModuleList());
+    }
+
+    @Test
+    public void execute_creditKeyword_foundModule() {
+        String expectedMessage = String.format(MESSAGE_MODULES_LISTED_OVERVIEW, 1);
+        // TODO: update the module credits after TypicalModule attribute are updated
+        CreditsContainsKeywordsPredicate<Module> predicate = prepareCreditsPredicate("5");
+        FindCommand command = new FindCommand(predicate);
+        expectedModel.updateFilteredModuleList(predicate);
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(List.of(FIONA), model.getFilteredModuleList());
+    }
+
+    @Test
+    public void execute_tagKeyword_multipleModulesFound() {
+        String expectedMessage = String.format(MESSAGE_MODULES_LISTED_OVERVIEW, 3);
+        TagContainsKeywordsPredicate<Module> predicate = new TagContainsKeywordsPredicate<>("friends");
+        FindCommand command = new FindCommand(predicate);
+        expectedModel.updateFilteredModuleList(predicate);
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(List.of(ALICE, BENSON, DANIEL), model.getFilteredModuleList());
+    }
+
+    @Test
+    public void execute_semKeyword_multipleModulesFound() {
+        String expectedMessage = String.format(MESSAGE_MODULES_LISTED_OVERVIEW, 1);
+        SemesterContainsKeywordPredicate<Module> predicate = new SemesterContainsKeywordPredicate<>("4");
+        FindCommand command = new FindCommand(predicate);
+        expectedModel.updateFilteredModuleList(predicate);
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(List.of(ALICE), model.getFilteredModuleList());
+    }
+
+    /**
+     * Parses {@code userInput} into a {@code NameContainsKeywordsPredicate}.
+     */
+    private NameContainsKeywordsPredicate<Module> prepareNamePredicate(String userInput) {
+        return new NameContainsKeywordsPredicate<>(userInput);
+    }
+
+    /**
+     * Parses {@code userInput} into a {@code CodeContainsKeywordsPredicate}.
+     */
+    private CodeContainsKeywordsPredicate<Module> prepareCodePredicate(String userInput) {
+        return new CodeContainsKeywordsPredicate<>(userInput);
+    }
+
+    /**
+     * Parses {@code userInput} into a {@code CreditsContainsKeywordsPredicate}.
+     */
+    private CreditsContainsKeywordsPredicate<Module> prepareCreditsPredicate(String userInput) {
+        return new CreditsContainsKeywordsPredicate<>(userInput);
+    }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java b/src/test/java/pwe/planner/logic/commands/HelpCommandTest.java
similarity index 61%
rename from src/test/java/seedu/address/logic/commands/HelpCommandTest.java
rename to src/test/java/pwe/planner/logic/commands/HelpCommandTest.java
index 9012e9f18e37..a25b55e26e06 100644
--- a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
+++ b/src/test/java/pwe/planner/logic/commands/HelpCommandTest.java
@@ -1,13 +1,13 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE;
 
 import org.junit.Test;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
 
 public class HelpCommandTest {
     private Model model = new ModelManager();
diff --git a/src/test/java/seedu/address/logic/commands/HistoryCommandTest.java b/src/test/java/pwe/planner/logic/commands/HistoryCommandTest.java
similarity index 67%
rename from src/test/java/seedu/address/logic/commands/HistoryCommandTest.java
rename to src/test/java/pwe/planner/logic/commands/HistoryCommandTest.java
index 8d2ecab4d940..26bfad2b49dc 100644
--- a/src/test/java/seedu/address/logic/commands/HistoryCommandTest.java
+++ b/src/test/java/pwe/planner/logic/commands/HistoryCommandTest.java
@@ -1,12 +1,12 @@
-package seedu.address.logic.commands;
+package pwe.planner.logic.commands;
 
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
 
 import org.junit.Test;
 
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
 
 public class HistoryCommandTest {
     private CommandHistory history = new CommandHistory();
@@ -20,7 +20,7 @@ public void execute() {
         String command1 = "clear";
         history.add(command1);
         assertCommandSuccess(new HistoryCommand(), model, history,
-                String.format(HistoryCommand.MESSAGE_SUCCESS, command1), expectedModel);
+                String.format(HistoryCommand.MESSAGE_SUCCESS, "- " + command1), expectedModel);
 
         String command2 = "randomCommand";
         String command3 = "select 1";
@@ -28,7 +28,7 @@ public void execute() {
         history.add(command3);
 
         String expectedMessage = String.format(HistoryCommand.MESSAGE_SUCCESS,
-                String.join("\n", command3, command2, command1));
+                String.join("\n", "- " + command3, "- " + command2, "- " + command1));
         assertCommandSuccess(new HistoryCommand(), model, history, expectedMessage, expectedModel);
     }
 
diff --git a/src/test/java/pwe/planner/logic/commands/ListCommandTest.java b/src/test/java/pwe/planner/logic/commands/ListCommandTest.java
new file mode 100644
index 000000000000..6217e1f6e33e
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/ListCommandTest.java
@@ -0,0 +1,48 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.showModuleAtIndex;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.storage.JsonSerializableApplication;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for ListCommand.
+ */
+public class ListCommandTest {
+
+    private Model model;
+    private Model expectedModel;
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        //ToDo: Implement getTypicalDegreePlannerList for DegreePlannerList and update the codes below
+        model = new ModelManager(
+                new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+        expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+    }
+
+    @Test
+    public void execute_listIsNotFiltered_showsSameList() {
+        assertCommandSuccess(new ListCommand(), model, commandHistory, ListCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_listIsFiltered_showsEverything() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+        assertCommandSuccess(new ListCommand(), model, commandHistory, ListCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/PlannerAddCommandTest.java b/src/test/java/pwe/planner/logic/commands/PlannerAddCommandTest.java
new file mode 100644
index 000000000000..058e767d93b1
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/PlannerAddCommandTest.java
@@ -0,0 +1,152 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.logic.commands.exceptions.CommandException;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.storage.JsonSerializableApplication;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class PlannerAddCommandTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private CommandHistory commandHistory = new CommandHistory();
+
+    private Model model;
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void constructor_nullYear_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        Semester defaultSemester = new Semester("1");
+        Set<Code> defaultCodeSet = Set.of(new ModuleBuilder().build().getCode());
+        new PlannerAddCommand(null, defaultSemester, defaultCodeSet);
+    }
+
+    @Test
+    public void constructor_nullSemester_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        Year defaultYear = new Year("1");
+        Set<Code> defaultCodeSet = Set.of(new ModuleBuilder().build().getCode());
+        new PlannerAddCommand(defaultYear, null, defaultCodeSet);
+    }
+
+    @Test
+    public void constructor_nullCode_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        Year defaultYear = new Year("1");
+        Semester defaultSemester = new Semester("1");
+        new PlannerAddCommand(defaultYear, defaultSemester, null);
+    }
+
+    @Test
+    public void execute_parametersAcceptedByModel_addSuccessful() throws Exception {
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("1");
+        Set<Code> validCodeSet = Set.of(new Code("CS2105"));
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+
+        DegreePlanner selectedDegreePlanner = model.getApplication().getDegreePlannerList().stream()
+                .filter(degreePlanner -> (degreePlanner.getYear().equals(validYear)
+                        && degreePlanner.getSemester().equals(validSemester))).findFirst().orElse(null);
+
+        assert selectedDegreePlanner != null;
+        Set<Code> selectedCodeSet = new HashSet<>(selectedDegreePlanner.getCodes());
+        selectedCodeSet.addAll(validCodeSet);
+        DegreePlanner editedDegreePlanner = new DegreePlanner(selectedDegreePlanner.getYear(),
+                selectedDegreePlanner.getSemester(), selectedCodeSet);
+        expectedModel.setDegreePlanner(selectedDegreePlanner, editedDegreePlanner);
+
+        expectedModel.commitApplication();
+
+        String validCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        assertCommandSuccess(new PlannerAddCommand(validYear, validSemester, validCodeSet), model, commandHistory,
+                String.format(PlannerAddCommand.MESSAGE_SUCCESS, validYear, validSemester, validCodeString, "None"),
+                expectedModel);
+    }
+
+    @Test
+    public void execute_duplicatePlannerCodes_throwsCommandException() throws Exception {
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("1");
+        Set<Code> validCodeSet = Set.of(new Code("CS1010"));
+
+        PlannerAddCommand plannerAddCommand = new PlannerAddCommand(validYear, validSemester, validCodeSet);
+
+        String validCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        thrown.expect(CommandException.class);
+        thrown.expectMessage(String.format(PlannerAddCommand.MESSAGE_DUPLICATE_CODE, validCodeString));
+        plannerAddCommand.execute(model, commandHistory);
+    }
+
+    @Test
+    public void execute_nonexistentPlannerCodes_throwsCommandException() throws Exception {
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("1");
+        Set<Code> nonexistentCodeSet = Set.of(new Code("CS9999"));
+
+        PlannerAddCommand plannerAddCommand = new PlannerAddCommand(validYear, validSemester, nonexistentCodeSet);
+
+        String nonexistentCodeString = StringUtil.joinStreamAsString(nonexistentCodeSet.stream().sorted());
+
+        thrown.expect(CommandException.class);
+        thrown.expectMessage(String.format(PlannerAddCommand.MESSAGE_NONEXISTENT_MODULES, nonexistentCodeString));
+        plannerAddCommand.execute(model, commandHistory);
+    }
+
+    @Test
+    public void equals() {
+        Year year = new Year("1");
+        Semester semester = new Semester("1");
+        Set<Code> codeSet = Set.of(new Code("CS1010"), new Code("IS1103"));
+        Set<Code> anotherCodeSet = Set.of(new Code("IS1103"));
+
+        PlannerAddCommand plannerAddACommand = new PlannerAddCommand(year, semester, codeSet);
+        PlannerAddCommand plannerAddBCommand = new PlannerAddCommand(year, semester, anotherCodeSet);
+
+        // same object -> returns true
+        assertTrue(plannerAddACommand.equals(plannerAddACommand));
+
+        // same values -> returns true
+        PlannerAddCommand plannerAddACommandCopy = new PlannerAddCommand(year, semester, codeSet);
+        assertTrue(plannerAddACommand.equals(plannerAddACommandCopy));
+
+        // different types -> returns false
+        assertFalse(plannerAddACommand.equals(1));
+
+        // different module -> returns false
+        assertFalse(plannerAddACommand.equals(plannerAddBCommand));
+    }
+}
+
diff --git a/src/test/java/pwe/planner/logic/commands/PlannerListCommandTest.java b/src/test/java/pwe/planner/logic/commands/PlannerListCommandTest.java
new file mode 100644
index 000000000000..222d528fb2d0
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/PlannerListCommandTest.java
@@ -0,0 +1,45 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.storage.JsonSerializableApplication;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for PlannerListCommand.
+ */
+public class PlannerListCommandTest {
+    private Model model;
+    private Model expectedModel;
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+        expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+    }
+
+    @Test
+    public void execute_plannerListIsNotFiltered_showsSameList() {
+        String degreePlannerListContent = model.getApplication().getDegreePlannerList().stream()
+                .map(DegreePlanner::toString)
+                .collect(Collectors.joining("\n"));
+        String expectedMessage =
+                String.format(PlannerListCommand.MESSAGE_SUCCESS, degreePlannerListContent);
+        assertCommandSuccess(new PlannerListCommand(), model, commandHistory, expectedMessage, expectedModel);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/PlannerMoveCommandTest.java b/src/test/java/pwe/planner/logic/commands/PlannerMoveCommandTest.java
new file mode 100644
index 000000000000..d381d657f941
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/PlannerMoveCommandTest.java
@@ -0,0 +1,224 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class PlannerMoveCommandTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+    private CommandHistory commandHistory = new CommandHistory();
+    private Model model;
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void execute_nonExistentCode_throwsCommandException() {
+        Code nonExistentCode = new Code("CS9999");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("2");
+        assertCommandFailure(new PlannerMoveCommand(validYear, validSemester, nonExistentCode), model,
+                commandHistory, String.format(PlannerMoveCommand.MESSAGE_NONEXISTENT_CODE, nonExistentCode));
+    }
+
+    @Test
+    public void execute_nonExistentYear_throwsCommandException() {
+        Code validCodeToMove = new Code("CS1010");
+        Year nonExistentYear = new Year("4");
+        Semester validSemester = new Semester("1");
+        assertCommandFailure(new PlannerMoveCommand(nonExistentYear, validSemester, validCodeToMove), model,
+                commandHistory,
+                String.format(PlannerMoveCommand.MESSAGE_NONEXISTENT_DEGREE_PLANNER, nonExistentYear, validSemester));
+    }
+
+    @Test
+    public void execute_nonExistentSemester_throwsCommandException() {
+        Code validCodeToMove = new Code("CS1010");
+        Year validYear = new Year("1");
+        Semester nonExistentSemester = new Semester("4");
+        assertCommandFailure(new PlannerMoveCommand(validYear, nonExistentSemester, validCodeToMove), model,
+                commandHistory,
+                String.format(PlannerMoveCommand.MESSAGE_NONEXISTENT_DEGREE_PLANNER, validYear, nonExistentSemester));
+    }
+
+    @Test
+    public void execute_validPlannerUnfilteredList_success() {
+        Code validCodeToMove = new Code("CS1010");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("2");
+        DegreePlanner toFind = new DegreePlanner(validYear, validSemester, Collections.emptySet());
+        DegreePlanner sourcePlannerToEdit = model.getDegreePlannerByCode(validCodeToMove);
+        DegreePlanner destinationPlannerToEdit = model.getApplication().getDegreePlannerList().stream()
+                .filter(toFind::isSameDegreePlanner)
+                .findFirst()
+                .orElse(null);
+
+        PlannerMoveCommand plannerMoveCommand = new PlannerMoveCommand(validYear, validSemester, validCodeToMove);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+
+        expectedModel.moveModuleBetweenPlanner(sourcePlannerToEdit, destinationPlannerToEdit, validCodeToMove);
+
+        Set<Code> corequisites = model.getModuleByCode(validCodeToMove).getCorequisites();
+        String corequisitesMoved = corequisites.isEmpty()
+                ? "None"
+                : corequisites.stream().sorted().map(Code::toString).collect(Collectors.joining(", "));
+        String expectedMessage = String.format(PlannerMoveCommand.MESSAGE_SUCCESS, validCodeToMove, validYear,
+                validSemester, corequisitesMoved);
+
+        expectedModel.commitApplication();
+
+        // plannerMove -> module moved
+        assertCommandSuccess(plannerMoveCommand, model, commandHistory, expectedMessage, expectedModel);
+
+        // undo -> reverts application back to previous state and filtered module list to show all modules
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // redo -> same first module deleted again
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_moveToSamePlannerUnfilteredList_success() {
+        Code validCodeToMove = new Code("CS1010");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("1");
+
+        PlannerMoveCommand plannerMoveCommand = new PlannerMoveCommand(validYear, validSemester, validCodeToMove);
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.commitApplication();
+
+        Set<Code> corequisites = model.getModuleByCode(validCodeToMove).getCorequisites();
+        String corequisitesMoved = corequisites.isEmpty()
+                ? "None"
+                : corequisites.stream().sorted().map(Code::toString).collect(Collectors.joining(", "));
+        String expectedMessage = String.format(PlannerMoveCommand.MESSAGE_SUCCESS, validCodeToMove, validYear,
+                validSemester, corequisitesMoved);
+
+        assertCommandSuccess(plannerMoveCommand, model, commandHistory, expectedMessage, expectedModel);
+
+        // undo -> reverts application back to previous state and filtered module list to show all modules
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // redo -> same first module deleted again
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_unavailableModuleInSemesterPlannerUnfilteredList_success() {
+        // module not available in the semester
+        Code unavailableValidCodeToMove = new Code("CS1010");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("3");
+
+        PlannerMoveCommand plannerMoveCommand =
+                new PlannerMoveCommand(validYear, validSemester, unavailableValidCodeToMove);
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.commitApplication();
+
+        String expectedMessage = String.format(PlannerMoveCommand.MESSAGE_UNAVAILABLE_SEMESTER, validSemester);
+
+        assertCommandFailure(plannerMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_unavailableCorequisitesInSemesterPlannerUnfilteredList_success() {
+        // module's corequisite(s) not available in the semester
+        Code codeToMove = new Code("CS1231");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("2");
+
+        PlannerMoveCommand plannerMoveCommand =
+                new PlannerMoveCommand(validYear, validSemester, codeToMove);
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.commitApplication();
+
+        Set<Code> corequisites = model.getModuleByCode(codeToMove).getCorequisites();
+        String corequisitesMoved = corequisites.isEmpty()
+                ? "None"
+                : corequisites.stream().sorted().map(Code::toString).collect(Collectors.joining(", "));
+
+        String expectedMessage =
+                String.format(PlannerMoveCommand.MESSAGE_UNAVAILABLE_COREQUISITES, corequisitesMoved, validSemester);
+
+        assertCommandFailure(plannerMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void executeUndoRedo_invalidPlannerUnfilteredList_success() {
+        Code invalidCodeToMove = new Code("CS9999");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("2");
+        PlannerMoveCommand plannerMoveCommand = new PlannerMoveCommand(validYear, validSemester, invalidCodeToMove);
+
+        // execution failed -> application state not added into model
+        assertCommandFailure(plannerMoveCommand, model, commandHistory,
+                String.format(PlannerMoveCommand.MESSAGE_NONEXISTENT_CODE, invalidCodeToMove));
+
+        // single application state in model -> undoCommand and redoCommand fail
+        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
+        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
+    }
+
+    @Test
+    public void equals() {
+        Code firstCodeToMove = new Code("CS1111");
+        Code secondCodeToMove = new Code("CS2222");
+        Year firstValidYear = new Year("1");
+        Year secondValidYear = new Year("1");
+        Semester firstValidSemester = new Semester("1");
+        Semester secondValidSemester = new Semester("2");
+
+        PlannerMoveCommand plannerMoveFirstCommand =
+                new PlannerMoveCommand(firstValidYear, firstValidSemester, firstCodeToMove);
+        PlannerMoveCommand plannerMoveSecondCommand =
+                new PlannerMoveCommand(secondValidYear, secondValidSemester, secondCodeToMove);
+
+        // same object -> returns true
+        assertTrue(plannerMoveFirstCommand.equals(plannerMoveFirstCommand));
+
+        // same values -> returns true
+        PlannerMoveCommand plannerMoveFirstCommandCopy =
+                new PlannerMoveCommand(firstValidYear, firstValidSemester, firstCodeToMove);
+        assertTrue(plannerMoveFirstCommand.equals(plannerMoveFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(plannerMoveFirstCommand.equals(1));
+
+        // different module -> returns false
+        assertFalse(plannerMoveFirstCommand.equals(plannerMoveSecondCommand));
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/PlannerRemoveCommandTest.java b/src/test/java/pwe/planner/logic/commands/PlannerRemoveCommandTest.java
new file mode 100644
index 000000000000..b0d89241934d
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/PlannerRemoveCommandTest.java
@@ -0,0 +1,104 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class PlannerRemoveCommandTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private CommandHistory commandHistory = new CommandHistory();
+
+    private Model model;
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void constructor_nullCodes_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        new PlannerRemoveCommand(null);
+    }
+
+    @Test
+    public void execute_parametersAcceptedByModel_removeSuccessful() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"), new Code("CS1010"));
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+
+        List<DegreePlanner> degreePlannerList = model.getApplication().getDegreePlannerList();
+        for (DegreePlanner selectedDegreePlanner : degreePlannerList) {
+            Set<Code> selectedCodeSet = new HashSet<>(selectedDegreePlanner.getCodes());
+            selectedCodeSet.removeAll(validCodeSet);
+            DegreePlanner editedDegreePlanner = new DegreePlanner(selectedDegreePlanner.getYear(),
+                    selectedDegreePlanner.getSemester(), selectedCodeSet);
+            expectedModel.setDegreePlanner(selectedDegreePlanner, editedDegreePlanner);
+        }
+        expectedModel.commitApplication();
+
+        String removedCodesString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandSuccess(new PlannerRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(PlannerRemoveCommand.MESSAGE_SUCCESS, removedCodesString, "None"), expectedModel);
+    }
+
+    @Test
+    public void execute_nonexistentPlannerCodes_throwsCommandException() {
+        Set<Code> nonexistentCodeSet = Set.of(new Code("CS9999"));
+
+        String nonexistentCodesString = StringUtil.joinStreamAsString(nonexistentCodeSet.stream().sorted());
+
+        PlannerRemoveCommand plannerRemoveCommand = new PlannerRemoveCommand(nonexistentCodeSet);
+        assertCommandFailure(plannerRemoveCommand, model, commandHistory,
+                String.format(PlannerRemoveCommand.MESSAGE_NONEXISTENT_CODES, nonexistentCodesString));
+    }
+
+    @Test
+    public void equals() {
+        Set<Code> codeSet = Set.of(new Code("CS1010"));
+        Set<Code> anotherCodeSet = Set.of(new Code("IS1103"));
+
+        PlannerRemoveCommand plannerRemoveCommand = new PlannerRemoveCommand(codeSet);
+        PlannerRemoveCommand plannerRemoveCommandToCompare = new PlannerRemoveCommand(anotherCodeSet);
+
+        // same object -> returns true
+        assertTrue(plannerRemoveCommand.equals(plannerRemoveCommand));
+
+        // same values -> returns true
+        PlannerRemoveCommand plannerAddACommandCopy = new PlannerRemoveCommand(codeSet);
+        assertTrue(plannerRemoveCommand.equals(plannerAddACommandCopy));
+
+        // different types -> returns false
+        assertFalse(plannerRemoveCommand.equals(1));
+
+        // different module -> returns false
+        assertFalse(plannerRemoveCommand.equals(plannerRemoveCommandToCompare));
+    }
+}
+
diff --git a/src/test/java/pwe/planner/logic/commands/PlannerShowCommandTest.java b/src/test/java/pwe/planner/logic/commands/PlannerShowCommandTest.java
new file mode 100644
index 000000000000..45273cb3ae32
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/PlannerShowCommandTest.java
@@ -0,0 +1,98 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_1_SEMESTER_1;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_1_SEMESTER_2;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_2_SEMESTER_1;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_3_SEMESTER_1;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.SemesterContainsKeywordPredicate;
+import pwe.planner.model.planner.YearContainsKeywordPredicate;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class PlannerShowCommandTest {
+    private Model model = new ModelManager(
+            new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private Model expectedModel = new ModelManager(
+            new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private CommandHistory commandHistory = new CommandHistory();
+
+    public PlannerShowCommandTest() throws IllegalValueException {}
+
+    @Test
+    public void execute_validYear_success() {
+        YearContainsKeywordPredicate<DegreePlanner> predicate = prepareYearPredicate("1");
+        PlannerShowCommand command = new PlannerShowCommand(predicate);
+        expectedModel.updateFilteredDegreePlannerList(predicate);
+        String expectedMessage =
+                String.format(PlannerShowCommand.MESSAGE_SUCCESS, expectedModel.getFilteredDegreePlannerList().size());
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(Arrays.asList(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_2), model.getFilteredDegreePlannerList());
+    }
+
+    @Test
+    public void execute_validSemester_success() {
+        SemesterContainsKeywordPredicate<DegreePlanner> predicate = prepareSemesterPredicate("1");
+        PlannerShowCommand command = new PlannerShowCommand(predicate);
+        expectedModel.updateFilteredDegreePlannerList(predicate);
+        String expectedMessage =
+                String.format(PlannerShowCommand.MESSAGE_SUCCESS, expectedModel.getFilteredDegreePlannerList().size());
+        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
+        assertEquals(Arrays.asList(YEAR_1_SEMESTER_1, YEAR_2_SEMESTER_1, YEAR_3_SEMESTER_1),
+                model.getFilteredDegreePlannerList());
+    }
+
+    @Test
+    public void equals() {
+        YearContainsKeywordPredicate<DegreePlanner> firstPredicate = prepareYearPredicate("1");
+        SemesterContainsKeywordPredicate<DegreePlanner> secondPredicate = prepareSemesterPredicate("1");
+
+        PlannerShowCommand plannerShowFirstCommand = new PlannerShowCommand(firstPredicate);
+        PlannerShowCommand plannerShowSecondCommand = new PlannerShowCommand(secondPredicate);
+
+        // same object -> returns true
+        assertTrue(plannerShowFirstCommand.equals(plannerShowFirstCommand));
+
+        // same values -> returns true
+        PlannerShowCommand plannerShowFirstCommandCopy = new PlannerShowCommand(firstPredicate);
+        assertTrue(plannerShowFirstCommand.equals(plannerShowFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(plannerShowFirstCommand.equals(1));
+
+        // different module -> returns false
+        assertFalse(plannerShowFirstCommand.equals(plannerShowSecondCommand));
+    }
+
+    /**
+     * Parses {@code userInput} into a {@code YearContainsKeywordPredicate}.
+     */
+    private YearContainsKeywordPredicate<DegreePlanner> prepareYearPredicate(String userInput) {
+        return new YearContainsKeywordPredicate<>(userInput);
+    }
+
+    /**
+     * Parses {@code userInput} into a {@code SemesterContainsKeywordPredicate}.
+     */
+    private SemesterContainsKeywordPredicate<DegreePlanner> prepareSemesterPredicate(String userInput) {
+        return new SemesterContainsKeywordPredicate<>(userInput);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/PlannerSuggestCommandTest.java b/src/test/java/pwe/planner/logic/commands/PlannerSuggestCommandTest.java
new file mode 100644
index 000000000000..364915ceee94
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/PlannerSuggestCommandTest.java
@@ -0,0 +1,71 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.storage.JsonSerializableApplication;
+
+/**
+ * Contains unit tests for PlannerSuggestCommand.
+ */
+public class PlannerSuggestCommandTest {
+
+    private Model model;
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void execute_modulesWithoutMatchingTagsAndCredits_recommendedModulesFound() {
+        Credits bestCredits = new Credits("3");
+        Set<Tag> tagsToFind = Set.of(new Tag("nonexistent"));
+        List<Code> recommendedCodes = List.of(new Code("CS2101"), new Code("CS2105"));
+
+        String recommendedCodesString = StringUtil.joinStreamAsString(recommendedCodes.stream().sorted());
+
+        String expectedMessage = String.format(PlannerSuggestCommand.MESSAGE_SUCCESS, recommendedCodesString, "None",
+                "None");
+
+        assertCommandSuccess(new PlannerSuggestCommand(bestCredits, tagsToFind), model, commandHistory,
+                expectedMessage, model);
+    }
+
+    @Test
+    public void execute_modulesWithMatchingCredits_recommendedModulesFound() {
+        Credits bestCredits = new Credits("4");
+        Set<Tag> tagsToFind = Set.of(new Tag("nonexistent"));
+        List<Code> recommendedCodes = List.of(new Code("CS2101"), new Code("CS2105"));
+        List<Code> codesWithMatchingCredits = List.of(new Code("CS2101"));
+
+        String matchingCreditCodesString = StringUtil.joinStreamAsString(codesWithMatchingCredits.stream().sorted());
+
+        String recommendedCodesString = StringUtil.joinStreamAsString(recommendedCodes.stream().sorted());
+
+        String expectedMessage = String.format(PlannerSuggestCommand.MESSAGE_SUCCESS, recommendedCodesString, "None",
+                matchingCreditCodesString);
+
+        assertCommandSuccess(new PlannerSuggestCommand(bestCredits, tagsToFind), model, commandHistory,
+                expectedMessage, model);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/RedoCommandTest.java b/src/test/java/pwe/planner/logic/commands/RedoCommandTest.java
new file mode 100644
index 000000000000..7d4e589452e0
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/RedoCommandTest.java
@@ -0,0 +1,61 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.deleteFirstModule;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class RedoCommandTest {
+    //ToDo: Implement getTypicalDegreePlannerList for DegreePlannerList and update the codes below
+    private final Model model =
+            new ModelManager(
+                    new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                            getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private final Model expectedModel =
+            new ModelManager(
+                    new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                            getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private final CommandHistory commandHistory = new CommandHistory();
+
+    public RedoCommandTest() throws IllegalValueException {}
+
+    @Before
+    public void setUp() {
+        // set up of both models' undo/redo history
+        deleteFirstModule(model);
+        deleteFirstModule(model);
+        model.undoApplication();
+        model.undoApplication();
+
+        deleteFirstModule(expectedModel);
+        deleteFirstModule(expectedModel);
+        expectedModel.undoApplication();
+        expectedModel.undoApplication();
+    }
+
+    @Test
+    public void execute() {
+        // multiple redoable states in model
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // single redoable state in model
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // no redoable state in model
+        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/RequirementAddCommandTest.java b/src/test/java/pwe/planner/logic/commands/RequirementAddCommandTest.java
new file mode 100644
index 000000000000..a3a71b7abf3f
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/RequirementAddCommandTest.java
@@ -0,0 +1,179 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class RequirementAddCommandTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private CommandHistory commandHistory = new CommandHistory();
+    private Model model;
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(
+                new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void constructor_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        new RequirementAddCommand(null, null);
+    }
+
+    @Test
+    public void execute_nonExistentRequirementCategory_throwsCommandException() {
+        Set<Code> validCodeSet = new HashSet<>();
+        Name nonExistentRequirementCategoryName = new Name("DOES NOT EXIST");
+        assertCommandFailure(new RequirementAddCommand(nonExistentRequirementCategoryName, validCodeSet),
+                model, commandHistory, String.format(RequirementAddCommand.MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY,
+                        nonExistentRequirementCategoryName));
+    }
+
+    @Test
+    public void execute_nonExistentCode_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2010"));
+        Name requirementCategoryName = new Name("Computing Foundation");
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandFailure(new RequirementAddCommand(requirementCategoryName, validCodeSet), model, commandHistory,
+                String.format(RequirementAddCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString));
+
+        //case insensitive checks
+        requirementCategoryName = new Name("comPUTING FOUNDATion");
+        assertCommandFailure(new RequirementAddCommand(requirementCategoryName, validCodeSet), model, commandHistory,
+                String.format(RequirementAddCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString));
+    }
+
+    @Test
+    public void execute_duplicateCode_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Foundation");
+        assertCommandFailure(new RequirementAddCommand(requirementCategoryName, validCodeSet), model, commandHistory,
+                String.format(RequirementAddCommand.MESSAGE_DUPLICATE_CODE, requirementCategoryName));
+
+        //case insensitive checks
+        Set<Code> validCodeSetCaseInsensitive = Set.of(new Code("CS2100"));
+        Name requirementCategoryNameInsensitive = new Name("COMPUting FOundAtIon");
+        assertCommandFailure(new RequirementAddCommand(requirementCategoryNameInsensitive, validCodeSetCaseInsensitive),
+                model, commandHistory, String.format(RequirementAddCommand.MESSAGE_DUPLICATE_CODE,
+                        requirementCategoryName));
+    }
+
+    @Test
+    public void execute_existingCode_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Breadth");
+        assertCommandFailure(new RequirementAddCommand(requirementCategoryName, validCodeSet), model, commandHistory,
+                RequirementAddCommand.MESSAGE_EXISTING_CODE);
+
+        //case insensitive checks
+        Set<Code> validCodeSetCaseInsensitive = Set.of(new Code("CS2100"));
+        requirementCategoryName = new Name("COMPUting BREAdth");
+        assertCommandFailure(new RequirementAddCommand(requirementCategoryName, validCodeSetCaseInsensitive),
+                model, commandHistory, String.format(RequirementAddCommand.MESSAGE_EXISTING_CODE,
+                        requirementCategoryName));
+    }
+
+    @Test
+    public void execute_addModuleToRequirementCategory_success() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2040C"));
+        Set<Code> codeSetToCheck = Set.of(new Code("CS2040C"), new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Foundation");
+        RequirementCategory currentRequirementCategory = model.getRequirementCategory(requirementCategoryName);
+        RequirementCategory editedRequirementCategory = new RequirementCategory(requirementCategoryName,
+                currentRequirementCategory.getCredits(), codeSetToCheck);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(currentRequirementCategory, editedRequirementCategory);
+        expectedModel.commitApplication();
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        assertCommandSuccess(new RequirementAddCommand(requirementCategoryName, validCodeSet), model, commandHistory,
+                String.format(RequirementAddCommand.MESSAGE_SUCCESS, formattedCodeString, requirementCategoryName),
+                expectedModel);
+
+        // undo -> reverts application back to previous state
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // redo -> reverts application back to previous state before undo
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_addModuleToRequirementCategoryCaseInsensitive_success() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2102"), new Code("CS2040C"));
+        Set<Code> codeSetToCheck = Set.of(new Code("CS2040C"), new Code("CS2100"), new Code("CS2102"));
+        Name requirementCategoryName = new Name("CoMpUtInG FoundatioN");
+        RequirementCategory currentRequirementCategory = model.getRequirementCategory(requirementCategoryName);
+        RequirementCategory editedRequirementCategory = new RequirementCategory(currentRequirementCategory.getName(),
+                currentRequirementCategory.getCredits(), codeSetToCheck);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(currentRequirementCategory, editedRequirementCategory);
+        expectedModel.commitApplication();
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        assertCommandSuccess(new RequirementAddCommand(requirementCategoryName, validCodeSet), model, commandHistory,
+                String.format(RequirementAddCommand.MESSAGE_SUCCESS, formattedCodeString,
+                        currentRequirementCategory.getName()), expectedModel);
+
+    }
+
+    @Test
+    public void execute_equals() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Foundation");
+
+        Set<Code> codeSetToCompare = Set.of(new Code("CS1010"));
+        Name requirementCategoryNameToCompare = new Name("Mathematics");
+
+        RequirementAddCommand commandBaseline = new RequirementAddCommand(requirementCategoryName, validCodeSet);
+        RequirementAddCommand commandToCompare =
+                new RequirementAddCommand(requirementCategoryNameToCompare, codeSetToCompare);
+
+        //same object -> returns true
+        assertTrue(commandBaseline.equals(commandBaseline));
+
+        //different objects, same values -> returns true
+        RequirementAddCommand commandBaselineCopy = new RequirementAddCommand(requirementCategoryName, validCodeSet);
+        assertTrue(commandBaseline.equals(commandBaselineCopy));
+
+        //different objects -> returns false
+        assertFalse(commandBaseline.equals(commandToCompare));
+
+        //different objects -> returns false
+        assertFalse(commandBaseline.equals(1));
+    }
+
+}
diff --git a/src/test/java/pwe/planner/logic/commands/RequirementListCommandTest.java b/src/test/java/pwe/planner/logic/commands/RequirementListCommandTest.java
new file mode 100644
index 000000000000..ceb3a179bce7
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/RequirementListCommandTest.java
@@ -0,0 +1,61 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import javafx.collections.ObservableList;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class RequirementListCommandTest {
+
+    private Model model;
+    private Model expectedModel;
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Before public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+        expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+    }
+
+    @Test public void execute_displayList() {
+        StringBuilder requirementListContent = new StringBuilder();
+
+        ObservableList<RequirementCategory> requirementCategories = model.getFilteredRequirementCategoryList();
+
+        for (RequirementCategory requirementCategory : requirementCategories) {
+            requirementListContent.append(requirementCategory.getName()).append(" ");
+
+            int currentCredits = requirementCategory.getCodeSet().stream()
+                    .map(code -> model.getModuleByCode(code).getCredits().toString())
+                    .map(Integer::parseInt).reduce(0, (totalCredits, credit) -> totalCredits + credit);
+
+            requirementListContent.append("(").append(currentCredits).append("/")
+                    .append(requirementCategory.getCredits()).append(" Modular Credits Fulfilled) \n");
+
+            if (requirementCategory.getCodeSet().isEmpty()) {
+                requirementListContent.append("No modules added!");
+            } else {
+                requirementListContent.append("Modules: ")
+                        .append(StringUtil.joinStreamAsString(requirementCategory.getCodeSet().stream().sorted()));
+            }
+
+            requirementListContent.append("\n\n");
+        }
+        String expectedMessage =
+                String.format(RequirementListCommand.MESSAGE_SUCCESS, requirementListContent.toString());
+        assertCommandSuccess(new RequirementListCommand(), model, commandHistory, expectedMessage, expectedModel);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/RequirementMoveCommandTest.java b/src/test/java/pwe/planner/logic/commands/RequirementMoveCommandTest.java
new file mode 100644
index 000000000000..4d7207c360f3
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/RequirementMoveCommandTest.java
@@ -0,0 +1,349 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.model.util.RequirementCategoryUtil;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class RequirementMoveCommandTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private CommandHistory commandHistory = new CommandHistory();
+    private Model model;
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void constructor_nullInputs_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        new RequirementMoveCommand(null, null);
+    }
+
+    @Test
+    public void execute_nonExistentRequirementCategory_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1231"));
+        Name nonExistentRequirementCategoryName = new Name("DOES NOT EXIST");
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(nonExistentRequirementCategoryName, validCodeSet);
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY,
+                nonExistentRequirementCategoryName);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_nonExistentCodeInApplication_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS9999"));
+        Name requirementCategoryName = new Name("Computing Breadth");
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_codeNotInAnyRequirementCategory_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2040C"));
+        Name requirementCategoryName = new Name("Computing Breadth");
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        String expectedMessage =
+                String.format(RequirementMoveCommand.MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY, formattedCodeString);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_multiCodeWithNonExistentCodeInApplication_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS9999"), new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Breadth");
+
+        Set<Code> invalidCodeSet = Set.of(new Code("CS9999"));
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(invalidCodeSet.stream().sorted());
+
+        String expectedMessage =
+                String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_multiCodeWithCodeNotInAnyRequirementCategory_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2040C"), new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Breadth");
+
+        Set<Code> invalidCodeSet = Set.of(new Code("CS2040C"));
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(invalidCodeSet.stream().sorted());
+
+        String expectedMessage =
+                String.format(RequirementMoveCommand.MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY, formattedCodeString);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_multiCodeAndCodeNotInAnyRequirementCategoryAndNonExistentRequirementCategory_throwsException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2040C"), new Code("CS2100"));
+        Name nonExistentRequirementCategoryName = new Name("DOES NOT EXIST");
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(nonExistentRequirementCategoryName, validCodeSet);
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY,
+                nonExistentRequirementCategoryName);
+
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_multiCodeWithNonExistentCodeInAppAndNonExistentRequirementCategory_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS9999"), new Code("CS2100"));
+        Name nonExistentRequirementCategoryName = new Name("DOES NOT EXIST");
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(nonExistentRequirementCategoryName, validCodeSet);
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY,
+                nonExistentRequirementCategoryName);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_multiCodeWithCodeNotInAnyRequirementCategoryAndApplication_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2040C"), new Code("CS2100"), new Code("CS9999"));
+        Name requirementCategoryName = new Name("Computing Breadth");
+
+        Set<Code> invalidCodeSet = Set.of(new Code("CS9999"));
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(invalidCodeSet.stream().sorted());
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_multiCodeWithAllInvalid_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS9999"), new Code("CS2040C"));
+        Name requirementCategoryName = new Name("Computing 123");
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_NONEXISTENT_REQUIREMENT_CATEGORY,
+                requirementCategoryName);
+
+        assertCommandFailure(requirementMoveCommand, model, commandHistory, expectedMessage);
+    }
+
+    @Test
+    public void execute_moveCodeToOtherRequirementCategory_success() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+
+        Name sourceReqCatName = new Name("Computing Foundation");
+        Name destinationReqCatName = new Name("Computing Breadth");
+
+        RequirementCategory sourceReqCat = model.getRequirementCategory(sourceReqCatName);
+        RequirementCategory destinationReqCat = model.getRequirementCategory(destinationReqCatName);
+
+        RequirementCategory editedSourceReqCat = RequirementCategoryUtil
+                .getRequirementCategoryWithCodesRemoved(sourceReqCat, validCodeSet);
+        RequirementCategory editedDestinationReqCat = RequirementCategoryUtil
+                .getRequirementCategoryWithCodesAdded(destinationReqCat, validCodeSet);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(sourceReqCat, editedSourceReqCat);
+        expectedModel.setRequirementCategory(destinationReqCat, editedDestinationReqCat);
+        expectedModel.commitApplication();
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(destinationReqCatName, validCodeSet);
+
+        String expectedMessage = String.format(RequirementMoveCommand.MESSAGE_SUCCESS, formattedCodeString,
+                destinationReqCatName);
+
+        assertCommandSuccess(requirementMoveCommand, model, commandHistory, expectedMessage , expectedModel);
+    }
+
+    @Test
+    public void execute_moveCodeToSameRequirementCategory_success() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+
+        Name destinationReqCatName = new Name("Computing Foundation");
+
+        Model expectedModel = model;
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(destinationReqCatName, validCodeSet);
+
+        String expectedMessage =
+                String.format(RequirementMoveCommand.MESSAGE_SUCCESS, formattedCodeString, destinationReqCatName);
+
+        assertCommandSuccess(requirementMoveCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_moveCodesFromMultipleSource_success() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1231"), new Code("CS2100"));
+
+        Set<Code> sourceCodeSet1 = Set.of(new Code("CS2100"));
+
+        Set<Code> sourceCodeSet2 = Set.of(new Code("CS1231"));
+
+        Name sourceReqCatName1 = new Name("Computing Foundation");
+        Name sourceReqCatName2 = new Name("Mathematics");
+        Name destinationReqCatName = new Name("Computing Breadth");
+
+        RequirementCategory sourceReqCat1 = model.getRequirementCategory(sourceReqCatName1);
+        RequirementCategory sourceReqCat2 = model.getRequirementCategory(sourceReqCatName2);
+        RequirementCategory destinationReqCat = model.getRequirementCategory(destinationReqCatName);
+
+        RequirementCategory editedSourceReqCat = RequirementCategoryUtil
+                        .getRequirementCategoryWithCodesRemoved(sourceReqCat1, sourceCodeSet1);
+        RequirementCategory editedSourceReqCat2 = RequirementCategoryUtil
+                        .getRequirementCategoryWithCodesRemoved(sourceReqCat2, sourceCodeSet2);
+        RequirementCategory editedDestinationReqCat = RequirementCategoryUtil
+                        .getRequirementCategoryWithCodesAdded(destinationReqCat, validCodeSet);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(sourceReqCat1, editedSourceReqCat);
+        expectedModel.setRequirementCategory(sourceReqCat2, editedSourceReqCat2);
+        expectedModel.setRequirementCategory(destinationReqCat, editedDestinationReqCat);
+        expectedModel.commitApplication();
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(destinationReqCatName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        String expectedMessage =
+                String.format(RequirementMoveCommand.MESSAGE_SUCCESS, formattedCodeString, destinationReqCatName);
+
+        assertCommandSuccess(requirementMoveCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_moveCodesWithSameSourceAndDestination_success() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1231"), new Code("CS2100"));
+
+        Set<Code> sourceCodeSet1 = Set.of(new Code("CS2100"));
+
+        Set<Code> sourceCodeSet2 = Set.of(new Code("CS1231"));
+
+        Name sourceReqCatName1 = new Name("Computing Foundation");
+        Name sourceReqCatName2 = new Name("Mathematics");
+        Name destinationReqCatName = new Name("Computing Foundation");
+
+        RequirementCategory sourceReqCat1 = model.getRequirementCategory(sourceReqCatName1);
+        RequirementCategory sourceReqCat2 = model.getRequirementCategory(sourceReqCatName2);
+
+        RequirementCategory editedSourceReqCat = RequirementCategoryUtil
+                        .getRequirementCategoryWithCodesRemoved(sourceReqCat1, sourceCodeSet1);
+        RequirementCategory editedSourceReqCat2 = RequirementCategoryUtil
+                        .getRequirementCategoryWithCodesRemoved(sourceReqCat2, sourceCodeSet2);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(sourceReqCat1, editedSourceReqCat);
+        expectedModel.setRequirementCategory(sourceReqCat2, editedSourceReqCat2);
+
+        RequirementCategory destinationReqCat = expectedModel.getRequirementCategory(destinationReqCatName);
+        RequirementCategory editedDestinationReqCat = RequirementCategoryUtil
+                        .getRequirementCategoryWithCodesAdded(destinationReqCat, validCodeSet);
+        expectedModel.setRequirementCategory(destinationReqCat, editedDestinationReqCat);
+        expectedModel.commitApplication();
+
+        RequirementMoveCommand requirementMoveCommand =
+                new RequirementMoveCommand(destinationReqCatName, validCodeSet);
+
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+
+        String expectedMessage =
+                String.format(RequirementMoveCommand.MESSAGE_SUCCESS, formattedCodeString, destinationReqCatName);
+
+        assertCommandSuccess(requirementMoveCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_equals() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+        Name requirementCategoryName = new Name("Computing Foundation");
+
+        Set<Code> codeSetToCompare = Set.of(new Code("CS1010"));
+        Name requirementCategoryNameToCompare = new Name("Mathematics");
+
+        RequirementMoveCommand commandBaseline = new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+        RequirementMoveCommand commandToCompare =
+                new RequirementMoveCommand(requirementCategoryNameToCompare, codeSetToCompare);
+
+        //same object -> returns true
+        assertTrue(commandBaseline.equals(commandBaseline));
+
+        //different objects, same values -> returns true
+        RequirementMoveCommand commandBaselineCopy = new RequirementMoveCommand(requirementCategoryName, validCodeSet);
+        assertTrue(commandBaseline.equals(commandBaselineCopy));
+
+        //different objects -> returns false
+        assertFalse(commandBaseline.equals(commandToCompare));
+
+        //different objects -> returns false
+        assertFalse(commandBaseline.equals(1));
+    }
+
+
+}
diff --git a/src/test/java/pwe/planner/logic/commands/RequirementRemoveCommandTest.java b/src/test/java/pwe/planner/logic/commands/RequirementRemoveCommandTest.java
new file mode 100644
index 000000000000..d796b8ba4c4b
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/RequirementRemoveCommandTest.java
@@ -0,0 +1,192 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.StringUtil;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class RequirementRemoveCommandTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private CommandHistory commandHistory = new CommandHistory();
+    private Model model;
+
+    @Before
+    public void setUp() throws IllegalValueException {
+        model = new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    }
+
+    @Test
+    public void constructor_nullInputs_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        new RequirementRemoveCommand(null);
+    }
+
+    @Test
+    public void execute_nonExistentCode_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS9999"));
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandFailure(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString));
+
+        //case insensitive checks
+        Set<Code> validCodeSetCaseInsensitive = Set.of(new Code("cs9999"));
+        formattedCodeString = StringUtil.joinStreamAsString(validCodeSetCaseInsensitive.stream().sorted());
+        assertCommandFailure(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString));
+    }
+
+    @Test
+    public void execute_nonExistentCodes_throwsCommandException() {
+        Set<Code> invalidCodeSet = Set.of(new Code("CS9999"));
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"), new Code("CS9999"));
+        String formattedCodeString = StringUtil.joinStreamAsString(invalidCodeSet.stream().sorted());
+        assertCommandFailure(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_NONEXISTENT_CODE, formattedCodeString));
+    }
+
+    @Test
+    public void execute_codeNotInAnyRequirementCategory_throwsCommandException() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1010"));
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandFailure(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY,
+                        formattedCodeString));
+
+        //case insensitive checks
+        Set<Code> validCodeSetCaseInsensitive = Set.of(new Code("cs1010"));
+        formattedCodeString = StringUtil.joinStreamAsString(validCodeSetCaseInsensitive.stream().sorted());
+        assertCommandFailure(new RequirementRemoveCommand(validCodeSetCaseInsensitive), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY,
+                        formattedCodeString));
+    }
+
+    @Test
+    public void execute_codesNotInAnyRequirementCategory_throwsCommandException() {
+        Set<Code> invalidCodeSet = Set.of(new Code("CS1010"));
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"), new Code("CS1010"));
+        String formattedCodeString = StringUtil.joinStreamAsString(invalidCodeSet.stream().sorted());
+        assertCommandFailure(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_CODE_NOT_IN_ANY_REQUIREMENT_CATEGORY,
+                        formattedCodeString));
+    }
+
+    @Test
+    public void execute_removeCodeFromRequirementCategory_success() {
+        Set<Code> validCodeSet = new HashSet<>();
+        Name requirementCategoryName = new Name("Computing Foundation");
+        RequirementCategory currentRequirementCategory = model.getRequirementCategory(requirementCategoryName);
+        RequirementCategory editedRequirementCategory =
+                new RequirementCategory(requirementCategoryName, currentRequirementCategory.getCredits(), validCodeSet);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(currentRequirementCategory, editedRequirementCategory);
+        expectedModel.commitApplication();
+
+        validCodeSet.add(new Code("CS2100"));
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandSuccess(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_SUCCESS, formattedCodeString),
+                expectedModel);
+    }
+
+    @Test
+    public void execute_removeCodeFromRequirementCategoryCaseInsensitive_success() {
+        Set<Code> validCodeSet = new HashSet<>();
+        Name requirementCategoryName = new Name("COMPUting FOundAtIon");
+        RequirementCategory currentRequirementCategory = model.getRequirementCategory(requirementCategoryName);
+        RequirementCategory editedRequirementCategory = new RequirementCategory(currentRequirementCategory.getName(),
+                currentRequirementCategory.getCredits(), validCodeSet);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(currentRequirementCategory, editedRequirementCategory);
+        expectedModel.commitApplication();
+
+        validCodeSet.add(new Code("cs2100"));
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandSuccess(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_SUCCESS, formattedCodeString),
+                expectedModel);
+    }
+
+    @Test
+    public void execute_removeMultipleCodeFromRequirementCategory_success() {
+        Set<Code> validCodeSet = new HashSet<>();
+        Name requirementCategoryNameSource1 = new Name("Computing Foundation");
+        Name requirementCategoryNameSource2 = new Name("Mathematics");
+
+        RequirementCategory currentRequirementCategory1 = model.getRequirementCategory(requirementCategoryNameSource1);
+        RequirementCategory currentRequirementCategory2 = model.getRequirementCategory(requirementCategoryNameSource2);
+
+        RequirementCategory editedRequirementCategory1 = new RequirementCategory(requirementCategoryNameSource1,
+                currentRequirementCategory1.getCredits(), validCodeSet);
+        RequirementCategory editedRequirementCategory2 = new RequirementCategory(requirementCategoryNameSource2,
+                currentRequirementCategory2.getCredits(), validCodeSet);
+
+        Model expectedModel = new ModelManager(model.getApplication(), new UserPrefs());
+        expectedModel.setRequirementCategory(currentRequirementCategory1, editedRequirementCategory1);
+        expectedModel.setRequirementCategory(currentRequirementCategory2, editedRequirementCategory2);
+        expectedModel.commitApplication();
+
+        validCodeSet.addAll(Set.of(new Code("CS2100"), new Code("CS1231")));
+        String formattedCodeString = StringUtil.joinStreamAsString(validCodeSet.stream().sorted());
+        assertCommandSuccess(new RequirementRemoveCommand(validCodeSet), model, commandHistory,
+                String.format(RequirementRemoveCommand.MESSAGE_SUCCESS, formattedCodeString),
+                expectedModel);
+
+        // undo -> reverts application back to previous state
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // redo -> reverts application back to previous state before undo
+        expectedModel.redoApplication();
+        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+    @Test
+    public void execute_equals() {
+        Set<Code> validCodeSet = Set.of(new Code("CS2100"));
+        Set<Code> codeSetToCompare = Set.of(new Code("CS1010"));
+
+        RequirementRemoveCommand commandBaseline = new RequirementRemoveCommand(validCodeSet);
+        RequirementRemoveCommand commandToCompare = new RequirementRemoveCommand(codeSetToCompare);
+
+        //same object -> returns true
+        assertTrue(commandBaseline.equals(commandBaseline));
+
+        //different objects, same values -> returns true
+        RequirementRemoveCommand commandBaselineCopy = new RequirementRemoveCommand(validCodeSet);
+        assertTrue(commandBaseline.equals(commandBaselineCopy));
+
+        //different objects -> returns false
+        assertFalse(commandBaseline.equals(commandToCompare));
+
+        //different objects -> returns false
+        assertFalse(commandBaseline.equals(1));
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/ResetCommandTest.java b/src/test/java/pwe/planner/logic/commands/ResetCommandTest.java
new file mode 100644
index 000000000000..7bf8b3b6c6d1
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/ResetCommandTest.java
@@ -0,0 +1,25 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+
+import org.junit.Test;
+
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.util.SampleDataUtil;
+
+public class ResetCommandTest {
+    private CommandHistory commandHistory = new CommandHistory();
+
+    @Test
+    public void execute_reset_command() {
+        Model model = new ModelManager();
+        Model expectedModel = new ModelManager();
+        expectedModel.setApplication(SampleDataUtil.getSampleApplication());
+        expectedModel.commitApplication();
+
+        assertCommandSuccess(new ResetCommand(), model, commandHistory, ResetCommand.MESSAGE_SUCCESS, expectedModel);
+    }
+
+}
diff --git a/src/test/java/pwe/planner/logic/commands/SelectCommandTest.java b/src/test/java/pwe/planner/logic/commands/SelectCommandTest.java
new file mode 100644
index 000000000000..fa4ff4dc56c5
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/SelectCommandTest.java
@@ -0,0 +1,121 @@
+package pwe.planner.logic.commands;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.showModuleAtIndex;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_SECOND_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_THIRD_MODULE;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Test;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.storage.JsonSerializableApplication;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code SelectCommand}.
+ */
+public class SelectCommandTest {
+    //ToDo: Implement getTypicalDegreePlannerList for DegreePlannerList and update the codes below
+    private Model model =
+            new ModelManager(
+                    new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                            getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private Model expectedModel =
+            new ModelManager(
+                    new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                            getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private CommandHistory commandHistory = new CommandHistory();
+
+    public SelectCommandTest() throws IllegalValueException {}
+
+    @Test
+    public void execute_validIndexUnfilteredList_success() {
+        Index lastModuleIndex = Index.fromOneBased(model.getFilteredModuleList().size());
+
+        assertExecutionSuccess(INDEX_FIRST_MODULE);
+        assertExecutionSuccess(INDEX_THIRD_MODULE);
+        assertExecutionSuccess(lastModuleIndex);
+    }
+
+    @Test
+    public void execute_invalidIndexUnfilteredList_failure() {
+        Index outOfBoundsIndex = Index.fromOneBased(model.getFilteredModuleList().size() + 1);
+
+        assertExecutionFailure(outOfBoundsIndex, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void execute_validIndexFilteredList_success() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+        showModuleAtIndex(expectedModel, INDEX_FIRST_MODULE);
+
+        assertExecutionSuccess(INDEX_FIRST_MODULE);
+    }
+
+    @Test
+    public void execute_invalidIndexFilteredList_failure() {
+        showModuleAtIndex(model, INDEX_FIRST_MODULE);
+        showModuleAtIndex(expectedModel, INDEX_FIRST_MODULE);
+
+        Index outOfBoundsIndex = INDEX_SECOND_MODULE;
+        // ensures that outOfBoundIndex is still in bounds of application list
+        assertTrue(outOfBoundsIndex.getZeroBased() < model.getApplication().getModuleList().size());
+
+        assertExecutionFailure(outOfBoundsIndex, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void equals() {
+        SelectCommand selectFirstCommand = new SelectCommand(INDEX_FIRST_MODULE);
+        SelectCommand selectSecondCommand = new SelectCommand(INDEX_SECOND_MODULE);
+
+        // same object -> returns true
+        assertTrue(selectFirstCommand.equals(selectFirstCommand));
+
+        // same values -> returns true
+        SelectCommand selectFirstCommandCopy = new SelectCommand(INDEX_FIRST_MODULE);
+        assertTrue(selectFirstCommand.equals(selectFirstCommandCopy));
+
+        // different types -> returns false
+        assertFalse(selectFirstCommand.equals(1));
+
+        // null -> returns false
+        assertFalse(selectFirstCommand.equals(null));
+
+        // different module -> returns false
+        assertFalse(selectFirstCommand.equals(selectSecondCommand));
+    }
+
+    /**
+     * Executes a {@code SelectCommand} with the given {@code index},
+     * and checks that the model's selected module is set to the module at {@code index} in the filtered module list.
+     */
+    private void assertExecutionSuccess(Index index) {
+        SelectCommand selectCommand = new SelectCommand(index);
+        String expectedMessage = String.format(SelectCommand.MESSAGE_SELECT_MODULE_SUCCESS, index.getOneBased());
+        expectedModel.setSelectedModule(model.getFilteredModuleList().get(index.getZeroBased()));
+
+        assertCommandSuccess(selectCommand, model, commandHistory, expectedMessage, expectedModel);
+    }
+
+    /**
+     * Executes a {@code SelectCommand} with the given {@code index}, and checks that a {@code CommandException}
+     * is thrown with the {@code expectedMessage}.
+     */
+    private void assertExecutionFailure(Index index, String expectedMessage) {
+        SelectCommand selectCommand = new SelectCommand(index);
+        assertCommandFailure(selectCommand, model, commandHistory, expectedMessage);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/commands/UndoCommandTest.java b/src/test/java/pwe/planner/logic/commands/UndoCommandTest.java
new file mode 100644
index 000000000000..17510d8cacb1
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/commands/UndoCommandTest.java
@@ -0,0 +1,56 @@
+package pwe.planner.logic.commands;
+
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandFailure;
+import static pwe.planner.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static pwe.planner.logic.commands.CommandTestUtil.deleteFirstModule;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.CommandHistory;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.storage.JsonSerializableApplication;
+
+public class UndoCommandTest {
+
+    //ToDo: Implement getTypicalDegreePlannerList for DegreePlannerList and update the codes below
+    private final Model model =
+            new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private final Model expectedModel =
+            new ModelManager(new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType(), new UserPrefs());
+    private final CommandHistory commandHistory = new CommandHistory();
+
+    public UndoCommandTest() throws IllegalValueException {}
+
+    @Before
+    public void setUp() {
+        // set up of models' undo/redo history
+        deleteFirstModule(model);
+        deleteFirstModule(model);
+
+        deleteFirstModule(expectedModel);
+        deleteFirstModule(expectedModel);
+    }
+
+    @Test
+    public void execute() {
+        // multiple undoable states in model
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // single undoable state in model
+        expectedModel.undoApplication();
+        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
+
+        // no undoable states in model
+        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/AddCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/AddCommandParserTest.java
new file mode 100644
index 000000000000..879da6af9ff3
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/AddCommandParserTest.java
@@ -0,0 +1,171 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CODE_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CREDITS_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_SEMESTER_DESC_ZERO;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTERS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTERS_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTER_DESC_BOB_FOUR;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTER_DESC_BOB_THREE;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_AMY_ONE;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_AMY_TWO;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_BOB_FOUR;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_BOB_THREE;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static pwe.planner.testutil.TypicalModules.AMY;
+import static pwe.planner.testutil.TypicalModules.BOB;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class AddCommandParserTest {
+    private AddCommandParser parser = new AddCommandParser();
+
+    @Test
+    public void parse_allFieldsPresent_success() {
+        Module expectedModule =
+                new ModuleBuilder(BOB).withTags(VALID_TAG_FRIEND).build();
+
+        String addCommand = PREAMBLE_WHITESPACE + CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_FRIEND;
+        // whitespace only preamble
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModule));
+
+        // multiple codes - last code accepted
+        addCommand = CODE_DESC_AMY + CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_FRIEND;
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModule));
+
+        // multiple names - last name accepted
+        addCommand = CODE_DESC_BOB + NAME_DESC_AMY + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_FRIEND;
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModule));
+
+        // multiple credits - last credits accepted
+        addCommand = CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_AMY + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_FRIEND;
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModule));
+
+        // multiple semesters - all accepted
+        addCommand = CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_AMY + CREDITS_DESC_BOB + SEMESTERS_DESC_AMY
+                + SEMESTERS_DESC_BOB;
+        Module expectedModuleMultipleSemesters = new ModuleBuilder(BOB)
+                .withSemesters(VALID_SEMESTER_AMY_ONE, VALID_SEMESTER_AMY_TWO, VALID_SEMESTER_BOB_THREE,
+                        VALID_SEMESTER_BOB_FOUR)
+                .withTags()
+                .build();
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModuleMultipleSemesters));
+
+        // multiple tags - all accepted
+        addCommand = CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_AMY + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
+        Module expectedModuleMultipleTags = new ModuleBuilder(BOB)
+                .withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND).build();
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModuleMultipleTags));
+    }
+
+    @Test
+    public void parse_optionalFieldsMissing_success() {
+        // zero tags
+        Module expectedModule = new ModuleBuilder(AMY).withTags().build();
+        String addCommand = CODE_DESC_AMY + NAME_DESC_AMY + CREDITS_DESC_AMY + SEMESTERS_DESC_AMY;
+        assertParseSuccess(parser, addCommand, new AddCommand(expectedModule));
+    }
+
+    @Test
+    public void parse_compulsoryFieldMissing_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
+
+        // missing code prefix
+        String addCommand = VALID_CODE_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB;
+        assertParseFailure(parser, addCommand, expectedMessage);
+
+        // missing name prefix
+        addCommand = VALID_NAME_BOB + CODE_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB;
+        assertParseFailure(parser, addCommand, expectedMessage);
+
+        // missing credits prefix
+        addCommand = VALID_CREDITS_BOB + CODE_DESC_BOB + NAME_DESC_BOB + SEMESTERS_DESC_BOB;
+        assertParseFailure(parser, addCommand, expectedMessage);
+
+        // missing semester prefix for first of the two semesters
+        addCommand = VALID_SEMESTER_BOB_THREE + CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB
+                + SEMESTER_DESC_BOB_FOUR;
+        assertParseFailure(parser, addCommand, expectedMessage);
+
+        // missing semester prefix for last of the two semesters
+        addCommand = VALID_SEMESTER_BOB_FOUR + CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB
+                + SEMESTER_DESC_BOB_THREE;
+        assertParseFailure(parser, addCommand, expectedMessage);
+
+        // all prefixes missing
+        addCommand = VALID_CODE_BOB + VALID_NAME_BOB + VALID_CREDITS_BOB + VALID_SEMESTER_BOB_THREE
+                + VALID_SEMESTER_BOB_FOUR;
+        assertParseFailure(parser, addCommand, expectedMessage);
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid code
+        String addCommand = INVALID_CODE_DESC + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, Code.MESSAGE_CONSTRAINTS);
+
+        // invalid name
+        addCommand = CODE_DESC_BOB + INVALID_NAME_DESC + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, Name.MESSAGE_CONSTRAINTS);
+
+        // invalid credits
+        addCommand = CODE_DESC_BOB + NAME_DESC_BOB + INVALID_CREDITS_DESC + SEMESTERS_DESC_BOB
+                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, Credits.MESSAGE_CONSTRAINTS);
+
+        // invalid semesters
+        addCommand = CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB + INVALID_SEMESTER_DESC_ZERO
+                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // invalid tag
+        addCommand = CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + INVALID_TAG_DESC + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, Tag.MESSAGE_CONSTRAINTS);
+
+        // two invalid values, only first invalid value reported
+        addCommand = INVALID_CODE_DESC + INVALID_NAME_DESC + INVALID_CREDITS_DESC + SEMESTERS_DESC_BOB
+                + INVALID_TAG_DESC + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, Code.MESSAGE_CONSTRAINTS);
+
+        // non-empty preamble
+        addCommand = PREAMBLE_NON_EMPTY + CODE_DESC_BOB + NAME_DESC_BOB + CREDITS_DESC_BOB + SEMESTERS_DESC_BOB
+                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
+        assertParseFailure(parser, addCommand, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+    }
+}
diff --git a/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java b/src/test/java/pwe/planner/logic/parser/ArgumentTokenizerTest.java
similarity index 99%
rename from src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java
rename to src/test/java/pwe/planner/logic/parser/ArgumentTokenizerTest.java
index 310eeee1863d..bbf620e04059 100644
--- a/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java
+++ b/src/test/java/pwe/planner/logic/parser/ArgumentTokenizerTest.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/pwe/planner/logic/parser/ClearCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/ClearCommandParserTest.java
new file mode 100644
index 000000000000..1ff59dc7b3a7
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/ClearCommandParserTest.java
@@ -0,0 +1,57 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.logic.commands.ClearCommand.MESSAGE_USAGE;
+import static pwe.planner.logic.commands.ClearCommand.PLANNER;
+import static pwe.planner.logic.commands.ClearCommand.REQUIREMENT;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.Test;
+
+import pwe.planner.commons.core.Messages;
+import pwe.planner.logic.commands.ClearCommand;
+
+public class ClearCommandParserTest {
+    private ClearCommandParser parser = new ClearCommandParser();
+
+    @Test
+    public void clear_success() {
+
+        // empty argument
+        assertParseSuccess(parser, "", new ClearCommand());
+        // multiple whitespaces
+        assertParseSuccess(parser, "                   ", new ClearCommand());
+
+        // clear command with valid argument
+        assertParseSuccess(parser, PLANNER, new ClearCommand(PLANNER));
+        assertParseSuccess(parser, REQUIREMENT, new ClearCommand(REQUIREMENT));
+
+        // clear command with case insensitive
+        assertParseSuccess(parser, "PLANNER", new ClearCommand(PLANNER));
+        assertParseSuccess(parser, "REQUIREMENT", new ClearCommand(REQUIREMENT));
+
+        // clear command with mixed cases
+        assertParseSuccess(parser, "PlAnNeR", new ClearCommand(PLANNER));
+        assertParseSuccess(parser, "ReQuIrEmEnt", new ClearCommand(REQUIREMENT));
+    }
+
+    @Test
+    public void clear_badArgument() {
+
+        // invalid argument
+        assertParseFailure(parser, "notExisting", String.format(
+                Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+        // invalid argument with leading and trailing space.
+        assertParseFailure(parser, "            notExisting             ", String.format(
+                Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+
+        // substring of a valid argument -> false
+        assertParseFailure(parser, "planne", String.format(
+                Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+        assertParseFailure(parser, "modul", String.format(
+                Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+        assertParseFailure(parser, "requriemen", String.format(
+                Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/CommandParserTest.java b/src/test/java/pwe/planner/logic/parser/CommandParserTest.java
new file mode 100644
index 000000000000..47a9fcc4e113
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/CommandParserTest.java
@@ -0,0 +1,250 @@
+package pwe.planner.logic.parser;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+
+import java.util.Set;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.logic.commands.ClearCommand;
+import pwe.planner.logic.commands.DeleteCommand;
+import pwe.planner.logic.commands.EditCommand;
+import pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import pwe.planner.logic.commands.ExitCommand;
+import pwe.planner.logic.commands.FindCommand;
+import pwe.planner.logic.commands.HelpCommand;
+import pwe.planner.logic.commands.HistoryCommand;
+import pwe.planner.logic.commands.ListCommand;
+import pwe.planner.logic.commands.PlannerAddCommand;
+import pwe.planner.logic.commands.PlannerListCommand;
+import pwe.planner.logic.commands.PlannerMoveCommand;
+import pwe.planner.logic.commands.PlannerRemoveCommand;
+import pwe.planner.logic.commands.PlannerShowCommand;
+import pwe.planner.logic.commands.PlannerSuggestCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.RequirementAddCommand;
+import pwe.planner.logic.commands.RequirementListCommand;
+import pwe.planner.logic.commands.RequirementMoveCommand;
+import pwe.planner.logic.commands.RequirementRemoveCommand;
+import pwe.planner.logic.commands.ResetCommand;
+import pwe.planner.logic.commands.SelectCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.module.NameContainsKeywordsPredicate;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.model.planner.YearContainsKeywordPredicate;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.testutil.EditModuleDescriptorBuilder;
+import pwe.planner.testutil.ModuleBuilder;
+import pwe.planner.testutil.ModuleUtil;
+import pwe.planner.testutil.RequirementUtil;
+
+public class CommandParserTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private final CommandParser parser = new CommandParser();
+
+    @Test
+    public void parseCommand_add() throws Exception {
+        Module module = new ModuleBuilder().build();
+        AddCommand command = (AddCommand) parser.parseCommand(ModuleUtil.getAddCommand(module));
+        assertEquals(new AddCommand(module), command);
+    }
+
+    @Test
+    public void parseCommand_clear() throws Exception {
+        assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
+        assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD + " planner") instanceof ClearCommand);
+    }
+
+    @Test
+    public void parseCommand_reset() throws Exception {
+        assertTrue(parser.parseCommand(ResetCommand.COMMAND_WORD) instanceof ResetCommand);
+        assertTrue(parser.parseCommand(ResetCommand.COMMAND_WORD + " abc") instanceof ResetCommand);
+    }
+
+    @Test
+    public void parseCommand_delete() throws Exception {
+        DeleteCommand command = (DeleteCommand) parser.parseCommand(
+                DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased());
+        assertEquals(new DeleteCommand(INDEX_FIRST_MODULE), command);
+    }
+
+    @Test
+    public void parseCommand_edit() throws Exception {
+        Module module = new ModuleBuilder().build();
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder(module).build();
+        EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
+                + INDEX_FIRST_MODULE.getOneBased() + " " + ModuleUtil.getEditModuleDescriptorDetails(descriptor));
+        assertEquals(new EditCommand(INDEX_FIRST_MODULE, descriptor), command);
+    }
+
+    @Test
+    public void parseCommand_exit() throws Exception {
+        assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
+        assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
+    }
+
+    @Test
+    public void parseCommand_find() throws Exception {
+        String keyword = "foo";
+        FindCommand command = (FindCommand) parser.parseCommand(FindCommand.COMMAND_WORD + " "
+                + PREFIX_NAME + "foo");
+        assertEquals(new FindCommand(new NameContainsKeywordsPredicate<>(keyword)), command);
+    }
+
+    @Test
+    public void parseCommand_help() throws Exception {
+        assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
+        assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
+    }
+
+    @Test
+    public void parseCommand_history() throws Exception {
+        assertTrue(parser.parseCommand(HistoryCommand.COMMAND_WORD) instanceof HistoryCommand);
+        assertTrue(parser.parseCommand(HistoryCommand.COMMAND_WORD + " 3") instanceof HistoryCommand);
+
+        try {
+            parser.parseCommand("histories");
+            throw new AssertionError("The expected ParseException was not thrown.");
+        } catch (ParseException pe) {
+            assertEquals(MESSAGE_UNKNOWN_COMMAND, pe.getMessage());
+        }
+    }
+
+    @Test
+    public void parseCommand_list() throws Exception {
+        assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
+        assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
+    }
+
+    @Test
+    public void parseCommand_select() throws Exception {
+        SelectCommand command = (SelectCommand) parser.parseCommand(
+                SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased());
+        assertEquals(new SelectCommand(INDEX_FIRST_MODULE), command);
+    }
+
+    @Test
+    public void parseCommand_plannerList() throws Exception {
+        assertTrue(parser.parseCommand(PlannerListCommand.COMMAND_WORD) instanceof PlannerListCommand);
+        assertTrue(parser.parseCommand(PlannerListCommand.COMMAND_WORD + " 3") instanceof PlannerListCommand);
+    }
+
+    @Test
+    public void parseCommand_plannerShow() throws Exception {
+        String keyword = "1";
+        PlannerShowCommand yearCommand = (PlannerShowCommand) parser.parseCommand(PlannerShowCommand.COMMAND_WORD + " "
+                + PREFIX_YEAR + "1");
+        assertEquals(new PlannerShowCommand(new YearContainsKeywordPredicate<>(keyword)), yearCommand);
+    }
+
+    @Test
+    public void parseCommand_plannerMove() throws Exception {
+        PlannerMoveCommand command = (PlannerMoveCommand) parser.parseCommand(
+                PlannerMoveCommand.COMMAND_WORD + " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 " + PREFIX_CODE
+                        + "CS1010");
+        assertEquals(new PlannerMoveCommand(new Year("1"), new Semester("2"), new Code("CS1010")), command);
+    }
+
+    @Test
+    public void parseCommand_plannerSuggest() throws Exception {
+        Set<Tag> validTags = Set.of(new Tag("validTag"));
+        PlannerSuggestCommand command = (PlannerSuggestCommand) parser.parseCommand(
+                PlannerSuggestCommand.COMMAND_WORD + " " + PREFIX_CREDITS + "2 " + PREFIX_TAG + "validTag");
+        assertEquals(new PlannerSuggestCommand(new Credits("2"), validTags), command);
+    }
+
+    @Test
+    public void parseCommand_plannerAdd() throws Exception {
+        Set<Code> codesToAdd = Set.of(new Code("CS1010"));
+        PlannerAddCommand command = (PlannerAddCommand) parser.parseCommand(
+                PlannerAddCommand.COMMAND_WORD + " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 " + PREFIX_CODE
+                        + "CS1010");
+        assertEquals(new PlannerAddCommand(new Year("1"), new Semester("2"), codesToAdd), command);
+    }
+
+    @Test
+    public void parseCommand_requirementAdd() throws Exception {
+        Name name = new Name("Computing Foundation");
+        Set<Code> codeSet = Set.of(new Code("CS1010"));
+        RequirementAddCommand command = (RequirementAddCommand)
+                parser.parseCommand(RequirementUtil.getRequirementAddCommand(name, codeSet));
+        assertEquals(new RequirementAddCommand(name, codeSet), command);
+    }
+
+    @Test
+    public void parseCommand_requirementList() throws Exception {
+        assertTrue(parser.parseCommand(RequirementListCommand.COMMAND_WORD) instanceof RequirementListCommand);
+    }
+
+    @Test
+    public void parseCommand_requirementMove() throws Exception {
+        Set<Code> codeSet = Set.of(new Code("CS2100"));
+        RequirementMoveCommand command = (RequirementMoveCommand) parser.parseCommand(
+                RequirementMoveCommand.COMMAND_WORD + " " + PREFIX_NAME + "Computing Breadth " + PREFIX_CODE
+                        + "CS2100");
+        assertEquals(new RequirementMoveCommand(new Name("Computing Breadth"), codeSet), command);
+    }
+
+    @Test
+    public void parseCommand_requirementRemove() throws Exception {
+        Set<Code> codeSet = Set.of(new Code("CS1010"));
+        RequirementRemoveCommand command = (RequirementRemoveCommand) parser.parseCommand(
+                RequirementUtil.getRequirementRemoveCommand(codeSet));
+        assertEquals(new RequirementRemoveCommand(codeSet), command);
+    }
+
+    @Test
+    public void parseCommand_plannerRemove() throws Exception {
+        Set<Code> codesToRemove = Set.of(new Code("CS1010"));
+        PlannerRemoveCommand command = (PlannerRemoveCommand) parser.parseCommand(
+                PlannerRemoveCommand.COMMAND_WORD + " " + PREFIX_CODE + "CS1010");
+        assertEquals(new PlannerRemoveCommand(codesToRemove), command);
+    }
+
+    @Test
+    public void parseCommand_redoCommandWord_returnsRedoCommand() throws Exception {
+        assertTrue(parser.parseCommand(RedoCommand.COMMAND_WORD) instanceof RedoCommand);
+        assertTrue(parser.parseCommand("redo 1") instanceof RedoCommand);
+    }
+
+    @Test
+    public void parseCommand_undoCommandWord_returnsUndoCommand() throws Exception {
+        assertTrue(parser.parseCommand(UndoCommand.COMMAND_WORD) instanceof UndoCommand);
+        assertTrue(parser.parseCommand("undo 3") instanceof UndoCommand);
+    }
+
+    @Test
+    public void parseCommand_unrecognisedInput_throwsParseException() throws Exception {
+        thrown.expect(ParseException.class);
+        thrown.expectMessage(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
+        parser.parseCommand("");
+    }
+
+    @Test
+    public void parseCommand_unknownCommand_throwsParseException() throws Exception {
+        thrown.expect(ParseException.class);
+        thrown.expectMessage(MESSAGE_UNKNOWN_COMMAND);
+        parser.parseCommand("unknownCommand");
+    }
+}
diff --git a/src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java b/src/test/java/pwe/planner/logic/parser/CommandParserTestUtil.java
similarity index 74%
rename from src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java
rename to src/test/java/pwe/planner/logic/parser/CommandParserTestUtil.java
index 382360a85f8f..3f845060693e 100644
--- a/src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java
+++ b/src/test/java/pwe/planner/logic/parser/CommandParserTestUtil.java
@@ -1,9 +1,9 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
 
 import static org.junit.Assert.assertEquals;
 
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.parser.exceptions.ParseException;
+import pwe.planner.logic.commands.Command;
+import pwe.planner.logic.parser.exceptions.ParseException;
 
 /**
  * Contains helper methods for testing command parsers.
@@ -14,7 +14,7 @@ public class CommandParserTestUtil {
      * Asserts that the parsing of {@code userInput} by {@code parser} is successful and the command created
      * equals to {@code expectedCommand}.
      */
-    public static void assertParseSuccess(Parser parser, String userInput, Command expectedCommand) {
+    public static void assertParseSuccess(Parser<?> parser, String userInput, Command expectedCommand) {
         try {
             Command command = parser.parse(userInput);
             assertEquals(expectedCommand, command);
@@ -27,7 +27,7 @@ public static void assertParseSuccess(Parser parser, String userInput, Command e
      * Asserts that the parsing of {@code userInput} by {@code parser} is unsuccessful and the error message
      * equals to {@code expectedMessage}.
      */
-    public static void assertParseFailure(Parser parser, String userInput, String expectedMessage) {
+    public static void assertParseFailure(Parser<?> parser, String userInput, String expectedMessage) {
         try {
             parser.parse(userInput);
             throw new AssertionError("The expected ParseException was not thrown.");
diff --git a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/DeleteCommandParserTest.java
similarity index 66%
rename from src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
rename to src/test/java/pwe/planner/logic/parser/DeleteCommandParserTest.java
index 825732ced6ac..488800782e29 100644
--- a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
+++ b/src/test/java/pwe/planner/logic/parser/DeleteCommandParserTest.java
@@ -1,13 +1,13 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
 
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
 
 import org.junit.Test;
 
-import seedu.address.logic.commands.DeleteCommand;
+import pwe.planner.logic.commands.DeleteCommand;
 
 /**
  * As we are only doing white-box testing, our test cases do not cover path variations
@@ -22,7 +22,7 @@ public class DeleteCommandParserTest {
 
     @Test
     public void parse_validArgs_returnsDeleteCommand() {
-        assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST_PERSON));
+        assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST_MODULE));
     }
 
     @Test
diff --git a/src/test/java/pwe/planner/logic/parser/EditCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/EditCommandParserTest.java
new file mode 100644
index 000000000000..1fc72f55b807
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/EditCommandParserTest.java
@@ -0,0 +1,180 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CODE_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CREDITS_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_SECOND_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_THIRD_MODULE;
+
+import org.junit.Test;
+
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.EditCommand;
+import pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.testutil.EditModuleDescriptorBuilder;
+
+public class EditCommandParserTest {
+
+    private static final String TAG_EMPTY = " " + PREFIX_TAG;
+
+    private static final String MESSAGE_INVALID_FORMAT =
+            String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
+
+    private EditCommandParser parser = new EditCommandParser();
+
+    @Test
+    public void parse_missingParts_failure() {
+        // no index specified
+        assertParseFailure(parser, VALID_NAME_AMY, MESSAGE_INVALID_FORMAT);
+
+        // no field specified
+        assertParseFailure(parser, "1", EditCommand.MESSAGE_NOT_EDITED);
+
+        // no index and no field specified
+        assertParseFailure(parser, "", EditCommand.MESSAGE_USAGE);
+    }
+
+    @Test
+    public void parse_invalidPreamble_failure() {
+        // negative index
+        assertParseFailure(parser, "-5" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
+
+        // zero index
+        assertParseFailure(parser, "0" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
+
+        // invalid arguments being parsed as preamble
+        assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
+
+        // invalid prefix being parsed as preamble
+        assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        assertParseFailure(parser, "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name
+        assertParseFailure(parser, "1" + INVALID_CREDITS_DESC, Credits.MESSAGE_CONSTRAINTS); // invalid credits
+        assertParseFailure(parser, "1" + INVALID_CODE_DESC, Code.MESSAGE_CONSTRAINTS); // invalid code
+        assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS); // invalid tag
+
+        // valid credits followed by invalid credits. The test case for invalid credits followed by valid credits
+        // is tested at {@code parse_invalidValueFollowedByValidValue_success()}
+        assertParseFailure(parser, "1" + CREDITS_DESC_BOB + INVALID_CREDITS_DESC, Credits.MESSAGE_CONSTRAINTS);
+
+        // while parsing {@code PREFIX_TAG} alone will reset the tags of the {@code Module} being edited,
+        // parsing it together with a valid tag results in error
+        assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_DESC_HUSBAND + TAG_EMPTY, Tag.MESSAGE_CONSTRAINTS);
+        assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_EMPTY + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
+        assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
+
+        // multiple invalid values, but only the first invalid value is captured
+        assertParseFailure(parser, "1" + INVALID_CODE_DESC + INVALID_NAME_DESC + VALID_CODE_AMY + VALID_CREDITS_AMY,
+                Code.MESSAGE_CONSTRAINTS);
+    }
+
+    @Test
+    public void parse_allFieldsSpecified_success() {
+        Index targetIndex = INDEX_SECOND_MODULE;
+        String userInput = targetIndex.getOneBased() + CREDITS_DESC_BOB + TAG_DESC_HUSBAND + CODE_DESC_AMY
+                + NAME_DESC_AMY + TAG_DESC_FRIEND;
+
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder().withName(VALID_NAME_AMY)
+                .withCredits(VALID_CREDITS_BOB).withCode(VALID_CODE_AMY)
+                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+
+    @Test
+    public void parse_oneFieldSpecified_success() {
+        // name
+        Index targetIndex = INDEX_THIRD_MODULE;
+        String userInput = targetIndex.getOneBased() + NAME_DESC_AMY;
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder().withName(VALID_NAME_AMY).build();
+        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+
+        // credits
+        userInput = targetIndex.getOneBased() + CREDITS_DESC_AMY;
+        descriptor = new EditModuleDescriptorBuilder().withCredits(VALID_CREDITS_AMY).build();
+        expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+
+        // code
+        userInput = targetIndex.getOneBased() + CODE_DESC_AMY;
+        descriptor = new EditModuleDescriptorBuilder().withCode(VALID_CODE_AMY).build();
+        expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+
+        // tags
+        userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND;
+        descriptor = new EditModuleDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
+        expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+
+    @Test
+    public void parse_multipleRepeatedFields_acceptsLast() {
+        Index targetIndex = INDEX_FIRST_MODULE;
+        String userInput = targetIndex.getOneBased() + CREDITS_DESC_AMY + CODE_DESC_AMY + TAG_DESC_FRIEND
+                + CREDITS_DESC_AMY + CODE_DESC_AMY + TAG_DESC_FRIEND + CREDITS_DESC_BOB + CODE_DESC_BOB
+                + TAG_DESC_HUSBAND;
+
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder().withCredits(VALID_CREDITS_BOB)
+                .withCode(VALID_CODE_BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND).build();
+        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+
+    @Test
+    public void parse_invalidValueFollowedByValidValue_success() {
+        // no other valid values specified
+        Index targetIndex = INDEX_FIRST_MODULE;
+        String userInput = targetIndex.getOneBased() + INVALID_CREDITS_DESC + CREDITS_DESC_BOB;
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder().withCredits(VALID_CREDITS_BOB).build();
+        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+
+        // other valid values specified
+        userInput = targetIndex.getOneBased() + INVALID_CREDITS_DESC + CODE_DESC_BOB + CREDITS_DESC_BOB;
+        descriptor = new EditModuleDescriptorBuilder().withCredits(VALID_CREDITS_BOB).withCode(VALID_CODE_BOB).build();
+        expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+
+    @Test
+    public void parse_resetTags_success() {
+        Index targetIndex = INDEX_THIRD_MODULE;
+        String userInput = targetIndex.getOneBased() + TAG_EMPTY;
+
+        EditModuleDescriptor descriptor = new EditModuleDescriptorBuilder().withTags().build();
+        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/FindCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/FindCommandParserTest.java
new file mode 100644
index 000000000000..01a3f35fdea1
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/FindCommandParserTest.java
@@ -0,0 +1,174 @@
+package pwe.planner.logic.parser;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_AND;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_LEFT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_OR;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_RIGHT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.FindCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.CodeContainsKeywordsPredicate;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.CreditsContainsKeywordsPredicate;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.module.NameContainsKeywordsPredicate;
+import pwe.planner.model.module.TagContainsKeywordsPredicate;
+import pwe.planner.model.planner.SemesterContainsKeywordPredicate;
+
+public class FindCommandParserTest {
+
+    private static final String WHITESPACE = " ";
+    private FindCommandParser parser = new FindCommandParser();
+
+    @Test
+    public void parse_emptyArg_throwsParseException() {
+        assertParseFailure(parser, "", FindCommand.MESSAGE_USAGE);
+        // No name argument -> assertFailure
+        assertParseFailure(parser, PREFIX_NAME + "     ", Name.MESSAGE_CONSTRAINTS);
+        // No code argument -> assertFailure
+        assertParseFailure(parser, PREFIX_CODE + "     ", Code.MESSAGE_CONSTRAINTS);
+        // No credits argument -> assertFailure
+        assertParseFailure(parser, PREFIX_CREDITS + "     ", Credits.MESSAGE_CONSTRAINTS);
+    }
+
+    @Test
+    public void parse_validArgs_returnsFindCommand() {
+        // no leading and trailing whitespaces
+        FindCommand expectedFindNameCommand =
+                new FindCommand(new NameContainsKeywordsPredicate<>("Alice"));
+        // single keyword
+        assertParseSuccess(parser, PREFIX_NAME + "Alice", expectedFindNameCommand);
+
+        FindCommand expectedFindCodeCommand =
+                new FindCommand(new CodeContainsKeywordsPredicate<>("CS1231"));
+        // single keyword
+        assertParseSuccess(parser, PREFIX_CODE + "CS1231", expectedFindCodeCommand);
+
+        FindCommand expectedFindCreditsCommand =
+                new FindCommand(new CreditsContainsKeywordsPredicate<>("999"));
+        // single keyword
+        assertParseSuccess(parser, PREFIX_CREDITS + "999", expectedFindCreditsCommand);
+
+        // single keyword
+        FindCommand expectedFindTagsCommand = new FindCommand(new TagContainsKeywordsPredicate<>("tag"));
+        assertParseSuccess(parser, PREFIX_TAG + "tag", expectedFindTagsCommand);
+
+        FindCommand expectedFindSemesterCommand = new FindCommand(new SemesterContainsKeywordPredicate<>("2"));
+        assertParseSuccess(parser, PREFIX_SEMESTER + "2", expectedFindSemesterCommand);
+    }
+
+    @Test
+    public void parse_validArgs() {
+        // test for boolean OR
+        // name/NAME || name/NAME
+        assertParserSuccess(parser, PREFIX_NAME + "Programming " + WHITESPACE + OPERATOR_OR + WHITESPACE
+                + PREFIX_NAME + "Discrete");
+        // code/CODE || code/CODE
+        assertParserSuccess(parser, PREFIX_CODE + "CS1231 " + WHITESPACE + OPERATOR_OR + WHITESPACE
+                + PREFIX_CODE + "CS2040C");
+        // credits/CREDITS || credits/CREDITS
+        assertParserSuccess(parser, PREFIX_CREDITS + "4 " + WHITESPACE + OPERATOR_OR + WHITESPACE
+                + PREFIX_CREDITS + "999");
+        // tag/TAGG || tag/Tag1
+        assertParserSuccess(parser, PREFIX_TAG + "TAGG " + OPERATOR_OR + PREFIX_TAG + "Tag1");
+        // sem/1 || sem/2
+        assertParserSuccess(parser, PREFIX_SEMESTER + "1 " + OPERATOR_OR + PREFIX_SEMESTER + "2");
+
+        // test for boolean AND
+        // name/NAME && name/NAME
+        assertParserSuccess(parser, PREFIX_NAME + "Programming " + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_NAME + "Methodology");
+        // code/CODE && code/CODE
+        assertParserSuccess(parser, PREFIX_CODE + "CS1231 " + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_CODE + "CS2040C");
+        // credits/CREDITS && credits/CREDITS
+        assertParserSuccess(parser, PREFIX_CREDITS + "4 " + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_CREDITS + "999");
+        // tag/TAG && tag/TAG
+        assertParserSuccess(parser, PREFIX_TAG + "TAG " + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_TAG + "TAGGG");
+        // sem1 && sem/2
+        assertParserSuccess(parser, PREFIX_SEMESTER + "1" + OPERATOR_AND + PREFIX_SEMESTER + "2");
+
+        // test for boolean AND and boolean OR
+        // credits/CREDITS || credits/CREDITS && name/Programming
+        assertParserSuccess(parser, PREFIX_CREDITS + "4 " + WHITESPACE + OPERATOR_OR + WHITESPACE
+                + PREFIX_CREDITS + "999" + OPERATOR_AND + PREFIX_NAME + "programming");
+
+        // credits/4 || (name/Information && name/Security)
+        assertParserSuccess(parser, PREFIX_CREDITS + "4" + OPERATOR_OR + OPERATOR_LEFT_BRACKET + PREFIX_NAME
+                + "information" + OPERATOR_AND + PREFIX_NAME + "security" + OPERATOR_RIGHT_BRACKET);
+
+        // tag/C || (name/Information && name/Security)
+        assertParserSuccess(parser, PREFIX_TAG + "C" + OPERATOR_OR + OPERATOR_LEFT_BRACKET + PREFIX_NAME
+                + "information" + OPERATOR_AND + PREFIX_NAME + "security" + OPERATOR_RIGHT_BRACKET);
+
+        // tag/C && (name/Information || name/Security)
+        assertParserSuccess(parser, PREFIX_TAG + "C" + OPERATOR_AND + OPERATOR_LEFT_BRACKET + PREFIX_NAME
+                + "information" + OPERATOR_OR + PREFIX_NAME + "security" + OPERATOR_RIGHT_BRACKET);
+
+    }
+
+    @Test
+    public void parseInvalidArgs() {
+        assertParseThrowsException(parser, "invalid/DoesNotExists");
+        // name/Programming code/CS1231
+        assertParseThrowsException(parser, PREFIX_NAME + "Programming " + PREFIX_CODE + "CS1231");
+        // ()
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + OPERATOR_RIGHT_BRACKET);
+        // ()()
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + OPERATOR_RIGHT_BRACKET + OPERATOR_LEFT_BRACKET
+                + OPERATOR_RIGHT_BRACKET);
+        // ())
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + OPERATOR_RIGHT_BRACKET + OPERATOR_RIGHT_BRACKET);
+        // name/Programming ) code/CS1231
+        assertParseThrowsException(parser, PREFIX_NAME + "Programming " + OPERATOR_RIGHT_BRACKET + PREFIX_CODE
+                + "CS1231");
+        // (name/Programming || code/CS1231
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + PREFIX_NAME + "Programming" + OPERATOR_OR
+                + PREFIX_CODE + "CS1231");
+        // credits/4 || (name/Programming AND code/CS1231))
+        assertParseThrowsException(parser, PREFIX_CREDITS + "4" + OPERATOR_OR + OPERATOR_LEFT_BRACKET + PREFIX_NAME
+                + "Programming" + OPERATOR_AND + PREFIX_CODE + "CS1231" + OPERATOR_RIGHT_BRACKET
+                + OPERATOR_RIGHT_BRACKET);
+
+    }
+
+    /**
+     * Assert if a parse is successful. This does not check if {@code FindCommand} is the same
+     * Rather it check if a parser return a FindCommand.
+     */
+    private void assertParserSuccess(FindCommandParser parser, String input) {
+        try {
+            FindCommand command = parser.parse(input);
+            assertNotNull("Expecting not null", command);
+        } catch (ParseException e) {
+            fail("Expecting no parser error");
+        }
+    }
+
+    /**
+     * Assert if a parse return an exception.
+     */
+    private void assertParseThrowsException(FindCommandParser parser, String str) {
+        try {
+            parser.parse(str);
+            fail("Expected a parse error");
+        } catch (ParseException ignore) {
+            // we want the exception to be thrown.
+        }
+    }
+
+}
diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/pwe/planner/logic/parser/ParserUtilTest.java
similarity index 56%
rename from src/test/java/seedu/address/logic/parser/ParserUtilTest.java
rename to src/test/java/pwe/planner/logic/parser/ParserUtilTest.java
index 78fd9c877708..82a09aed1db5 100644
--- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
+++ b/src/test/java/pwe/planner/logic/parser/ParserUtilTest.java
@@ -1,10 +1,10 @@
-package seedu.address.logic.parser;
+package pwe.planner.logic.parser;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-
-import static seedu.address.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static pwe.planner.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -15,25 +15,22 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.Assert;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.testutil.Assert;
 
 public class ParserUtilTest {
-    private static final String INVALID_NAME = "R@chel";
-    private static final String INVALID_PHONE = "+651234";
-    private static final String INVALID_ADDRESS = " ";
-    private static final String INVALID_EMAIL = "example.com";
+    private static final String INVALID_NAME = "Rächel";
+    private static final String INVALID_CREDITS = "+651234";
+    private static final String INVALID_CODE = " ";
     private static final String INVALID_TAG = "#friend";
 
     private static final String VALID_NAME = "Rachel Walker";
-    private static final String VALID_PHONE = "123456";
-    private static final String VALID_ADDRESS = "123 Main Street #0505";
-    private static final String VALID_EMAIL = "rachel@example.com";
+    private static final String VALID_CREDITS = "246";
+    private static final String VALID_CODE = "MA1301";
     private static final String VALID_TAG_1 = "friend";
     private static final String VALID_TAG_2 = "neighbour";
 
@@ -58,10 +55,10 @@ public void parseIndex_outOfRangeInput_throwsParseException() throws Exception {
     @Test
     public void parseIndex_validInput_success() throws Exception {
         // No whitespaces
-        assertEquals(INDEX_FIRST_PERSON, ParserUtil.parseIndex("1"));
+        assertEquals(INDEX_FIRST_MODULE, ParserUtil.parseIndex("1"));
 
         // Leading and trailing whitespaces
-        assertEquals(INDEX_FIRST_PERSON, ParserUtil.parseIndex("  1  "));
+        assertEquals(INDEX_FIRST_MODULE, ParserUtil.parseIndex("  1  "));
     }
 
     @Test
@@ -88,72 +85,49 @@ public void parseName_validValueWithWhitespace_returnsTrimmedName() throws Excep
     }
 
     @Test
-    public void parsePhone_null_throwsNullPointerException() {
-        Assert.assertThrows(NullPointerException.class, () -> ParserUtil.parsePhone((String) null));
-    }
-
-    @Test
-    public void parsePhone_invalidValue_throwsParseException() {
-        Assert.assertThrows(ParseException.class, () -> ParserUtil.parsePhone(INVALID_PHONE));
-    }
-
-    @Test
-    public void parsePhone_validValueWithoutWhitespace_returnsPhone() throws Exception {
-        Phone expectedPhone = new Phone(VALID_PHONE);
-        assertEquals(expectedPhone, ParserUtil.parsePhone(VALID_PHONE));
-    }
-
-    @Test
-    public void parsePhone_validValueWithWhitespace_returnsTrimmedPhone() throws Exception {
-        String phoneWithWhitespace = WHITESPACE + VALID_PHONE + WHITESPACE;
-        Phone expectedPhone = new Phone(VALID_PHONE);
-        assertEquals(expectedPhone, ParserUtil.parsePhone(phoneWithWhitespace));
+    public void parseCredits_null_throwsNullPointerException() {
+        Assert.assertThrows(NullPointerException.class, () -> ParserUtil.parseCredits((String) null));
     }
 
     @Test
-    public void parseAddress_null_throwsNullPointerException() {
-        Assert.assertThrows(NullPointerException.class, () -> ParserUtil.parseAddress((String) null));
+    public void parseCredits_invalidValue_throwsParseException() {
+        Assert.assertThrows(ParseException.class, () -> ParserUtil.parseCredits(INVALID_CREDITS));
     }
 
     @Test
-    public void parseAddress_invalidValue_throwsParseException() {
-        Assert.assertThrows(ParseException.class, () -> ParserUtil.parseAddress(INVALID_ADDRESS));
+    public void parseCredits_validValueWithoutWhitespace_returnsCredits() throws Exception {
+        Credits expectedCredits = new Credits(VALID_CREDITS);
+        assertEquals(expectedCredits, ParserUtil.parseCredits(VALID_CREDITS));
     }
 
     @Test
-    public void parseAddress_validValueWithoutWhitespace_returnsAddress() throws Exception {
-        Address expectedAddress = new Address(VALID_ADDRESS);
-        assertEquals(expectedAddress, ParserUtil.parseAddress(VALID_ADDRESS));
+    public void parseCredits_validValueWithWhitespace_returnsTrimmedCredits() throws Exception {
+        String creditsWithWhitespace = WHITESPACE + VALID_CREDITS + WHITESPACE;
+        Credits expectedCredits = new Credits(VALID_CREDITS);
+        assertEquals(expectedCredits, ParserUtil.parseCredits(creditsWithWhitespace));
     }
 
     @Test
-    public void parseAddress_validValueWithWhitespace_returnsTrimmedAddress() throws Exception {
-        String addressWithWhitespace = WHITESPACE + VALID_ADDRESS + WHITESPACE;
-        Address expectedAddress = new Address(VALID_ADDRESS);
-        assertEquals(expectedAddress, ParserUtil.parseAddress(addressWithWhitespace));
+    public void parseCode_null_throwsNullPointerException() {
+        Assert.assertThrows(NullPointerException.class, () -> ParserUtil.parseCode((String) null));
     }
 
     @Test
-    public void parseEmail_null_throwsNullPointerException() {
-        Assert.assertThrows(NullPointerException.class, () -> ParserUtil.parseEmail((String) null));
+    public void parseCode_invalidValue_throwsParseException() {
+        Assert.assertThrows(ParseException.class, () -> ParserUtil.parseCode(INVALID_CODE));
     }
 
     @Test
-    public void parseEmail_invalidValue_throwsParseException() {
-        Assert.assertThrows(ParseException.class, () -> ParserUtil.parseEmail(INVALID_EMAIL));
+    public void parseCode_validValueWithoutWhitespace_returnsCode() throws Exception {
+        Code expectedCode = new Code(VALID_CODE);
+        assertEquals(expectedCode, ParserUtil.parseCode(VALID_CODE));
     }
 
     @Test
-    public void parseEmail_validValueWithoutWhitespace_returnsEmail() throws Exception {
-        Email expectedEmail = new Email(VALID_EMAIL);
-        assertEquals(expectedEmail, ParserUtil.parseEmail(VALID_EMAIL));
-    }
-
-    @Test
-    public void parseEmail_validValueWithWhitespace_returnsTrimmedEmail() throws Exception {
-        String emailWithWhitespace = WHITESPACE + VALID_EMAIL + WHITESPACE;
-        Email expectedEmail = new Email(VALID_EMAIL);
-        assertEquals(expectedEmail, ParserUtil.parseEmail(emailWithWhitespace));
+    public void parseCode_validValueWithWhitespace_returnsTrimmedCode() throws Exception {
+        String codeWithWhitespace = WHITESPACE + VALID_CODE + WHITESPACE;
+        Code expectedCode = new Code(VALID_CODE);
+        assertEquals(expectedCode, ParserUtil.parseCode(codeWithWhitespace));
     }
 
     @Test
@@ -205,4 +179,18 @@ public void parseTags_collectionWithValidTags_returnsTagSet() throws Exception {
 
         assertEquals(expectedTagSet, actualTagSet);
     }
+
+    @Test
+    public void parseKeyword() {
+        String keyword = "abc";
+        String actualWord = "abc xyz 123";
+        String sentence = "abc xyz";
+        assertTrue(ParserUtil.parseKeyword(keyword, actualWord));
+
+        String sentenceKeyword = "abc xyz";
+        assertFalse(ParserUtil.parseKeyword(sentenceKeyword, actualWord));
+
+        assertTrue(ParserUtil.parseKeyword(sentenceKeyword, sentence));
+
+    }
 }
diff --git a/src/test/java/pwe/planner/logic/parser/PlannerAddCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/PlannerAddCommandParserTest.java
new file mode 100644
index 000000000000..7de47a919155
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/PlannerAddCommandParserTest.java
@@ -0,0 +1,97 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.Set;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.PlannerAddCommand;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+public class PlannerAddCommandParserTest {
+    private PlannerAddCommandParser parser = new PlannerAddCommandParser();
+
+    @Test
+    public void parse_invalidValue_failure() {
+
+        // invalid year
+        assertParseFailure(parser, " " + PREFIX_YEAR + "-1 " + PREFIX_SEMESTER + "1 "
+                + PREFIX_CODE + "CS1010", Year.MESSAGE_YEAR_CONSTRAINTS);
+
+        // invalid year
+        assertParseFailure(parser, " " + PREFIX_YEAR + "% " + PREFIX_SEMESTER + "1 "
+                + PREFIX_CODE + "CS1010", Year.MESSAGE_YEAR_CONSTRAINTS);
+
+        // invalid semester
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "-1 "
+                + PREFIX_CODE + "CS1010", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // invalid semester
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "% "
+                + PREFIX_CODE + "CS1010", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // invalid code
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "1 "
+                + PREFIX_CODE + "INVALID", Code.MESSAGE_CONSTRAINTS);
+
+    }
+
+    @Test
+    public void parse_validArgs_returnsPlannerAddCommand() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1010"));
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("4");
+
+        PlannerAddCommand expectedPlannerAddCommand =
+                new PlannerAddCommand(validYear, validSemester, validCodeSet);
+
+        assertParseSuccess(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "4 "
+                + PREFIX_CODE + "CS1010", expectedPlannerAddCommand);
+    }
+
+    @Test
+    public void parse_missingParts_failure() {
+        // no year specified
+        assertParseFailure(parser, " " + PREFIX_YEAR + " " + PREFIX_SEMESTER + "3 "
+                + PREFIX_CODE + "CS1010", Year.MESSAGE_YEAR_CONSTRAINTS);
+
+        // no semester specified
+        assertParseFailure(parser, " " + PREFIX_YEAR + "4 " + PREFIX_SEMESTER + " "
+                + PREFIX_CODE + "CS1010", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // no code specified
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + " ", Code.MESSAGE_CONSTRAINTS);
+
+    }
+
+    @Test
+    public void parse_compulsoryFieldMissing_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerAddCommand.MESSAGE_USAGE);
+
+        // missing parameter year number
+        assertParseFailure(parser, " " + PREFIX_YEAR + null + PREFIX_SEMESTER + "1 "
+                + PREFIX_CODE + "CS1010", expectedMessage);
+
+        // missing parameter year number
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + null
+                + PREFIX_CODE + "CS1010", expectedMessage);
+
+        // missing year prefix
+        assertParseFailure(parser, "" + "1 " + PREFIX_SEMESTER + "2 " + PREFIX_CODE + "CS1010", expectedMessage);
+
+        // missing semester prefix
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + "2 " + PREFIX_CODE + "CS1010", expectedMessage);
+
+        // missing code prefix
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 " + "CS1010", expectedMessage);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/PlannerMoveCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/PlannerMoveCommandParserTest.java
new file mode 100644
index 000000000000..74d6426cfbea
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/PlannerMoveCommandParserTest.java
@@ -0,0 +1,114 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.PlannerMoveCommand;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+
+public class PlannerMoveCommandParserTest {
+    private PlannerMoveCommandParser parser = new PlannerMoveCommandParser();
+
+    @Test
+    public void parse_emptyArg_throwsParseException() {
+        //Displays usage
+        assertParseFailure(parser, "", PlannerMoveCommand.MESSAGE_USAGE);
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid code
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "1 "
+                + PREFIX_CODE + "INVALID", Code.MESSAGE_CONSTRAINTS);
+
+        // invalid year
+        assertParseFailure(parser, " " + PREFIX_YEAR + "999 " + PREFIX_SEMESTER + "1 "
+                + PREFIX_CODE + "CS1010", Year.MESSAGE_YEAR_CONSTRAINTS);
+
+        // invalid semester
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "999 "
+                + PREFIX_CODE + "CS1010", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // two invalid values, only first invalid value reported
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "999 "
+                + PREFIX_CODE + "INVALID", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // non-empty preamble
+        assertParseFailure(parser,
+                PREAMBLE_NON_EMPTY + " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "1 " + PREFIX_CODE + "CS1010 ",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerMoveCommand.MESSAGE_USAGE));
+
+    }
+
+    @Test
+    public void parse_validArgs_returnsPlannerMoveCommand() {
+        Code validCodeToMove = new Code("CS1010");
+        Year validYear = new Year("1");
+        Semester validSemester = new Semester("2");
+
+        PlannerMoveCommand expectedPlannerMoveCommand =
+                new PlannerMoveCommand(validYear, validSemester, validCodeToMove);
+
+        assertParseSuccess(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + "CS1010", expectedPlannerMoveCommand);
+
+        // whitespace only preamble
+        assertParseSuccess(parser,
+                PREAMBLE_WHITESPACE + " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 "
+                        + PREFIX_CODE + "CS1010", expectedPlannerMoveCommand);
+
+        // multiple codes - last code accepted
+        assertParseSuccess(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + "CS1011 " + PREFIX_CODE + "CS1010 ", expectedPlannerMoveCommand);
+
+        // multiple years - last year accepted
+        assertParseSuccess(parser, " " + PREFIX_YEAR + "2 " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + "CS1010 ", expectedPlannerMoveCommand);
+
+        // multiple semesters - last semester accepted
+        assertParseSuccess(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "1 " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + "CS1010 ", expectedPlannerMoveCommand);
+    }
+
+    @Test
+    public void parse_missingParts_failure() {
+        // no year specified
+        assertParseFailure(parser, " " + PREFIX_YEAR + " " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + "CS1010", Year.MESSAGE_YEAR_CONSTRAINTS);
+
+        // no semester specified
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + " "
+                + PREFIX_CODE + "CS1010", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+
+        // no code specified
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 "
+                + PREFIX_CODE + " ", Code.MESSAGE_CONSTRAINTS);
+    }
+
+    @Test
+    public void parse_compulsoryFieldMissing_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerMoveCommand.MESSAGE_USAGE);
+
+        // missing year prefix
+        assertParseFailure(parser, " " + "1 " + PREFIX_SEMESTER + "2 " + PREFIX_CODE + "CS1010", expectedMessage);
+
+        // missing semester prefix
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + "2 " + PREFIX_CODE + "CS1010", expectedMessage);
+
+        // missing code prefix
+        assertParseFailure(parser, " " + PREFIX_YEAR + "1 " + PREFIX_SEMESTER + "2 " + "CS1010", expectedMessage);
+
+        // all prefixes missing
+        assertParseFailure(parser, "1 " + "2 " + "CS1010", expectedMessage);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/PlannerRemoveCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/PlannerRemoveCommandParserTest.java
new file mode 100644
index 000000000000..f21f63e5c16b
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/PlannerRemoveCommandParserTest.java
@@ -0,0 +1,53 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.PlannerRemoveCommand;
+import pwe.planner.model.module.Code;
+
+public class PlannerRemoveCommandParserTest {
+    private PlannerRemoveCommandParser parser = new PlannerRemoveCommandParser();
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid code
+        assertParseFailure(parser, " " + PREFIX_CODE + "INVALID", Code.MESSAGE_CONSTRAINTS);
+
+        // invalid code
+        assertParseFailure(parser, " " + PREFIX_CODE + null, Code.MESSAGE_CONSTRAINTS);
+
+        // one valid one invalid code
+        assertParseFailure(parser, " " + PREFIX_CODE + "CS1010 " + PREFIX_CODE
+                + "INVALID", Code.MESSAGE_CONSTRAINTS);
+    }
+
+    @Test
+    public void parse_validArgs_returnsPlannerRemoveCommand() {
+        Code validCode = new Code("CS1010");
+        Code anotherValidCode = new Code("CS2100");
+        Set<Code> validCodeSet = new HashSet<>();
+        validCodeSet.add(validCode);
+        validCodeSet.add(anotherValidCode);
+
+        PlannerRemoveCommand expectedPlannerRemoveCommand = new PlannerRemoveCommand(validCodeSet);
+
+        assertParseSuccess(parser, " " + PREFIX_CODE + "CS1010 " + PREFIX_CODE
+                + "CS2100", expectedPlannerRemoveCommand);
+    }
+
+    @Test
+    public void parse_compulsoryFieldMissing_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerRemoveCommand.MESSAGE_USAGE);
+
+        // missing code prefix
+        assertParseFailure(parser, " " + "CS1010", expectedMessage);
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/PlannerShowCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/PlannerShowCommandParserTest.java
new file mode 100644
index 000000000000..f25be6e220f5
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/PlannerShowCommandParserTest.java
@@ -0,0 +1,129 @@
+package pwe.planner.logic.parser;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_AND;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_LEFT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_OR;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_RIGHT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_YEAR;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.PlannerShowCommand;
+import pwe.planner.logic.parser.exceptions.ParseException;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.SemesterContainsKeywordPredicate;
+import pwe.planner.model.planner.Year;
+import pwe.planner.model.planner.YearContainsKeywordPredicate;
+
+public class PlannerShowCommandParserTest {
+    private static final String WHITESPACE = " ";
+    private PlannerShowCommandParser parser = new PlannerShowCommandParser();
+
+    @Test
+    public void parse_emptyArg_throwsParseException() {
+        //Displays usage
+        assertParseFailure(parser, "", PlannerShowCommand.MESSAGE_USAGE);
+        assertParseFailure(parser, "     ",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerShowCommand.MESSAGE_USAGE));
+        // No year argument -> assertFailure
+        assertParseFailure(parser, PREFIX_YEAR + "     ", Year.MESSAGE_YEAR_CONSTRAINTS);
+        // No semester argument -> assertFailure
+        assertParseFailure(parser, PREFIX_SEMESTER + "     ", Semester.MESSAGE_SEMESTER_CONSTRAINTS);
+    }
+
+    @Test
+    public void parse_validArgs_returnsPlannerShowCommand() {
+        PlannerShowCommand expectedPlannerShowYearCommand =
+                new PlannerShowCommand(new YearContainsKeywordPredicate<>("1"));
+        // single year
+        assertParseSuccess(parser, PREFIX_YEAR + "1", expectedPlannerShowYearCommand);
+
+        PlannerShowCommand expectedPlannerShowSemesterCommand =
+                new PlannerShowCommand(new SemesterContainsKeywordPredicate<>("1"));
+        // single semester
+        assertParseSuccess(parser, PREFIX_SEMESTER + "1", expectedPlannerShowSemesterCommand);
+    }
+
+    @Test
+    public void parse_validArgs() {
+        // test for boolean OR
+        // year/1 || year/2
+        assertParserSuccess(parser, PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_OR + WHITESPACE
+                + PREFIX_YEAR + "2");
+        // sem/1 || sem/2
+        assertParserSuccess(parser, PREFIX_SEMESTER + "1" + WHITESPACE + OPERATOR_OR + WHITESPACE
+                + PREFIX_SEMESTER + "2");
+
+        // test for boolean AND
+        // year/1 && year/1
+        assertParserSuccess(parser, PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_YEAR + "1");
+        // sem/1 && sem/1
+        assertParserSuccess(parser, PREFIX_SEMESTER + "1" + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_SEMESTER + "1");
+        // year/1 && sem/2
+        assertParserSuccess(parser, PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + PREFIX_SEMESTER + "2");
+
+        // test for boolean AND OR with LEFT_BRACKET RIGHT_BRACKET
+        // year/1 && ( sem/1 || sem/2 )
+        assertParserSuccess(parser, PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_AND + WHITESPACE
+                + OPERATOR_LEFT_BRACKET + WHITESPACE + PREFIX_SEMESTER + "1" + WHITESPACE + OPERATOR_OR
+                + WHITESPACE + PREFIX_SEMESTER + "2" + WHITESPACE + OPERATOR_RIGHT_BRACKET);
+    }
+
+    @Test
+    public void parseInvalidArgs() {
+        assertParseThrowsException(parser, "invalid/DoesNotExists");
+        // year/1 sem/2
+        assertParseThrowsException(parser, PREFIX_YEAR + "1" + WHITESPACE + PREFIX_SEMESTER + "2");
+        // ()
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + OPERATOR_RIGHT_BRACKET);
+        // ()()
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + OPERATOR_RIGHT_BRACKET + OPERATOR_LEFT_BRACKET
+                + OPERATOR_RIGHT_BRACKET);
+        // ())
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + OPERATOR_RIGHT_BRACKET + OPERATOR_RIGHT_BRACKET);
+        // year/1 ) sem/2
+        assertParseThrowsException(parser,
+                PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_RIGHT_BRACKET + PREFIX_SEMESTER + "2");
+        // (year/1 || sem/2
+        assertParseThrowsException(parser, OPERATOR_LEFT_BRACKET + PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_OR
+                + PREFIX_SEMESTER + "2");
+        // year/1 && (sem/1 || sem/2))
+        assertParseThrowsException(parser, PREFIX_YEAR + "1" + WHITESPACE + OPERATOR_AND + OPERATOR_LEFT_BRACKET
+                + PREFIX_SEMESTER + "1" + WHITESPACE + OPERATOR_OR + PREFIX_SEMESTER + "2" + OPERATOR_RIGHT_BRACKET
+                + OPERATOR_RIGHT_BRACKET);
+    }
+
+    /**
+     * Assert if a parse is successful.
+     * Checks if a parser return a PlannerShowCommand.
+     */
+    private void assertParserSuccess(PlannerShowCommandParser parser, String input) {
+        try {
+            PlannerShowCommand command = parser.parse(input);
+            assertNotNull("Expecting not null", command);
+        } catch (ParseException e) {
+            fail("Expecting no parser error");
+        }
+    }
+
+    /**
+     * Assert if a parse return an exception.
+     */
+    private void assertParseThrowsException(PlannerShowCommandParser parser, String str) {
+        try {
+            parser.parse(str);
+            fail("Expected a parse error");
+        } catch (ParseException ignore) {
+            // we want the exception to be thrown.
+        }
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/PlannerSuggestCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/PlannerSuggestCommandParserTest.java
new file mode 100644
index 000000000000..730fff1064b7
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/PlannerSuggestCommandParserTest.java
@@ -0,0 +1,49 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.Set;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.PlannerSuggestCommand;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.tag.Tag;
+
+public class PlannerSuggestCommandParserTest {
+    private PlannerSuggestCommandParser parser = new PlannerSuggestCommandParser();
+
+    @Test
+    public void parse_allFieldsPresent_success() {
+        Credits bestCredits = new Credits("2");
+        Set<Tag> tagsToFind = Set.of(new Tag("validName"), new Tag("anotherValidName"));
+
+        // multiple tags - all tags accepted
+        assertParseSuccess(parser, " " + PREFIX_CREDITS + "2 "
+                + PREFIX_TAG + "validName " + PREFIX_TAG
+                + "anotherValidName", new PlannerSuggestCommand(bestCredits, tagsToFind));
+    }
+
+    @Test
+    public void parse_compulsoryFieldMissing_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerSuggestCommand.MESSAGE_USAGE);
+
+        // missing credits prefix
+        assertParseFailure(parser, " " + "3 " + PREFIX_TAG + "validTag", expectedMessage);
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid credits
+        assertParseFailure(parser, " " + PREFIX_CREDITS + "-1 " + PREFIX_TAG + "validTag", Credits.MESSAGE_CONSTRAINTS);
+
+        // non-empty preamble
+        assertParseFailure(parser, PREAMBLE_NON_EMPTY + " " + PREFIX_CREDITS + "1 " + PREFIX_TAG + "validTag",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, PlannerSuggestCommand.MESSAGE_USAGE));
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/RequirementAddCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/RequirementAddCommandParserTest.java
new file mode 100644
index 000000000000..caa4b10a1e82
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/RequirementAddCommandParserTest.java
@@ -0,0 +1,80 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.RequirementAddCommand;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+
+public class RequirementAddCommandParserTest {
+
+    private RequirementAddCommandParser parser = new RequirementAddCommandParser();
+
+    @Test
+    public void parse_nullValue_failure() {
+        //empty input
+        assertParseFailure(parser, "", RequirementAddCommand.MESSAGE_USAGE);
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid format
+        assertParseFailure(parser, " INVALID INPUT", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                RequirementAddCommand.MESSAGE_USAGE));
+
+        // invalid name format
+        assertParseFailure(parser, " " + PREFIX_NAME + "  " + PREFIX_CODE + "CS1010 ",
+                Name.MESSAGE_CONSTRAINTS);
+
+        // invalid code format
+        assertParseFailure(parser, " " + PREFIX_NAME + "Computing Foundation " + PREFIX_CODE + "1231",
+                Code.MESSAGE_CONSTRAINTS);
+
+        // invalid name and code format
+        assertParseFailure(parser, " " + PREFIX_NAME + "   " + PREFIX_CODE + "1231",
+                Name.MESSAGE_CONSTRAINTS);
+
+        // non-empty preamble
+        assertParseFailure(parser,
+                PREAMBLE_NON_EMPTY + " " + PREFIX_NAME + "Computing Foundation " + PREFIX_CODE + "CS1231",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, RequirementAddCommand.MESSAGE_USAGE));
+
+    }
+
+    @Test
+    public void parse_validArgs_returnsRequirementAddCommand() {
+        Name validName = new Name("Computing Foundation");
+        Set<Code> validCodeSet = new HashSet<>();
+        validCodeSet.add(new Code("CS1010"));
+
+        RequirementAddCommand expectedRequirementAddCommand =
+                new RequirementAddCommand(validName, validCodeSet);
+
+        assertParseSuccess(parser, " " + PREFIX_NAME + "Computing Foundation " + PREFIX_CODE + "CS1010 ",
+                expectedRequirementAddCommand);
+
+        assertParseSuccess(parser, " " + PREFIX_CODE + "CS1010 " + PREFIX_NAME + "Computing Foundation ",
+                expectedRequirementAddCommand);
+
+        // whitespace only preamble
+        assertParseSuccess(parser,
+                PREAMBLE_WHITESPACE + " " + PREFIX_NAME + "Computing Foundation " + PREFIX_CODE + "CS1010 ",
+                expectedRequirementAddCommand);
+
+        // multiple requirement categories specified - last requirement category accepted
+        assertParseSuccess(parser, " " + PREFIX_NAME + "Mathematics " + PREFIX_NAME
+                + "Computing Foundation " + PREFIX_CODE + "CS1010", expectedRequirementAddCommand);
+
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/RequirementMoveCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/RequirementMoveCommandParserTest.java
new file mode 100644
index 000000000000..2f30aca39b11
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/RequirementMoveCommandParserTest.java
@@ -0,0 +1,85 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.Set;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.RequirementMoveCommand;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+
+public class RequirementMoveCommandParserTest {
+
+    private RequirementMoveCommandParser parser = new RequirementMoveCommandParser();
+
+    @Test
+    public void parse_nullValue_failure() {
+        //empty input
+        assertParseFailure(parser, "", RequirementMoveCommand.MESSAGE_USAGE);
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid format
+        assertParseFailure(parser, " INVALID INPUT", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                RequirementMoveCommand.MESSAGE_USAGE));
+
+        // invalid name format
+        assertParseFailure(parser, " " + PREFIX_NAME + "  " + PREFIX_CODE + "CS1010 ",
+                Name.MESSAGE_CONSTRAINTS);
+
+        // invalid name format
+        assertParseFailure(parser, " " + PREFIX_CODE + "CS1010 " + " " + PREFIX_NAME ,
+                Name.MESSAGE_CONSTRAINTS);
+
+        // invalid code format
+        assertParseFailure(parser, " " + PREFIX_NAME + "Computing Foundation " + PREFIX_CODE + "1231",
+                Code.MESSAGE_CONSTRAINTS);
+
+        // invalid code format
+        assertParseFailure(parser, " " + PREFIX_CODE + "1231 " + PREFIX_NAME + "Computing Foundation ",
+                Code.MESSAGE_CONSTRAINTS);
+
+        // invalid name and code format
+        assertParseFailure(parser, " " + PREFIX_NAME + " " + PREFIX_CODE + "1231",
+                Name.MESSAGE_CONSTRAINTS);
+
+        // invalid name and code format
+        assertParseFailure(parser, " " + PREFIX_CODE + "1231 " + PREFIX_NAME + " ",
+                Name.MESSAGE_CONSTRAINTS);
+
+        // non-empty preamble
+        assertParseFailure(parser, PREAMBLE_NON_EMPTY + " " + PREFIX_NAME + "Computing Foundation "
+                + PREFIX_CODE + "CS1231", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                RequirementMoveCommand.MESSAGE_USAGE));
+
+    }
+
+    @Test
+    public void parse_validArgs_returnsRequirementRemoveCommand() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1010"));
+        RequirementMoveCommand expectedRequirementMoveCommand =
+                new RequirementMoveCommand(new Name("Computing Foundation"), validCodeSet);
+
+        //valid command
+        assertParseSuccess(parser, " " + PREFIX_NAME + "Computing Foundation " + PREFIX_CODE + "CS1010 ",
+                expectedRequirementMoveCommand);
+
+        // whitespace only preamble
+        assertParseSuccess(parser, PREAMBLE_WHITESPACE + " " + PREFIX_NAME + "Computing Foundation "
+                        + PREFIX_CODE + "CS1010 ", expectedRequirementMoveCommand);
+
+        // multiple requirement categories specified - last requirement category accepted
+        assertParseSuccess(parser, " " + PREFIX_NAME + "Mathematics " + PREFIX_NAME
+                + "Computing Foundation " + PREFIX_CODE + "CS1010", expectedRequirementMoveCommand);
+
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/RequirementRemoveCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/RequirementRemoveCommandParserTest.java
new file mode 100644
index 000000000000..2b3950718831
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/RequirementRemoveCommandParserTest.java
@@ -0,0 +1,84 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static pwe.planner.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import java.util.Set;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.RequirementRemoveCommand;
+import pwe.planner.model.module.Code;
+
+public class RequirementRemoveCommandParserTest {
+
+    private RequirementRemoveCommandParser parser = new RequirementRemoveCommandParser();
+
+    @Test
+    public void parse_nullValue_failure() {
+        //empty input
+        assertParseFailure(parser, "", RequirementRemoveCommand.MESSAGE_USAGE);
+
+    }
+
+    @Test
+    public void parse_invalidValue_failure() {
+        // invalid format -> false
+        assertParseFailure(parser, " INVALID INPUT", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                RequirementRemoveCommand.MESSAGE_USAGE));
+
+        // invalid code format -> false
+        assertParseFailure(parser, " " + PREFIX_CODE + "1231", Code.MESSAGE_CONSTRAINTS);
+
+        // invalid code format -> false
+        assertParseFailure(parser, " " + PREFIX_CODE + "CS1010 " + PREFIX_CODE + "1231",
+                Code.MESSAGE_CONSTRAINTS);
+
+        // invalid code format -> false
+        assertParseFailure(parser, " " + PREFIX_CODE + "1010 " + PREFIX_CODE + "CS1231",
+                Code.MESSAGE_CONSTRAINTS);
+
+        // non-empty preamble -> false
+        assertParseFailure(parser,
+                PREAMBLE_NON_EMPTY + " " + PREFIX_CODE + "CS1231",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, RequirementRemoveCommand.MESSAGE_USAGE));
+
+    }
+
+    @Test
+    public void parse_validArgs_returnsRequirementRemoveCommand() {
+        Set<Code> validCodeSet = Set.of(new Code("CS1010"));
+        Set<Code> validMultiCodeSet = Set.of(new Code("CS1010"), new Code("CS1231"));
+
+        RequirementRemoveCommand expectedRequirementRemoveCommand = new RequirementRemoveCommand(validCodeSet);
+
+        //normal command -> true
+        assertParseSuccess(parser, " " + PREFIX_CODE + "CS1010", expectedRequirementRemoveCommand);
+
+        // whitespace only preamble -> true
+        assertParseSuccess(parser, PREAMBLE_WHITESPACE + " " + PREFIX_CODE + "CS1010",
+                expectedRequirementRemoveCommand);
+
+        // same command -> true
+        assertParseSuccess(parser, " " + PREFIX_CODE + "CS1010 ", expectedRequirementRemoveCommand);
+
+        expectedRequirementRemoveCommand = new RequirementRemoveCommand(validMultiCodeSet);
+
+        //normal command with multi codes -> true
+        assertParseSuccess(parser, " " + PREFIX_CODE + "CS1010 " + PREFIX_CODE + "CS1231",
+                expectedRequirementRemoveCommand);
+
+        //whitespace only preamble -> true
+        assertParseSuccess(parser, PREAMBLE_WHITESPACE + " " + PREFIX_CODE + "CS1010 " + PREFIX_CODE + "CS1231",
+                expectedRequirementRemoveCommand);
+
+        // same command -> true
+        assertParseSuccess(parser, " " + PREFIX_CODE + "CS1010 " + PREFIX_CODE + "CS1231",
+                expectedRequirementRemoveCommand);
+
+    }
+}
diff --git a/src/test/java/pwe/planner/logic/parser/SelectCommandParserTest.java b/src/test/java/pwe/planner/logic/parser/SelectCommandParserTest.java
new file mode 100644
index 000000000000..7139cea10cc7
--- /dev/null
+++ b/src/test/java/pwe/planner/logic/parser/SelectCommandParserTest.java
@@ -0,0 +1,31 @@
+package pwe.planner.logic.parser;
+
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static pwe.planner.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+
+import org.junit.Test;
+
+import pwe.planner.logic.commands.SelectCommand;
+
+/**
+ * Test scope: similar to {@code DeleteCommandParserTest}.
+ *
+ * @see DeleteCommandParserTest
+ */
+public class SelectCommandParserTest {
+
+    private SelectCommandParser parser = new SelectCommandParser();
+
+    @Test
+    public void parse_validArgs_returnsSelectCommand() {
+        assertParseSuccess(parser, "1", new SelectCommand(INDEX_FIRST_MODULE));
+    }
+
+    @Test
+    public void parse_invalidArgs_throwsParseException() {
+        assertParseFailure(parser, "a",
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, SelectCommand.MESSAGE_USAGE));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/ApplicationTest.java b/src/test/java/pwe/planner/model/ApplicationTest.java
new file mode 100644
index 000000000000..74064b4cac9d
--- /dev/null
+++ b/src/test/java/pwe/planner/model/ApplicationTest.java
@@ -0,0 +1,163 @@
+package pwe.planner.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.exceptions.DuplicateModuleException;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.storage.JsonSerializableApplication;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class ApplicationTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private final Application application = new Application();
+
+    @Test
+    public void constructor() {
+        assertEquals(Collections.emptyList(), application.getModuleList());
+    }
+
+    @Test
+    public void resetData_null_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        application.resetData(null);
+    }
+
+    @Test
+    public void resetData_withValidReadOnlyapplication_replacesData() throws IllegalValueException {
+        Application newData = new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType();
+        application.resetData(newData);
+        assertEquals(newData, application);
+    }
+
+    @Test
+    public void resetData_withDuplicateModules_throwsDuplicateModuleException() {
+        // Two modules with the same identity fields
+        Module editedAlice = new ModuleBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
+        List<Module> newModules = Arrays.asList(ALICE, editedAlice);
+        ApplicationStub newData = new ApplicationStub(newModules);
+
+        thrown.expect(DuplicateModuleException.class);
+        application.resetData(newData);
+    }
+
+    @Test
+    public void hasModule_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        application.hasModule(null);
+    }
+
+    @Test
+    public void getModuleByCode_nullCode_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        application.getModuleByCode(null);
+    }
+
+    @Test
+    public void hasModule_moduleNotInapplication_returnsFalse() {
+        assertFalse(application.hasModule(ALICE));
+    }
+
+    @Test
+    public void hasModule_moduleInapplication_returnsTrue() {
+        application.addModule(ALICE);
+        assertTrue(application.hasModule(ALICE));
+    }
+
+    @Test
+    public void hasModule_moduleWithSameIdentityFieldsInapplication_returnsTrue() {
+        application.addModule(ALICE);
+        Module editedAlice = new ModuleBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
+        assertTrue(application.hasModule(editedAlice));
+    }
+
+    @Test
+    public void getModuleList_modifyList_throwsUnsupportedOperationException() {
+        thrown.expect(UnsupportedOperationException.class);
+        application.getModuleList().remove(0);
+    }
+
+    @Test
+    public void addListener_withInvalidationListener_listenerAdded() {
+        SimpleIntegerProperty counter = new SimpleIntegerProperty();
+        InvalidationListener listener = observable -> counter.set(counter.get() + 1);
+        application.addListener(listener);
+        application.addModule(ALICE);
+        assertEquals(1, counter.get());
+    }
+
+    @Test
+    public void removeListener_withInvalidationListener_listenerRemoved() {
+        SimpleIntegerProperty counter = new SimpleIntegerProperty();
+        InvalidationListener listener = observable -> counter.set(counter.get() + 1);
+        application.addListener(listener);
+        application.removeListener(listener);
+        application.addModule(ALICE);
+        assertEquals(0, counter.get());
+    }
+
+    /**
+     * A stub ReadOnlyApplication whose modules list can violate interface constraints.
+     */
+    private static class ApplicationStub implements ReadOnlyApplication {
+        private final ObservableList<Module> modules = FXCollections.observableArrayList();
+        private final ObservableList<DegreePlanner> degreePlanners = FXCollections.observableArrayList();
+        private final ObservableList<RequirementCategory> requirementCategories = FXCollections.observableArrayList();
+
+        ApplicationStub(Collection<Module> modules) {
+            this.modules.setAll(modules);
+        }
+
+        @Override
+        public ObservableList<Module> getModuleList() {
+            return modules;
+        }
+
+        @Override
+        public ObservableList<DegreePlanner> getDegreePlannerList() {
+            return degreePlanners;
+        }
+
+        @Override
+        public ObservableList<RequirementCategory> getRequirementCategoryList() {
+            return requirementCategories;
+        }
+
+        @Override
+        public void addListener(InvalidationListener listener) {
+            throw new AssertionError("This method should not be called.");
+        }
+
+        @Override
+        public void removeListener(InvalidationListener listener) {
+            throw new AssertionError("This method should not be called.");
+        }
+    }
+
+}
diff --git a/src/test/java/pwe/planner/model/ModelManagerTest.java b/src/test/java/pwe/planner/model/ModelManagerTest.java
new file mode 100644
index 000000000000..dc1be36139b5
--- /dev/null
+++ b/src/test/java/pwe/planner/model/ModelManagerTest.java
@@ -0,0 +1,198 @@
+package pwe.planner.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_MODULES;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.BENSON;
+import static pwe.planner.testutil.TypicalModules.BOB;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.NameContainsKeywordsPredicate;
+import pwe.planner.model.module.exceptions.ModuleNotFoundException;
+import pwe.planner.testutil.ApplicationBuilder;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class ModelManagerTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private ModelManager modelManager = new ModelManager();
+
+    @Test
+    public void constructor() {
+        assertEquals(new UserPrefs(), modelManager.getUserPrefs());
+        assertEquals(new GuiSettings(), modelManager.getGuiSettings());
+        assertEquals(new Application(), new Application(modelManager.getApplication()));
+        assertEquals(null, modelManager.getSelectedModule());
+    }
+
+    @Test
+    public void setUserPrefs_nullUserPrefs_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        modelManager.setUserPrefs(null);
+    }
+
+    @Test
+    public void setUserPrefs_validUserPrefs_copiesUserPrefs() {
+        UserPrefs userPrefs = new UserPrefs();
+        userPrefs.setModuleListFilePath(Paths.get("pwe/planner/file/path"));
+        userPrefs.setGuiSettings(new GuiSettings(1, 2, 3, 4));
+        modelManager.setUserPrefs(userPrefs);
+        assertEquals(userPrefs, modelManager.getUserPrefs());
+
+        // Modifying userPrefs should not modify modelManager's userPrefs
+        UserPrefs oldUserPrefs = new UserPrefs(userPrefs);
+        userPrefs.setModuleListFilePath(Paths.get("new/pwe/planner/file/path"));
+        assertEquals(oldUserPrefs, modelManager.getUserPrefs());
+    }
+
+    @Test
+    public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        modelManager.setGuiSettings(null);
+    }
+
+    @Test
+    public void setGuiSettings_validGuiSettings_setsGuiSettings() {
+        GuiSettings guiSettings = new GuiSettings(1, 2, 3, 4);
+        modelManager.setGuiSettings(guiSettings);
+        assertEquals(guiSettings, modelManager.getGuiSettings());
+    }
+
+    @Test
+    public void setModuleListFilePath_nullPath_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        modelManager.setModuleListFilePath(null);
+    }
+
+    @Test
+    public void setModuleListFilePath_validPath_setsModuleListFilePath() {
+        Path path = Paths.get("pwe/planner/file/path");
+        modelManager.setModuleListFilePath(path);
+        assertEquals(path, modelManager.getModuleListFilePath());
+    }
+
+    @Test
+    public void hasModule_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        modelManager.hasModule(null);
+    }
+
+    @Test
+    public void getModuleByCode_nullCode_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        modelManager.getModuleByCode(null);
+    }
+
+    @Test
+    public void hasModule_moduleNotInapplication_returnsFalse() {
+        assertFalse(modelManager.hasModule(ALICE));
+    }
+
+    @Test
+    public void hasModule_moduleInapplication_returnsTrue() {
+        modelManager.addModule(ALICE);
+        assertTrue(modelManager.hasModule(ALICE));
+    }
+
+    @Test
+    public void deleteModule_moduleIsSelectedAndFirstModuleInFilteredModuleList_selectionCleared() {
+        modelManager.addModule(ALICE);
+        modelManager.setSelectedModule(ALICE);
+        modelManager.deleteModule(ALICE);
+        assertEquals(null, modelManager.getSelectedModule());
+    }
+
+    @Test
+    public void deleteModule_moduleIsSelectedAndSecondModuleInFilteredModuleList_firstModuleSelected() {
+        modelManager.addModule(ALICE);
+        modelManager.addModule(BOB);
+        assertEquals(Arrays.asList(ALICE, BOB), modelManager.getFilteredModuleList());
+        modelManager.setSelectedModule(BOB);
+        modelManager.deleteModule(BOB);
+        assertEquals(ALICE, modelManager.getSelectedModule());
+    }
+
+    @Test
+    public void setModule_moduleIsSelected_selectedModuleUpdated() {
+        modelManager.addModule(ALICE);
+        modelManager.setSelectedModule(ALICE);
+        Module updatedAlice = new ModuleBuilder(ALICE).withCode(VALID_CODE_BOB).build();
+        modelManager.editModule(ALICE, updatedAlice);
+        assertEquals(updatedAlice, modelManager.getSelectedModule());
+    }
+
+    @Test
+    public void getFilteredModuleList_modifyList_throwsUnsupportedOperationException() {
+        thrown.expect(UnsupportedOperationException.class);
+        modelManager.getFilteredModuleList().remove(0);
+    }
+
+    @Test
+    public void setSelectedModule_moduleNotInFilteredModuleList_throwsModuleNotFoundException() {
+        thrown.expect(ModuleNotFoundException.class);
+        modelManager.setSelectedModule(ALICE);
+    }
+
+    @Test
+    public void setSelectedModule_moduleInFilteredModuleList_setsSelectedModule() {
+        modelManager.addModule(ALICE);
+        assertEquals(Collections.singletonList(ALICE), modelManager.getFilteredModuleList());
+        modelManager.setSelectedModule(ALICE);
+        assertEquals(ALICE, modelManager.getSelectedModule());
+    }
+
+    @Test
+    public void equals() {
+        Application application = new ApplicationBuilder().withModule(ALICE).withModule(BENSON).build();
+        Application differentApplication = new Application();
+        UserPrefs userPrefs = new UserPrefs();
+
+        // same values -> returns true
+        modelManager = new ModelManager(application, userPrefs);
+        ModelManager modelManagerCopy = new ModelManager(application, userPrefs);
+        assertTrue(modelManager.equals(modelManagerCopy));
+
+        // same object -> returns true
+        assertTrue(modelManager.equals(modelManager));
+
+        // null -> returns false
+        assertFalse(modelManager.equals(null));
+
+        // different types -> returns false
+        assertFalse(modelManager.equals(5));
+
+        // different application -> returns false
+
+        assertFalse(modelManager.equals(new ModelManager(differentApplication, userPrefs)));
+
+        // different filteredList -> returns false
+        String keyword = ALICE.getName().toString();
+        modelManager.updateFilteredModuleList(new NameContainsKeywordsPredicate<>(keyword));
+
+        assertFalse(modelManager
+                .equals(new ModelManager(application, userPrefs)));
+
+        // resets modelManager to initial state for upcoming tests
+        modelManager.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
+
+        // different userPrefs -> returns false
+        UserPrefs differentUserPrefs = new UserPrefs();
+        differentUserPrefs.setModuleListFilePath(Paths.get("differentFilePath"));
+        assertFalse(modelManager.equals(new ModelManager(application, differentUserPrefs)));
+
+    }
+}
diff --git a/src/test/java/seedu/address/model/UserPrefsTest.java b/src/test/java/pwe/planner/model/UserPrefsTest.java
similarity index 69%
rename from src/test/java/seedu/address/model/UserPrefsTest.java
rename to src/test/java/pwe/planner/model/UserPrefsTest.java
index 20da6c4050d9..512e04e40ce8 100644
--- a/src/test/java/seedu/address/model/UserPrefsTest.java
+++ b/src/test/java/pwe/planner/model/UserPrefsTest.java
@@ -1,8 +1,8 @@
-package seedu.address.model;
+package pwe.planner.model;
 
 import org.junit.Test;
 
-import seedu.address.testutil.Assert;
+import pwe.planner.testutil.Assert;
 
 public class UserPrefsTest {
 
@@ -13,9 +13,9 @@ public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
     }
 
     @Test
-    public void setAddressBookFilePath_nullPath_throwsNullPointerException() {
+    public void setModuleListFilePath_nullPath_throwsNullPointerException() {
         UserPrefs userPrefs = new UserPrefs();
-        Assert.assertThrows(NullPointerException.class, () -> userPrefs.setAddressBookFilePath(null));
+        Assert.assertThrows(NullPointerException.class, () -> userPrefs.setModuleListFilePath(null));
     }
 
 }
diff --git a/src/test/java/pwe/planner/model/VersionedApplicationTest.java b/src/test/java/pwe/planner/model/VersionedApplicationTest.java
new file mode 100644
index 000000000000..cd1faf2fad20
--- /dev/null
+++ b/src/test/java/pwe/planner/model/VersionedApplicationTest.java
@@ -0,0 +1,298 @@
+package pwe.planner.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static pwe.planner.testutil.TypicalModules.AMY;
+import static pwe.planner.testutil.TypicalModules.BOB;
+import static pwe.planner.testutil.TypicalModules.CARL;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.ApplicationBuilder;
+
+public class VersionedApplicationTest {
+
+    private final ReadOnlyApplication applicationWithAmy = new ApplicationBuilder().withModule(AMY).build();
+    private final ReadOnlyApplication applicationWithBob = new ApplicationBuilder().withModule(BOB).build();
+    private final ReadOnlyApplication applicationWithCarl = new ApplicationBuilder().withModule(CARL).build();
+    private final ReadOnlyApplication emptyapplication = new ApplicationBuilder().build();
+
+    @Test
+    public void commit_singleapplication_noStatesRemovedCurrentStateSaved() {
+        VersionedApplication versionedapplication = prepareapplicationList(emptyapplication);
+
+        versionedapplication.commit();
+        assertapplicationListStatus(versionedapplication,
+                Collections.singletonList(emptyapplication),
+                emptyapplication,
+                Collections.emptyList());
+    }
+
+    @Test
+    public void commit_multipleapplicationPointerAtEndOfStateList_noStatesRemovedCurrentStateSaved() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+
+        versionedapplication.commit();
+        assertapplicationListStatus(versionedapplication,
+                Arrays.asList(emptyapplication, applicationWithAmy, applicationWithBob),
+                applicationWithBob,
+                Collections.emptyList());
+    }
+
+    @Test
+    public void commit_multipleapplicationPointerNotAtEndOfStateList_statesAfterPointerRemovedCurrentStateSaved() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 2);
+
+        versionedapplication.commit();
+        assertapplicationListStatus(versionedapplication,
+                Collections.singletonList(emptyapplication),
+                emptyapplication,
+                Collections.emptyList());
+    }
+
+    @Test
+    public void canUndo_multipleapplicationPointerAtEndOfStateList_returnsTrue() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+
+        assertTrue(versionedapplication.canUndo());
+    }
+
+    @Test
+    public void canUndo_multipleapplicationPointerAtStartOfStateList_returnsTrue() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 1);
+
+        assertTrue(versionedapplication.canUndo());
+    }
+
+    @Test
+    public void canUndo_singleapplication_returnsFalse() {
+        VersionedApplication versionedapplication = prepareapplicationList(emptyapplication);
+
+        assertFalse(versionedapplication.canUndo());
+    }
+
+    @Test
+    public void canUndo_multipleapplicationPointerAtStartOfStateList_returnsFalse() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 2);
+
+        assertFalse(versionedapplication.canUndo());
+    }
+
+    @Test
+    public void canRedo_multipleapplicationPointerNotAtEndOfStateList_returnsTrue() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 1);
+
+        assertTrue(versionedapplication.canRedo());
+    }
+
+    @Test
+    public void canRedo_multipleapplicationPointerAtStartOfStateList_returnsTrue() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 2);
+
+        assertTrue(versionedapplication.canRedo());
+    }
+
+    @Test
+    public void canRedo_singleapplication_returnsFalse() {
+        VersionedApplication versionedapplication = prepareapplicationList(emptyapplication);
+
+        assertFalse(versionedapplication.canRedo());
+    }
+
+    @Test
+    public void canRedo_multipleapplicationPointerAtEndOfStateList_returnsFalse() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+
+        assertFalse(versionedapplication.canRedo());
+    }
+
+    @Test
+    public void undo_multipleapplicationPointerAtEndOfStateList_success() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+
+        versionedapplication.undo();
+        assertapplicationListStatus(versionedapplication,
+                Collections.singletonList(emptyapplication),
+                applicationWithAmy,
+                Collections.singletonList(applicationWithBob));
+    }
+
+    @Test
+    public void undo_multipleapplicationPointerNotAtStartOfStateList_success() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 1);
+
+        versionedapplication.undo();
+        assertapplicationListStatus(versionedapplication,
+                Collections.emptyList(),
+                emptyapplication,
+                Arrays.asList(applicationWithAmy, applicationWithBob));
+    }
+
+    @Test
+    public void undo_singleapplication_throwsNoUndoableStateException() {
+        VersionedApplication versionedapplication = prepareapplicationList(emptyapplication);
+
+        assertThrows(VersionedApplication.NoUndoableStateException.class, versionedapplication::undo);
+    }
+
+    @Test
+    public void undo_multipleapplicationPointerAtStartOfStateList_throwsNoUndoableStateException() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 2);
+
+        assertThrows(VersionedApplication.NoUndoableStateException.class, versionedapplication::undo);
+    }
+
+    @Test
+    public void redo_multipleapplicationPointerNotAtEndOfStateList_success() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 1);
+
+        versionedapplication.redo();
+        assertapplicationListStatus(versionedapplication,
+                Arrays.asList(emptyapplication, applicationWithAmy),
+                applicationWithBob,
+                Collections.emptyList());
+    }
+
+    @Test
+    public void redo_multipleapplicationPointerAtStartOfStateList_success() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 2);
+
+        versionedapplication.redo();
+        assertapplicationListStatus(versionedapplication,
+                Collections.singletonList(emptyapplication),
+                applicationWithAmy,
+                Collections.singletonList(applicationWithBob));
+    }
+
+    @Test
+    public void redo_singleapplication_throwsNoRedoableStateException() {
+        VersionedApplication versionedapplication = prepareapplicationList(emptyapplication);
+
+        assertThrows(VersionedApplication.NoRedoableStateException.class, versionedapplication::redo);
+    }
+
+    @Test
+    public void redo_multipleapplicationPointerAtEndOfStateList_throwsNoRedoableStateException() {
+        VersionedApplication versionedapplication = prepareapplicationList(
+                emptyapplication, applicationWithAmy, applicationWithBob);
+
+        assertThrows(VersionedApplication.NoRedoableStateException.class, versionedapplication::redo);
+    }
+
+    @Test
+    public void equals() {
+        VersionedApplication versionedapplication = prepareapplicationList(applicationWithAmy, applicationWithBob);
+
+        // same values -> returns true
+        VersionedApplication copy = prepareapplicationList(applicationWithAmy, applicationWithBob);
+        assertTrue(versionedapplication.equals(copy));
+
+        // same object -> returns true
+        assertTrue(versionedapplication.equals(versionedapplication));
+
+        // null -> returns false
+        assertFalse(versionedapplication.equals(null));
+
+        // different types -> returns false
+        assertFalse(versionedapplication.equals(1));
+
+        // different state list -> returns false
+        VersionedApplication differentapplicationList = prepareapplicationList(applicationWithBob, applicationWithCarl);
+        assertFalse(versionedapplication.equals(differentapplicationList));
+
+        // different current pointer index -> returns false
+        VersionedApplication differentCurrentStatePointer = prepareapplicationList(
+                applicationWithAmy, applicationWithBob);
+        shiftCurrentStatePointerLeftwards(versionedapplication, 1);
+        assertFalse(versionedapplication.equals(differentCurrentStatePointer));
+    }
+
+    /**
+     * Asserts that {@code versionedapplication} is currently pointing at {@code expectedCurrentState},
+     * states before {@code versionedapplication#currentStatePointer} is equal to {@code expectedStatesBeforePointer},
+     * and states after {@code versionedapplication#currentStatePointer} is equal to {@code expectedStatesAfterPointer}.
+     */
+    private void assertapplicationListStatus(VersionedApplication versionedapplication,
+            List<ReadOnlyApplication> expectedStatesBeforePointer,
+            ReadOnlyApplication expectedCurrentState,
+            List<ReadOnlyApplication> expectedStatesAfterPointer) {
+        // check state currently pointing at is correct
+        assertEquals(new Application(versionedapplication), expectedCurrentState);
+
+        // shift pointer to start of state list
+        while (versionedapplication.canUndo()) {
+            versionedapplication.undo();
+        }
+
+        // check states before pointer are correct
+        for (ReadOnlyApplication expectedapplication : expectedStatesBeforePointer) {
+            assertEquals(expectedapplication, new Application(versionedapplication));
+            versionedapplication.redo();
+        }
+
+        // check states after pointer are correct
+        for (ReadOnlyApplication expectedapplication : expectedStatesAfterPointer) {
+            versionedapplication.redo();
+            assertEquals(expectedapplication, new Application(versionedapplication));
+        }
+
+        // check that there are no more states after pointer
+        assertFalse(versionedapplication.canRedo());
+
+        // revert pointer to original position
+        expectedStatesAfterPointer.forEach(unused -> versionedapplication.undo());
+    }
+
+    /**
+     * Creates and returns a {@code VersionedApplication} with the {@code applicationStates} added into it, and the
+     * {@code VersionedApplication#currentStatePointer} at the end of list.
+     */
+    private VersionedApplication prepareapplicationList(ReadOnlyApplication... applicationStates) {
+        assertFalse(applicationStates.length == 0);
+
+        VersionedApplication versionedapplication = new VersionedApplication(applicationStates[0]);
+        for (int i = 1; i < applicationStates.length; i++) {
+            versionedapplication.resetData(applicationStates[i]);
+            versionedapplication.commit();
+        }
+
+        return versionedapplication;
+    }
+
+    /**
+     * Shifts the {@code versionedapplication#currentStatePointer} by {@code count} to the left of its list.
+     */
+    private void shiftCurrentStatePointerLeftwards(VersionedApplication versionedapplication, int count) {
+        for (int i = 0; i < count; i++) {
+            versionedapplication.undo();
+        }
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/CodeContainsKeywordsPredicateTest.java b/src/test/java/pwe/planner/model/module/CodeContainsKeywordsPredicateTest.java
new file mode 100644
index 000000000000..d13ae607183e
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/CodeContainsKeywordsPredicateTest.java
@@ -0,0 +1,62 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.ModuleBuilder;
+
+public class CodeContainsKeywordsPredicateTest {
+    @Test
+    public void equals() {
+        String firstPredicateKeyword = "first";
+        String secondPredicateKeyword = "second";
+
+        CodeContainsKeywordsPredicate<Module> firstPredicate =
+                new CodeContainsKeywordsPredicate<>(firstPredicateKeyword);
+        CodeContainsKeywordsPredicate<Module> secondPredicate =
+                new CodeContainsKeywordsPredicate<>(secondPredicateKeyword);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        CodeContainsKeywordsPredicate<Module> firstPredicateCopy =
+                new CodeContainsKeywordsPredicate<>(firstPredicateKeyword);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // null -> returns false
+        assertFalse(firstPredicate.equals(null));
+
+        // different module -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_nameContainsKeywords_returnsTrue() {
+        // One keyword
+        CodeContainsKeywordsPredicate<Module> predicate =
+                new CodeContainsKeywordsPredicate<>("CS1010");
+        assertTrue(predicate.test(new ModuleBuilder().withCode("CS1010").build()));
+
+        // Mixed-case keywords
+        predicate = new CodeContainsKeywordsPredicate<>("cS1010");
+        assertTrue(predicate.test(new ModuleBuilder().withCode("CS1010").build()));
+    }
+
+    @Test
+    public void test_nameDoesNotContainKeywords_returnsFalse() {
+        // Non-matching keyword
+        CodeContainsKeywordsPredicate<Module> predicate = new CodeContainsKeywordsPredicate<>("CS1000");
+        assertFalse(predicate.test(new ModuleBuilder().withCode("CS1010").build()));
+
+        // Keywords match credits and name, but does not match code
+        predicate = new CodeContainsKeywordsPredicate<>("CS0000");
+        assertFalse(predicate.test(new ModuleBuilder().withName("Alice").withCredits("123")
+                .withCode("CS1010").build()));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/CodeTest.java b/src/test/java/pwe/planner/model/module/CodeTest.java
new file mode 100644
index 000000000000..4723b60e2ef3
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/CodeTest.java
@@ -0,0 +1,49 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.Assert;
+
+public class CodeTest {
+
+    @Test
+    public void constructor_null_throwsNullPointerException() {
+        Assert.assertThrows(NullPointerException.class, () -> new Code(null));
+    }
+
+    @Test
+    public void constructor_invalidCode_throwsIllegalArgumentException() {
+        String invalidCode = "";
+        Assert.assertThrows(IllegalArgumentException.class, () -> new Code(invalidCode));
+    }
+
+    @Test
+    public void isValidCode() {
+        // null code
+        Assert.assertThrows(NullPointerException.class, () -> Code.isValidCode(null));
+
+        // invalid codes
+        assertFalse(Code.isValidCode("")); // empty string
+        assertFalse(Code.isValidCode(" ")); // spaces only
+
+        // valid codes
+        assertTrue(Code.isValidCode("CS1010"));
+        assertTrue(Code.isValidCode("CS2040C")); // ends with an optional alphabet
+        assertTrue(Code.isValidCode("IFS4231")); // starts with 3 alphabets
+        assertTrue(Code.isValidCode("ABC1234D")); // starts with 3 alphabets and ends with optional alphabet
+    }
+
+    @Test
+    public void equals() {
+        // case insensitive equals codes -> success
+        assertTrue(new Code("ABC1234D").equals(new Code("ABC1234D")));
+        assertTrue(new Code("ABC1234D").equals(new Code("abc1234d")));
+        assertTrue(new Code("ABC1234D").equals(new Code("aBc1234D")));
+
+        // case insensitive equals codes -> success
+        assertFalse(new Code("DEF5678").equals(new Code("DE5678F")));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/CreditsContainsKeywordsPredicateTest.java b/src/test/java/pwe/planner/model/module/CreditsContainsKeywordsPredicateTest.java
new file mode 100644
index 000000000000..17a871f96849
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/CreditsContainsKeywordsPredicateTest.java
@@ -0,0 +1,54 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.ModuleBuilder;
+
+public class CreditsContainsKeywordsPredicateTest {
+    //TODO: to update all test cases again after regex for `Credits` is updated
+    @Test
+    public void equals() {
+        String firstPredicateKeyword = "1";
+        String secondPredicateKeyword = "2";
+
+        CreditsContainsKeywordsPredicate<Module> firstPredicate =
+                new CreditsContainsKeywordsPredicate<>(firstPredicateKeyword);
+        CreditsContainsKeywordsPredicate<Module> secondPredicate =
+                new CreditsContainsKeywordsPredicate<>(secondPredicateKeyword);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        CreditsContainsKeywordsPredicate<Module> firstPredicateCopy =
+                new CreditsContainsKeywordsPredicate<>(firstPredicateKeyword);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // null -> returns false
+        assertFalse(firstPredicate.equals(null));
+
+        // different module -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_nameContainsKeywords_returnsTrue() {
+        // One keyword
+        CreditsContainsKeywordsPredicate<Module> predicate =
+                new CreditsContainsKeywordsPredicate<>("444");
+        assertTrue(predicate.test(new ModuleBuilder().withCredits("444").build()));
+    }
+
+    @Test
+    public void test_nameDoesNotContainKeywords_returnsFalse() {
+        // Non-matching keyword
+        CreditsContainsKeywordsPredicate<Module> predicate = new CreditsContainsKeywordsPredicate<>("144");
+        assertFalse(predicate.test(new ModuleBuilder().withCredits("441").build()));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/CreditsTest.java b/src/test/java/pwe/planner/model/module/CreditsTest.java
new file mode 100644
index 000000000000..5b5473fe91a2
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/CreditsTest.java
@@ -0,0 +1,46 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.Assert;
+
+public class CreditsTest {
+
+    @Test
+    public void constructor_null_throwsNullPointerException() {
+        Assert.assertThrows(NullPointerException.class, () -> new Credits(null));
+    }
+
+    @Test
+    public void constructor_invalidCredits_throwsIllegalArgumentException() {
+        String invalidCredits = "";
+        Assert.assertThrows(IllegalArgumentException.class, () -> new Credits(invalidCredits));
+    }
+
+    @Test
+    public void isValidCredits() {
+        // null credits
+        Assert.assertThrows(NullPointerException.class, () -> Credits.isValidCredits(null));
+
+        // invalid credits
+        assertFalse(Credits.isValidCredits("")); // empty string
+        assertFalse(Credits.isValidCredits(" ")); // spaces only
+        assertFalse(Credits.isValidCredits("+10")); // no plus sign
+        assertFalse(Credits.isValidCredits("-1")); // no negative sign
+        assertFalse(Credits.isValidCredits("00")); // no leading zero (for 1 zero)
+        assertFalse(Credits.isValidCredits("000")); // no leading zeroes (for 1 zero)
+        assertFalse(Credits.isValidCredits("01")); // no leading zero (for 1 digit)
+        assertFalse(Credits.isValidCredits("001")); // no leading zeroes (for 1 digit)
+        assertFalse(Credits.isValidCredits("099")); // no leading zero (for 2 digits)
+        assertFalse(Credits.isValidCredits("1MC")); // alphabets within digits
+        assertFalse(Credits.isValidCredits("1 6")); // spaces within digits
+
+        // valid credits
+        assertTrue(Credits.isValidCredits("0")); // exactly zero
+        assertTrue(Credits.isValidCredits("50")); // exactly 2 numbers
+        assertTrue(Credits.isValidCredits("999")); // exactly 3 numbers
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/ModuleTest.java b/src/test/java/pwe/planner/model/module/ModuleTest.java
new file mode 100644
index 000000000000..886598e289c2
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/ModuleTest.java
@@ -0,0 +1,85 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.BOB;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.testutil.ModuleBuilder;
+
+public class ModuleTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void asObservableList_modifyList_throwsUnsupportedOperationException() {
+        Module module = new ModuleBuilder().build();
+        thrown.expect(UnsupportedOperationException.class);
+        module.getTags().remove(0);
+    }
+
+    @Test
+    public void isSameModule() {
+        // same object -> returns true
+        assertTrue(ALICE.isSameModule(ALICE));
+
+        // null -> returns false
+        assertFalse(ALICE.isSameModule(null));
+
+        // different credits and code -> returns false
+        Module editedAlice = new ModuleBuilder(ALICE).withCredits(VALID_CREDITS_BOB).withCode(VALID_CODE_BOB).build();
+        assertFalse(ALICE.isSameModule(editedAlice));
+
+        // different name but same code -> returns true
+        editedAlice = new ModuleBuilder(ALICE).withName(VALID_NAME_BOB).build();
+        assertTrue(ALICE.isSameModule(editedAlice));
+
+        // same name, same code, different attributes -> returns true
+        editedAlice = new ModuleBuilder(ALICE)
+                .withTags(VALID_TAG_HUSBAND).build();
+        assertTrue(ALICE.isSameModule(editedAlice));
+    }
+
+    @Test
+    public void equals() {
+        // same values -> returns true
+        Module aliceCopy = new ModuleBuilder(ALICE).build();
+        assertTrue(ALICE.equals(aliceCopy));
+
+        // same object -> returns true
+        assertTrue(ALICE.equals(ALICE));
+
+        // null -> returns false
+        assertFalse(ALICE.equals(null));
+
+        // different type -> returns false
+        assertFalse(ALICE.equals(5));
+
+        // different module -> returns false
+        assertFalse(ALICE.equals(BOB));
+
+        // different name -> returns false
+        Module editedAlice = new ModuleBuilder(ALICE).withName(VALID_NAME_BOB).build();
+        assertFalse(ALICE.equals(editedAlice));
+
+        // different credits -> returns false
+        editedAlice = new ModuleBuilder(ALICE).withCredits(VALID_CREDITS_BOB).build();
+        assertFalse(ALICE.equals(editedAlice));
+
+        // different code -> returns false
+        editedAlice = new ModuleBuilder(ALICE).withCode(VALID_CODE_BOB).build();
+        assertFalse(ALICE.equals(editedAlice));
+
+        // different tags -> returns false
+        editedAlice = new ModuleBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
+        assertFalse(ALICE.equals(editedAlice));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/NameContainsKeywordsPredicateTest.java b/src/test/java/pwe/planner/model/module/NameContainsKeywordsPredicateTest.java
new file mode 100644
index 000000000000..dec710ef270c
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/NameContainsKeywordsPredicateTest.java
@@ -0,0 +1,71 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.ModuleBuilder;
+
+public class NameContainsKeywordsPredicateTest {
+
+    @Test
+    public void equals() {
+        String firstPredicateKeyword = "first";
+        String secondPredicateKeyword = "second";
+
+        NameContainsKeywordsPredicate<Module> firstPredicate = new NameContainsKeywordsPredicate<>(
+                firstPredicateKeyword);
+        NameContainsKeywordsPredicate<Module> secondPredicate = new NameContainsKeywordsPredicate<>(
+                secondPredicateKeyword);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        NameContainsKeywordsPredicate<Module> firstPredicateCopy = new NameContainsKeywordsPredicate<>(
+                firstPredicateKeyword);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // null -> returns false
+        assertFalse(firstPredicate.equals(null));
+
+        // different module -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_nameContainsKeywords_returnsTrue() {
+        // One keyword
+        NameContainsKeywordsPredicate<Module> predicate = new NameContainsKeywordsPredicate<>(
+                "Alice");
+        assertTrue(predicate.test(new ModuleBuilder().withName("Alice Bob").build()));
+
+        // exact keyword match
+        predicate = new NameContainsKeywordsPredicate<>("Alice Bob");
+        assertTrue(predicate.test(new ModuleBuilder().withName("Alice Bob").build()));
+
+        // exact mixed case keyword
+        predicate = new NameContainsKeywordsPredicate<>("AlIcE bOb");
+        assertTrue(predicate.test(new ModuleBuilder().withName("Alice Bob").build()));
+
+        // Mixed-case keyword
+        predicate = new NameContainsKeywordsPredicate<>("aLIce");
+        assertTrue(predicate.test(new ModuleBuilder().withName("Alice Bob").build()));
+    }
+
+    @Test
+    public void test_nameDoesNotContainKeywords_returnsFalse() {
+        // Non-matching keyword
+        NameContainsKeywordsPredicate<Module> predicate = new NameContainsKeywordsPredicate<>("Carol");
+        assertFalse(predicate.test(new ModuleBuilder().withName("Alice Bob").build()));
+
+        // Keywords match credits, but does not match name
+        predicate = new NameContainsKeywordsPredicate<>("123");
+        assertFalse(predicate.test(new ModuleBuilder().withName("Alice").withCredits("123")
+                .withCode("CS1010").build()));
+    }
+}
diff --git a/src/test/java/seedu/address/model/person/NameTest.java b/src/test/java/pwe/planner/model/module/NameTest.java
similarity index 83%
rename from src/test/java/seedu/address/model/person/NameTest.java
rename to src/test/java/pwe/planner/model/module/NameTest.java
index b4a356b6f011..257117300050 100644
--- a/src/test/java/seedu/address/model/person/NameTest.java
+++ b/src/test/java/pwe/planner/model/module/NameTest.java
@@ -1,11 +1,11 @@
-package seedu.address.model.person;
+package pwe.planner.model.module;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import seedu.address.testutil.Assert;
+import pwe.planner.testutil.Assert;
 
 public class NameTest {
 
@@ -28,8 +28,8 @@ public void isValidName() {
         // invalid name
         assertFalse(Name.isValidName("")); // empty string
         assertFalse(Name.isValidName(" ")); // spaces only
-        assertFalse(Name.isValidName("^")); // only non-alphanumeric characters
-        assertFalse(Name.isValidName("peter*")); // contains non-alphanumeric characters
+        assertFalse(Name.isValidName("µ")); // only non-printable character
+        assertFalse(Name.isValidName("pëter")); // contains non-printable characters
 
         // valid name
         assertTrue(Name.isValidName("peter jack")); // alphabets only
diff --git a/src/test/java/pwe/planner/model/module/TagContainsKeywordsPredicateTest.java b/src/test/java/pwe/planner/model/module/TagContainsKeywordsPredicateTest.java
new file mode 100644
index 000000000000..a9cbd7781372
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/TagContainsKeywordsPredicateTest.java
@@ -0,0 +1,64 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.ModuleBuilder;
+
+public class TagContainsKeywordsPredicateTest {
+
+    @Test
+    public void equals() {
+        String firstPredicateKeyword = "first";
+        String secondPredicateKeyword = "second";
+
+        TagContainsKeywordsPredicate<Module> firstPredicate = new TagContainsKeywordsPredicate<>(
+                firstPredicateKeyword);
+        TagContainsKeywordsPredicate<Module> secondPredicate = new TagContainsKeywordsPredicate<>(
+                secondPredicateKeyword);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        TagContainsKeywordsPredicate<Module> firstPredicateCopy = new TagContainsKeywordsPredicate<>(
+                firstPredicateKeyword);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // null -> returns false
+        assertFalse(firstPredicate.equals(null));
+
+        // different module -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_nameContainsKeywords_returnsTrue() {
+        // One keyword
+        TagContainsKeywordsPredicate<Module> predicate = new TagContainsKeywordsPredicate<>("tag");
+        assertTrue(predicate.test(new ModuleBuilder().withTags("tag").build()));
+
+        // Mixed-case keywords
+        predicate = new TagContainsKeywordsPredicate<>("tAg");
+        assertTrue(predicate.test(new ModuleBuilder().withTags("tag").build()));
+    }
+
+    @Test
+    public void test_nameDoesNotContainKeywords_returnsFalse() {
+
+
+        // Non-matching keyword
+        TagContainsKeywordsPredicate<Module> predicate = new TagContainsKeywordsPredicate<>("notExisting");
+        assertFalse(predicate.test(new ModuleBuilder().withTags("tags").build()));
+
+        // Keywords match credits but does not match tag
+        predicate = new TagContainsKeywordsPredicate<>("123");
+        assertFalse(predicate.test(new ModuleBuilder().withTags("Alice").withCredits("123")
+                .withCode("CS1010").withTags("TAG").build()));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/module/UniqueModuleListTest.java b/src/test/java/pwe/planner/model/module/UniqueModuleListTest.java
new file mode 100644
index 000000000000..d4dbd2c767d9
--- /dev/null
+++ b/src/test/java/pwe/planner/model/module/UniqueModuleListTest.java
@@ -0,0 +1,183 @@
+package pwe.planner.model.module;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.BOB;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.model.module.exceptions.DuplicateModuleException;
+import pwe.planner.model.module.exceptions.ModuleNotFoundException;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class UniqueModuleListTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private final UniqueModuleList uniqueModuleList = new UniqueModuleList();
+
+    @Test
+    public void contains_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.contains(null);
+    }
+
+    @Test
+    public void getModuleByCode_nullCode_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.getModuleByCode(null);
+    }
+
+    @Test
+    public void contains_moduleNotInList_returnsFalse() {
+        assertFalse(uniqueModuleList.contains(ALICE));
+    }
+
+    @Test
+    public void contains_moduleInList_returnsTrue() {
+        uniqueModuleList.add(ALICE);
+        assertTrue(uniqueModuleList.contains(ALICE));
+    }
+
+    @Test
+    public void add_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.add(null);
+    }
+
+    @Test
+    public void add_duplicateModule_throwsDuplicateModuleException() {
+        uniqueModuleList.add(ALICE);
+        thrown.expect(DuplicateModuleException.class);
+        uniqueModuleList.add(ALICE);
+    }
+
+    @Test
+    public void setModule_nullTargetModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.setModule(null, ALICE);
+    }
+
+    @Test
+    public void setModule_nullEditedModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.setModule(ALICE, null);
+    }
+
+    @Test
+    public void setModule_targetModuleNotInList_throwsModuleNotFoundException() {
+        thrown.expect(ModuleNotFoundException.class);
+        uniqueModuleList.setModule(ALICE, ALICE);
+    }
+
+    @Test
+    public void setModule_editedModuleIsSameModule_success() {
+        uniqueModuleList.add(ALICE);
+        uniqueModuleList.setModule(ALICE, ALICE);
+        UniqueModuleList expectedUniqueModuleList = new UniqueModuleList();
+        expectedUniqueModuleList.add(ALICE);
+        assertEquals(expectedUniqueModuleList, uniqueModuleList);
+    }
+
+    @Test
+    public void setModule_editedModuleHasSameIdentity_success() {
+        uniqueModuleList.add(ALICE);
+        Module editedAlice = new ModuleBuilder(ALICE).withCode(VALID_CODE_BOB).withTags(VALID_TAG_HUSBAND)
+                .build();
+        uniqueModuleList.setModule(ALICE, editedAlice);
+        UniqueModuleList expectedUniqueModuleList = new UniqueModuleList();
+        expectedUniqueModuleList.add(editedAlice);
+        assertEquals(expectedUniqueModuleList, uniqueModuleList);
+    }
+
+    @Test
+    public void setModule_editedModuleHasDifferentIdentity_success() {
+        uniqueModuleList.add(ALICE);
+        uniqueModuleList.setModule(ALICE, BOB);
+        UniqueModuleList expectedUniqueModuleList = new UniqueModuleList();
+        expectedUniqueModuleList.add(BOB);
+        assertEquals(expectedUniqueModuleList, uniqueModuleList);
+    }
+
+    @Test
+    public void setModule_editedModuleHasNonUniqueIdentity_throwsDuplicateModuleException() {
+        uniqueModuleList.add(ALICE);
+        uniqueModuleList.add(BOB);
+        thrown.expect(DuplicateModuleException.class);
+        uniqueModuleList.setModule(ALICE, BOB);
+    }
+
+    @Test
+    public void remove_nullModule_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.remove(null);
+    }
+
+    @Test
+    public void remove_moduleDoesNotExist_throwsModuleNotFoundException() {
+        thrown.expect(ModuleNotFoundException.class);
+        uniqueModuleList.remove(ALICE);
+    }
+
+    @Test
+    public void remove_existingModule_removesModule() {
+        uniqueModuleList.add(ALICE);
+        uniqueModuleList.remove(ALICE);
+        UniqueModuleList expectedUniqueModuleList = new UniqueModuleList();
+        assertEquals(expectedUniqueModuleList, uniqueModuleList);
+    }
+
+    @Test
+    public void setModules_nullUniqueModuleList_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.setModules((UniqueModuleList) null);
+    }
+
+    @Test
+    public void setModules_uniqueModuleList_replacesOwnListWithProvidedUniqueModuleList() {
+        uniqueModuleList.add(ALICE);
+        UniqueModuleList expectedUniqueModuleList = new UniqueModuleList();
+        expectedUniqueModuleList.add(BOB);
+        uniqueModuleList.setModules(expectedUniqueModuleList);
+        assertEquals(expectedUniqueModuleList, uniqueModuleList);
+    }
+
+    @Test
+    public void setModules_nullList_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueModuleList.setModules((List<Module>) null);
+    }
+
+    @Test
+    public void setModules_list_replacesOwnListWithProvidedList() {
+        uniqueModuleList.add(ALICE);
+        List<Module> moduleList = Collections.singletonList(BOB);
+        uniqueModuleList.setModules(moduleList);
+        UniqueModuleList expectedUniqueModuleList = new UniqueModuleList();
+        expectedUniqueModuleList.add(BOB);
+        assertEquals(expectedUniqueModuleList, uniqueModuleList);
+    }
+
+    @Test
+    public void setModules_listWithDuplicateModules_throwsDuplicateModuleException() {
+        List<Module> listWithDuplicateModules = Arrays.asList(ALICE, ALICE);
+        thrown.expect(DuplicateModuleException.class);
+        uniqueModuleList.setModules(listWithDuplicateModules);
+    }
+
+    @Test
+    public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+        thrown.expect(UnsupportedOperationException.class);
+        uniqueModuleList.asUnmodifiableObservableList().remove(0);
+    }
+}
diff --git a/src/test/java/pwe/planner/model/planner/DegreePlannerTest.java b/src/test/java/pwe/planner/model/planner/DegreePlannerTest.java
new file mode 100644
index 000000000000..0ac211f18160
--- /dev/null
+++ b/src/test/java/pwe/planner/model/planner/DegreePlannerTest.java
@@ -0,0 +1,78 @@
+package pwe.planner.model.planner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_1_SEMESTER_1;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_1_SEMESTER_2;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.testutil.DegreePlannerBuilder;
+
+public class DegreePlannerTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void asObservableList_modifyList_throwsUnsupportedOperationException() {
+        DegreePlanner degreePlanner = new DegreePlannerBuilder().build();
+        thrown.expect(UnsupportedOperationException.class);
+        degreePlanner.getCodes().remove(0);
+    }
+
+    @Test
+    public void isSameDegreePlanner() {
+        // same object -> returns true
+        assertTrue(YEAR_1_SEMESTER_1.isSameDegreePlanner(YEAR_1_SEMESTER_1));
+
+        // null -> returns false
+        assertFalse(YEAR_1_SEMESTER_1.isSameDegreePlanner(null));
+
+        // different year and code -> returns false
+        DegreePlanner editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1)
+                .withYear("2").withCodes("CS1111", "CS2222").build();
+        assertFalse(YEAR_1_SEMESTER_1.isSameDegreePlanner(editedDegreePlanner));
+
+        // different year but same code -> returns false
+        editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withYear("2").build();
+        assertFalse(YEAR_1_SEMESTER_1.isSameDegreePlanner(editedDegreePlanner));
+
+        // different year but same semester -> returns false
+        editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withYear("2").withSemester("1").build();
+        assertFalse(YEAR_1_SEMESTER_1.isSameDegreePlanner(editedDegreePlanner));
+
+        // same year, same semester, different codes -> returns true
+        editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withCodes("CS1111", "CS2222").build();
+        assertTrue(YEAR_1_SEMESTER_1.isSameDegreePlanner(editedDegreePlanner));
+    }
+
+    @Test
+    public void equals() {
+        // same values -> returns true
+        DegreePlanner degreePlannerCopy = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).build();
+        assertTrue(YEAR_1_SEMESTER_1.equals(degreePlannerCopy));
+
+        // same object -> returns true
+        assertTrue(YEAR_1_SEMESTER_1.equals(YEAR_1_SEMESTER_1));
+
+        // different type -> returns false
+        assertFalse(YEAR_1_SEMESTER_1.equals(5));
+
+        // different degree plan -> returns false
+        assertFalse(YEAR_1_SEMESTER_1.equals(YEAR_1_SEMESTER_2));
+
+        // different year -> returns false
+        DegreePlanner editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withYear("2").build();
+        assertFalse(YEAR_1_SEMESTER_1.equals(editedDegreePlanner));
+
+        // different semester -> returns false
+        editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withSemester("2").build();
+        assertFalse(YEAR_1_SEMESTER_1.equals(editedDegreePlanner));
+
+        // different codes -> returns false
+        editedDegreePlanner = new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withCodes("CS1111", "CS2222").build();
+        assertFalse(YEAR_1_SEMESTER_1.equals(editedDegreePlanner));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/planner/SemesterContainsKeywordPredicateTest.java b/src/test/java/pwe/planner/model/planner/SemesterContainsKeywordPredicateTest.java
new file mode 100644
index 000000000000..74a9fd8aaec0
--- /dev/null
+++ b/src/test/java/pwe/planner/model/planner/SemesterContainsKeywordPredicateTest.java
@@ -0,0 +1,51 @@
+package pwe.planner.model.planner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.DegreePlannerBuilder;
+
+public class SemesterContainsKeywordPredicateTest {
+    @Test
+    public void equals() {
+        String firstPredicateKeyword = "1";
+        String secondPredicateKeyword = "2";
+
+        SemesterContainsKeywordPredicate<DegreePlanner> firstPredicate =
+                new SemesterContainsKeywordPredicate<>(firstPredicateKeyword);
+        SemesterContainsKeywordPredicate<DegreePlanner> secondPredicate =
+                new SemesterContainsKeywordPredicate<>(secondPredicateKeyword);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        SemesterContainsKeywordPredicate<DegreePlanner> firstPredicateCopy =
+                new SemesterContainsKeywordPredicate<>(firstPredicateKeyword);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // different module -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_semesterContainsKeywords_returnsTrue() {
+        // One keyword
+        SemesterContainsKeywordPredicate<DegreePlanner> predicate =
+                new SemesterContainsKeywordPredicate<>("1");
+        assertTrue(predicate.test(new DegreePlannerBuilder().withSemester("1").build()));
+
+    }
+
+    @Test
+    public void test_semesterDoesNotContainKeywords_returnsFalse() {
+        // Non-matching keyword
+        SemesterContainsKeywordPredicate<DegreePlanner> predicate = new SemesterContainsKeywordPredicate<>("4");
+        assertFalse(predicate.test(new DegreePlannerBuilder().withSemester("1").build()));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/planner/SemesterTest.java b/src/test/java/pwe/planner/model/planner/SemesterTest.java
new file mode 100644
index 000000000000..79e17ac6bba2
--- /dev/null
+++ b/src/test/java/pwe/planner/model/planner/SemesterTest.java
@@ -0,0 +1,40 @@
+package pwe.planner.model.planner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.Assert;
+
+public class SemesterTest {
+    @Test
+    public void constructor_null_throwsNullPointerException() {
+        Assert.assertThrows(NullPointerException.class, () -> new Semester(null));
+    }
+
+    @Test
+    public void constructor_invalidSemester_throwsIllegalArgumentException() {
+        String invalidSemester = "";
+        Assert.assertThrows(IllegalArgumentException.class, () -> new Semester(invalidSemester));
+    }
+
+    @Test
+    public void isValidSemester() {
+        // null year
+        Assert.assertThrows(NullPointerException.class, () -> Semester.isValidSemester(null));
+
+        // invalid year
+        assertFalse(Semester.isValidSemester("")); // empty string
+        assertFalse(Semester.isValidSemester(" ")); // spaces only
+        assertFalse(Semester.isValidSemester("+1")); // no plus sign
+        assertFalse(Semester.isValidSemester("-1")); // no negative sign
+        assertFalse(Semester.isValidSemester("5")); // no integer outside range of 1 to 4
+        assertFalse(Semester.isValidSemester("01")); // no leading zero
+        assertFalse(Semester.isValidSemester("one")); // alphabets
+        assertFalse(Semester.isValidSemester("1 6")); // spaces within digits
+
+        // valid year
+        assertTrue(Semester.isValidSemester("1")); // exactly zero
+    }
+}
diff --git a/src/test/java/pwe/planner/model/planner/UniqueDegreePlannerListTest.java b/src/test/java/pwe/planner/model/planner/UniqueDegreePlannerListTest.java
new file mode 100644
index 000000000000..e877d9de42d4
--- /dev/null
+++ b/src/test/java/pwe/planner/model/planner/UniqueDegreePlannerListTest.java
@@ -0,0 +1,181 @@
+package pwe.planner.model.planner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_1_SEMESTER_1;
+import static pwe.planner.testutil.TypicalDegreePlanners.YEAR_1_SEMESTER_2;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.model.planner.exceptions.DegreePlannerNotFoundException;
+import pwe.planner.model.planner.exceptions.DuplicateDegreePlannerException;
+import pwe.planner.testutil.DegreePlannerBuilder;
+
+public class UniqueDegreePlannerListTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private final UniqueDegreePlannerList uniqueDegreePlannerList = new UniqueDegreePlannerList();
+
+    @Test
+    public void contains_nullDegreePlanner_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.contains(null);
+    }
+
+    @Test
+    public void getDegreePlannerByCode_nullCode_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.getDegreePlannerByCode(null);
+    }
+
+    @Test
+    public void contains_degreePlannerNotInList_returnsFalse() {
+        assertFalse(uniqueDegreePlannerList.contains(YEAR_1_SEMESTER_1));
+    }
+
+    @Test
+    public void contains_degreePlannerInList_returnsTrue() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        assertTrue(uniqueDegreePlannerList.contains(YEAR_1_SEMESTER_1));
+    }
+
+    @Test
+    public void add_nullDegreePlanner_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.add(null);
+    }
+
+    @Test
+    public void add_duplicateDegreePlanner_throwsDuplicateDegreePlannerException() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        thrown.expect(DuplicateDegreePlannerException.class);
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+    }
+
+    @Test
+    public void setDegreePlanner_nullTargetDegreePlanner_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.setDegreePlanner(null, YEAR_1_SEMESTER_1);
+    }
+
+    @Test
+    public void setDegreePlanner_nullEditedDegreePlanner_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.setDegreePlanner(YEAR_1_SEMESTER_1, null);
+    }
+
+    @Test
+    public void setDegreePlanner_targetDegreePlannerNotInList_throwsDegreePlannerNotFoundException() {
+        thrown.expect(DegreePlannerNotFoundException.class);
+        uniqueDegreePlannerList.setDegreePlanner(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_1);
+    }
+
+    @Test
+    public void setDegreePlanner_editedDegreePlannerIsSameDegreePlanner_success() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        uniqueDegreePlannerList.setDegreePlanner(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_1);
+        UniqueDegreePlannerList expectedUniqueDegreePlannerList = new UniqueDegreePlannerList();
+        expectedUniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        assertEquals(expectedUniqueDegreePlannerList, uniqueDegreePlannerList);
+    }
+
+    @Test
+    public void setDegreePlanner_editedDegreePlannerHasSameIdentity_success() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        DegreePlanner editedDegreePlanner =
+                new DegreePlannerBuilder(YEAR_1_SEMESTER_1).withCodes("CS1111", "CS2222").build();
+        uniqueDegreePlannerList.setDegreePlanner(YEAR_1_SEMESTER_1, editedDegreePlanner);
+        UniqueDegreePlannerList expectedUniqueDegreePlannerList = new UniqueDegreePlannerList();
+        expectedUniqueDegreePlannerList.add(editedDegreePlanner);
+        assertEquals(expectedUniqueDegreePlannerList, uniqueDegreePlannerList);
+    }
+
+    @Test
+    public void setDegreePlanner_editedDegreePlannerHasDifferentIdentity_success() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        uniqueDegreePlannerList.setDegreePlanner(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_2);
+        UniqueDegreePlannerList expectedUniqueDegreePlannerList = new UniqueDegreePlannerList();
+        expectedUniqueDegreePlannerList.add(YEAR_1_SEMESTER_2);
+        assertEquals(expectedUniqueDegreePlannerList, uniqueDegreePlannerList);
+    }
+
+    @Test
+    public void setDegreePlanner_editedDegreePlannerHasNonUniqueIdentity_throwsDuplicateDegreePlannerException() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_2);
+        thrown.expect(DuplicateDegreePlannerException.class);
+        uniqueDegreePlannerList.setDegreePlanner(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_2);
+    }
+
+    @Test
+    public void remove_nullDegreePlanner_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.remove(null);
+    }
+
+    @Test
+    public void remove_degreePlannerDoesNotExist_throwsDegreePlannerNotFoundException() {
+        thrown.expect(DegreePlannerNotFoundException.class);
+        uniqueDegreePlannerList.remove(YEAR_1_SEMESTER_1);
+    }
+
+    @Test
+    public void remove_existingDegreePlanner_removesDegreePlanner() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        uniqueDegreePlannerList.remove(YEAR_1_SEMESTER_1);
+        UniqueDegreePlannerList expectedUniqueDegreePlannerList = new UniqueDegreePlannerList();
+        assertEquals(expectedUniqueDegreePlannerList, uniqueDegreePlannerList);
+    }
+
+    @Test
+    public void setDegreePlanners_nullUniqueDegreePlannerList_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.setDegreePlanners((UniqueDegreePlannerList) null);
+    }
+
+    @Test
+    public void setDegreePlanners_uniqueDegreePlannerList_replacesOwnListWithProvidedUniqueDegreePlannerList() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        UniqueDegreePlannerList expectedUniqueDegreePlannerList = new UniqueDegreePlannerList();
+        expectedUniqueDegreePlannerList.add(YEAR_1_SEMESTER_2);
+        uniqueDegreePlannerList.setDegreePlanners(expectedUniqueDegreePlannerList);
+        assertEquals(expectedUniqueDegreePlannerList, uniqueDegreePlannerList);
+    }
+
+    @Test
+    public void setDegreePlanners_nullList_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueDegreePlannerList.setDegreePlanners((List<DegreePlanner>) null);
+    }
+
+    @Test
+    public void setDegreePlanners_list_replacesOwnListWithProvidedList() {
+        uniqueDegreePlannerList.add(YEAR_1_SEMESTER_1);
+        List<DegreePlanner> degreePlannerList = Collections.singletonList(YEAR_1_SEMESTER_2);
+        uniqueDegreePlannerList.setDegreePlanners(degreePlannerList);
+        UniqueDegreePlannerList expectedUniqueDegreePlannerList = new UniqueDegreePlannerList();
+        expectedUniqueDegreePlannerList.add(YEAR_1_SEMESTER_2);
+        assertEquals(expectedUniqueDegreePlannerList, uniqueDegreePlannerList);
+    }
+
+    @Test
+    public void setDegreePlanners_listWithDuplicateDegreePlanners_throwsDuplicateDegreePlannerException() {
+        List<DegreePlanner> listWithDuplicateDegreePlanners = Arrays.asList(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_1);
+        thrown.expect(DuplicateDegreePlannerException.class);
+        uniqueDegreePlannerList.setDegreePlanners(listWithDuplicateDegreePlanners);
+    }
+
+    @Test
+    public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+        thrown.expect(UnsupportedOperationException.class);
+        uniqueDegreePlannerList.asUnmodifiableObservableList().remove(0);
+    }
+}
diff --git a/src/test/java/pwe/planner/model/planner/YearContainsKeywordPredicateTest.java b/src/test/java/pwe/planner/model/planner/YearContainsKeywordPredicateTest.java
new file mode 100644
index 000000000000..1120ea9bd2a6
--- /dev/null
+++ b/src/test/java/pwe/planner/model/planner/YearContainsKeywordPredicateTest.java
@@ -0,0 +1,50 @@
+package pwe.planner.model.planner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.DegreePlannerBuilder;
+
+public class YearContainsKeywordPredicateTest {
+    @Test
+    public void equals() {
+        String firstPredicateKeyword = "1";
+        String secondPredicateKeyword = "2";
+
+        YearContainsKeywordPredicate<DegreePlanner> firstPredicate =
+                new YearContainsKeywordPredicate<>(firstPredicateKeyword);
+        YearContainsKeywordPredicate<DegreePlanner> secondPredicate =
+                new YearContainsKeywordPredicate<>(secondPredicateKeyword);
+
+        // same object -> returns true
+        assertTrue(firstPredicate.equals(firstPredicate));
+
+        // same values -> returns true
+        YearContainsKeywordPredicate<DegreePlanner> firstPredicateCopy =
+                new YearContainsKeywordPredicate<>(firstPredicateKeyword);
+        assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+        // different types -> returns false
+        assertFalse(firstPredicate.equals(1));
+
+        // different module -> returns false
+        assertFalse(firstPredicate.equals(secondPredicate));
+    }
+
+    @Test
+    public void test_yearContainsKeywords_returnsTrue() {
+        // One keyword
+        YearContainsKeywordPredicate<DegreePlanner> predicate =
+                new YearContainsKeywordPredicate<>("1");
+        assertTrue(predicate.test(new DegreePlannerBuilder().withYear("1").build()));
+    }
+
+    @Test
+    public void test_yearDoesNotContainKeywords_returnsFalse() {
+        // Non-matching keyword
+        YearContainsKeywordPredicate<DegreePlanner> predicate = new YearContainsKeywordPredicate<>("4");
+        assertFalse(predicate.test(new DegreePlannerBuilder().withYear("1").build()));
+    }
+}
diff --git a/src/test/java/pwe/planner/model/planner/YearTest.java b/src/test/java/pwe/planner/model/planner/YearTest.java
new file mode 100644
index 000000000000..6d1f6040c8a4
--- /dev/null
+++ b/src/test/java/pwe/planner/model/planner/YearTest.java
@@ -0,0 +1,40 @@
+package pwe.planner.model.planner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import pwe.planner.testutil.Assert;
+
+public class YearTest {
+    @Test
+    public void constructor_null_throwsNullPointerException() {
+        Assert.assertThrows(NullPointerException.class, () -> new Year(null));
+    }
+
+    @Test
+    public void constructor_invalidYear_throwsIllegalArgumentException() {
+        String invalidYear = "";
+        Assert.assertThrows(IllegalArgumentException.class, () -> new Year(invalidYear));
+    }
+
+    @Test
+    public void isValidYear() {
+        // null year
+        Assert.assertThrows(NullPointerException.class, () -> Year.isValidYear(null));
+
+        // invalid year
+        assertFalse(Year.isValidYear("")); // empty string
+        assertFalse(Year.isValidYear(" ")); // spaces only
+        assertFalse(Year.isValidYear("+1")); // no plus sign
+        assertFalse(Year.isValidYear("-1")); // no negative sign
+        assertFalse(Year.isValidYear("5")); // no integer outside range of 1 to 4
+        assertFalse(Year.isValidYear("01")); // no leading zero
+        assertFalse(Year.isValidYear("one")); // alphabets
+        assertFalse(Year.isValidYear("1 6")); // spaces within digits
+
+        // valid year
+        assertTrue(Year.isValidYear("1")); // exactly zero
+    }
+}
diff --git a/src/test/java/pwe/planner/model/requirement/RequirementCategoryTest.java b/src/test/java/pwe/planner/model/requirement/RequirementCategoryTest.java
new file mode 100644
index 000000000000..682a245d618a
--- /dev/null
+++ b/src/test/java/pwe/planner/model/requirement/RequirementCategoryTest.java
@@ -0,0 +1,88 @@
+package pwe.planner.model.requirement;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.testutil.TypicalRequirementCategories.COMPUTING_BREADTH;
+import static pwe.planner.testutil.TypicalRequirementCategories.COMPUTING_FOUNDATION;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.testutil.RequirementCategoryBuilder;
+
+public class RequirementCategoryTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void asObservableList_modifyList_throwsUnsupportedOperationException() {
+        RequirementCategory requirementCategory = new RequirementCategoryBuilder().build();
+        thrown.expect(UnsupportedOperationException.class);
+        requirementCategory.getCodeSet().remove(0);
+    }
+
+    @Test
+    public void isSameRequirementCategory() {
+        // same object -> true
+        assertTrue(COMPUTING_FOUNDATION.isSameRequirementCategory(COMPUTING_FOUNDATION));
+
+        // null -> false
+        assertFalse(COMPUTING_FOUNDATION.isSameRequirementCategory(null));
+
+        // different name, credits and code -> false
+        RequirementCategory editedRequirementCategory =
+                new RequirementCategoryBuilder().withName("DIFFERENT").withCredits("14").withCodes("CS9999").build();
+        assertFalse(COMPUTING_FOUNDATION.isSameRequirementCategory(editedRequirementCategory));
+
+        // different name, credits and same code -> false
+        editedRequirementCategory =
+                new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withName("DIFFERENT").withCredits("14").build();
+        assertFalse(COMPUTING_FOUNDATION.isSameRequirementCategory(editedRequirementCategory));
+
+        // different name, code and same credits -> false
+        editedRequirementCategory =
+                new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withName("DIFFERENT").withCodes("CS1231").build();
+        assertFalse(COMPUTING_FOUNDATION.isSameRequirementCategory(editedRequirementCategory));
+
+        // different name and same code, credits -> false
+        editedRequirementCategory =
+                new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withName("DIFFERENT").build();
+        assertFalse(COMPUTING_FOUNDATION.isSameRequirementCategory(editedRequirementCategory));
+
+        // different credits, code and same name -> false
+        editedRequirementCategory =
+                new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withCredits("14").withCodes("CS9999").build();
+        assertTrue(COMPUTING_FOUNDATION.isSameRequirementCategory(editedRequirementCategory));
+    }
+
+    @Test
+    public void equals() {
+        // same values -> true
+        RequirementCategory requirementCategoryCopy = new RequirementCategoryBuilder(COMPUTING_FOUNDATION).build();
+        assertTrue(COMPUTING_FOUNDATION.equals(requirementCategoryCopy));
+
+        // same object -> true
+        assertTrue(COMPUTING_FOUNDATION.equals(COMPUTING_FOUNDATION));
+
+        // different type -> false
+        assertFalse(COMPUTING_FOUNDATION.equals(3));
+
+        // different requirement category -> false
+        assertFalse(COMPUTING_FOUNDATION.equals(COMPUTING_BREADTH));
+
+        // different name -> false
+        RequirementCategory editedRequirementCategory =
+                new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withName("DIFFERENT").build();
+        assertFalse(COMPUTING_FOUNDATION.equals(editedRequirementCategory));
+
+        // different credits -> false
+        editedRequirementCategory = new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withCredits("14").build();
+        assertFalse(COMPUTING_FOUNDATION.equals(editedRequirementCategory));
+
+        // different codes -> false
+        editedRequirementCategory = new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withCodes("CS9999").build();
+        assertFalse(COMPUTING_FOUNDATION.equals(editedRequirementCategory));
+    }
+
+}
diff --git a/src/test/java/pwe/planner/model/requirement/UniqueRequirementCategoryListTest.java b/src/test/java/pwe/planner/model/requirement/UniqueRequirementCategoryListTest.java
new file mode 100644
index 000000000000..e6bc7fb1b942
--- /dev/null
+++ b/src/test/java/pwe/planner/model/requirement/UniqueRequirementCategoryListTest.java
@@ -0,0 +1,201 @@
+package pwe.planner.model.requirement;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.testutil.TypicalRequirementCategories.COMPUTING_BREADTH;
+import static pwe.planner.testutil.TypicalRequirementCategories.COMPUTING_FOUNDATION;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.exceptions.DuplicateRequirementCategoryException;
+import pwe.planner.model.requirement.exceptions.RequirementCategoryNotFoundException;
+import pwe.planner.testutil.RequirementCategoryBuilder;
+
+public class UniqueRequirementCategoryListTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private final UniqueRequirementCategoryList uniqueRequirementCategoryList = new UniqueRequirementCategoryList();
+
+    @Test
+    public void contains_nullRequirementCategory_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.contains((RequirementCategory) null);
+    }
+
+    @Test
+    public void contains_nullRequirementCategoryName_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.contains((Name) null);
+    }
+
+    @Test
+    public void getRequirementCategoryByName_nullName_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.getRequirementCategory(null);
+    }
+
+    @Test
+    public void contains_requirementCategoryNameNotInList_returnsFalse() {
+        assertFalse(uniqueRequirementCategoryList.contains(new Name("SOMETHING")));
+    }
+
+    @Test
+    public void contains_requirementCategoryNotInList_returnsFalse() {
+        Set<Code> codeSet = Set.of(new Code("CS2100"));
+        RequirementCategory requirementCategory =
+                new RequirementCategory(new Name("SOMETHING"), new Credits("12"), codeSet);
+        assertFalse(uniqueRequirementCategoryList.contains(requirementCategory));
+    }
+
+
+    @Test
+    public void contains_requirementCategoryInList_returnsTrue() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        assertTrue(uniqueRequirementCategoryList.contains(COMPUTING_FOUNDATION));
+    }
+
+    @Test
+    public void add_nullRequirementCategory_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.add(null);
+    }
+
+    @Test
+    public void add_duplicateRequirementCategory_throwsDuplicateRequirementCategoryException() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        thrown.expect(DuplicateRequirementCategoryException.class);
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+    }
+
+    @Test
+    public void setRequirementCategory_nullTargetRequirementCategory_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.setRequirementCategory(null, COMPUTING_FOUNDATION);
+    }
+
+    @Test
+    public void setRequirementCategory_nullEditedRequirementCategory_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.setRequirementCategory(COMPUTING_FOUNDATION, null);
+    }
+
+    @Test
+    public void setRequirementCategory_targetRequirementCategoryNotInList_throwsRequirementCategoryNotFoundException() {
+        thrown.expect(RequirementCategoryNotFoundException.class);
+        uniqueRequirementCategoryList.setRequirementCategory(COMPUTING_FOUNDATION, COMPUTING_FOUNDATION);
+    }
+
+    @Test
+    public void setRequirementCategory_editedRequirementCategoryIsSameRequirementCategory_success() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        uniqueRequirementCategoryList.setRequirementCategory(COMPUTING_FOUNDATION, COMPUTING_FOUNDATION);
+        UniqueRequirementCategoryList expectedRequirementCategoryList = new UniqueRequirementCategoryList();
+        expectedRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        assertEquals(expectedRequirementCategoryList, uniqueRequirementCategoryList);
+    }
+
+    @Test
+    public void setRequirementCategory_editedRequirementCategoryHasSameIdentity_success() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        RequirementCategory editedRequirementCategory =
+                new RequirementCategoryBuilder(COMPUTING_FOUNDATION).withCodes("CS9999").build();
+        uniqueRequirementCategoryList.setRequirementCategory(COMPUTING_FOUNDATION, editedRequirementCategory);
+        UniqueRequirementCategoryList expectedRequirementCategoryList = new UniqueRequirementCategoryList();
+        expectedRequirementCategoryList.add(editedRequirementCategory);
+        assertEquals(expectedRequirementCategoryList, uniqueRequirementCategoryList);
+    }
+
+    @Test
+    public void setRequirementCategory_editedRequirementCategoryHasDifferentIdentity_success() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        uniqueRequirementCategoryList.setRequirementCategory(COMPUTING_FOUNDATION, COMPUTING_BREADTH);
+        UniqueRequirementCategoryList expectedRequirementCategoryList = new UniqueRequirementCategoryList();
+        expectedRequirementCategoryList.add(COMPUTING_BREADTH);
+        assertEquals(expectedRequirementCategoryList, uniqueRequirementCategoryList);
+    }
+
+    @Test
+    public void setRequirementCategory_editedRequirementCategoryNonUniqueIdentity_throwsDuplicateReqCatException() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        uniqueRequirementCategoryList.add(COMPUTING_BREADTH);
+        thrown.expect(DuplicateRequirementCategoryException.class);
+        uniqueRequirementCategoryList.setRequirementCategory(COMPUTING_FOUNDATION, COMPUTING_BREADTH);
+    }
+
+    @Test
+    public void remove_nullRequirementCategory_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.remove(null);
+    }
+
+    @Test
+    public void remove_requirementCategoryDoesNotExist_throwsRequirementCategoryNotFoundException() {
+        thrown.expect(RequirementCategoryNotFoundException.class);
+        uniqueRequirementCategoryList.remove(COMPUTING_FOUNDATION);
+    }
+
+    @Test
+    public void remove_existingRequirementCategory_removesRequirementCategory() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        uniqueRequirementCategoryList.remove(COMPUTING_FOUNDATION);
+        UniqueRequirementCategoryList expectedRequirementCategoryList = new UniqueRequirementCategoryList();
+        assertEquals(expectedRequirementCategoryList, uniqueRequirementCategoryList);
+    }
+
+    @Test
+    public void setRequirementCategories_nullUniqueRequirementCategoryList_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.setRequirementCategories((UniqueRequirementCategoryList) null);
+    }
+
+    @Test
+    public void setRequirementCategories_uniqueRequirementCategoryList_replacesOwnListWithProvidedUniqueReqCatList() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        UniqueRequirementCategoryList expectedRequirementCategoryList = new UniqueRequirementCategoryList();
+        expectedRequirementCategoryList.add(COMPUTING_BREADTH);
+        uniqueRequirementCategoryList.setRequirementCategories(expectedRequirementCategoryList);
+        assertEquals(expectedRequirementCategoryList, uniqueRequirementCategoryList);
+    }
+
+    @Test
+    public void setRequirementCategories_nullList_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        uniqueRequirementCategoryList.setRequirementCategories((List<RequirementCategory>) null);
+    }
+
+    @Test
+    public void setRequirementCategories_list_replacesOwnListWithProvidedList() {
+        uniqueRequirementCategoryList.add(COMPUTING_FOUNDATION);
+        List<RequirementCategory> requirementCategoryList = Collections.singletonList(COMPUTING_BREADTH);
+        uniqueRequirementCategoryList.setRequirementCategories(requirementCategoryList);
+        UniqueRequirementCategoryList expectedRequirementCategoryList = new UniqueRequirementCategoryList();
+        expectedRequirementCategoryList.add(COMPUTING_BREADTH);
+        assertEquals(expectedRequirementCategoryList, uniqueRequirementCategoryList);
+    }
+
+    @Test
+    public void setRequirementCategories_listWithDuplicateRequirementCategory_throwsDuplicateReqCatException() {
+        List<RequirementCategory> listWithRequirementCategory =
+                Arrays.asList(COMPUTING_FOUNDATION, COMPUTING_FOUNDATION);
+        thrown.expect(DuplicateRequirementCategoryException.class);
+        uniqueRequirementCategoryList.setRequirementCategories(listWithRequirementCategory);
+    }
+
+    @Test
+    public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+        thrown.expect(UnsupportedOperationException.class);
+        uniqueRequirementCategoryList.asUnmodifiableObservableList().remove(0);
+    }
+}
diff --git a/src/test/java/seedu/address/model/tag/TagTest.java b/src/test/java/pwe/planner/model/tag/TagTest.java
similarity index 89%
rename from src/test/java/seedu/address/model/tag/TagTest.java
rename to src/test/java/pwe/planner/model/tag/TagTest.java
index 80bfd156d816..33f92ba938d7 100644
--- a/src/test/java/seedu/address/model/tag/TagTest.java
+++ b/src/test/java/pwe/planner/model/tag/TagTest.java
@@ -1,8 +1,8 @@
-package seedu.address.model.tag;
+package pwe.planner.model.tag;
 
 import org.junit.Test;
 
-import seedu.address.testutil.Assert;
+import pwe.planner.testutil.Assert;
 
 public class TagTest {
 
diff --git a/src/test/java/pwe/planner/storage/JsonAdaptedModuleTest.java b/src/test/java/pwe/planner/storage/JsonAdaptedModuleTest.java
new file mode 100644
index 000000000000..aa393363979e
--- /dev/null
+++ b/src/test/java/pwe/planner/storage/JsonAdaptedModuleTest.java
@@ -0,0 +1,135 @@
+package pwe.planner.storage;
+
+import static org.junit.Assert.assertEquals;
+import static pwe.planner.storage.JsonAdaptedModule.MISSING_FIELD_MESSAGE_FORMAT;
+import static pwe.planner.testutil.TypicalModules.BENSON;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.testutil.Assert;
+
+public class JsonAdaptedModuleTest {
+    private static final JsonAdaptedCode VALID_CODE = new JsonAdaptedCode(BENSON.getCode());
+    private static final JsonAdaptedName VALID_NAME = new JsonAdaptedName(BENSON.getName());
+    private static final JsonAdaptedCredits VALID_CREDITS = new JsonAdaptedCredits(BENSON.getCredits());
+    private static final List<JsonAdaptedSemester> VALID_SEMESTERS = BENSON.getSemesters().stream()
+            .map(JsonAdaptedSemester::new).collect(Collectors.toList());
+    private static final List<JsonAdaptedCode> VALID_COREQUISITES = BENSON.getCorequisites().stream()
+            .map(JsonAdaptedCode::new).collect(Collectors.toList());
+    private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
+            .map(JsonAdaptedTag::new).collect(Collectors.toList());
+
+    private static final JsonAdaptedCode INVALID_CODE = new JsonAdaptedCode("A1234B");
+    private static final JsonAdaptedName INVALID_NAME = new JsonAdaptedName("Näme containing invalid characters");
+    private static final JsonAdaptedCredits INVALID_CREDITS = new JsonAdaptedCredits("1000");
+    private static final JsonAdaptedSemester INVALID_SEMESTER = new JsonAdaptedSemester("5");
+    private static final List<JsonAdaptedSemester> INVALID_SEMESTERS = Stream
+            .concat(VALID_SEMESTERS.stream(), List.of(INVALID_SEMESTER).stream())
+            .collect(Collectors.toList());
+    private static final JsonAdaptedCode INVALID_COREQUISITE = new JsonAdaptedCode("Z9876Y");
+    private static final List<JsonAdaptedCode> INVALID_COREQUISITES = Stream
+            .concat(VALID_COREQUISITES.stream(), List.of(INVALID_COREQUISITE).stream())
+            .collect(Collectors.toList());
+    private static final JsonAdaptedTag INVALID_TAG = new JsonAdaptedTag("#hashIsInvalid");
+    private static final List<JsonAdaptedTag> INVALID_TAGS = Stream
+            .concat(VALID_TAGS.stream(), List.of(INVALID_TAG).stream())
+            .collect(Collectors.toList());
+
+    @Test
+    public void toModelType_validModuleDetails_returnsModule() throws Exception {
+        JsonAdaptedModule module = new JsonAdaptedModule(BENSON);
+        assertEquals(BENSON, module.toModelType());
+    }
+
+    @Test
+    public void toModelType_invalidCode_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                INVALID_CODE, VALID_NAME, VALID_CREDITS, VALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = Code.MESSAGE_CONSTRAINTS;
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_nullCode_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                null, VALID_NAME, VALID_CREDITS, VALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Code.class.getSimpleName());
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_invalidName_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, INVALID_NAME, VALID_CREDITS, VALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = Name.MESSAGE_CONSTRAINTS;
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_nullName_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, null, VALID_CREDITS, VALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_invalidCredits_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, VALID_NAME, INVALID_CREDITS, VALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = Credits.MESSAGE_CONSTRAINTS;
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_nullCredits_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, VALID_NAME, null, VALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Credits.class.getSimpleName());
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    // We don't test for null semesters, corequisites, tags because all of them will result in a successful operation.
+    // (They can be empty sets).
+
+    @Test
+    public void toModelType_invalidSemesters_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, VALID_NAME, VALID_CREDITS, INVALID_SEMESTERS, VALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = Semester.MESSAGE_SEMESTER_CONSTRAINTS;
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_invalidCorequisites_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, VALID_NAME, VALID_CREDITS, VALID_SEMESTERS, INVALID_COREQUISITES, VALID_TAGS
+        );
+        String expectedMessage = Code.MESSAGE_CONSTRAINTS;
+        Assert.assertThrows(IllegalValueException.class, expectedMessage, module::toModelType);
+    }
+
+    @Test
+    public void toModelType_invalidTags_throwsIllegalValueException() {
+        JsonAdaptedModule module = new JsonAdaptedModule(
+                VALID_CODE, VALID_NAME, VALID_CREDITS, VALID_SEMESTERS, VALID_COREQUISITES, INVALID_TAGS
+        );
+        Assert.assertThrows(IllegalValueException.class, module::toModelType);
+    }
+}
diff --git a/src/test/java/pwe/planner/storage/JsonApplicationStorageTest.java b/src/test/java/pwe/planner/storage/JsonApplicationStorageTest.java
new file mode 100644
index 000000000000..cfb4b93ac52f
--- /dev/null
+++ b/src/test/java/pwe/planner/storage/JsonApplicationStorageTest.java
@@ -0,0 +1,161 @@
+package pwe.planner.storage;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.HOON;
+import static pwe.planner.testutil.TypicalModules.IDA;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.rules.TemporaryFolder;
+
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.Application;
+import pwe.planner.model.ReadOnlyApplication;
+
+public class JsonApplicationStorageTest {
+    private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonApplicationStorageTest");
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Rule
+    public TemporaryFolder testFolder = new TemporaryFolder();
+
+    @Test
+    public void readApplication_nullFilePath_throwsNullPointerException() throws Exception {
+        thrown.expect(NullPointerException.class);
+        readApplication(null, null, null);
+    }
+
+    /**
+     * Reads files at the specified {@code moduleListFilePath}, {@code degreePlannerListFilePath}
+     * and {@code requirementCategoryListFilePath}.
+     */
+    private java.util.Optional<ReadOnlyApplication> readApplication(String moduleListFilePath,
+            String degreePlannerListFilePath, String requirementCategoryListFilePath) throws Exception {
+        return new JsonApplicationStorage(Paths.get(moduleListFilePath), Paths.get(degreePlannerListFilePath),
+                Paths.get(requirementCategoryListFilePath))
+                .readApplication(addToTestDataPathIfNotNull(moduleListFilePath),
+                        addToTestDataPathIfNotNull(degreePlannerListFilePath),
+                        addToTestDataPathIfNotNull(requirementCategoryListFilePath));
+    }
+
+    private Path addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) {
+        return prefsFileInTestDataFolder != null
+                ? TEST_DATA_FOLDER.resolve(prefsFileInTestDataFolder)
+                : null;
+    }
+
+    @Test
+    public void read_missingFile_emptyResult() throws Exception {
+        assertFalse(readApplication("NonExistentModuleListFile.json",
+                "NonExistentDegreePlannerListFile.json",
+                "NonExistentRequirementCategoryListFile.json").isPresent());
+    }
+
+    @Test
+    public void read_notJsonFormat_exceptionThrown() throws Exception {
+
+        thrown.expect(DataConversionException.class);
+        readApplication("notJsonFormatList.json",
+                "notJsonFormatList.json",
+                "notJsonFormatList.json");
+
+        // IMPORTANT: Any code below an exception-throwing line (like the one above) will be ignored.
+        // That means you should not have more than one exception test in one method
+    }
+
+    @Test
+    public void readApplication_invalidModuleApplication_throwDataConversionException() throws Exception {
+        thrown.expect(DataConversionException.class);
+        readApplication("invalidModuleList.json",
+                "invalidDegreePlannerList.json",
+                "invalidModuleList.json");
+    }
+
+    @Test
+    public void readApplication_invalidAndValidModuleApplication_throwDataConversionException() throws Exception {
+        thrown.expect(DataConversionException.class);
+        readApplication("invalidAndValidModuleList.json",
+                "invalidAndValidDegreePlannerList.json",
+                "invalidAndValidModuleList.json");
+    }
+
+    @Test
+    public void readAndSaveApplication_allInOrder_success() throws Exception {
+        Path moduleListFilePath = testFolder.getRoot().toPath().resolve("TempModuleApplication.json");
+        Path degreePlannerListFilePath = testFolder.getRoot().toPath().resolve("TempDegreePlannerApplication.json");
+        Path requirementCategoryListFilePath =
+                testFolder.getRoot().toPath().resolve("TempRequirementCategoryApplication.json");
+        Application original = new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                getTypicalRequirementCategoriesList()).toModelType();
+        JsonApplicationStorage jsonApplicationStorage =
+                new JsonApplicationStorage(moduleListFilePath, degreePlannerListFilePath,
+                        requirementCategoryListFilePath);
+
+        // Save in new file and read back
+        jsonApplicationStorage.saveModuleList(original, moduleListFilePath);
+        jsonApplicationStorage.saveDegreePlannerList(original, degreePlannerListFilePath);
+        jsonApplicationStorage.saveRequirementCategoryList(original, requirementCategoryListFilePath);
+        ReadOnlyApplication readBack =
+                jsonApplicationStorage
+                        .readApplication(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath)
+                        .get();
+        assertEquals(original, new Application(readBack));
+
+        // Modify data, overwrite exiting file, and read back
+        original.addModule(HOON);
+        original.removeModule(ALICE);
+        jsonApplicationStorage.saveModuleList(original, moduleListFilePath);
+        jsonApplicationStorage.saveDegreePlannerList(original, degreePlannerListFilePath);
+        readBack = jsonApplicationStorage
+                .readApplication(moduleListFilePath, degreePlannerListFilePath, requirementCategoryListFilePath).get();
+        assertEquals(original, new Application(readBack));
+
+        // Save and read without specifying file path
+        original.addModule(IDA);
+        jsonApplicationStorage.saveModuleList(original); // file path not specified
+        readBack = jsonApplicationStorage.readApplication().get(); // file path not specified
+        assertEquals(original, new Application(readBack));
+
+    }
+
+    @Test
+    public void saveApplication_nullApplication_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        saveApplication(null, "SomeModuleListFile.json",
+                "SomeDegreePlannerListFile.json",
+                "SomeRequirementCategoryListFile.json");
+    }
+
+    /**
+     * Saves {@code application} at the specified {@code filePath}.
+     */
+    private void saveApplication(ReadOnlyApplication application, String moduleListFilePath,
+            String degreePlannerListFilePath,
+            String requirementCategoryListFilePath) {
+        try {
+            new JsonApplicationStorage(Paths.get(moduleListFilePath), Paths.get(degreePlannerListFilePath),
+                    Paths.get(requirementCategoryListFilePath))
+                    .saveModuleList(application, addToTestDataPathIfNotNull(moduleListFilePath));
+        } catch (IOException ioe) {
+            throw new AssertionError("There should not be an error writing to the file.", ioe);
+        }
+    }
+
+    @Test
+    public void saveApplication_nullFilePath_throwsNullPointerException() {
+        thrown.expect(NullPointerException.class);
+        saveApplication(new Application(), null, null, null);
+    }
+}
diff --git a/src/test/java/pwe/planner/storage/JsonSerializableApplicationTest.java b/src/test/java/pwe/planner/storage/JsonSerializableApplicationTest.java
new file mode 100644
index 000000000000..7c02a6bacf64
--- /dev/null
+++ b/src/test/java/pwe/planner/storage/JsonSerializableApplicationTest.java
@@ -0,0 +1,73 @@
+package pwe.planner.storage;
+
+import static org.junit.Assert.assertEquals;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.commons.util.JsonUtil;
+import pwe.planner.model.Application;
+import pwe.planner.testutil.TypicalDegreePlanners;
+
+public class JsonSerializableApplicationTest {
+
+    private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableApplicationTest");
+    private static final Path TYPICAL_MODULES_FILE = TEST_DATA_FOLDER.resolve("typicalModulesList.json");
+    private static final Path TYPICAL_DEGREE_PLANNER_FILE =
+            TEST_DATA_FOLDER.resolve("typicalDegreePlannerList.json");
+    private static final Path TYPICAL_REQUIREMENT_CATEGORY_FILE =
+            TEST_DATA_FOLDER.resolve("typicalRequirementCategoryList.json");
+    private static final Path INVALID_MODULE_FILE = TEST_DATA_FOLDER.resolve("invalidModuleList.json");
+    private static final Path DUPLICATE_MODULE_FILE = TEST_DATA_FOLDER.resolve("duplicateModuleList.json");
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void toModelType_typicalModulesFile_success() throws Exception {
+        JsonSerializableModuleList dataFromModuleListFile = JsonUtil.readJsonFile(TYPICAL_MODULES_FILE,
+                JsonSerializableModuleList.class).get();
+        JsonSerializableDegreePlannerList dataFromDegreePlannerListFile =
+                JsonUtil.readJsonFile(TYPICAL_DEGREE_PLANNER_FILE, JsonSerializableDegreePlannerList.class).get();
+        JsonSerializableRequirementCategoryList dataFromRequirementCategoryListFile =
+                JsonUtil.readJsonFile(TYPICAL_REQUIREMENT_CATEGORY_FILE,
+                        JsonSerializableRequirementCategoryList.class).get();
+        JsonSerializableApplication jsonSerializableApplication =
+                new JsonSerializableApplication(dataFromModuleListFile.toModelType(),
+                        dataFromDegreePlannerListFile.toModelType(),
+                        dataFromRequirementCategoryListFile.toModelType());
+        Application applicationFromFile =
+                jsonSerializableApplication.toModelType();
+        JsonSerializableApplication typicalApplicationData =
+                new JsonSerializableApplication(getTypicalModuleList(),
+                        TypicalDegreePlanners.getTypicalDegreePlannerList(), getTypicalRequirementCategoriesList());
+        Application typicalApplication =
+                typicalApplicationData.toModelType();
+        assertEquals(applicationFromFile, typicalApplication);
+    }
+
+    @Test
+    public void toModelType_invalidModuleFile_throwsIllegalValueException() throws Exception {
+        JsonSerializableModuleList dataFromFile = JsonUtil.readJsonFile(INVALID_MODULE_FILE,
+                JsonSerializableModuleList.class).get();
+        thrown.expect(IllegalValueException.class);
+        dataFromFile.toModelType();
+    }
+
+    @Test
+    public void toModelType_duplicateModules_throwsIllegalValueException() throws Exception {
+        JsonSerializableModuleList dataFromFile = JsonUtil.readJsonFile(DUPLICATE_MODULE_FILE,
+                JsonSerializableModuleList.class).get();
+        thrown.expect(IllegalValueException.class);
+        thrown.expectMessage(JsonSerializableModuleList.MESSAGE_DUPLICATE_MODULE);
+        dataFromFile.toModelType();
+    }
+
+}
diff --git a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java b/src/test/java/pwe/planner/storage/JsonUserPrefsStorageTest.java
similarity index 94%
rename from src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java
rename to src/test/java/pwe/planner/storage/JsonUserPrefsStorageTest.java
index 5d2699cc889a..a947a01eeb8f 100644
--- a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java
+++ b/src/test/java/pwe/planner/storage/JsonUserPrefsStorageTest.java
@@ -1,4 +1,4 @@
-package seedu.address.storage;
+package pwe.planner.storage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -13,9 +13,9 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.UserPrefs;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.commons.exceptions.DataConversionException;
+import pwe.planner.model.UserPrefs;
 
 public class JsonUserPrefsStorageTest {
 
@@ -83,7 +83,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataConv
     private UserPrefs getTypicalUserPrefs() {
         UserPrefs userPrefs = new UserPrefs();
         userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100));
-        userPrefs.setAddressBookFilePath(Paths.get("addressbook.json"));
+        userPrefs.setModuleListFilePath(Paths.get("moduleList.json"));
         return userPrefs;
     }
 
diff --git a/src/test/java/seedu/address/storage/StorageManagerTest.java b/src/test/java/pwe/planner/storage/StorageManagerTest.java
similarity index 55%
rename from src/test/java/seedu/address/storage/StorageManagerTest.java
rename to src/test/java/pwe/planner/storage/StorageManagerTest.java
index b56a68ded0b3..a1ccb96f5efb 100644
--- a/src/test/java/seedu/address/storage/StorageManagerTest.java
+++ b/src/test/java/pwe/planner/storage/StorageManagerTest.java
@@ -1,8 +1,9 @@
-package seedu.address.storage;
+package pwe.planner.storage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
 
 import java.nio.file.Path;
 
@@ -11,10 +12,11 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.UserPrefs;
+import pwe.planner.commons.core.GuiSettings;
+import pwe.planner.model.Application;
+import pwe.planner.model.ReadOnlyApplication;
+import pwe.planner.model.UserPrefs;
+import pwe.planner.testutil.TypicalModules;
 
 public class StorageManagerTest {
 
@@ -25,16 +27,17 @@ public class StorageManagerTest {
 
     @Before
     public void setUp() {
-        JsonAddressBookStorage addressBookStorage = new JsonAddressBookStorage(getTempFilePath("ab"));
+        JsonApplicationStorage applicationStorage =
+                new JsonApplicationStorage(getTempFilePath("ab"), getTempFilePath("dp"), getTempFilePath("reqCat"));
         JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(getTempFilePath("prefs"));
-        storageManager = new StorageManager(addressBookStorage, userPrefsStorage);
+
+        storageManager = new StorageManager(applicationStorage, userPrefsStorage);
     }
 
     private Path getTempFilePath(String fileName) {
         return testFolder.getRoot().toPath().resolve(fileName);
     }
 
-
     @Test
     public void prefsReadSave() throws Exception {
         /*
@@ -50,21 +53,23 @@ public void prefsReadSave() throws Exception {
     }
 
     @Test
-    public void addressBookReadSave() throws Exception {
+    public void applicationReadSave() throws Exception {
         /*
          * Note: This is an integration test that verifies the StorageManager is properly wired to the
-         * {@link JsonAddressBookStorage} class.
-         * More extensive testing of UserPref saving/reading is done in {@link JsonAddressBookStorageTest} class.
+         * {@link JsonApplicationStorage} class.
+         * More extensive testing of UserPref saving/reading is done in {@link JsonApplicationStorageTest} class.
          */
-        AddressBook original = getTypicalAddressBook();
-        storageManager.saveAddressBook(original);
-        ReadOnlyAddressBook retrieved = storageManager.readAddressBook().get();
-        assertEquals(original, new AddressBook(retrieved));
+        Application original =
+                new JsonSerializableApplication(TypicalModules.getTypicalModuleList(), getTypicalDegreePlannerList(),
+                        getTypicalRequirementCategoriesList()).toModelType();
+        storageManager.saveApplication(original);
+        ReadOnlyApplication retrieved = storageManager.readApplication().get();
+        assertEquals(original, new Application(retrieved));
     }
 
     @Test
-    public void getAddressBookFilePath() {
-        assertNotNull(storageManager.getAddressBookFilePath());
+    public void getModuleListFilePath() {
+        assertNotNull(storageManager.getModuleListFilePath());
     }
 
 }
diff --git a/src/test/java/pwe/planner/testutil/ApplicationBuilder.java b/src/test/java/pwe/planner/testutil/ApplicationBuilder.java
new file mode 100644
index 000000000000..914ed843c08f
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/ApplicationBuilder.java
@@ -0,0 +1,34 @@
+package pwe.planner.testutil;
+
+import pwe.planner.model.Application;
+import pwe.planner.model.module.Module;
+
+/**
+ * A utility class to help with building application objects.
+ * Example usage: <br>
+ *     {@code Application ab = new ApplicationBuilder().withModule("John", "Doe").build();}
+ */
+public class ApplicationBuilder {
+
+    private Application application;
+
+    public ApplicationBuilder() {
+        application = new Application();
+    }
+
+    public ApplicationBuilder(Application application) {
+        this.application = application;
+    }
+
+    /**
+     * Adds a new {@code Module} to the {@code Application} that we are building.
+     */
+    public ApplicationBuilder withModule(Module module) {
+        application.addModule(module);
+        return this;
+    }
+
+    public Application build() {
+        return application;
+    }
+}
diff --git a/src/test/java/seedu/address/testutil/Assert.java b/src/test/java/pwe/planner/testutil/Assert.java
similarity index 98%
rename from src/test/java/seedu/address/testutil/Assert.java
rename to src/test/java/pwe/planner/testutil/Assert.java
index c72a7622b080..0b5877b9ac9d 100644
--- a/src/test/java/seedu/address/testutil/Assert.java
+++ b/src/test/java/pwe/planner/testutil/Assert.java
@@ -1,4 +1,4 @@
-package seedu.address.testutil;
+package pwe.planner.testutil;
 
 /**
  * A set of assertion methods useful for writing tests.
diff --git a/src/test/java/pwe/planner/testutil/DegreePlannerBuilder.java b/src/test/java/pwe/planner/testutil/DegreePlannerBuilder.java
new file mode 100644
index 000000000000..5d1e8c02e5e3
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/DegreePlannerBuilder.java
@@ -0,0 +1,68 @@
+package pwe.planner.testutil;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import pwe.planner.model.module.Code;
+import pwe.planner.model.planner.DegreePlanner;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.planner.Year;
+import pwe.planner.model.util.SampleDataUtil;
+
+/**
+ * A utility class to help with building DegreePlanner objects.
+ * Example usage: <br>
+ * {@code DegreePlanner dp = new DegreePlannerBuilder().withYear("1).withSemester("1").build();}
+ */
+public class DegreePlannerBuilder {
+
+    public static final String DEFAULT_YEAR = "1";
+    public static final String DEFAULT_SEMESTER = "1";
+
+    private Year year;
+    private Semester semester;
+    private Set<Code> codes;
+
+    public DegreePlannerBuilder() {
+        year = new Year(DEFAULT_YEAR);
+        semester = new Semester(DEFAULT_SEMESTER);
+        codes = new HashSet<>();
+    }
+
+    /**
+     * Initializes the DegreePlannerBuilder with the data of {@code degreePlannerToCopy}.
+     */
+    public DegreePlannerBuilder(DegreePlanner degreePlannerToCopy) {
+        year = degreePlannerToCopy.getYear();
+        semester = degreePlannerToCopy.getSemester();
+        codes = new HashSet<Code>(degreePlannerToCopy.getCodes());
+    }
+
+    /**
+     * Sets the {@code Year} of the {@code DegreePlanner} that we are building.
+     */
+    public DegreePlannerBuilder withYear(String year) {
+        this.year = new Year(year);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Semester} of the {@code DegreePlanner} that we are building.
+     */
+    public DegreePlannerBuilder withSemester(String semester) {
+        this.semester = new Semester(semester);
+        return this;
+    }
+
+    /**
+     * Parses the {@code codes} into a {@code Set<Code>} and set it to the {@code DegreePlanner} that we are building.
+     */
+    public DegreePlannerBuilder withCodes(String... codes) {
+        this.codes = SampleDataUtil.getCodeSet(codes);
+        return this;
+    }
+
+    public DegreePlanner build() {
+        return new DegreePlanner(year, semester, codes);
+    }
+}
diff --git a/src/test/java/pwe/planner/testutil/EditModuleDescriptorBuilder.java b/src/test/java/pwe/planner/testutil/EditModuleDescriptorBuilder.java
new file mode 100644
index 000000000000..6a5d08377cb9
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/EditModuleDescriptorBuilder.java
@@ -0,0 +1,101 @@
+package pwe.planner.testutil;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import pwe.planner.logic.commands.EditCommand;
+import pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * A utility class to help with building EditModuleDescriptor objects.
+ */
+public class EditModuleDescriptorBuilder {
+
+    private EditCommand.EditModuleDescriptor descriptor;
+
+    public EditModuleDescriptorBuilder() {
+        descriptor = new EditCommand.EditModuleDescriptor();
+    }
+
+    public EditModuleDescriptorBuilder(EditCommand.EditModuleDescriptor descriptor) {
+        this.descriptor = new EditModuleDescriptor(descriptor);
+    }
+
+    /**
+     * Returns an {@code EditModuleDescriptor} with fields containing {@code module}'s details
+     */
+    public EditModuleDescriptorBuilder(Module module) {
+        descriptor = new EditCommand.EditModuleDescriptor();
+        descriptor.setCode(module.getCode());
+        descriptor.setName(module.getName());
+        descriptor.setCredits(module.getCredits());
+        descriptor.setSemesters(module.getSemesters());
+        descriptor.setCorequisites(module.getCorequisites());
+        descriptor.setTags(module.getTags());
+    }
+
+    /**
+     * Sets the {@code Code} of the {@code EditModuleDescriptor} that we are building.
+     */
+    public EditModuleDescriptorBuilder withCode(String code) {
+        descriptor.setCode(new Code(code));
+        return this;
+    }
+
+    /**
+     * Sets the {@code Name} of the {@code EditModuleDescriptor} that we are building.
+     */
+    public EditModuleDescriptorBuilder withName(String name) {
+        descriptor.setName(new Name(name));
+        return this;
+    }
+
+    /**
+     * Sets the {@code Credits} of the {@code EditModuleDescriptor} that we are building.
+     */
+    public EditModuleDescriptorBuilder withCredits(String credits) {
+        descriptor.setCredits(new Credits(credits));
+        return this;
+    }
+
+    /**
+     * Parses the {@code semesters} into a {@code Set<Semester>} and set it to the {@code EditModuleDescriptor}
+     * that we are building.
+     */
+    public EditModuleDescriptorBuilder withSemesters(String... semesters) {
+        Set<Semester> semesterSet = Stream.of(semesters).map(Semester::new).collect(Collectors.toSet());
+        descriptor.setSemesters(semesterSet);
+        return this;
+    }
+
+    /**
+     * Parses the {@code corequisites} into a {@code Set<Code>} and set it to the {@code EditModuleDescriptor}
+     * that we are building.
+     */
+    public EditModuleDescriptorBuilder withCorequisites(String... corequisites) {
+        Set<Code> corequisitesSet = Stream.of(corequisites).map(Code::new).collect(Collectors.toSet());
+        descriptor.setCorequisites(corequisitesSet);
+        return this;
+    }
+
+    /**
+     * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code EditModuleDescriptor}
+     * that we are building.
+     */
+    public EditModuleDescriptorBuilder withTags(String... tags) {
+        Set<Tag> tagSet = Stream.of(tags).map(Tag::new).collect(Collectors.toSet());
+        descriptor.setTags(tagSet);
+        return this;
+    }
+
+    public EditCommand.EditModuleDescriptor build() {
+        return descriptor;
+    }
+}
diff --git a/src/test/java/pwe/planner/testutil/ModuleBuilder.java b/src/test/java/pwe/planner/testutil/ModuleBuilder.java
new file mode 100644
index 000000000000..7fc87a9bbcb7
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/ModuleBuilder.java
@@ -0,0 +1,129 @@
+package pwe.planner.testutil;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.model.util.SampleDataUtil;
+
+/**
+ * A utility class to help with building Module objects.
+ */
+public class ModuleBuilder {
+
+    public static final String DEFAULT_NAME = "Alice Pauline";
+    public static final String DEFAULT_CREDITS = "666";
+    public static final String DEFAULT_CODE = "ABC1234Z";
+    public static final String DEFAULT_SEMESTERS_ONE = "1";
+    public static final String DEFAULT_SEMESTERS_TWO = "2";
+
+    private Code code;
+    private Name name;
+    private Credits credits;
+    private Set<Code> corequisites;
+    private Set<Semester> semesters;
+    private Set<Tag> tags;
+
+    public ModuleBuilder() {
+        code = new Code(DEFAULT_CODE);
+        name = new Name(DEFAULT_NAME);
+        credits = new Credits(DEFAULT_CREDITS);
+        semesters = new HashSet<>();
+        semesters.add(new Semester(DEFAULT_SEMESTERS_ONE));
+        semesters.add(new Semester(DEFAULT_SEMESTERS_TWO));
+        corequisites = new HashSet<>();
+        tags = new HashSet<>();
+    }
+
+    /**
+     * Initializes the ModuleBuilder with the data of {@code moduleToCopy}.
+     */
+    public ModuleBuilder(Module moduleToCopy) {
+        code = moduleToCopy.getCode();
+        name = moduleToCopy.getName();
+        credits = moduleToCopy.getCredits();
+        semesters = new HashSet<>(moduleToCopy.getSemesters());
+        corequisites = new HashSet<>(moduleToCopy.getCorequisites());
+        tags = new HashSet<>(moduleToCopy.getTags());
+    }
+
+    /**
+     * Sets the {@code Code} of the {@code Module} that we are building.
+     */
+    public ModuleBuilder withCode(String code) {
+        this.code = new Code(code);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Name} of the {@code Module} that we are building.
+     */
+    public ModuleBuilder withName(String name) {
+        this.name = new Name(name);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Credits} of the {@code Module} that we are building.
+     */
+    public ModuleBuilder withCredits(String credits) {
+        this.credits = new Credits(credits);
+        return this;
+    }
+
+    /**
+     * Parses the {@code corequisites} into a {@code Set<Code>} and set it to the {@code Module} that we are building.
+     */
+    public ModuleBuilder withCorequisites(String... corequisites) {
+        this.corequisites = SampleDataUtil.getCodeSet(corequisites);
+        return this;
+    }
+
+    /**
+     * Sets the {@code corequisites} of the {@code Module} that we are building.
+     */
+    public ModuleBuilder withCorequisites(Set<Code> corequisites) {
+        this.corequisites = new HashSet<>(corequisites);
+        return this;
+    }
+
+    /**
+     * Parses the {@code semesters} into a {@code Set<Semester>} and set it to the {@code Module} that we are building.
+     */
+    public ModuleBuilder withSemesters(String... semesters) {
+        requireNonNull(semesters);
+
+        this.semesters = Arrays.stream(semesters).map(Semester::new).collect(Collectors.toSet());
+        return this;
+    }
+
+    /**
+     * Sets the {@code semesters} of the {@code Module} that we are building.
+     */
+    public ModuleBuilder withSemesters(Set<Semester> semesters) {
+        this.semesters = new HashSet<>(semesters);
+        return this;
+    }
+
+    /**
+     * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code Module} that we are building.
+     */
+    public ModuleBuilder withTags(String... tags) {
+        this.tags = SampleDataUtil.getTagSet(tags);
+        return this;
+    }
+
+    public Module build() {
+        return new Module(code, name, credits, semesters, corequisites, tags);
+    }
+
+}
diff --git a/src/test/java/pwe/planner/testutil/ModuleUtil.java b/src/test/java/pwe/planner/testutil/ModuleUtil.java
new file mode 100644
index 000000000000..971ef4cae88a
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/ModuleUtil.java
@@ -0,0 +1,79 @@
+package pwe.planner.testutil;
+
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_COREQUISITE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.logic.commands.EditCommand.EditModuleDescriptor;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+/**
+ * A utility class for Module.
+ */
+public class ModuleUtil {
+
+    /**
+     * Returns an add command string for adding the {@code module}.
+     */
+    public static String getAddCommand(Module module) {
+        return AddCommand.COMMAND_WORD + " " + getModuleDetails(module);
+    }
+
+    /**
+     * Returns the part of command string for the given {@code module}'s details.
+     */
+    public static String getModuleDetails(Module module) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(PREFIX_CODE + module.getCode().value + " ")
+                .append(PREFIX_NAME + module.getName().fullName + " ")
+                .append(PREFIX_CREDITS + module.getCredits().value + " ");
+        module.getSemesters().stream().forEach(s -> sb.append(PREFIX_SEMESTER + s.plannerSemester + " "));
+        module.getCorequisites().stream().forEach(s -> sb.append(PREFIX_COREQUISITE + s.value + " "));
+        module.getTags().stream().forEach(s -> sb.append(PREFIX_TAG + s.tagName + " "));
+        return sb.toString();
+    }
+
+    /**
+     * Returns the part of command string for the given {@code EditModuleDescriptor}'s details.
+     */
+    public static String getEditModuleDescriptorDetails(EditModuleDescriptor descriptor) {
+        StringBuilder sb = new StringBuilder();
+        descriptor.getCode().ifPresent(code -> sb.append(PREFIX_CODE).append(code.value).append(' '));
+        descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(' '));
+        descriptor.getCredits().ifPresent(credits -> sb.append(PREFIX_CREDITS).append(credits.value).append(' '));
+        if (descriptor.getSemesters().isPresent()) {
+            Set<Semester> semesters = descriptor.getSemesters().get();
+            if (semesters.isEmpty()) {
+                sb.append(PREFIX_SEMESTER).append(' ');
+            } else {
+                semesters.forEach(s -> sb.append(PREFIX_SEMESTER).append(s.plannerSemester).append(' '));
+            }
+        }
+        if (descriptor.getCorequisites().isPresent()) {
+            Set<Code> corequisites = descriptor.getCorequisites().get();
+            if (corequisites.isEmpty()) {
+                sb.append(PREFIX_COREQUISITE).append(' ');
+            } else {
+                corequisites.forEach(s -> sb.append(PREFIX_COREQUISITE).append(s.value).append(' '));
+            }
+        }
+        if (descriptor.getTags().isPresent()) {
+            Set<Tag> tags = descriptor.getTags().get();
+            if (tags.isEmpty()) {
+                sb.append(PREFIX_TAG).append(' ');
+            } else {
+                tags.forEach(s -> sb.append(PREFIX_TAG).append(s.tagName).append(' '));
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/test/java/pwe/planner/testutil/RequirementCategoryBuilder.java b/src/test/java/pwe/planner/testutil/RequirementCategoryBuilder.java
new file mode 100644
index 000000000000..12ce4a941642
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/RequirementCategoryBuilder.java
@@ -0,0 +1,68 @@
+package pwe.planner.testutil;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.requirement.RequirementCategory;
+import pwe.planner.model.util.SampleDataUtil;
+
+/**
+ * A utility class to help with building RequirementCategory objects.
+ */
+public class RequirementCategoryBuilder {
+
+    public static final String DEFAULT_NAME = "Computing Foundation";
+    public static final String DEFAULT_CREDITS = "36";
+
+    private Name name;
+    private Credits credits;
+    private Set<Code> codeSet;
+
+    public RequirementCategoryBuilder() {
+        name = new Name(DEFAULT_NAME);
+        credits = new Credits(DEFAULT_CREDITS);
+        codeSet = new HashSet<>();
+    }
+
+    /**
+     * Initializes the RequirementCategoryBuilder with the data of {@code requirementCategoryToCopy}.
+     */
+    public RequirementCategoryBuilder(RequirementCategory requirementCategoryToCopy) {
+        name = requirementCategoryToCopy.getName();
+        credits = requirementCategoryToCopy.getCredits();
+        codeSet = new HashSet<>(requirementCategoryToCopy.getCodeSet());
+    }
+
+    /**
+     * Sets the {@code Name} of the {@code RequirementCategory} that we are building.
+     */
+    public RequirementCategoryBuilder withName(String name) {
+        this.name = new Name(name);
+        return this;
+    }
+
+    /**
+     * Parses the {@code codes} into a {@code Set<Code>} and set it to the {@code RequirementCategory} that we are
+     * building.
+     */
+    public RequirementCategoryBuilder withCodes(String... codes) {
+        this.codeSet = SampleDataUtil.getCodeSet(codes);
+        return this;
+    }
+
+    /**
+     * Sets the {@code Credits} of the {@code RequirementCategory} that we are building.
+     */
+    public RequirementCategoryBuilder withCredits(String credits) {
+        this.credits = new Credits(credits);
+        return this;
+    }
+
+    public RequirementCategory build() {
+        return new RequirementCategory(name, credits, codeSet);
+    }
+
+}
diff --git a/src/test/java/pwe/planner/testutil/RequirementUtil.java b/src/test/java/pwe/planner/testutil/RequirementUtil.java
new file mode 100644
index 000000000000..12d44227b5b4
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/RequirementUtil.java
@@ -0,0 +1,39 @@
+package pwe.planner.testutil;
+
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+
+import java.util.Set;
+
+import pwe.planner.logic.commands.RequirementAddCommand;
+import pwe.planner.logic.commands.RequirementRemoveCommand;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Name;
+
+/**
+ * A utility class for RequirementCategory.
+ */
+public class RequirementUtil {
+
+    /**
+     * Returns an remove command string for removing the {@code code}.
+     */
+    public static String getRequirementRemoveCommand(Set<Code> codeSet) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(RequirementRemoveCommand.COMMAND_WORD).append(" ");
+        codeSet.stream().forEach(s -> sb.append(PREFIX_CODE).append(s.value).append(" "));
+        return sb.toString();
+    }
+
+    /**
+     * Returns an add command string for adding the {@code code}.
+     */
+    public static String getRequirementAddCommand(Name requirementCategoryName, Set<Code> codeSet) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(RequirementAddCommand.COMMAND_WORD).append(" ");
+        sb.append(PREFIX_NAME).append(requirementCategoryName.toString()).append(" ");
+        codeSet.stream().forEach(s -> sb.append(PREFIX_CODE).append(s.value).append(" "));
+        return sb.toString();
+    }
+
+}
diff --git a/src/test/java/seedu/address/testutil/SerializableTestClass.java b/src/test/java/pwe/planner/testutil/SerializableTestClass.java
similarity index 98%
rename from src/test/java/seedu/address/testutil/SerializableTestClass.java
rename to src/test/java/pwe/planner/testutil/SerializableTestClass.java
index f5a66340489f..de0eda7f45a4 100644
--- a/src/test/java/seedu/address/testutil/SerializableTestClass.java
+++ b/src/test/java/pwe/planner/testutil/SerializableTestClass.java
@@ -1,4 +1,4 @@
-package seedu.address.testutil;
+package pwe.planner.testutil;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
diff --git a/src/test/java/seedu/address/testutil/TestUtil.java b/src/test/java/pwe/planner/testutil/TestUtil.java
similarity index 61%
rename from src/test/java/seedu/address/testutil/TestUtil.java
rename to src/test/java/pwe/planner/testutil/TestUtil.java
index 896d103eb0b5..eb31cb04f91e 100644
--- a/src/test/java/seedu/address/testutil/TestUtil.java
+++ b/src/test/java/pwe/planner/testutil/TestUtil.java
@@ -1,13 +1,13 @@
-package seedu.address.testutil;
+package pwe.planner.testutil;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import seedu.address.commons.core.index.Index;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
 
 /**
  * A utility class for test cases.
@@ -33,23 +33,23 @@ public static Path getFilePathInSandboxFolder(String fileName) {
     }
 
     /**
-     * Returns the middle index of the person in the {@code model}'s person list.
+     * Returns the middle index of the module in the {@code model}'s module list.
      */
     public static Index getMidIndex(Model model) {
-        return Index.fromOneBased(model.getFilteredPersonList().size() / 2);
+        return Index.fromOneBased(model.getFilteredModuleList().size() / 2);
     }
 
     /**
-     * Returns the last index of the person in the {@code model}'s person list.
+     * Returns the last index of the module in the {@code model}'s module list.
      */
     public static Index getLastIndex(Model model) {
-        return Index.fromOneBased(model.getFilteredPersonList().size());
+        return Index.fromOneBased(model.getFilteredModuleList().size());
     }
 
     /**
-     * Returns the person in the {@code model}'s person list at {@code index}.
+     * Returns the module in the {@code model}'s module list at {@code index}.
      */
-    public static Person getPerson(Model model, Index index) {
-        return model.getFilteredPersonList().get(index.getZeroBased());
+    public static Module getModule(Model model, Index index) {
+        return model.getFilteredModuleList().get(index.getZeroBased());
     }
 }
diff --git a/src/test/java/pwe/planner/testutil/TypicalDegreePlanners.java b/src/test/java/pwe/planner/testutil/TypicalDegreePlanners.java
new file mode 100644
index 000000000000..035f1f9bbb08
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/TypicalDegreePlanners.java
@@ -0,0 +1,62 @@
+package pwe.planner.testutil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import pwe.planner.model.Application;
+import pwe.planner.model.planner.DegreePlanner;
+
+/**
+ * A utility class containing a list of {@code DegreePlanner} objects to be used in tests.
+ */
+public class TypicalDegreePlanners {
+
+    public static final DegreePlanner YEAR_1_SEMESTER_1 = new DegreePlannerBuilder()
+            .withYear("1")
+            .withSemester("1")
+            .withCodes("CS1231", "CS2100", "CS1010", "CS2040C", "CS2102")
+            .build();
+
+    public static final DegreePlanner YEAR_1_SEMESTER_2 = new DegreePlannerBuilder()
+            .withYear("1")
+            .withSemester("2")
+            .build();
+
+    public static final DegreePlanner YEAR_2_SEMESTER_1 = new DegreePlannerBuilder()
+            .withYear("2")
+            .withSemester("1")
+            .build();
+
+    public static final DegreePlanner YEAR_2_SEMESTER_2 = new DegreePlannerBuilder()
+            .withYear("2")
+            .withSemester("2")
+            .build();
+
+    public static final DegreePlanner YEAR_3_SEMESTER_1 = new DegreePlannerBuilder()
+            .withYear("3")
+            .withSemester("1")
+            .build();
+
+    public static final DegreePlanner YEAR_3_SEMESTER_2 = new DegreePlannerBuilder()
+            .withYear("3")
+            .withSemester("2")
+            .build();
+
+    /**
+     * Returns an {@code Application} with all the typical degree planners.
+     */
+    public static ObservableList<DegreePlanner> getTypicalDegreePlannerList() {
+        Application degreePlannerList = new Application();
+        for (DegreePlanner degreePlanner : getTypicalDegreePlanners()) {
+            degreePlannerList.addDegreePlanner(degreePlanner);
+        }
+        return degreePlannerList.getDegreePlannerList();
+    }
+
+    public static List<DegreePlanner> getTypicalDegreePlanners() {
+        return new ArrayList<>(Arrays.asList(YEAR_1_SEMESTER_1, YEAR_1_SEMESTER_2, YEAR_2_SEMESTER_1, YEAR_2_SEMESTER_2,
+                YEAR_3_SEMESTER_1, YEAR_3_SEMESTER_2));
+    }
+}
diff --git a/src/test/java/pwe/planner/testutil/TypicalIndexes.java b/src/test/java/pwe/planner/testutil/TypicalIndexes.java
new file mode 100644
index 000000000000..1b60949c9a3a
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/TypicalIndexes.java
@@ -0,0 +1,12 @@
+package pwe.planner.testutil;
+
+import pwe.planner.commons.core.index.Index;
+
+/**
+ * A utility class containing a list of {@code Index} objects to be used in tests.
+ */
+public class TypicalIndexes {
+    public static final Index INDEX_FIRST_MODULE = Index.fromOneBased(1);
+    public static final Index INDEX_SECOND_MODULE = Index.fromOneBased(2);
+    public static final Index INDEX_THIRD_MODULE = Index.fromOneBased(3);
+}
diff --git a/src/test/java/pwe/planner/testutil/TypicalModules.java b/src/test/java/pwe/planner/testutil/TypicalModules.java
new file mode 100644
index 000000000000..36686ebe8503
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/TypicalModules.java
@@ -0,0 +1,135 @@
+package pwe.planner.testutil;
+
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_AMY_ONE;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_AMY_TWO;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_BOB_FOUR;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_BOB_THREE;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import pwe.planner.model.Application;
+import pwe.planner.model.module.Module;
+
+/**
+ * A utility class containing a list of {@code Module} objects to be used in tests.
+ */
+public class TypicalModules {
+
+    public static final Module ALICE = new ModuleBuilder()
+            .withCode("CS1010")
+            .withName("Alice Pauline")
+            .withCredits("0")
+            .withSemesters("1", "2", "4")
+            .withTags("friends")
+            .build();
+
+    public static final Module BENSON = new ModuleBuilder()
+            .withCode("CS1231")
+            .withName("Benson Meier")
+            .withCredits("1")
+            .withSemesters("1", "2")
+            .withCorequisites("CS2102")
+            .withTags("owesMoney", "friends")
+            .build();
+
+    public static final Module CARL = new ModuleBuilder()
+            .withCode("CS2040C")
+            .withName("Carl Kurz")
+            .withCredits("2")
+            .withSemesters("1", "2")
+            .build();
+
+    public static final Module DANIEL = new ModuleBuilder()
+            .withCode("CS2100")
+            .withName("Daniel Meier")
+            .withCredits("3")
+            .withSemesters("1", "2")
+            .withTags("friends")
+            .build();
+
+    public static final Module ELLE = new ModuleBuilder()
+            .withCode("CS2101")
+            .withName("Elle Meyer")
+            .withCredits("4")
+            .withSemesters("1", "2")
+            .build();
+
+    public static final Module FIONA = new ModuleBuilder()
+            .withCode("CS2102")
+            .withName("Fiona Kunz")
+            .withCredits("5")
+            .withSemesters("1")
+            .withCorequisites("CS1231")
+            .build();
+
+    public static final Module GEORGE = new ModuleBuilder()
+            .withCode("CS2105")
+            .withName("George Best")
+            .withCredits("6")
+            .withSemesters("1", "2")
+            .build();
+
+    // Manually added
+    public static final Module HOON = new ModuleBuilder()
+            .withName("Hoon Meier")
+            .withCredits("7")
+            .withCode("CS2106")
+            .withSemesters("3")
+            .build();
+
+    public static final Module IDA = new ModuleBuilder()
+            .withName("Ida Mueller")
+            .withCredits("8")
+            .withCode("CS2107")
+            .withSemesters("4")
+            .build();
+
+    // Manually added - Module's details found in {@code CommandTestUtil}
+    public static final Module AMY = new ModuleBuilder()
+            .withCode(VALID_CODE_AMY)
+            .withName(VALID_NAME_AMY)
+            .withCredits(VALID_CREDITS_AMY)
+            .withSemesters(VALID_SEMESTER_AMY_ONE, VALID_SEMESTER_AMY_TWO)
+            .withTags(VALID_TAG_FRIEND)
+            .build();
+
+    public static final Module BOB = new ModuleBuilder()
+            .withCode(VALID_CODE_BOB)
+            .withName(VALID_NAME_BOB)
+            .withCredits(VALID_CREDITS_BOB)
+            .withSemesters(VALID_SEMESTER_BOB_THREE, VALID_SEMESTER_BOB_FOUR)
+            .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
+            .build();
+
+    public static final String KEYWORD_MATCHING_MEIER = PREFIX_NAME + "Meier"; // A keyword that matches MEIER
+
+    private TypicalModules() {} // prevents instantiation
+
+    /**
+     * Returns an {@code Application} with all the typical modules.
+     */
+    public static ObservableList<Module> getTypicalModuleList() {
+        Application moduleList = new Application();
+        for (Module module : getTypicalModules()) {
+            moduleList.addModule(module);
+        }
+        return moduleList.getModuleList();
+    }
+
+
+    public static List<Module> getTypicalModules() {
+        return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE));
+    }
+}
diff --git a/src/test/java/pwe/planner/testutil/TypicalRequirementCategories.java b/src/test/java/pwe/planner/testutil/TypicalRequirementCategories.java
new file mode 100644
index 000000000000..b5660864f684
--- /dev/null
+++ b/src/test/java/pwe/planner/testutil/TypicalRequirementCategories.java
@@ -0,0 +1,75 @@
+package pwe.planner.testutil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import pwe.planner.model.Application;
+import pwe.planner.model.requirement.RequirementCategory;
+
+/**
+ * A utility class containing a list of {@code RequirementCategory} objects to be used in tests.
+ */
+public class TypicalRequirementCategories {
+
+    public static final RequirementCategory COMPUTING_FOUNDATION = new RequirementCategoryBuilder()
+            .withName("Computing Foundation")
+            .withCredits("36")
+            .withCodes("CS2100")
+            .build();
+
+    public static final RequirementCategory INFORMATION_SECURITY_REQUIREMENTS = new RequirementCategoryBuilder()
+            .withName("Information Security Requirements")
+            .withCredits("20")
+            .build();
+
+    public static final RequirementCategory INFORMATION_SECURITY_ELECTIVES = new RequirementCategoryBuilder()
+            .withName("Information Security Electives")
+            .withCredits("12")
+            .build();
+    public static final RequirementCategory COMPUTING_BREADTH = new RequirementCategoryBuilder()
+            .withName("Computing Breadth")
+            .withCredits("20")
+            .build();
+
+    public static final RequirementCategory IT_PROFESSIONALISM = new RequirementCategoryBuilder()
+            .withName("IT Professionalism")
+            .withCredits("8")
+            .build();
+
+    public static final RequirementCategory MATHEMATICS = new RequirementCategoryBuilder()
+            .withName("Mathematics")
+            .withCredits("12")
+            .withCodes("CS1231")
+            .build();
+
+    public static final RequirementCategory GENERAL_EDUCATION = new RequirementCategoryBuilder()
+            .withName("General Education")
+            .withCredits("20")
+            .build();
+
+    public static final RequirementCategory UNRESTRICTED_ELECTIVES = new RequirementCategoryBuilder()
+            .withName("Unrestricted Electives")
+            .withCredits("12")
+            .build();
+
+    private TypicalRequirementCategories() {} // prevents instantiation
+
+    /**
+     * Returns an {@code Application} with all the typical requirement categories.
+     */
+    public static ObservableList<RequirementCategory> getTypicalRequirementCategoriesList() {
+        Application requirementCategoryList = new Application();
+        for (RequirementCategory requirementCategory : getTypicalRequirementCategories()) {
+            requirementCategoryList.addRequirementCategory(requirementCategory);
+        }
+        return requirementCategoryList.getRequirementCategoryList();
+    }
+
+    public static List<RequirementCategory> getTypicalRequirementCategories() {
+        return new ArrayList<>(Arrays.asList(COMPUTING_FOUNDATION, INFORMATION_SECURITY_REQUIREMENTS,
+                INFORMATION_SECURITY_ELECTIVES, COMPUTING_BREADTH, IT_PROFESSIONALISM, MATHEMATICS,
+                GENERAL_EDUCATION, UNRESTRICTED_ELECTIVES));
+    }
+}
diff --git a/src/test/java/seedu/address/ui/BrowserPanelTest.java b/src/test/java/pwe/planner/ui/BrowserPanelTest.java
similarity index 69%
rename from src/test/java/seedu/address/ui/BrowserPanelTest.java
rename to src/test/java/pwe/planner/ui/BrowserPanelTest.java
index b678957f6414..90187da85983 100644
--- a/src/test/java/seedu/address/ui/BrowserPanelTest.java
+++ b/src/test/java/pwe/planner/ui/BrowserPanelTest.java
@@ -1,8 +1,8 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static guitests.guihandles.WebViewUtil.waitUntilBrowserLoaded;
 import static org.junit.Assert.assertEquals;
-import static seedu.address.testutil.TypicalPersons.ALICE;
+import static pwe.planner.testutil.TypicalModules.ALICE;
 
 import java.net.URL;
 
@@ -11,16 +11,16 @@
 
 import guitests.guihandles.BrowserPanelHandle;
 import javafx.beans.property.SimpleObjectProperty;
-import seedu.address.model.person.Person;
+import pwe.planner.model.module.Module;
 
 public class BrowserPanelTest extends GuiUnitTest {
-    private SimpleObjectProperty<Person> selectedPerson = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Module> selectedModule = new SimpleObjectProperty<>();
     private BrowserPanel browserPanel;
     private BrowserPanelHandle browserPanelHandle;
 
     @Before
     public void setUp() {
-        guiRobot.interact(() -> browserPanel = new BrowserPanel(selectedPerson));
+        guiRobot.interact(() -> browserPanel = new BrowserPanel(selectedModule));
         uiPartRule.setUiPart(browserPanel);
 
         browserPanelHandle = new BrowserPanelHandle(browserPanel.getRoot());
@@ -31,11 +31,11 @@ public void display() throws Exception {
         // default web page
         assertEquals(BrowserPanel.DEFAULT_PAGE, browserPanelHandle.getLoadedUrl());
 
-        // associated web page of a person
-        guiRobot.interact(() -> selectedPerson.set(ALICE));
-        URL expectedPersonUrl = new URL(BrowserPanel.SEARCH_PAGE_URL + ALICE.getName().fullName.replaceAll(" ", "%20"));
+        // associated web page of a module
+        guiRobot.interact(() -> selectedModule.set(ALICE));
+        URL expectedModuleUrl = new URL(BrowserPanel.SEARCH_PAGE_URL + ALICE.getName().fullName.replaceAll(" ", "%20"));
 
         waitUntilBrowserLoaded(browserPanelHandle);
-        assertEquals(expectedPersonUrl, browserPanelHandle.getLoadedUrl());
+        assertEquals(expectedModuleUrl, browserPanelHandle.getLoadedUrl());
     }
 }
diff --git a/src/test/java/seedu/address/ui/CommandBoxTest.java b/src/test/java/pwe/planner/ui/CommandBoxTest.java
similarity index 96%
rename from src/test/java/seedu/address/ui/CommandBoxTest.java
rename to src/test/java/pwe/planner/ui/CommandBoxTest.java
index b58d1d7eba2f..8c8177afe561 100644
--- a/src/test/java/seedu/address/ui/CommandBoxTest.java
+++ b/src/test/java/pwe/planner/ui/CommandBoxTest.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
 
@@ -9,9 +9,9 @@
 
 import guitests.guihandles.CommandBoxHandle;
 import javafx.scene.input.KeyCode;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.exceptions.CommandException;
+import pwe.planner.logic.commands.CommandResult;
+import pwe.planner.logic.commands.ListCommand;
+import pwe.planner.logic.commands.exceptions.CommandException;
 
 public class CommandBoxTest extends GuiUnitTest {
 
diff --git a/src/test/java/seedu/address/ui/GuiUnitTest.java b/src/test/java/pwe/planner/ui/GuiUnitTest.java
similarity index 87%
rename from src/test/java/seedu/address/ui/GuiUnitTest.java
rename to src/test/java/pwe/planner/ui/GuiUnitTest.java
index d163c5748337..0849ae6abbb6 100644
--- a/src/test/java/seedu/address/ui/GuiUnitTest.java
+++ b/src/test/java/pwe/planner/ui/GuiUnitTest.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import java.util.Optional;
 
@@ -7,10 +7,10 @@
 import guitests.GuiRobot;
 import guitests.guihandles.exceptions.NodeNotFoundException;
 import javafx.scene.Node;
-import seedu.address.ui.testutil.UiPartRule;
+import pwe.planner.ui.testutil.UiPartRule;
 
 /**
- * A GUI unit test class for AddressBook.
+ * A GUI unit test class for Application.
  */
 public abstract class GuiUnitTest {
     @Rule
diff --git a/src/test/java/seedu/address/ui/HelpWindowTest.java b/src/test/java/pwe/planner/ui/HelpWindowTest.java
similarity index 96%
rename from src/test/java/seedu/address/ui/HelpWindowTest.java
rename to src/test/java/pwe/planner/ui/HelpWindowTest.java
index da285ab5b2ba..411ee80bd851 100644
--- a/src/test/java/seedu/address/ui/HelpWindowTest.java
+++ b/src/test/java/pwe/planner/ui/HelpWindowTest.java
@@ -1,10 +1,10 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
-import static seedu.address.ui.HelpWindow.USERGUIDE_FILE_PATH;
+import static pwe.planner.ui.HelpWindow.USERGUIDE_FILE_PATH;
 
 import java.net.URL;
 
diff --git a/src/test/java/seedu/address/ui/ListElementPointerTest.java b/src/test/java/pwe/planner/ui/ListElementPointerTest.java
similarity index 99%
rename from src/test/java/seedu/address/ui/ListElementPointerTest.java
rename to src/test/java/pwe/planner/ui/ListElementPointerTest.java
index 0557e1d94d6a..4174d1e54ed6 100644
--- a/src/test/java/seedu/address/ui/ListElementPointerTest.java
+++ b/src/test/java/pwe/planner/ui/ListElementPointerTest.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/seedu/address/ui/MainWindowCloseTest.java b/src/test/java/pwe/planner/ui/MainWindowCloseTest.java
similarity index 83%
rename from src/test/java/seedu/address/ui/MainWindowCloseTest.java
rename to src/test/java/pwe/planner/ui/MainWindowCloseTest.java
index e63967f1b926..7cc6eff3eda9 100644
--- a/src/test/java/seedu/address/ui/MainWindowCloseTest.java
+++ b/src/test/java/pwe/planner/ui/MainWindowCloseTest.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -15,11 +15,11 @@
 import guitests.guihandles.StageHandle;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import seedu.address.logic.LogicManager;
-import seedu.address.model.ModelManager;
-import seedu.address.storage.JsonAddressBookStorage;
-import seedu.address.storage.JsonUserPrefsStorage;
-import seedu.address.storage.StorageManager;
+import pwe.planner.logic.LogicManager;
+import pwe.planner.model.ModelManager;
+import pwe.planner.storage.JsonApplicationStorage;
+import pwe.planner.storage.JsonUserPrefsStorage;
+import pwe.planner.storage.StorageManager;
 
 /**
  * Contains tests for closing of the {@code MainWindow}.
@@ -34,9 +34,12 @@ public class MainWindowCloseTest extends GuiUnitTest {
 
     @Before
     public void setUp() throws Exception {
-        JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(temporaryFolder.newFile().toPath());
+        JsonApplicationStorage jsonApplicationStorage =
+                new JsonApplicationStorage(temporaryFolder.newFile().toPath(), temporaryFolder.newFile().toPath(),
+                        temporaryFolder.newFile().toPath());
         JsonUserPrefsStorage jsonUserPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.newFile().toPath());
-        StorageManager storageManager = new StorageManager(jsonAddressBookStorage, jsonUserPrefsStorage);
+        StorageManager storageManager =
+                new StorageManager(jsonApplicationStorage, jsonUserPrefsStorage);
         FxToolkit.setupStage(stage -> {
             this.stage = stage;
             mainWindow = new MainWindow(stage, new LogicManager(new ModelManager(), storageManager));
diff --git a/src/test/java/pwe/planner/ui/ModuleCardTest.java b/src/test/java/pwe/planner/ui/ModuleCardTest.java
new file mode 100644
index 000000000000..d2b443a6eeae
--- /dev/null
+++ b/src/test/java/pwe/planner/ui/ModuleCardTest.java
@@ -0,0 +1,72 @@
+package pwe.planner.ui;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static pwe.planner.ui.testutil.GuiTestAssert.assertCardDisplaysModule;
+
+import org.junit.Test;
+
+import guitests.guihandles.ModuleCardHandle;
+import pwe.planner.model.module.Module;
+import pwe.planner.testutil.ModuleBuilder;
+
+public class ModuleCardTest extends GuiUnitTest {
+
+    @Test
+    public void display() {
+        // no tags
+        Module moduleWithNoTags = new ModuleBuilder().withTags(new String[0]).build();
+        ModuleCard moduleCard = new ModuleCard(moduleWithNoTags, 1);
+        uiPartRule.setUiPart(moduleCard);
+        assertCardDisplay(moduleCard, moduleWithNoTags, 1);
+
+        // with tags
+        Module moduleWithTags = new ModuleBuilder().build();
+        moduleCard = new ModuleCard(moduleWithTags, 2);
+        uiPartRule.setUiPart(moduleCard);
+        assertCardDisplay(moduleCard, moduleWithTags, 2);
+    }
+
+    @Test
+    public void equals() {
+        Module module = new ModuleBuilder().build();
+        ModuleCard moduleCard = new ModuleCard(module, 0);
+
+        // same module, same index -> returns true
+        ModuleCard copy = new ModuleCard(module, 0);
+        assertTrue(moduleCard.equals(copy));
+
+        // same object -> returns true
+        assertTrue(moduleCard.equals(moduleCard));
+
+        // null -> returns false
+        assertFalse(moduleCard.equals(null));
+
+        // different types -> returns false
+        assertFalse(moduleCard.equals(0));
+
+        // different module, same index -> returns false
+        Module differentModule = new ModuleBuilder().withName("differentName").build();
+        assertFalse(moduleCard.equals(new ModuleCard(differentModule, 0)));
+
+        // same module, different index -> returns false
+        assertFalse(moduleCard.equals(new ModuleCard(module, 1)));
+    }
+
+    /**
+     * Asserts that {@code moduleCard} displays the details of {@code expectedModule} correctly and matches
+     * {@code expectedId}.
+     */
+    private void assertCardDisplay(ModuleCard moduleCard, Module expectedModule, int expectedId) {
+        guiRobot.pauseForHuman();
+
+        ModuleCardHandle moduleCardHandle = new ModuleCardHandle(moduleCard.getRoot());
+
+        // verify id is displayed correctly
+        assertEquals(Integer.toString(expectedId) + ". ", moduleCardHandle.getId());
+
+        // verify module details are displayed correctly
+        assertCardDisplaysModule(expectedModule, moduleCardHandle);
+    }
+}
diff --git a/src/test/java/pwe/planner/ui/ModuleListPanelTest.java b/src/test/java/pwe/planner/ui/ModuleListPanelTest.java
new file mode 100644
index 000000000000..f14fd88f5db5
--- /dev/null
+++ b/src/test/java/pwe/planner/ui/ModuleListPanelTest.java
@@ -0,0 +1,107 @@
+package pwe.planner.ui;
+
+import static java.time.Duration.ofMillis;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_SECOND_MODULE;
+import static pwe.planner.testutil.TypicalModules.getTypicalModules;
+import static pwe.planner.ui.testutil.GuiTestAssert.assertCardDisplaysModule;
+import static pwe.planner.ui.testutil.GuiTestAssert.assertCardEquals;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.junit.Test;
+
+import guitests.guihandles.ModuleCardHandle;
+import guitests.guihandles.ModuleListPanelHandle;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+
+public class ModuleListPanelTest extends GuiUnitTest {
+    private static final ObservableList<Module> TYPICAL_MODULES = FXCollections.observableList(getTypicalModules());
+
+    private static final long CARD_CREATION_AND_DELETION_TIMEOUT = 2500;
+
+    private final SimpleObjectProperty<Module> selectedModule = new SimpleObjectProperty<>();
+    private ModuleListPanelHandle moduleListPanelHandle;
+
+    @Test
+    public void display() {
+        initUi(TYPICAL_MODULES);
+
+        for (int i = 0; i < TYPICAL_MODULES.size(); i++) {
+            moduleListPanelHandle.navigateToCard(TYPICAL_MODULES.get(i));
+            Module expectedModule = TYPICAL_MODULES.get(i);
+            ModuleCardHandle actualCard = moduleListPanelHandle.getModuleCardHandle(i);
+
+            assertCardDisplaysModule(expectedModule, actualCard);
+            assertEquals(Integer.toString(i + 1) + ". ", actualCard.getId());
+        }
+    }
+
+    @Test
+    public void selection_modelSelectedModuleChanged_selectionChanges() {
+        initUi(TYPICAL_MODULES);
+        Module secondModule = TYPICAL_MODULES.get(INDEX_SECOND_MODULE.getZeroBased());
+        guiRobot.interact(() -> selectedModule.set(secondModule));
+        guiRobot.pauseForHuman();
+
+        ModuleCardHandle expectedModule = moduleListPanelHandle.getModuleCardHandle(INDEX_SECOND_MODULE.getZeroBased());
+        ModuleCardHandle selectedModule = moduleListPanelHandle.getHandleToSelectedCard();
+        assertCardEquals(expectedModule, selectedModule);
+    }
+
+    /**
+     * Verifies that creating and deleting large number of modules in {@code ModuleListPanel} requires lesser than
+     * {@code CARD_CREATION_AND_DELETION_TIMEOUT} milliseconds to execute.
+     */
+    @Test
+    public void performanceTest() {
+        ObservableList<Module> backingList = createBackingList(10000);
+
+        assertTimeoutPreemptively(ofMillis(CARD_CREATION_AND_DELETION_TIMEOUT), () -> {
+            initUi(backingList);
+            guiRobot.interact(backingList::clear);
+        }, "Creation and deletion of module cards exceeded time limit");
+    }
+
+    /**
+     * Returns a list of modules containing {@code moduleCount} modules that is used to populate the
+     * {@code ModuleListPanel}.
+     */
+    private ObservableList<Module> createBackingList(int moduleCount) {
+        ObservableList<Module> backingList = FXCollections.observableArrayList();
+        for (int i = 0; i < moduleCount; i++) {
+            Name name = new Name(i + "a");
+            Credits credits = new Credits("999");
+            Code code = new Code("CS1010");
+            Set<Code> corequisites = Collections.emptySet();
+            Set<Semester> semesters = Collections.emptySet();
+            Set<Tag> tags = Collections.emptySet();
+            Module module = new Module(code, name, credits, semesters, corequisites, tags);
+            backingList.add(module);
+        }
+        return backingList;
+    }
+
+    /**
+     * Initializes {@code moduleListPanelHandle} with a {@code ModuleListPanel} backed by {@code backingList}.
+     * Also shows the {@code Stage} that displays only {@code ModuleListPanel}.
+     */
+    private void initUi(ObservableList<Module> backingList) {
+        ModuleListPanel moduleListPanel =
+                new ModuleListPanel(backingList, selectedModule, selectedModule::set);
+        uiPartRule.setUiPart(moduleListPanel);
+
+        moduleListPanelHandle = new ModuleListPanelHandle(getChildNode(moduleListPanel.getRoot(),
+                ModuleListPanelHandle.MODULE_LIST_VIEW_ID));
+    }
+}
diff --git a/src/test/java/seedu/address/ui/ResultDisplayTest.java b/src/test/java/pwe/planner/ui/ResultDisplayTest.java
similarity index 97%
rename from src/test/java/seedu/address/ui/ResultDisplayTest.java
rename to src/test/java/pwe/planner/ui/ResultDisplayTest.java
index 23a47b651881..e177d96c2bd3 100644
--- a/src/test/java/seedu/address/ui/ResultDisplayTest.java
+++ b/src/test/java/pwe/planner/ui/ResultDisplayTest.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/seedu/address/ui/StatusBarFooterTest.java b/src/test/java/pwe/planner/ui/StatusBarFooterTest.java
similarity index 80%
rename from src/test/java/seedu/address/ui/StatusBarFooterTest.java
rename to src/test/java/pwe/planner/ui/StatusBarFooterTest.java
index f044599b286a..e493bdd2a4df 100644
--- a/src/test/java/seedu/address/ui/StatusBarFooterTest.java
+++ b/src/test/java/pwe/planner/ui/StatusBarFooterTest.java
@@ -1,9 +1,9 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.ui.StatusBarFooter.SYNC_STATUS_INITIAL;
-import static seedu.address.ui.StatusBarFooter.SYNC_STATUS_UPDATED;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.ui.StatusBarFooter.SYNC_STATUS_INITIAL;
+import static pwe.planner.ui.StatusBarFooter.SYNC_STATUS_UPDATED;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -18,18 +18,18 @@
 import org.junit.Test;
 
 import guitests.guihandles.StatusBarFooterHandle;
-import seedu.address.model.AddressBook;
+import pwe.planner.model.Application;
 
 public class StatusBarFooterTest extends GuiUnitTest {
 
     private static final Path STUB_SAVE_LOCATION = Paths.get("Stub");
-    private static final Path RELATIVE_PATH = Paths.get(".");
+    private static final Path RELATIVE_PATH = Paths.get("");
 
     private static final Clock originalClock = StatusBarFooter.getClock();
     private static final Clock injectedClock = Clock.fixed(Instant.now(), ZoneId.systemDefault());
 
     private StatusBarFooterHandle statusBarFooterHandle;
-    private final AddressBook addressBook = new AddressBook();
+    private final Application application = new Application();
 
     @BeforeClass
     public static void setUpBeforeClass() {
@@ -45,7 +45,7 @@ public static void tearDownAfterClass() {
 
     @Before
     public void setUp() {
-        StatusBarFooter statusBarFooter = new StatusBarFooter(STUB_SAVE_LOCATION, addressBook);
+        StatusBarFooter statusBarFooter = new StatusBarFooter(STUB_SAVE_LOCATION, application);
         uiPartRule.setUiPart(statusBarFooter);
 
         statusBarFooterHandle = new StatusBarFooterHandle(statusBarFooter.getRoot());
@@ -56,8 +56,8 @@ public void display() {
         // initial state
         assertStatusBarContent(RELATIVE_PATH.resolve(STUB_SAVE_LOCATION).toString(), SYNC_STATUS_INITIAL);
 
-        // after address book is updated
-        guiRobot.interact(() -> addressBook.addPerson(ALICE));
+        // after application is updated
+        guiRobot.interact(() -> application.addModule(ALICE));
         assertStatusBarContent(RELATIVE_PATH.resolve(STUB_SAVE_LOCATION).toString(),
                 String.format(SYNC_STATUS_UPDATED, new Date(injectedClock.millis()).toString()));
     }
diff --git a/src/test/java/seedu/address/ui/TestFxmlObject.java b/src/test/java/pwe/planner/ui/TestFxmlObject.java
similarity index 96%
rename from src/test/java/seedu/address/ui/TestFxmlObject.java
rename to src/test/java/pwe/planner/ui/TestFxmlObject.java
index 5ecd82656f25..4c738fdc002a 100644
--- a/src/test/java/seedu/address/ui/TestFxmlObject.java
+++ b/src/test/java/pwe/planner/ui/TestFxmlObject.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import javafx.beans.DefaultProperty;
 
diff --git a/src/test/java/seedu/address/ui/UiPartTest.java b/src/test/java/pwe/planner/ui/UiPartTest.java
similarity index 97%
rename from src/test/java/seedu/address/ui/UiPartTest.java
rename to src/test/java/pwe/planner/ui/UiPartTest.java
index 00bffd0d5608..57b9741e385f 100644
--- a/src/test/java/seedu/address/ui/UiPartTest.java
+++ b/src/test/java/pwe/planner/ui/UiPartTest.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package pwe.planner.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -11,8 +11,8 @@
 import org.junit.rules.TemporaryFolder;
 
 import javafx.fxml.FXML;
-import seedu.address.MainApp;
-import seedu.address.testutil.Assert;
+import pwe.planner.MainApp;
+import pwe.planner.testutil.Assert;
 
 public class UiPartTest {
 
diff --git a/src/test/java/pwe/planner/ui/testutil/GuiTestAssert.java b/src/test/java/pwe/planner/ui/testutil/GuiTestAssert.java
new file mode 100644
index 000000000000..1ff850535947
--- /dev/null
+++ b/src/test/java/pwe/planner/ui/testutil/GuiTestAssert.java
@@ -0,0 +1,73 @@
+package pwe.planner.ui.testutil;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import guitests.guihandles.ModuleCardHandle;
+import guitests.guihandles.ModuleListPanelHandle;
+import guitests.guihandles.ResultDisplayHandle;
+import pwe.planner.model.module.Module;
+
+/**
+ * A set of assertion methods useful for writing GUI tests.
+ */
+public class GuiTestAssert {
+    /**
+     * Asserts that {@code actualCard} displays the same values as {@code expectedCard}.
+     */
+    public static void assertCardEquals(ModuleCardHandle expectedCard, ModuleCardHandle actualCard) {
+        assertEquals(expectedCard.getId(), actualCard.getId());
+        assertEquals(expectedCard.getCode(), actualCard.getCode());
+        assertEquals(expectedCard.getName(), actualCard.getName());
+        assertEquals(expectedCard.getCredits(), actualCard.getCredits());
+        assertEquals(expectedCard.getTags(), actualCard.getTags());
+        assertEquals(expectedCard.getCorequisites(), actualCard.getCorequisites());
+    }
+
+    /**
+     * Asserts that {@code actualCard} displays the details of {@code expectedModule}.
+     */
+    public static void assertCardDisplaysModule(Module expectedModule, ModuleCardHandle actualCard) {
+        assertEquals(expectedModule.getName().fullName, actualCard.getName());
+        assertEquals(expectedModule.getCredits().value, actualCard.getCredits());
+        assertEquals(expectedModule.getCode().value, actualCard.getCode());
+        assertEquals(expectedModule.getTags().stream().map(tag -> tag.tagName).sorted().collect(Collectors.toList()),
+                actualCard.getTags());
+    }
+
+    /**
+     * Asserts that the list in {@code moduleListPanelHandle} displays the details of {@code modules} correctly and
+     * in the correct order.
+     */
+    public static void assertListMatching(ModuleListPanelHandle moduleListPanelHandle, Module... modules) {
+        for (int i = 0; i < modules.length; i++) {
+            moduleListPanelHandle.navigateToCard(i);
+            assertCardDisplaysModule(modules[i], moduleListPanelHandle.getModuleCardHandle(i));
+        }
+    }
+
+    /**
+     * Asserts that the list in {@code moduleListPanelHandle} displays the details of {@code modules} correctly and
+     * in the correct order.
+     */
+    public static void assertListMatching(ModuleListPanelHandle moduleListPanelHandle, List<Module> modules) {
+        assertListMatching(moduleListPanelHandle, modules.toArray(new Module[0]));
+    }
+
+    /**
+     * Asserts the size of the list in {@code moduleListPanelHandle} equals to {@code size}.
+     */
+    public static void assertListSize(ModuleListPanelHandle moduleListPanelHandle, int size) {
+        int numberOfModules = moduleListPanelHandle.getListSize();
+        assertEquals(size, numberOfModules);
+    }
+
+    /**
+     * Asserts the message shown in {@code resultDisplayHandle} equals to {@code expected}.
+     */
+    public static void assertResultMessage(ResultDisplayHandle resultDisplayHandle, String expected) {
+        assertEquals(expected, resultDisplayHandle.getText());
+    }
+}
diff --git a/src/test/java/seedu/address/ui/testutil/StageRule.java b/src/test/java/pwe/planner/ui/testutil/StageRule.java
similarity index 96%
rename from src/test/java/seedu/address/ui/testutil/StageRule.java
rename to src/test/java/pwe/planner/ui/testutil/StageRule.java
index ea65a2bb8b95..c3e4d47f74d0 100644
--- a/src/test/java/seedu/address/ui/testutil/StageRule.java
+++ b/src/test/java/pwe/planner/ui/testutil/StageRule.java
@@ -1,4 +1,4 @@
-package seedu.address.ui.testutil;
+package pwe.planner.ui.testutil;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
diff --git a/src/test/java/seedu/address/ui/testutil/UiPartRule.java b/src/test/java/pwe/planner/ui/testutil/UiPartRule.java
similarity index 92%
rename from src/test/java/seedu/address/ui/testutil/UiPartRule.java
rename to src/test/java/pwe/planner/ui/testutil/UiPartRule.java
index ec8206a546dd..f54afc69a11d 100644
--- a/src/test/java/seedu/address/ui/testutil/UiPartRule.java
+++ b/src/test/java/pwe/planner/ui/testutil/UiPartRule.java
@@ -1,4 +1,4 @@
-package seedu.address.ui.testutil;
+package pwe.planner.ui.testutil;
 
 import java.util.concurrent.TimeoutException;
 
@@ -6,7 +6,7 @@
 
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import seedu.address.ui.UiPart;
+import pwe.planner.ui.UiPart;
 
 /**
  * Provides an isolated stage to test an individual {@code UiPart}.
diff --git a/src/test/java/seedu/address/TestApp.java b/src/test/java/seedu/address/TestApp.java
deleted file mode 100644
index 3d510937d0cb..000000000000
--- a/src/test/java/seedu/address/TestApp.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package seedu.address;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.function.Supplier;
-
-import javafx.stage.Screen;
-import javafx.stage.Stage;
-import seedu.address.commons.core.Config;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.UserPrefs;
-import seedu.address.storage.JsonAddressBookStorage;
-import seedu.address.storage.UserPrefsStorage;
-import seedu.address.testutil.TestUtil;
-import systemtests.ModelHelper;
-
-/**
- * This class is meant to override some properties of MainApp so that it will be suited for
- * testing
- */
-public class TestApp extends MainApp {
-
-    public static final Path SAVE_LOCATION_FOR_TESTING = TestUtil.getFilePathInSandboxFolder("sampleData.json");
-
-    protected static final Path DEFAULT_PREF_FILE_LOCATION_FOR_TESTING =
-            TestUtil.getFilePathInSandboxFolder("pref_testing.json");
-    protected Supplier<ReadOnlyAddressBook> initialDataSupplier = () -> null;
-    protected Path saveFileLocation = SAVE_LOCATION_FOR_TESTING;
-
-    public TestApp() {
-    }
-
-    public TestApp(Supplier<ReadOnlyAddressBook> initialDataSupplier, Path saveFileLocation) {
-        super();
-        this.initialDataSupplier = initialDataSupplier;
-        this.saveFileLocation = saveFileLocation;
-
-        // If some initial local data has been provided, write those to the file
-        if (initialDataSupplier.get() != null) {
-            JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(saveFileLocation);
-            try {
-                jsonAddressBookStorage.saveAddressBook(initialDataSupplier.get());
-            } catch (IOException ioe) {
-                throw new AssertionError(ioe);
-            }
-        }
-    }
-
-    @Override
-    protected Config initConfig(Path configFilePath) {
-        Config config = super.initConfig(configFilePath);
-        config.setUserPrefsFilePath(DEFAULT_PREF_FILE_LOCATION_FOR_TESTING);
-        return config;
-    }
-
-    @Override
-    protected UserPrefs initPrefs(UserPrefsStorage storage) {
-        UserPrefs userPrefs = super.initPrefs(storage);
-        double x = Screen.getPrimary().getVisualBounds().getMinX();
-        double y = Screen.getPrimary().getVisualBounds().getMinY();
-        userPrefs.setGuiSettings(new GuiSettings(600.0, 600.0, (int) x, (int) y));
-        userPrefs.setAddressBookFilePath(saveFileLocation);
-        return userPrefs;
-    }
-
-    /**
-     * Returns a defensive copy of the address book data stored inside the storage file.
-     */
-    public AddressBook readStorageAddressBook() {
-        try {
-            return new AddressBook(storage.readAddressBook().get());
-        } catch (DataConversionException dce) {
-            throw new AssertionError("Data is not in the AddressBook format.", dce);
-        } catch (IOException ioe) {
-            throw new AssertionError("Storage file cannot be found.", ioe);
-        }
-    }
-
-    /**
-     * Returns the file path of the storage file.
-     */
-    public Path getStorageSaveLocation() {
-        return storage.getAddressBookFilePath();
-    }
-
-    /**
-     * Returns a defensive copy of the model.
-     */
-    public Model getModel() {
-        Model copy = new ModelManager((model.getAddressBook()), new UserPrefs());
-        ModelHelper.setFilteredList(copy, model.getFilteredPersonList());
-        return copy;
-    }
-
-    @Override
-    public void start(Stage primaryStage) {
-        ui.start(primaryStage);
-    }
-
-    public static void main(String[] args) {
-        launch(args);
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
deleted file mode 100644
index 771480d0e9a6..000000000000
--- a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
-
-/**
- * Contains integration tests (interaction with the Model) for {@code AddCommand}.
- */
-public class AddCommandIntegrationTest {
-
-    private Model model;
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Before
-    public void setUp() {
-        model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    }
-
-    @Test
-    public void execute_newPerson_success() {
-        Person validPerson = new PersonBuilder().build();
-
-        Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-        expectedModel.addPerson(validPerson);
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(new AddCommand(validPerson), model, commandHistory,
-                String.format(AddCommand.MESSAGE_SUCCESS, validPerson), expectedModel);
-    }
-
-    @Test
-    public void execute_duplicatePerson_throwsCommandException() {
-        Person personInList = model.getAddressBook().getPersonList().get(0);
-        assertCommandFailure(new AddCommand(personInList), model, commandHistory,
-                AddCommand.MESSAGE_DUPLICATE_PERSON);
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
deleted file mode 100644
index f120a897779b..000000000000
--- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.function.Predicate;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddCommandTest {
-
-    private static final CommandHistory EMPTY_COMMAND_HISTORY = new CommandHistory();
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Test
-    public void constructor_nullPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        new AddCommand(null);
-    }
-
-    @Test
-    public void execute_personAcceptedByModel_addSuccessful() throws Exception {
-        ModelStubAcceptingPersonAdded modelStub = new ModelStubAcceptingPersonAdded();
-        Person validPerson = new PersonBuilder().build();
-
-        CommandResult commandResult = new AddCommand(validPerson).execute(modelStub, commandHistory);
-
-        assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, validPerson), commandResult.getFeedbackToUser());
-        assertEquals(Arrays.asList(validPerson), modelStub.personsAdded);
-        assertEquals(EMPTY_COMMAND_HISTORY, commandHistory);
-    }
-
-    @Test
-    public void execute_duplicatePerson_throwsCommandException() throws Exception {
-        Person validPerson = new PersonBuilder().build();
-        AddCommand addCommand = new AddCommand(validPerson);
-        ModelStub modelStub = new ModelStubWithPerson(validPerson);
-
-        thrown.expect(CommandException.class);
-        thrown.expectMessage(AddCommand.MESSAGE_DUPLICATE_PERSON);
-        addCommand.execute(modelStub, commandHistory);
-    }
-
-    @Test
-    public void equals() {
-        Person alice = new PersonBuilder().withName("Alice").build();
-        Person bob = new PersonBuilder().withName("Bob").build();
-        AddCommand addAliceCommand = new AddCommand(alice);
-        AddCommand addBobCommand = new AddCommand(bob);
-
-        // same object -> returns true
-        assertTrue(addAliceCommand.equals(addAliceCommand));
-
-        // same values -> returns true
-        AddCommand addAliceCommandCopy = new AddCommand(alice);
-        assertTrue(addAliceCommand.equals(addAliceCommandCopy));
-
-        // different types -> returns false
-        assertFalse(addAliceCommand.equals(1));
-
-        // null -> returns false
-        assertFalse(addAliceCommand.equals(null));
-
-        // different person -> returns false
-        assertFalse(addAliceCommand.equals(addBobCommand));
-    }
-
-    /**
-     * A default model stub that have all of the methods failing.
-     */
-    private class ModelStub implements Model {
-        @Override
-        public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ReadOnlyUserPrefs getUserPrefs() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public GuiSettings getGuiSettings() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setGuiSettings(GuiSettings guiSettings) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public Path getAddressBookFilePath() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setAddressBookFilePath(Path addressBookFilePath) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void addPerson(Person person) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setAddressBook(ReadOnlyAddressBook newData) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ReadOnlyAddressBook getAddressBook() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean hasPerson(Person person) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void deletePerson(Person target) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setPerson(Person target, Person editedPerson) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ObservableList<Person> getFilteredPersonList() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void updateFilteredPersonList(Predicate<Person> predicate) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean canUndoAddressBook() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean canRedoAddressBook() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void undoAddressBook() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void redoAddressBook() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void commitAddressBook() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ReadOnlyProperty<Person> selectedPersonProperty() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public Person getSelectedPerson() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setSelectedPerson(Person person) {
-            throw new AssertionError("This method should not be called.");
-        }
-    }
-
-    /**
-     * A Model stub that contains a single person.
-     */
-    private class ModelStubWithPerson extends ModelStub {
-        private final Person person;
-
-        ModelStubWithPerson(Person person) {
-            requireNonNull(person);
-            this.person = person;
-        }
-
-        @Override
-        public boolean hasPerson(Person person) {
-            requireNonNull(person);
-            return this.person.isSamePerson(person);
-        }
-    }
-
-    /**
-     * A Model stub that always accept the person being added.
-     */
-    private class ModelStubAcceptingPersonAdded extends ModelStub {
-        final ArrayList<Person> personsAdded = new ArrayList<>();
-
-        @Override
-        public boolean hasPerson(Person person) {
-            requireNonNull(person);
-            return personsAdded.stream().anyMatch(person::isSamePerson);
-        }
-
-        @Override
-        public void addPerson(Person person) {
-            requireNonNull(person);
-            personsAdded.add(person);
-        }
-
-        @Override
-        public void commitAddressBook() {
-            // called by {@code AddCommand#execute()}
-        }
-
-        @Override
-        public ReadOnlyAddressBook getAddressBook() {
-            return new AddressBook();
-        }
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
deleted file mode 100644
index 9255d74e5c6b..000000000000
--- a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Test;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-public class ClearCommandTest {
-
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Test
-    public void execute_emptyAddressBook_success() {
-        Model model = new ModelManager();
-        Model expectedModel = new ModelManager();
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(new ClearCommand(), model, commandHistory, ClearCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-    @Test
-    public void execute_nonEmptyAddressBook_success() {
-        Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-        Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-        expectedModel.setAddressBook(new AddressBook());
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(new ClearCommand(), model, commandHistory, ClearCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
deleted file mode 100644
index eb87ddcfbcf3..000000000000
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-
-/**
- * Contains helper methods for testing commands.
- */
-public class CommandTestUtil {
-
-    public static final String VALID_NAME_AMY = "Amy Bee";
-    public static final String VALID_NAME_BOB = "Bob Choo";
-    public static final String VALID_PHONE_AMY = "11111111";
-    public static final String VALID_PHONE_BOB = "22222222";
-    public static final String VALID_EMAIL_AMY = "amy@example.com";
-    public static final String VALID_EMAIL_BOB = "bob@example.com";
-    public static final String VALID_ADDRESS_AMY = "Block 312, Amy Street 1";
-    public static final String VALID_ADDRESS_BOB = "Block 123, Bobby Street 3";
-    public static final String VALID_TAG_HUSBAND = "husband";
-    public static final String VALID_TAG_FRIEND = "friend";
-
-    public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY;
-    public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB;
-    public static final String PHONE_DESC_AMY = " " + PREFIX_PHONE + VALID_PHONE_AMY;
-    public static final String PHONE_DESC_BOB = " " + PREFIX_PHONE + VALID_PHONE_BOB;
-    public static final String EMAIL_DESC_AMY = " " + PREFIX_EMAIL + VALID_EMAIL_AMY;
-    public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB;
-    public static final String ADDRESS_DESC_AMY = " " + PREFIX_ADDRESS + VALID_ADDRESS_AMY;
-    public static final String ADDRESS_DESC_BOB = " " + PREFIX_ADDRESS + VALID_ADDRESS_BOB;
-    public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_FRIEND;
-    public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_HUSBAND;
-
-    public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names
-    public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
-    public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol
-    public static final String INVALID_ADDRESS_DESC = " " + PREFIX_ADDRESS; // empty string not allowed for addresses
-    public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
-
-    public static final String PREAMBLE_WHITESPACE = "\t  \r  \n";
-    public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
-
-    public static final EditCommand.EditPersonDescriptor DESC_AMY;
-    public static final EditCommand.EditPersonDescriptor DESC_BOB;
-
-    static {
-        DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
-                .withTags(VALID_TAG_FRIEND).build();
-        DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
-                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
-    }
-
-    /**
-     * Executes the given {@code command}, confirms that <br>
-     * - the returned {@link CommandResult} matches {@code expectedCommandResult} <br>
-     * - the {@code actualModel} matches {@code expectedModel} <br>
-     * - the {@code actualCommandHistory} remains unchanged.
-     */
-    public static void assertCommandSuccess(Command command, Model actualModel, CommandHistory actualCommandHistory,
-            CommandResult expectedCommandResult, Model expectedModel) {
-        CommandHistory expectedCommandHistory = new CommandHistory(actualCommandHistory);
-        try {
-            CommandResult result = command.execute(actualModel, actualCommandHistory);
-            assertEquals(expectedCommandResult, result);
-            assertEquals(expectedModel, actualModel);
-            assertEquals(expectedCommandHistory, actualCommandHistory);
-        } catch (CommandException ce) {
-            throw new AssertionError("Execution of command should not fail.", ce);
-        }
-    }
-
-    /**
-     * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandHistory, CommandResult, Model)}
-     * that takes a string {@code expectedMessage}.
-     */
-    public static void assertCommandSuccess(Command command, Model actualModel, CommandHistory actualCommandHistory,
-            String expectedMessage, Model expectedModel) {
-        CommandResult expectedCommandResult = new CommandResult(expectedMessage);
-        assertCommandSuccess(command, actualModel, actualCommandHistory, expectedCommandResult, expectedModel);
-    }
-
-    /**
-     * Executes the given {@code command}, confirms that <br>
-     * - a {@code CommandException} is thrown <br>
-     * - the CommandException message matches {@code expectedMessage} <br>
-     * - the address book, filtered person list and selected person in {@code actualModel} remain unchanged <br>
-     * - {@code actualCommandHistory} remains unchanged.
-     */
-    public static void assertCommandFailure(Command command, Model actualModel, CommandHistory actualCommandHistory,
-            String expectedMessage) {
-        // we are unable to defensively copy the model for comparison later, so we can
-        // only do so by copying its components.
-        AddressBook expectedAddressBook = new AddressBook(actualModel.getAddressBook());
-        List<Person> expectedFilteredList = new ArrayList<>(actualModel.getFilteredPersonList());
-        Person expectedSelectedPerson = actualModel.getSelectedPerson();
-
-        CommandHistory expectedCommandHistory = new CommandHistory(actualCommandHistory);
-
-        try {
-            command.execute(actualModel, actualCommandHistory);
-            throw new AssertionError("The expected CommandException was not thrown.");
-        } catch (CommandException e) {
-            assertEquals(expectedMessage, e.getMessage());
-            assertEquals(expectedAddressBook, actualModel.getAddressBook());
-            assertEquals(expectedFilteredList, actualModel.getFilteredPersonList());
-            assertEquals(expectedSelectedPerson, actualModel.getSelectedPerson());
-            assertEquals(expectedCommandHistory, actualCommandHistory);
-        }
-    }
-
-    /**
-     * Updates {@code model}'s filtered list to show only the person at the given {@code targetIndex} in the
-     * {@code model}'s address book.
-     */
-    public static void showPersonAtIndex(Model model, Index targetIndex) {
-        assertTrue(targetIndex.getZeroBased() < model.getFilteredPersonList().size());
-
-        Person person = model.getFilteredPersonList().get(targetIndex.getZeroBased());
-        final String[] splitName = person.getName().fullName.split("\\s+");
-        model.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
-
-        assertEquals(1, model.getFilteredPersonList().size());
-    }
-
-    /**
-     * Deletes the first person in {@code model}'s filtered list from {@code model}'s address book.
-     */
-    public static void deleteFirstPerson(Model model) {
-        Person firstPerson = model.getFilteredPersonList().get(0);
-        model.deletePerson(firstPerson);
-        model.commitAddressBook();
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
deleted file mode 100644
index f5c987bdceed..000000000000
--- a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Test;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-
-/**
- * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for
- * {@code DeleteCommand}.
- */
-public class DeleteCommandTest {
-
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Test
-    public void execute_validIndexUnfilteredList_success() {
-        Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-
-        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
-
-        ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-        expectedModel.deletePerson(personToDelete);
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(deleteCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_invalidIndexUnfilteredList_throwsCommandException() {
-        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
-        DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
-
-        assertCommandFailure(deleteCommand, model, commandHistory, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-    }
-
-    @Test
-    public void execute_validIndexFilteredList_success() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
-        Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-
-        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
-
-        Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-        expectedModel.deletePerson(personToDelete);
-        expectedModel.commitAddressBook();
-        showNoPerson(expectedModel);
-
-        assertCommandSuccess(deleteCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_invalidIndexFilteredList_throwsCommandException() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
-        Index outOfBoundIndex = INDEX_SECOND_PERSON;
-        // ensures that outOfBoundIndex is still in bounds of address book list
-        assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
-
-        DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
-
-        assertCommandFailure(deleteCommand, model, commandHistory, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-    }
-
-    @Test
-    public void executeUndoRedo_validIndexUnfilteredList_success() throws Exception {
-        Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-        Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-        expectedModel.deletePerson(personToDelete);
-        expectedModel.commitAddressBook();
-
-        // delete -> first person deleted
-        deleteCommand.execute(model, commandHistory);
-
-        // undo -> reverts addressbook back to previous state and filtered person list to show all persons
-        expectedModel.undoAddressBook();
-        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        // redo -> same first person deleted again
-        expectedModel.redoAddressBook();
-        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-    @Test
-    public void executeUndoRedo_invalidIndexUnfilteredList_failure() {
-        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
-        DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
-
-        // execution failed -> address book state not added into model
-        assertCommandFailure(deleteCommand, model, commandHistory, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-
-        // single address book state in model -> undoCommand and redoCommand fail
-        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
-        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
-    }
-
-    /**
-     * 1. Deletes a {@code Person} from a filtered list.
-     * 2. Undo the deletion.
-     * 3. The unfiltered list should be shown now. Verify that the index of the previously deleted person in the
-     * unfiltered list is different from the index at the filtered list.
-     * 4. Redo the deletion. This ensures {@code RedoCommand} deletes the person object regardless of indexing.
-     */
-    @Test
-    public void executeUndoRedo_validIndexFilteredList_samePersonDeleted() throws Exception {
-        DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-        Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-
-        showPersonAtIndex(model, INDEX_SECOND_PERSON);
-        Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        expectedModel.deletePerson(personToDelete);
-        expectedModel.commitAddressBook();
-
-        // delete -> deletes second person in unfiltered person list / first person in filtered person list
-        deleteCommand.execute(model, commandHistory);
-
-        // undo -> reverts addressbook back to previous state and filtered person list to show all persons
-        expectedModel.undoAddressBook();
-        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        assertNotEquals(personToDelete, model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()));
-        // redo -> deletes same second person in unfiltered person list
-        expectedModel.redoAddressBook();
-        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-    @Test
-    public void equals() {
-        DeleteCommand deleteFirstCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-        DeleteCommand deleteSecondCommand = new DeleteCommand(INDEX_SECOND_PERSON);
-
-        // same object -> returns true
-        assertTrue(deleteFirstCommand.equals(deleteFirstCommand));
-
-        // same values -> returns true
-        DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST_PERSON);
-        assertTrue(deleteFirstCommand.equals(deleteFirstCommandCopy));
-
-        // different types -> returns false
-        assertFalse(deleteFirstCommand.equals(1));
-
-        // null -> returns false
-        assertFalse(deleteFirstCommand.equals(null));
-
-        // different person -> returns false
-        assertFalse(deleteFirstCommand.equals(deleteSecondCommand));
-    }
-
-    /**
-     * Updates {@code model}'s filtered list to show no one.
-     */
-    private void showNoPerson(Model model) {
-        model.updateFilteredPersonList(p -> false);
-
-        assertTrue(model.getFilteredPersonList().isEmpty());
-    }
-}
diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
deleted file mode 100644
index 274ccceea15f..000000000000
--- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Test;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.CommandHistory;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-import seedu.address.testutil.PersonBuilder;
-
-/**
- * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for EditCommand.
- */
-public class EditCommandTest {
-
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Test
-    public void execute_allFieldsSpecifiedUnfilteredList_success() {
-        Person editedPerson = new PersonBuilder().build();
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, descriptor);
-
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_someFieldsSpecifiedUnfilteredList_success() {
-        Index indexLastPerson = Index.fromOneBased(model.getFilteredPersonList().size());
-        Person lastPerson = model.getFilteredPersonList().get(indexLastPerson.getZeroBased());
-
-        PersonBuilder personInList = new PersonBuilder(lastPerson);
-        Person editedPerson = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
-                .withTags(VALID_TAG_HUSBAND).build();
-
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build();
-        EditCommand editCommand = new EditCommand(indexLastPerson, descriptor);
-
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.setPerson(lastPerson, editedPerson);
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_noFieldSpecifiedUnfilteredList_success() {
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor());
-        Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_filteredList_success() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
-        Person personInFilteredList = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        Person editedPerson = new PersonBuilder(personInFilteredList).withName(VALID_NAME_BOB).build();
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
-                new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
-
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
-        expectedModel.commitAddressBook();
-
-        assertCommandSuccess(editCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    @Test
-    public void execute_duplicatePersonUnfilteredList_failure() {
-        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(firstPerson).build();
-        EditCommand editCommand = new EditCommand(INDEX_SECOND_PERSON, descriptor);
-
-        assertCommandFailure(editCommand, model, commandHistory, EditCommand.MESSAGE_DUPLICATE_PERSON);
-    }
-
-    @Test
-    public void execute_duplicatePersonFilteredList_failure() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
-        // edit person in filtered list into a duplicate in address book
-        Person personInList = model.getAddressBook().getPersonList().get(INDEX_SECOND_PERSON.getZeroBased());
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
-                new EditPersonDescriptorBuilder(personInList).build());
-
-        assertCommandFailure(editCommand, model, commandHistory, EditCommand.MESSAGE_DUPLICATE_PERSON);
-    }
-
-    @Test
-    public void execute_invalidPersonIndexUnfilteredList_failure() {
-        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build();
-        EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
-
-        assertCommandFailure(editCommand, model, commandHistory, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-    }
-
-    /**
-     * Edit filtered list where index is larger than size of filtered list,
-     * but smaller than size of address book
-     */
-    @Test
-    public void execute_invalidPersonIndexFilteredList_failure() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-        Index outOfBoundIndex = INDEX_SECOND_PERSON;
-        // ensures that outOfBoundIndex is still in bounds of address book list
-        assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
-
-        EditCommand editCommand = new EditCommand(outOfBoundIndex,
-                new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
-
-        assertCommandFailure(editCommand, model, commandHistory, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-    }
-
-    @Test
-    public void executeUndoRedo_validIndexUnfilteredList_success() throws Exception {
-        Person editedPerson = new PersonBuilder().build();
-        Person personToEdit = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, descriptor);
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.setPerson(personToEdit, editedPerson);
-        expectedModel.commitAddressBook();
-
-        // edit -> first person edited
-        editCommand.execute(model, commandHistory);
-
-        // undo -> reverts addressbook back to previous state and filtered person list to show all persons
-        expectedModel.undoAddressBook();
-        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        // redo -> same first person edited again
-        expectedModel.redoAddressBook();
-        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-    @Test
-    public void executeUndoRedo_invalidIndexUnfilteredList_failure() {
-        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build();
-        EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
-
-        // execution failed -> address book state not added into model
-        assertCommandFailure(editCommand, model, commandHistory, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-
-        // single address book state in model -> undoCommand and redoCommand fail
-        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
-        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
-    }
-
-    /**
-     * 1. Edits a {@code Person} from a filtered list.
-     * 2. Undo the edit.
-     * 3. The unfiltered list should be shown now. Verify that the index of the previously edited person in the
-     * unfiltered list is different from the index at the filtered list.
-     * 4. Redo the edit. This ensures {@code RedoCommand} edits the person object regardless of indexing.
-     */
-    @Test
-    public void executeUndoRedo_validIndexFilteredList_samePersonEdited() throws Exception {
-        Person editedPerson = new PersonBuilder().build();
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, descriptor);
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-
-        showPersonAtIndex(model, INDEX_SECOND_PERSON);
-        Person personToEdit = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-        expectedModel.setPerson(personToEdit, editedPerson);
-        expectedModel.commitAddressBook();
-
-        // edit -> edits second person in unfiltered person list / first person in filtered person list
-        editCommand.execute(model, commandHistory);
-
-        // undo -> reverts addressbook back to previous state and filtered person list to show all persons
-        expectedModel.undoAddressBook();
-        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        assertNotEquals(model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()), personToEdit);
-        // redo -> edits same second person in unfiltered person list
-        expectedModel.redoAddressBook();
-        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-    @Test
-    public void equals() {
-        final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DESC_AMY);
-
-        // same values -> returns true
-        EditPersonDescriptor copyDescriptor = new EditPersonDescriptor(DESC_AMY);
-        EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, copyDescriptor);
-        assertTrue(standardCommand.equals(commandWithSameValues));
-
-        // same object -> returns true
-        assertTrue(standardCommand.equals(standardCommand));
-
-        // null -> returns false
-        assertFalse(standardCommand.equals(null));
-
-        // different types -> returns false
-        assertFalse(standardCommand.equals(new ClearCommand()));
-
-        // different index -> returns false
-        assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_PERSON, DESC_AMY)));
-
-        // different descriptor -> returns false
-        assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_PERSON, DESC_BOB)));
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
deleted file mode 100644
index bfa7549c690f..000000000000
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-
-import org.junit.Test;
-
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-
-public class EditPersonDescriptorTest {
-
-    @Test
-    public void equals() {
-        // same values -> returns true
-        EditPersonDescriptor descriptorWithSameValues = new EditPersonDescriptor(DESC_AMY);
-        assertTrue(DESC_AMY.equals(descriptorWithSameValues));
-
-        // same object -> returns true
-        assertTrue(DESC_AMY.equals(DESC_AMY));
-
-        // null -> returns false
-        assertFalse(DESC_AMY.equals(null));
-
-        // different types -> returns false
-        assertFalse(DESC_AMY.equals(5));
-
-        // different values -> returns false
-        assertFalse(DESC_AMY.equals(DESC_BOB));
-
-        // different name -> returns false
-        EditPersonDescriptor editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
-        assertFalse(DESC_AMY.equals(editedAmy));
-
-        // different phone -> returns false
-        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
-        assertFalse(DESC_AMY.equals(editedAmy));
-
-        // different email -> returns false
-        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build();
-        assertFalse(DESC_AMY.equals(editedAmy));
-
-        // different address -> returns false
-        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build();
-        assertFalse(DESC_AMY.equals(editedAmy));
-
-        // different tags -> returns false
-        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
-        assertFalse(DESC_AMY.equals(editedAmy));
-    }
-}
diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
deleted file mode 100644
index a3e4c78f9380..000000000000
--- a/src/test/java/seedu/address/logic/commands/FindCommandTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_PERSONS_LISTED_OVERVIEW;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.CARL;
-import static seedu.address.testutil.TypicalPersons.ELLE;
-import static seedu.address.testutil.TypicalPersons.FIONA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.junit.Test;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-/**
- * Contains integration tests (interaction with the Model) for {@code FindCommand}.
- */
-public class FindCommandTest {
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Test
-    public void equals() {
-        NameContainsKeywordsPredicate firstPredicate =
-                new NameContainsKeywordsPredicate(Collections.singletonList("first"));
-        NameContainsKeywordsPredicate secondPredicate =
-                new NameContainsKeywordsPredicate(Collections.singletonList("second"));
-
-        FindCommand findFirstCommand = new FindCommand(firstPredicate);
-        FindCommand findSecondCommand = new FindCommand(secondPredicate);
-
-        // same object -> returns true
-        assertTrue(findFirstCommand.equals(findFirstCommand));
-
-        // same values -> returns true
-        FindCommand findFirstCommandCopy = new FindCommand(firstPredicate);
-        assertTrue(findFirstCommand.equals(findFirstCommandCopy));
-
-        // different types -> returns false
-        assertFalse(findFirstCommand.equals(1));
-
-        // null -> returns false
-        assertFalse(findFirstCommand.equals(null));
-
-        // different person -> returns false
-        assertFalse(findFirstCommand.equals(findSecondCommand));
-    }
-
-    @Test
-    public void execute_zeroKeywords_noPersonFound() {
-        String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 0);
-        NameContainsKeywordsPredicate predicate = preparePredicate(" ");
-        FindCommand command = new FindCommand(predicate);
-        expectedModel.updateFilteredPersonList(predicate);
-        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
-        assertEquals(Collections.emptyList(), model.getFilteredPersonList());
-    }
-
-    @Test
-    public void execute_multipleKeywords_multiplePersonsFound() {
-        String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 3);
-        NameContainsKeywordsPredicate predicate = preparePredicate("Kurz Elle Kunz");
-        FindCommand command = new FindCommand(predicate);
-        expectedModel.updateFilteredPersonList(predicate);
-        assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
-        assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getFilteredPersonList());
-    }
-
-    /**
-     * Parses {@code userInput} into a {@code NameContainsKeywordsPredicate}.
-     */
-    private NameContainsKeywordsPredicate preparePredicate(String userInput) {
-        return new NameContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+")));
-    }
-}
diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
deleted file mode 100644
index e5235fe4b266..000000000000
--- a/src/test/java/seedu/address/logic/commands/ListCommandTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-/**
- * Contains integration tests (interaction with the Model) and unit tests for ListCommand.
- */
-public class ListCommandTest {
-
-    private Model model;
-    private Model expectedModel;
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Before
-    public void setUp() {
-        model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-        expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
-    }
-
-    @Test
-    public void execute_listIsNotFiltered_showsSameList() {
-        assertCommandSuccess(new ListCommand(), model, commandHistory, ListCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-
-    @Test
-    public void execute_listIsFiltered_showsEverything() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-        assertCommandSuccess(new ListCommand(), model, commandHistory, ListCommand.MESSAGE_SUCCESS, expectedModel);
-    }
-}
diff --git a/src/test/java/seedu/address/logic/commands/RedoCommandTest.java b/src/test/java/seedu/address/logic/commands/RedoCommandTest.java
deleted file mode 100644
index c8aaf714b890..000000000000
--- a/src/test/java/seedu/address/logic/commands/RedoCommandTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.deleteFirstPerson;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-public class RedoCommandTest {
-
-    private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private final CommandHistory commandHistory = new CommandHistory();
-
-    @Before
-    public void setUp() {
-        // set up of both models' undo/redo history
-        deleteFirstPerson(model);
-        deleteFirstPerson(model);
-        model.undoAddressBook();
-        model.undoAddressBook();
-
-        deleteFirstPerson(expectedModel);
-        deleteFirstPerson(expectedModel);
-        expectedModel.undoAddressBook();
-        expectedModel.undoAddressBook();
-    }
-
-    @Test
-    public void execute() {
-        // multiple redoable states in model
-        expectedModel.redoAddressBook();
-        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        // single redoable state in model
-        expectedModel.redoAddressBook();
-        assertCommandSuccess(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        // no redoable state in model
-        assertCommandFailure(new RedoCommand(), model, commandHistory, RedoCommand.MESSAGE_FAILURE);
-    }
-}
diff --git a/src/test/java/seedu/address/logic/commands/SelectCommandTest.java b/src/test/java/seedu/address/logic/commands/SelectCommandTest.java
deleted file mode 100644
index f6be591a4e67..000000000000
--- a/src/test/java/seedu/address/logic/commands/SelectCommandTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Test;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-/**
- * Contains integration tests (interaction with the Model) for {@code SelectCommand}.
- */
-public class SelectCommandTest {
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private CommandHistory commandHistory = new CommandHistory();
-
-    @Test
-    public void execute_validIndexUnfilteredList_success() {
-        Index lastPersonIndex = Index.fromOneBased(model.getFilteredPersonList().size());
-
-        assertExecutionSuccess(INDEX_FIRST_PERSON);
-        assertExecutionSuccess(INDEX_THIRD_PERSON);
-        assertExecutionSuccess(lastPersonIndex);
-    }
-
-    @Test
-    public void execute_invalidIndexUnfilteredList_failure() {
-        Index outOfBoundsIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
-
-        assertExecutionFailure(outOfBoundsIndex, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-    }
-
-    @Test
-    public void execute_validIndexFilteredList_success() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-        showPersonAtIndex(expectedModel, INDEX_FIRST_PERSON);
-
-        assertExecutionSuccess(INDEX_FIRST_PERSON);
-    }
-
-    @Test
-    public void execute_invalidIndexFilteredList_failure() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-        showPersonAtIndex(expectedModel, INDEX_FIRST_PERSON);
-
-        Index outOfBoundsIndex = INDEX_SECOND_PERSON;
-        // ensures that outOfBoundIndex is still in bounds of address book list
-        assertTrue(outOfBoundsIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
-
-        assertExecutionFailure(outOfBoundsIndex, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
-    }
-
-    @Test
-    public void equals() {
-        SelectCommand selectFirstCommand = new SelectCommand(INDEX_FIRST_PERSON);
-        SelectCommand selectSecondCommand = new SelectCommand(INDEX_SECOND_PERSON);
-
-        // same object -> returns true
-        assertTrue(selectFirstCommand.equals(selectFirstCommand));
-
-        // same values -> returns true
-        SelectCommand selectFirstCommandCopy = new SelectCommand(INDEX_FIRST_PERSON);
-        assertTrue(selectFirstCommand.equals(selectFirstCommandCopy));
-
-        // different types -> returns false
-        assertFalse(selectFirstCommand.equals(1));
-
-        // null -> returns false
-        assertFalse(selectFirstCommand.equals(null));
-
-        // different person -> returns false
-        assertFalse(selectFirstCommand.equals(selectSecondCommand));
-    }
-
-    /**
-     * Executes a {@code SelectCommand} with the given {@code index},
-     * and checks that the model's selected person is set to the person at {@code index} in the filtered person list.
-     */
-    private void assertExecutionSuccess(Index index) {
-        SelectCommand selectCommand = new SelectCommand(index);
-        String expectedMessage = String.format(SelectCommand.MESSAGE_SELECT_PERSON_SUCCESS, index.getOneBased());
-        expectedModel.setSelectedPerson(model.getFilteredPersonList().get(index.getZeroBased()));
-
-        assertCommandSuccess(selectCommand, model, commandHistory, expectedMessage, expectedModel);
-    }
-
-    /**
-     * Executes a {@code SelectCommand} with the given {@code index}, and checks that a {@code CommandException}
-     * is thrown with the {@code expectedMessage}.
-     */
-    private void assertExecutionFailure(Index index, String expectedMessage) {
-        SelectCommand selectCommand = new SelectCommand(index);
-        assertCommandFailure(selectCommand, model, commandHistory, expectedMessage);
-    }
-}
diff --git a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java
deleted file mode 100644
index 0a706b8eb823..000000000000
--- a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.deleteFirstPerson;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import seedu.address.logic.CommandHistory;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-public class UndoCommandTest {
-
-    private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private final CommandHistory commandHistory = new CommandHistory();
-
-    @Before
-    public void setUp() {
-        // set up of models' undo/redo history
-        deleteFirstPerson(model);
-        deleteFirstPerson(model);
-
-        deleteFirstPerson(expectedModel);
-        deleteFirstPerson(expectedModel);
-    }
-
-    @Test
-    public void execute() {
-        // multiple undoable states in model
-        expectedModel.undoAddressBook();
-        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        // single undoable state in model
-        expectedModel.undoAddressBook();
-        assertCommandSuccess(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_SUCCESS, expectedModel);
-
-        // no undoable states in model
-        assertCommandFailure(new UndoCommand(), model, commandHistory, UndoCommand.MESSAGE_FAILURE);
-    }
-}
diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
deleted file mode 100644
index f0d56909fd24..000000000000
--- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
-import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalPersons.AMY;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import org.junit.Test;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddCommandParserTest {
-    private AddCommandParser parser = new AddCommandParser();
-
-    @Test
-    public void parse_allFieldsPresent_success() {
-        Person expectedPerson = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND).build();
-
-        // whitespace only preamble
-        assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
-        // multiple names - last name accepted
-        assertParseSuccess(parser, NAME_DESC_AMY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
-        // multiple phones - last phone accepted
-        assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
-        // multiple emails - last email accepted
-        assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_AMY + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
-        // multiple addresses - last address accepted
-        assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_AMY
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
-        // multiple tags - all accepted
-        Person expectedPersonMultipleTags = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
-                .build();
-        assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
-                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, new AddCommand(expectedPersonMultipleTags));
-    }
-
-    @Test
-    public void parse_optionalFieldsMissing_success() {
-        // zero tags
-        Person expectedPerson = new PersonBuilder(AMY).withTags().build();
-        assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY,
-                new AddCommand(expectedPerson));
-    }
-
-    @Test
-    public void parse_compulsoryFieldMissing_failure() {
-        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
-
-        // missing name prefix
-        assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB,
-                expectedMessage);
-
-        // missing phone prefix
-        assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB,
-                expectedMessage);
-
-        // missing email prefix
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB + ADDRESS_DESC_BOB,
-                expectedMessage);
-
-        // missing address prefix
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VALID_ADDRESS_BOB,
-                expectedMessage);
-
-        // all prefixes missing
-        assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB + VALID_ADDRESS_BOB,
-                expectedMessage);
-    }
-
-    @Test
-    public void parse_invalidValue_failure() {
-        // invalid name
-        assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
-                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Name.MESSAGE_CONSTRAINTS);
-
-        // invalid phone
-        assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
-                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Phone.MESSAGE_CONSTRAINTS);
-
-        // invalid email
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC + ADDRESS_DESC_BOB
-                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Email.MESSAGE_CONSTRAINTS);
-
-        // invalid address
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC
-                + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Address.MESSAGE_CONSTRAINTS);
-
-        // invalid tag
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
-                + INVALID_TAG_DESC + VALID_TAG_FRIEND, Tag.MESSAGE_CONSTRAINTS);
-
-        // two invalid values, only first invalid value reported
-        assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC,
-                Name.MESSAGE_CONSTRAINTS);
-
-        // non-empty preamble
-        assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
-                String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
-    }
-}
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
deleted file mode 100644
index a8c8cbf21f4e..000000000000
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package seedu.address.logic.parser;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.logic.commands.ExitCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.HistoryCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-import seedu.address.testutil.PersonBuilder;
-import seedu.address.testutil.PersonUtil;
-
-public class AddressBookParserTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    private final AddressBookParser parser = new AddressBookParser();
-
-    @Test
-    public void parseCommand_add() throws Exception {
-        Person person = new PersonBuilder().build();
-        AddCommand command = (AddCommand) parser.parseCommand(PersonUtil.getAddCommand(person));
-        assertEquals(new AddCommand(person), command);
-    }
-
-    @Test
-    public void parseCommand_clear() throws Exception {
-        assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
-        assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD + " 3") instanceof ClearCommand);
-    }
-
-    @Test
-    public void parseCommand_delete() throws Exception {
-        DeleteCommand command = (DeleteCommand) parser.parseCommand(
-                DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
-        assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
-    }
-
-    @Test
-    public void parseCommand_edit() throws Exception {
-        Person person = new PersonBuilder().build();
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build();
-        EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
-                + INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor));
-        assertEquals(new EditCommand(INDEX_FIRST_PERSON, descriptor), command);
-    }
-
-    @Test
-    public void parseCommand_exit() throws Exception {
-        assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
-        assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
-    }
-
-    @Test
-    public void parseCommand_find() throws Exception {
-        List<String> keywords = Arrays.asList("foo", "bar", "baz");
-        FindCommand command = (FindCommand) parser.parseCommand(
-                FindCommand.COMMAND_WORD + " " + keywords.stream().collect(Collectors.joining(" ")));
-        assertEquals(new FindCommand(new NameContainsKeywordsPredicate(keywords)), command);
-    }
-
-    @Test
-    public void parseCommand_help() throws Exception {
-        assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
-        assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
-    }
-
-    @Test
-    public void parseCommand_history() throws Exception {
-        assertTrue(parser.parseCommand(HistoryCommand.COMMAND_WORD) instanceof HistoryCommand);
-        assertTrue(parser.parseCommand(HistoryCommand.COMMAND_WORD + " 3") instanceof HistoryCommand);
-
-        try {
-            parser.parseCommand("histories");
-            throw new AssertionError("The expected ParseException was not thrown.");
-        } catch (ParseException pe) {
-            assertEquals(MESSAGE_UNKNOWN_COMMAND, pe.getMessage());
-        }
-    }
-
-    @Test
-    public void parseCommand_list() throws Exception {
-        assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
-        assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
-    }
-
-    @Test
-    public void parseCommand_select() throws Exception {
-        SelectCommand command = (SelectCommand) parser.parseCommand(
-                SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
-        assertEquals(new SelectCommand(INDEX_FIRST_PERSON), command);
-    }
-
-    @Test
-    public void parseCommand_redoCommandWord_returnsRedoCommand() throws Exception {
-        assertTrue(parser.parseCommand(RedoCommand.COMMAND_WORD) instanceof RedoCommand);
-        assertTrue(parser.parseCommand("redo 1") instanceof RedoCommand);
-    }
-
-    @Test
-    public void parseCommand_undoCommandWord_returnsUndoCommand() throws Exception {
-        assertTrue(parser.parseCommand(UndoCommand.COMMAND_WORD) instanceof UndoCommand);
-        assertTrue(parser.parseCommand("undo 3") instanceof UndoCommand);
-    }
-
-    @Test
-    public void parseCommand_unrecognisedInput_throwsParseException() throws Exception {
-        thrown.expect(ParseException.class);
-        thrown.expectMessage(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
-        parser.parseCommand("");
-    }
-
-    @Test
-    public void parseCommand_unknownCommand_throwsParseException() throws Exception {
-        thrown.expect(ParseException.class);
-        thrown.expectMessage(MESSAGE_UNKNOWN_COMMAND);
-        parser.parseCommand("unknownCommand");
-    }
-}
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
deleted file mode 100644
index 24c54079db88..000000000000
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD_PERSON;
-
-import org.junit.Test;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-
-public class EditCommandParserTest {
-
-    private static final String TAG_EMPTY = " " + PREFIX_TAG;
-
-    private static final String MESSAGE_INVALID_FORMAT =
-            String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
-
-    private EditCommandParser parser = new EditCommandParser();
-
-    @Test
-    public void parse_missingParts_failure() {
-        // no index specified
-        assertParseFailure(parser, VALID_NAME_AMY, MESSAGE_INVALID_FORMAT);
-
-        // no field specified
-        assertParseFailure(parser, "1", EditCommand.MESSAGE_NOT_EDITED);
-
-        // no index and no field specified
-        assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
-    }
-
-    @Test
-    public void parse_invalidPreamble_failure() {
-        // negative index
-        assertParseFailure(parser, "-5" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
-
-        // zero index
-        assertParseFailure(parser, "0" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
-
-        // invalid arguments being parsed as preamble
-        assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
-
-        // invalid prefix being parsed as preamble
-        assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
-    }
-
-    @Test
-    public void parse_invalidValue_failure() {
-        assertParseFailure(parser, "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name
-        assertParseFailure(parser, "1" + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS); // invalid phone
-        assertParseFailure(parser, "1" + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS); // invalid email
-        assertParseFailure(parser, "1" + INVALID_ADDRESS_DESC, Address.MESSAGE_CONSTRAINTS); // invalid address
-        assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS); // invalid tag
-
-        // invalid phone followed by valid email
-        assertParseFailure(parser, "1" + INVALID_PHONE_DESC + EMAIL_DESC_AMY, Phone.MESSAGE_CONSTRAINTS);
-
-        // valid phone followed by invalid phone. The test case for invalid phone followed by valid phone
-        // is tested at {@code parse_invalidValueFollowedByValidValue_success()}
-        assertParseFailure(parser, "1" + PHONE_DESC_BOB + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS);
-
-        // while parsing {@code PREFIX_TAG} alone will reset the tags of the {@code Person} being edited,
-        // parsing it together with a valid tag results in error
-        assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_DESC_HUSBAND + TAG_EMPTY, Tag.MESSAGE_CONSTRAINTS);
-        assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_EMPTY + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
-        assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
-
-        // multiple invalid values, but only the first invalid value is captured
-        assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_ADDRESS_AMY + VALID_PHONE_AMY,
-                Name.MESSAGE_CONSTRAINTS);
-    }
-
-    @Test
-    public void parse_allFieldsSpecified_success() {
-        Index targetIndex = INDEX_SECOND_PERSON;
-        String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
-                + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
-
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
-                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
-        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
-        assertParseSuccess(parser, userInput, expectedCommand);
-    }
-
-    @Test
-    public void parse_someFieldsSpecified_success() {
-        Index targetIndex = INDEX_FIRST_PERSON;
-        String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY;
-
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
-                .withEmail(VALID_EMAIL_AMY).build();
-        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
-        assertParseSuccess(parser, userInput, expectedCommand);
-    }
-
-    @Test
-    public void parse_oneFieldSpecified_success() {
-        // name
-        Index targetIndex = INDEX_THIRD_PERSON;
-        String userInput = targetIndex.getOneBased() + NAME_DESC_AMY;
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY).build();
-        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-
-        // phone
-        userInput = targetIndex.getOneBased() + PHONE_DESC_AMY;
-        descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
-        expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-
-        // email
-        userInput = targetIndex.getOneBased() + EMAIL_DESC_AMY;
-        descriptor = new EditPersonDescriptorBuilder().withEmail(VALID_EMAIL_AMY).build();
-        expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-
-        // address
-        userInput = targetIndex.getOneBased() + ADDRESS_DESC_AMY;
-        descriptor = new EditPersonDescriptorBuilder().withAddress(VALID_ADDRESS_AMY).build();
-        expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-
-        // tags
-        userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND;
-        descriptor = new EditPersonDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
-        expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-    }
-
-    @Test
-    public void parse_multipleRepeatedFields_acceptsLast() {
-        Index targetIndex = INDEX_FIRST_PERSON;
-        String userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY
-                + TAG_DESC_FRIEND + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND
-                + PHONE_DESC_BOB + ADDRESS_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND;
-
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
-                .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
-                .build();
-        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
-        assertParseSuccess(parser, userInput, expectedCommand);
-    }
-
-    @Test
-    public void parse_invalidValueFollowedByValidValue_success() {
-        // no other valid values specified
-        Index targetIndex = INDEX_FIRST_PERSON;
-        String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB;
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).build();
-        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-
-        // other valid values specified
-        userInput = targetIndex.getOneBased() + EMAIL_DESC_BOB + INVALID_PHONE_DESC + ADDRESS_DESC_BOB
-                + PHONE_DESC_BOB;
-        descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
-                .withAddress(VALID_ADDRESS_BOB).build();
-        expectedCommand = new EditCommand(targetIndex, descriptor);
-        assertParseSuccess(parser, userInput, expectedCommand);
-    }
-
-    @Test
-    public void parse_resetTags_success() {
-        Index targetIndex = INDEX_THIRD_PERSON;
-        String userInput = targetIndex.getOneBased() + TAG_EMPTY;
-
-        EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build();
-        EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
-        assertParseSuccess(parser, userInput, expectedCommand);
-    }
-}
diff --git a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java b/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
deleted file mode 100644
index e65143d3b7b0..000000000000
--- a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-public class FindCommandParserTest {
-
-    private FindCommandParser parser = new FindCommandParser();
-
-    @Test
-    public void parse_emptyArg_throwsParseException() {
-        assertParseFailure(parser, "     ", String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
-    }
-
-    @Test
-    public void parse_validArgs_returnsFindCommand() {
-        // no leading and trailing whitespaces
-        FindCommand expectedFindCommand =
-                new FindCommand(new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob")));
-        assertParseSuccess(parser, "Alice Bob", expectedFindCommand);
-
-        // multiple whitespaces between keywords
-        assertParseSuccess(parser, " \n Alice \n \t Bob  \t", expectedFindCommand);
-    }
-
-}
diff --git a/src/test/java/seedu/address/logic/parser/SelectCommandParserTest.java b/src/test/java/seedu/address/logic/parser/SelectCommandParserTest.java
deleted file mode 100644
index 513ee46acd33..000000000000
--- a/src/test/java/seedu/address/logic/parser/SelectCommandParserTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-
-import org.junit.Test;
-
-import seedu.address.logic.commands.SelectCommand;
-
-/**
- * Test scope: similar to {@code DeleteCommandParserTest}.
- * @see DeleteCommandParserTest
- */
-public class SelectCommandParserTest {
-
-    private SelectCommandParser parser = new SelectCommandParser();
-
-    @Test
-    public void parse_validArgs_returnsSelectCommand() {
-        assertParseSuccess(parser, "1", new SelectCommand(INDEX_FIRST_PERSON));
-    }
-
-    @Test
-    public void parse_invalidArgs_throwsParseException() {
-        assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, SelectCommand.MESSAGE_USAGE));
-    }
-}
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
deleted file mode 100644
index 433147e1534a..000000000000
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package seedu.address.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddressBookTest {
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    private final AddressBook addressBook = new AddressBook();
-
-    @Test
-    public void constructor() {
-        assertEquals(Collections.emptyList(), addressBook.getPersonList());
-    }
-
-    @Test
-    public void resetData_null_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        addressBook.resetData(null);
-    }
-
-    @Test
-    public void resetData_withValidReadOnlyAddressBook_replacesData() {
-        AddressBook newData = getTypicalAddressBook();
-        addressBook.resetData(newData);
-        assertEquals(newData, addressBook);
-    }
-
-    @Test
-    public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
-        // Two persons with the same identity fields
-        Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
-                .build();
-        List<Person> newPersons = Arrays.asList(ALICE, editedAlice);
-        AddressBookStub newData = new AddressBookStub(newPersons);
-
-        thrown.expect(DuplicatePersonException.class);
-        addressBook.resetData(newData);
-    }
-
-    @Test
-    public void hasPerson_nullPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        addressBook.hasPerson(null);
-    }
-
-    @Test
-    public void hasPerson_personNotInAddressBook_returnsFalse() {
-        assertFalse(addressBook.hasPerson(ALICE));
-    }
-
-    @Test
-    public void hasPerson_personInAddressBook_returnsTrue() {
-        addressBook.addPerson(ALICE);
-        assertTrue(addressBook.hasPerson(ALICE));
-    }
-
-    @Test
-    public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
-        addressBook.addPerson(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
-                .build();
-        assertTrue(addressBook.hasPerson(editedAlice));
-    }
-
-    @Test
-    public void getPersonList_modifyList_throwsUnsupportedOperationException() {
-        thrown.expect(UnsupportedOperationException.class);
-        addressBook.getPersonList().remove(0);
-    }
-
-    @Test
-    public void addListener_withInvalidationListener_listenerAdded() {
-        SimpleIntegerProperty counter = new SimpleIntegerProperty();
-        InvalidationListener listener = observable -> counter.set(counter.get() + 1);
-        addressBook.addListener(listener);
-        addressBook.addPerson(ALICE);
-        assertEquals(1, counter.get());
-    }
-
-    @Test
-    public void removeListener_withInvalidationListener_listenerRemoved() {
-        SimpleIntegerProperty counter = new SimpleIntegerProperty();
-        InvalidationListener listener = observable -> counter.set(counter.get() + 1);
-        addressBook.addListener(listener);
-        addressBook.removeListener(listener);
-        addressBook.addPerson(ALICE);
-        assertEquals(0, counter.get());
-    }
-
-    /**
-     * A stub ReadOnlyAddressBook whose persons list can violate interface constraints.
-     */
-    private static class AddressBookStub implements ReadOnlyAddressBook {
-        private final ObservableList<Person> persons = FXCollections.observableArrayList();
-
-        AddressBookStub(Collection<Person> persons) {
-            this.persons.setAll(persons);
-        }
-
-        @Override
-        public ObservableList<Person> getPersonList() {
-            return persons;
-        }
-
-        @Override
-        public void addListener(InvalidationListener listener) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void removeListener(InvalidationListener listener) {
-            throw new AssertionError("This method should not be called.");
-        }
-    }
-
-}
diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java
deleted file mode 100644
index e865629884d5..000000000000
--- a/src/test/java/seedu/address/model/ModelManagerTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package seedu.address.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BENSON;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-import seedu.address.testutil.AddressBookBuilder;
-import seedu.address.testutil.PersonBuilder;
-
-public class ModelManagerTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    private ModelManager modelManager = new ModelManager();
-
-    @Test
-    public void constructor() {
-        assertEquals(new UserPrefs(), modelManager.getUserPrefs());
-        assertEquals(new GuiSettings(), modelManager.getGuiSettings());
-        assertEquals(new AddressBook(), new AddressBook(modelManager.getAddressBook()));
-        assertEquals(null, modelManager.getSelectedPerson());
-    }
-
-    @Test
-    public void setUserPrefs_nullUserPrefs_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        modelManager.setUserPrefs(null);
-    }
-
-    @Test
-    public void setUserPrefs_validUserPrefs_copiesUserPrefs() {
-        UserPrefs userPrefs = new UserPrefs();
-        userPrefs.setAddressBookFilePath(Paths.get("address/book/file/path"));
-        userPrefs.setGuiSettings(new GuiSettings(1, 2, 3, 4));
-        modelManager.setUserPrefs(userPrefs);
-        assertEquals(userPrefs, modelManager.getUserPrefs());
-
-        // Modifying userPrefs should not modify modelManager's userPrefs
-        UserPrefs oldUserPrefs = new UserPrefs(userPrefs);
-        userPrefs.setAddressBookFilePath(Paths.get("new/address/book/file/path"));
-        assertEquals(oldUserPrefs, modelManager.getUserPrefs());
-    }
-
-    @Test
-    public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        modelManager.setGuiSettings(null);
-    }
-
-    @Test
-    public void setGuiSettings_validGuiSettings_setsGuiSettings() {
-        GuiSettings guiSettings = new GuiSettings(1, 2, 3, 4);
-        modelManager.setGuiSettings(guiSettings);
-        assertEquals(guiSettings, modelManager.getGuiSettings());
-    }
-
-    @Test
-    public void setAddressBookFilePath_nullPath_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        modelManager.setAddressBookFilePath(null);
-    }
-
-    @Test
-    public void setAddressBookFilePath_validPath_setsAddressBookFilePath() {
-        Path path = Paths.get("address/book/file/path");
-        modelManager.setAddressBookFilePath(path);
-        assertEquals(path, modelManager.getAddressBookFilePath());
-    }
-
-    @Test
-    public void hasPerson_nullPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        modelManager.hasPerson(null);
-    }
-
-    @Test
-    public void hasPerson_personNotInAddressBook_returnsFalse() {
-        assertFalse(modelManager.hasPerson(ALICE));
-    }
-
-    @Test
-    public void hasPerson_personInAddressBook_returnsTrue() {
-        modelManager.addPerson(ALICE);
-        assertTrue(modelManager.hasPerson(ALICE));
-    }
-
-    @Test
-    public void deletePerson_personIsSelectedAndFirstPersonInFilteredPersonList_selectionCleared() {
-        modelManager.addPerson(ALICE);
-        modelManager.setSelectedPerson(ALICE);
-        modelManager.deletePerson(ALICE);
-        assertEquals(null, modelManager.getSelectedPerson());
-    }
-
-    @Test
-    public void deletePerson_personIsSelectedAndSecondPersonInFilteredPersonList_firstPersonSelected() {
-        modelManager.addPerson(ALICE);
-        modelManager.addPerson(BOB);
-        assertEquals(Arrays.asList(ALICE, BOB), modelManager.getFilteredPersonList());
-        modelManager.setSelectedPerson(BOB);
-        modelManager.deletePerson(BOB);
-        assertEquals(ALICE, modelManager.getSelectedPerson());
-    }
-
-    @Test
-    public void setPerson_personIsSelected_selectedPersonUpdated() {
-        modelManager.addPerson(ALICE);
-        modelManager.setSelectedPerson(ALICE);
-        Person updatedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).build();
-        modelManager.setPerson(ALICE, updatedAlice);
-        assertEquals(updatedAlice, modelManager.getSelectedPerson());
-    }
-
-    @Test
-    public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
-        thrown.expect(UnsupportedOperationException.class);
-        modelManager.getFilteredPersonList().remove(0);
-    }
-
-    @Test
-    public void setSelectedPerson_personNotInFilteredPersonList_throwsPersonNotFoundException() {
-        thrown.expect(PersonNotFoundException.class);
-        modelManager.setSelectedPerson(ALICE);
-    }
-
-    @Test
-    public void setSelectedPerson_personInFilteredPersonList_setsSelectedPerson() {
-        modelManager.addPerson(ALICE);
-        assertEquals(Collections.singletonList(ALICE), modelManager.getFilteredPersonList());
-        modelManager.setSelectedPerson(ALICE);
-        assertEquals(ALICE, modelManager.getSelectedPerson());
-    }
-
-    @Test
-    public void equals() {
-        AddressBook addressBook = new AddressBookBuilder().withPerson(ALICE).withPerson(BENSON).build();
-        AddressBook differentAddressBook = new AddressBook();
-        UserPrefs userPrefs = new UserPrefs();
-
-        // same values -> returns true
-        modelManager = new ModelManager(addressBook, userPrefs);
-        ModelManager modelManagerCopy = new ModelManager(addressBook, userPrefs);
-        assertTrue(modelManager.equals(modelManagerCopy));
-
-        // same object -> returns true
-        assertTrue(modelManager.equals(modelManager));
-
-        // null -> returns false
-        assertFalse(modelManager.equals(null));
-
-        // different types -> returns false
-        assertFalse(modelManager.equals(5));
-
-        // different addressBook -> returns false
-        assertFalse(modelManager.equals(new ModelManager(differentAddressBook, userPrefs)));
-
-        // different filteredList -> returns false
-        String[] keywords = ALICE.getName().fullName.split("\\s+");
-        modelManager.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(keywords)));
-        assertFalse(modelManager.equals(new ModelManager(addressBook, userPrefs)));
-
-        // resets modelManager to initial state for upcoming tests
-        modelManager.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-
-        // different userPrefs -> returns false
-        UserPrefs differentUserPrefs = new UserPrefs();
-        differentUserPrefs.setAddressBookFilePath(Paths.get("differentFilePath"));
-        assertFalse(modelManager.equals(new ModelManager(addressBook, differentUserPrefs)));
-    }
-}
diff --git a/src/test/java/seedu/address/model/VersionedAddressBookTest.java b/src/test/java/seedu/address/model/VersionedAddressBookTest.java
deleted file mode 100644
index d5a31a48e53f..000000000000
--- a/src/test/java/seedu/address/model/VersionedAddressBookTest.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package seedu.address.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static seedu.address.testutil.TypicalPersons.AMY;
-import static seedu.address.testutil.TypicalPersons.BOB;
-import static seedu.address.testutil.TypicalPersons.CARL;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-import seedu.address.testutil.AddressBookBuilder;
-
-public class VersionedAddressBookTest {
-
-    private final ReadOnlyAddressBook addressBookWithAmy = new AddressBookBuilder().withPerson(AMY).build();
-    private final ReadOnlyAddressBook addressBookWithBob = new AddressBookBuilder().withPerson(BOB).build();
-    private final ReadOnlyAddressBook addressBookWithCarl = new AddressBookBuilder().withPerson(CARL).build();
-    private final ReadOnlyAddressBook emptyAddressBook = new AddressBookBuilder().build();
-
-    @Test
-    public void commit_singleAddressBook_noStatesRemovedCurrentStateSaved() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(emptyAddressBook);
-
-        versionedAddressBook.commit();
-        assertAddressBookListStatus(versionedAddressBook,
-                Collections.singletonList(emptyAddressBook),
-                emptyAddressBook,
-                Collections.emptyList());
-    }
-
-    @Test
-    public void commit_multipleAddressBookPointerAtEndOfStateList_noStatesRemovedCurrentStateSaved() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-
-        versionedAddressBook.commit();
-        assertAddressBookListStatus(versionedAddressBook,
-                Arrays.asList(emptyAddressBook, addressBookWithAmy, addressBookWithBob),
-                addressBookWithBob,
-                Collections.emptyList());
-    }
-
-    @Test
-    public void commit_multipleAddressBookPointerNotAtEndOfStateList_statesAfterPointerRemovedCurrentStateSaved() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 2);
-
-        versionedAddressBook.commit();
-        assertAddressBookListStatus(versionedAddressBook,
-                Collections.singletonList(emptyAddressBook),
-                emptyAddressBook,
-                Collections.emptyList());
-    }
-
-    @Test
-    public void canUndo_multipleAddressBookPointerAtEndOfStateList_returnsTrue() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-
-        assertTrue(versionedAddressBook.canUndo());
-    }
-
-    @Test
-    public void canUndo_multipleAddressBookPointerAtStartOfStateList_returnsTrue() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 1);
-
-        assertTrue(versionedAddressBook.canUndo());
-    }
-
-    @Test
-    public void canUndo_singleAddressBook_returnsFalse() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(emptyAddressBook);
-
-        assertFalse(versionedAddressBook.canUndo());
-    }
-
-    @Test
-    public void canUndo_multipleAddressBookPointerAtStartOfStateList_returnsFalse() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 2);
-
-        assertFalse(versionedAddressBook.canUndo());
-    }
-
-    @Test
-    public void canRedo_multipleAddressBookPointerNotAtEndOfStateList_returnsTrue() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 1);
-
-        assertTrue(versionedAddressBook.canRedo());
-    }
-
-    @Test
-    public void canRedo_multipleAddressBookPointerAtStartOfStateList_returnsTrue() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 2);
-
-        assertTrue(versionedAddressBook.canRedo());
-    }
-
-    @Test
-    public void canRedo_singleAddressBook_returnsFalse() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(emptyAddressBook);
-
-        assertFalse(versionedAddressBook.canRedo());
-    }
-
-    @Test
-    public void canRedo_multipleAddressBookPointerAtEndOfStateList_returnsFalse() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-
-        assertFalse(versionedAddressBook.canRedo());
-    }
-
-    @Test
-    public void undo_multipleAddressBookPointerAtEndOfStateList_success() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-
-        versionedAddressBook.undo();
-        assertAddressBookListStatus(versionedAddressBook,
-                Collections.singletonList(emptyAddressBook),
-                addressBookWithAmy,
-                Collections.singletonList(addressBookWithBob));
-    }
-
-    @Test
-    public void undo_multipleAddressBookPointerNotAtStartOfStateList_success() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 1);
-
-        versionedAddressBook.undo();
-        assertAddressBookListStatus(versionedAddressBook,
-                Collections.emptyList(),
-                emptyAddressBook,
-                Arrays.asList(addressBookWithAmy, addressBookWithBob));
-    }
-
-    @Test
-    public void undo_singleAddressBook_throwsNoUndoableStateException() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(emptyAddressBook);
-
-        assertThrows(VersionedAddressBook.NoUndoableStateException.class, versionedAddressBook::undo);
-    }
-
-    @Test
-    public void undo_multipleAddressBookPointerAtStartOfStateList_throwsNoUndoableStateException() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 2);
-
-        assertThrows(VersionedAddressBook.NoUndoableStateException.class, versionedAddressBook::undo);
-    }
-
-    @Test
-    public void redo_multipleAddressBookPointerNotAtEndOfStateList_success() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 1);
-
-        versionedAddressBook.redo();
-        assertAddressBookListStatus(versionedAddressBook,
-                Arrays.asList(emptyAddressBook, addressBookWithAmy),
-                addressBookWithBob,
-                Collections.emptyList());
-    }
-
-    @Test
-    public void redo_multipleAddressBookPointerAtStartOfStateList_success() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 2);
-
-        versionedAddressBook.redo();
-        assertAddressBookListStatus(versionedAddressBook,
-                Collections.singletonList(emptyAddressBook),
-                addressBookWithAmy,
-                Collections.singletonList(addressBookWithBob));
-    }
-
-    @Test
-    public void redo_singleAddressBook_throwsNoRedoableStateException() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(emptyAddressBook);
-
-        assertThrows(VersionedAddressBook.NoRedoableStateException.class, versionedAddressBook::redo);
-    }
-
-    @Test
-    public void redo_multipleAddressBookPointerAtEndOfStateList_throwsNoRedoableStateException() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(
-                emptyAddressBook, addressBookWithAmy, addressBookWithBob);
-
-        assertThrows(VersionedAddressBook.NoRedoableStateException.class, versionedAddressBook::redo);
-    }
-
-    @Test
-    public void equals() {
-        VersionedAddressBook versionedAddressBook = prepareAddressBookList(addressBookWithAmy, addressBookWithBob);
-
-        // same values -> returns true
-        VersionedAddressBook copy = prepareAddressBookList(addressBookWithAmy, addressBookWithBob);
-        assertTrue(versionedAddressBook.equals(copy));
-
-        // same object -> returns true
-        assertTrue(versionedAddressBook.equals(versionedAddressBook));
-
-        // null -> returns false
-        assertFalse(versionedAddressBook.equals(null));
-
-        // different types -> returns false
-        assertFalse(versionedAddressBook.equals(1));
-
-        // different state list -> returns false
-        VersionedAddressBook differentAddressBookList = prepareAddressBookList(addressBookWithBob, addressBookWithCarl);
-        assertFalse(versionedAddressBook.equals(differentAddressBookList));
-
-        // different current pointer index -> returns false
-        VersionedAddressBook differentCurrentStatePointer = prepareAddressBookList(
-                addressBookWithAmy, addressBookWithBob);
-        shiftCurrentStatePointerLeftwards(versionedAddressBook, 1);
-        assertFalse(versionedAddressBook.equals(differentCurrentStatePointer));
-    }
-
-    /**
-     * Asserts that {@code versionedAddressBook} is currently pointing at {@code expectedCurrentState},
-     * states before {@code versionedAddressBook#currentStatePointer} is equal to {@code expectedStatesBeforePointer},
-     * and states after {@code versionedAddressBook#currentStatePointer} is equal to {@code expectedStatesAfterPointer}.
-     */
-    private void assertAddressBookListStatus(VersionedAddressBook versionedAddressBook,
-                                             List<ReadOnlyAddressBook> expectedStatesBeforePointer,
-                                             ReadOnlyAddressBook expectedCurrentState,
-                                             List<ReadOnlyAddressBook> expectedStatesAfterPointer) {
-        // check state currently pointing at is correct
-        assertEquals(new AddressBook(versionedAddressBook), expectedCurrentState);
-
-        // shift pointer to start of state list
-        while (versionedAddressBook.canUndo()) {
-            versionedAddressBook.undo();
-        }
-
-        // check states before pointer are correct
-        for (ReadOnlyAddressBook expectedAddressBook : expectedStatesBeforePointer) {
-            assertEquals(expectedAddressBook, new AddressBook(versionedAddressBook));
-            versionedAddressBook.redo();
-        }
-
-        // check states after pointer are correct
-        for (ReadOnlyAddressBook expectedAddressBook : expectedStatesAfterPointer) {
-            versionedAddressBook.redo();
-            assertEquals(expectedAddressBook, new AddressBook(versionedAddressBook));
-        }
-
-        // check that there are no more states after pointer
-        assertFalse(versionedAddressBook.canRedo());
-
-        // revert pointer to original position
-        expectedStatesAfterPointer.forEach(unused -> versionedAddressBook.undo());
-    }
-
-    /**
-     * Creates and returns a {@code VersionedAddressBook} with the {@code addressBookStates} added into it, and the
-     * {@code VersionedAddressBook#currentStatePointer} at the end of list.
-     */
-    private VersionedAddressBook prepareAddressBookList(ReadOnlyAddressBook... addressBookStates) {
-        assertFalse(addressBookStates.length == 0);
-
-        VersionedAddressBook versionedAddressBook = new VersionedAddressBook(addressBookStates[0]);
-        for (int i = 1; i < addressBookStates.length; i++) {
-            versionedAddressBook.resetData(addressBookStates[i]);
-            versionedAddressBook.commit();
-        }
-
-        return versionedAddressBook;
-    }
-
-    /**
-     * Shifts the {@code versionedAddressBook#currentStatePointer} by {@code count} to the left of its list.
-     */
-    private void shiftCurrentStatePointerLeftwards(VersionedAddressBook versionedAddressBook, int count) {
-        for (int i = 0; i < count; i++) {
-            versionedAddressBook.undo();
-        }
-    }
-}
diff --git a/src/test/java/seedu/address/model/person/AddressTest.java b/src/test/java/seedu/address/model/person/AddressTest.java
deleted file mode 100644
index 11974544d81d..000000000000
--- a/src/test/java/seedu/address/model/person/AddressTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import seedu.address.testutil.Assert;
-
-public class AddressTest {
-
-    @Test
-    public void constructor_null_throwsNullPointerException() {
-        Assert.assertThrows(NullPointerException.class, () -> new Address(null));
-    }
-
-    @Test
-    public void constructor_invalidAddress_throwsIllegalArgumentException() {
-        String invalidAddress = "";
-        Assert.assertThrows(IllegalArgumentException.class, () -> new Address(invalidAddress));
-    }
-
-    @Test
-    public void isValidAddress() {
-        // null address
-        Assert.assertThrows(NullPointerException.class, () -> Address.isValidAddress(null));
-
-        // invalid addresses
-        assertFalse(Address.isValidAddress("")); // empty string
-        assertFalse(Address.isValidAddress(" ")); // spaces only
-
-        // valid addresses
-        assertTrue(Address.isValidAddress("Blk 456, Den Road, #01-355"));
-        assertTrue(Address.isValidAddress("-")); // one character
-        assertTrue(Address.isValidAddress("Leng Inc; 1234 Market St; San Francisco CA 2349879; USA")); // long address
-    }
-}
diff --git a/src/test/java/seedu/address/model/person/EmailTest.java b/src/test/java/seedu/address/model/person/EmailTest.java
deleted file mode 100644
index ecbd0ee50208..000000000000
--- a/src/test/java/seedu/address/model/person/EmailTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import seedu.address.testutil.Assert;
-
-public class EmailTest {
-
-    @Test
-    public void constructor_null_throwsNullPointerException() {
-        Assert.assertThrows(NullPointerException.class, () -> new Email(null));
-    }
-
-    @Test
-    public void constructor_invalidEmail_throwsIllegalArgumentException() {
-        String invalidEmail = "";
-        Assert.assertThrows(IllegalArgumentException.class, () -> new Email(invalidEmail));
-    }
-
-    @Test
-    public void isValidEmail() {
-        // null email
-        Assert.assertThrows(NullPointerException.class, () -> Email.isValidEmail(null));
-
-        // blank email
-        assertFalse(Email.isValidEmail("")); // empty string
-        assertFalse(Email.isValidEmail(" ")); // spaces only
-
-        // missing parts
-        assertFalse(Email.isValidEmail("@example.com")); // missing local part
-        assertFalse(Email.isValidEmail("peterjackexample.com")); // missing '@' symbol
-        assertFalse(Email.isValidEmail("peterjack@")); // missing domain name
-
-        // invalid parts
-        assertFalse(Email.isValidEmail("peterjack@-")); // invalid domain name
-        assertFalse(Email.isValidEmail("peterjack@exam_ple.com")); // underscore in domain name
-        assertFalse(Email.isValidEmail("peter jack@example.com")); // spaces in local part
-        assertFalse(Email.isValidEmail("peterjack@exam ple.com")); // spaces in domain name
-        assertFalse(Email.isValidEmail(" peterjack@example.com")); // leading space
-        assertFalse(Email.isValidEmail("peterjack@example.com ")); // trailing space
-        assertFalse(Email.isValidEmail("peterjack@@example.com")); // double '@' symbol
-        assertFalse(Email.isValidEmail("peter@jack@example.com")); // '@' symbol in local part
-        assertFalse(Email.isValidEmail("peterjack@example@com")); // '@' symbol in domain name
-        assertFalse(Email.isValidEmail("peterjack@.example.com")); // domain name starts with a period
-        assertFalse(Email.isValidEmail("peterjack@example.com.")); // domain name ends with a period
-        assertFalse(Email.isValidEmail("peterjack@-example.com")); // domain name starts with a hyphen
-        assertFalse(Email.isValidEmail("peterjack@example.com-")); // domain name ends with a hyphen
-
-        // valid email
-        assertTrue(Email.isValidEmail("PeterJack_1190@example.com"));
-        assertTrue(Email.isValidEmail("a@bc")); // minimal
-        assertTrue(Email.isValidEmail("test@localhost")); // alphabets only
-        assertTrue(Email.isValidEmail("!#$%&'*+/=?`{|}~^.-@example.org")); // special characters local part
-        assertTrue(Email.isValidEmail("123@145")); // numeric local part and domain name
-        assertTrue(Email.isValidEmail("a1+be!@example1.com")); // mixture of alphanumeric and special characters
-        assertTrue(Email.isValidEmail("peter_jack@very-very-very-long-example.com")); // long domain name
-        assertTrue(Email.isValidEmail("if.you.dream.it_you.can.do.it@example.com")); // long local part
-    }
-}
diff --git a/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java b/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
deleted file mode 100644
index 76841215e3a0..000000000000
--- a/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-import seedu.address.testutil.PersonBuilder;
-
-public class NameContainsKeywordsPredicateTest {
-
-    @Test
-    public void equals() {
-        List<String> firstPredicateKeywordList = Collections.singletonList("first");
-        List<String> secondPredicateKeywordList = Arrays.asList("first", "second");
-
-        NameContainsKeywordsPredicate firstPredicate = new NameContainsKeywordsPredicate(firstPredicateKeywordList);
-        NameContainsKeywordsPredicate secondPredicate = new NameContainsKeywordsPredicate(secondPredicateKeywordList);
-
-        // same object -> returns true
-        assertTrue(firstPredicate.equals(firstPredicate));
-
-        // same values -> returns true
-        NameContainsKeywordsPredicate firstPredicateCopy = new NameContainsKeywordsPredicate(firstPredicateKeywordList);
-        assertTrue(firstPredicate.equals(firstPredicateCopy));
-
-        // different types -> returns false
-        assertFalse(firstPredicate.equals(1));
-
-        // null -> returns false
-        assertFalse(firstPredicate.equals(null));
-
-        // different person -> returns false
-        assertFalse(firstPredicate.equals(secondPredicate));
-    }
-
-    @Test
-    public void test_nameContainsKeywords_returnsTrue() {
-        // One keyword
-        NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Collections.singletonList("Alice"));
-        assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-
-        // Multiple keywords
-        predicate = new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob"));
-        assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-
-        // Only one matching keyword
-        predicate = new NameContainsKeywordsPredicate(Arrays.asList("Bob", "Carol"));
-        assertTrue(predicate.test(new PersonBuilder().withName("Alice Carol").build()));
-
-        // Mixed-case keywords
-        predicate = new NameContainsKeywordsPredicate(Arrays.asList("aLIce", "bOB"));
-        assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-    }
-
-    @Test
-    public void test_nameDoesNotContainKeywords_returnsFalse() {
-        // Zero keywords
-        NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Collections.emptyList());
-        assertFalse(predicate.test(new PersonBuilder().withName("Alice").build()));
-
-        // Non-matching keyword
-        predicate = new NameContainsKeywordsPredicate(Arrays.asList("Carol"));
-        assertFalse(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-
-        // Keywords match phone, email and address, but does not match name
-        predicate = new NameContainsKeywordsPredicate(Arrays.asList("12345", "alice@email.com", "Main", "Street"));
-        assertFalse(predicate.test(new PersonBuilder().withName("Alice").withPhone("12345")
-                .withEmail("alice@email.com").withAddress("Main Street").build()));
-    }
-}
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
deleted file mode 100644
index ac75b257fa39..000000000000
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import seedu.address.testutil.PersonBuilder;
-
-public class PersonTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void asObservableList_modifyList_throwsUnsupportedOperationException() {
-        Person person = new PersonBuilder().build();
-        thrown.expect(UnsupportedOperationException.class);
-        person.getTags().remove(0);
-    }
-
-    @Test
-    public void isSamePerson() {
-        // same object -> returns true
-        assertTrue(ALICE.isSamePerson(ALICE));
-
-        // null -> returns false
-        assertFalse(ALICE.isSamePerson(null));
-
-        // different phone and email -> returns false
-        Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).build();
-        assertFalse(ALICE.isSamePerson(editedAlice));
-
-        // different name -> returns false
-        editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
-        assertFalse(ALICE.isSamePerson(editedAlice));
-
-        // same name, same phone, different attributes -> returns true
-        editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
-                .withTags(VALID_TAG_HUSBAND).build();
-        assertTrue(ALICE.isSamePerson(editedAlice));
-
-        // same name, same email, different attributes -> returns true
-        editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB)
-                .withTags(VALID_TAG_HUSBAND).build();
-        assertTrue(ALICE.isSamePerson(editedAlice));
-
-        // same name, same phone, same email, different attributes -> returns true
-        editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND).build();
-        assertTrue(ALICE.isSamePerson(editedAlice));
-    }
-
-    @Test
-    public void equals() {
-        // same values -> returns true
-        Person aliceCopy = new PersonBuilder(ALICE).build();
-        assertTrue(ALICE.equals(aliceCopy));
-
-        // same object -> returns true
-        assertTrue(ALICE.equals(ALICE));
-
-        // null -> returns false
-        assertFalse(ALICE.equals(null));
-
-        // different type -> returns false
-        assertFalse(ALICE.equals(5));
-
-        // different person -> returns false
-        assertFalse(ALICE.equals(BOB));
-
-        // different name -> returns false
-        Person editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
-        assertFalse(ALICE.equals(editedAlice));
-
-        // different phone -> returns false
-        editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).build();
-        assertFalse(ALICE.equals(editedAlice));
-
-        // different email -> returns false
-        editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).build();
-        assertFalse(ALICE.equals(editedAlice));
-
-        // different address -> returns false
-        editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).build();
-        assertFalse(ALICE.equals(editedAlice));
-
-        // different tags -> returns false
-        editedAlice = new PersonBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
-        assertFalse(ALICE.equals(editedAlice));
-    }
-}
diff --git a/src/test/java/seedu/address/model/person/PhoneTest.java b/src/test/java/seedu/address/model/person/PhoneTest.java
deleted file mode 100644
index c721cbbfc048..000000000000
--- a/src/test/java/seedu/address/model/person/PhoneTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import seedu.address.testutil.Assert;
-
-public class PhoneTest {
-
-    @Test
-    public void constructor_null_throwsNullPointerException() {
-        Assert.assertThrows(NullPointerException.class, () -> new Phone(null));
-    }
-
-    @Test
-    public void constructor_invalidPhone_throwsIllegalArgumentException() {
-        String invalidPhone = "";
-        Assert.assertThrows(IllegalArgumentException.class, () -> new Phone(invalidPhone));
-    }
-
-    @Test
-    public void isValidPhone() {
-        // null phone number
-        Assert.assertThrows(NullPointerException.class, () -> Phone.isValidPhone(null));
-
-        // invalid phone numbers
-        assertFalse(Phone.isValidPhone("")); // empty string
-        assertFalse(Phone.isValidPhone(" ")); // spaces only
-        assertFalse(Phone.isValidPhone("91")); // less than 3 numbers
-        assertFalse(Phone.isValidPhone("phone")); // non-numeric
-        assertFalse(Phone.isValidPhone("9011p041")); // alphabets within digits
-        assertFalse(Phone.isValidPhone("9312 1534")); // spaces within digits
-
-        // valid phone numbers
-        assertTrue(Phone.isValidPhone("911")); // exactly 3 numbers
-        assertTrue(Phone.isValidPhone("93121534"));
-        assertTrue(Phone.isValidPhone("124293842033123")); // long phone numbers
-    }
-}
diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
deleted file mode 100644
index 6389cd81703f..000000000000
--- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-import seedu.address.testutil.PersonBuilder;
-
-public class UniquePersonListTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    private final UniquePersonList uniquePersonList = new UniquePersonList();
-
-    @Test
-    public void contains_nullPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.contains(null);
-    }
-
-    @Test
-    public void contains_personNotInList_returnsFalse() {
-        assertFalse(uniquePersonList.contains(ALICE));
-    }
-
-    @Test
-    public void contains_personInList_returnsTrue() {
-        uniquePersonList.add(ALICE);
-        assertTrue(uniquePersonList.contains(ALICE));
-    }
-
-    @Test
-    public void contains_personWithSameIdentityFieldsInList_returnsTrue() {
-        uniquePersonList.add(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
-                .build();
-        assertTrue(uniquePersonList.contains(editedAlice));
-    }
-
-    @Test
-    public void add_nullPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.add(null);
-    }
-
-    @Test
-    public void add_duplicatePerson_throwsDuplicatePersonException() {
-        uniquePersonList.add(ALICE);
-        thrown.expect(DuplicatePersonException.class);
-        uniquePersonList.add(ALICE);
-    }
-
-    @Test
-    public void setPerson_nullTargetPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.setPerson(null, ALICE);
-    }
-
-    @Test
-    public void setPerson_nullEditedPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.setPerson(ALICE, null);
-    }
-
-    @Test
-    public void setPerson_targetPersonNotInList_throwsPersonNotFoundException() {
-        thrown.expect(PersonNotFoundException.class);
-        uniquePersonList.setPerson(ALICE, ALICE);
-    }
-
-    @Test
-    public void setPerson_editedPersonIsSamePerson_success() {
-        uniquePersonList.add(ALICE);
-        uniquePersonList.setPerson(ALICE, ALICE);
-        UniquePersonList expectedUniquePersonList = new UniquePersonList();
-        expectedUniquePersonList.add(ALICE);
-        assertEquals(expectedUniquePersonList, uniquePersonList);
-    }
-
-    @Test
-    public void setPerson_editedPersonHasSameIdentity_success() {
-        uniquePersonList.add(ALICE);
-        Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
-                .build();
-        uniquePersonList.setPerson(ALICE, editedAlice);
-        UniquePersonList expectedUniquePersonList = new UniquePersonList();
-        expectedUniquePersonList.add(editedAlice);
-        assertEquals(expectedUniquePersonList, uniquePersonList);
-    }
-
-    @Test
-    public void setPerson_editedPersonHasDifferentIdentity_success() {
-        uniquePersonList.add(ALICE);
-        uniquePersonList.setPerson(ALICE, BOB);
-        UniquePersonList expectedUniquePersonList = new UniquePersonList();
-        expectedUniquePersonList.add(BOB);
-        assertEquals(expectedUniquePersonList, uniquePersonList);
-    }
-
-    @Test
-    public void setPerson_editedPersonHasNonUniqueIdentity_throwsDuplicatePersonException() {
-        uniquePersonList.add(ALICE);
-        uniquePersonList.add(BOB);
-        thrown.expect(DuplicatePersonException.class);
-        uniquePersonList.setPerson(ALICE, BOB);
-    }
-
-    @Test
-    public void remove_nullPerson_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.remove(null);
-    }
-
-    @Test
-    public void remove_personDoesNotExist_throwsPersonNotFoundException() {
-        thrown.expect(PersonNotFoundException.class);
-        uniquePersonList.remove(ALICE);
-    }
-
-    @Test
-    public void remove_existingPerson_removesPerson() {
-        uniquePersonList.add(ALICE);
-        uniquePersonList.remove(ALICE);
-        UniquePersonList expectedUniquePersonList = new UniquePersonList();
-        assertEquals(expectedUniquePersonList, uniquePersonList);
-    }
-
-    @Test
-    public void setPersons_nullUniquePersonList_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.setPersons((UniquePersonList) null);
-    }
-
-    @Test
-    public void setPersons_uniquePersonList_replacesOwnListWithProvidedUniquePersonList() {
-        uniquePersonList.add(ALICE);
-        UniquePersonList expectedUniquePersonList = new UniquePersonList();
-        expectedUniquePersonList.add(BOB);
-        uniquePersonList.setPersons(expectedUniquePersonList);
-        assertEquals(expectedUniquePersonList, uniquePersonList);
-    }
-
-    @Test
-    public void setPersons_nullList_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        uniquePersonList.setPersons((List<Person>) null);
-    }
-
-    @Test
-    public void setPersons_list_replacesOwnListWithProvidedList() {
-        uniquePersonList.add(ALICE);
-        List<Person> personList = Collections.singletonList(BOB);
-        uniquePersonList.setPersons(personList);
-        UniquePersonList expectedUniquePersonList = new UniquePersonList();
-        expectedUniquePersonList.add(BOB);
-        assertEquals(expectedUniquePersonList, uniquePersonList);
-    }
-
-    @Test
-    public void setPersons_listWithDuplicatePersons_throwsDuplicatePersonException() {
-        List<Person> listWithDuplicatePersons = Arrays.asList(ALICE, ALICE);
-        thrown.expect(DuplicatePersonException.class);
-        uniquePersonList.setPersons(listWithDuplicatePersons);
-    }
-
-    @Test
-    public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
-        thrown.expect(UnsupportedOperationException.class);
-        uniquePersonList.asUnmodifiableObservableList().remove(0);
-    }
-}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
deleted file mode 100644
index c21a37283d81..000000000000
--- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.Assert.assertEquals;
-import static seedu.address.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT;
-import static seedu.address.testutil.TypicalPersons.BENSON;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.testutil.Assert;
-
-public class JsonAdaptedPersonTest {
-    private static final String INVALID_NAME = "R@chel";
-    private static final String INVALID_PHONE = "+651234";
-    private static final String INVALID_ADDRESS = " ";
-    private static final String INVALID_EMAIL = "example.com";
-    private static final String INVALID_TAG = "#friend";
-
-    private static final String VALID_NAME = BENSON.getName().toString();
-    private static final String VALID_PHONE = BENSON.getPhone().toString();
-    private static final String VALID_EMAIL = BENSON.getEmail().toString();
-    private static final String VALID_ADDRESS = BENSON.getAddress().toString();
-    private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
-            .map(JsonAdaptedTag::new)
-            .collect(Collectors.toList());
-
-    @Test
-    public void toModelType_validPersonDetails_returnsPerson() throws Exception {
-        JsonAdaptedPerson person = new JsonAdaptedPerson(BENSON);
-        assertEquals(BENSON, person.toModelType());
-    }
-
-    @Test
-    public void toModelType_invalidName_throwsIllegalValueException() {
-        JsonAdaptedPerson person =
-                new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = Name.MESSAGE_CONSTRAINTS;
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_nullName_throwsIllegalValueException() {
-        JsonAdaptedPerson person = new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_invalidPhone_throwsIllegalValueException() {
-        JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_nullPhone_throwsIllegalValueException() {
-        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_invalidEmail_throwsIllegalValueException() {
-        JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = Email.MESSAGE_CONSTRAINTS;
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_nullEmail_throwsIllegalValueException() {
-        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_invalidAddress_throwsIllegalValueException() {
-        JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_TAGS);
-        String expectedMessage = Address.MESSAGE_CONSTRAINTS;
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_nullAddress_throwsIllegalValueException() {
-        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, null, VALID_TAGS);
-        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
-        Assert.assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
-
-    @Test
-    public void toModelType_invalidTags_throwsIllegalValueException() {
-        List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
-        invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
-        JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, invalidTags);
-        Assert.assertThrows(IllegalValueException.class, person::toModelType);
-    }
-
-}
diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
deleted file mode 100644
index 6c18ecd0edd9..000000000000
--- a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.HOON;
-import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.TemporaryFolder;
-
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-
-public class JsonAddressBookStorageTest {
-    private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonAddressBookStorageTest");
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-    @Test
-    public void readAddressBook_nullFilePath_throwsNullPointerException() throws Exception {
-        thrown.expect(NullPointerException.class);
-        readAddressBook(null);
-    }
-
-    private java.util.Optional<ReadOnlyAddressBook> readAddressBook(String filePath) throws Exception {
-        return new JsonAddressBookStorage(Paths.get(filePath)).readAddressBook(addToTestDataPathIfNotNull(filePath));
-    }
-
-    private Path addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) {
-        return prefsFileInTestDataFolder != null
-                ? TEST_DATA_FOLDER.resolve(prefsFileInTestDataFolder)
-                : null;
-    }
-
-    @Test
-    public void read_missingFile_emptyResult() throws Exception {
-        assertFalse(readAddressBook("NonExistentFile.json").isPresent());
-    }
-
-    @Test
-    public void read_notJsonFormat_exceptionThrown() throws Exception {
-
-        thrown.expect(DataConversionException.class);
-        readAddressBook("notJsonFormatAddressBook.json");
-
-        // IMPORTANT: Any code below an exception-throwing line (like the one above) will be ignored.
-        // That means you should not have more than one exception test in one method
-    }
-
-    @Test
-    public void readAddressBook_invalidPersonAddressBook_throwDataConversionException() throws Exception {
-        thrown.expect(DataConversionException.class);
-        readAddressBook("invalidPersonAddressBook.json");
-    }
-
-    @Test
-    public void readAddressBook_invalidAndValidPersonAddressBook_throwDataConversionException() throws Exception {
-        thrown.expect(DataConversionException.class);
-        readAddressBook("invalidAndValidPersonAddressBook.json");
-    }
-
-    @Test
-    public void readAndSaveAddressBook_allInOrder_success() throws Exception {
-        Path filePath = testFolder.getRoot().toPath().resolve("TempAddressBook.json");
-        AddressBook original = getTypicalAddressBook();
-        JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
-
-        // Save in new file and read back
-        jsonAddressBookStorage.saveAddressBook(original, filePath);
-        ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
-        assertEquals(original, new AddressBook(readBack));
-
-        // Modify data, overwrite exiting file, and read back
-        original.addPerson(HOON);
-        original.removePerson(ALICE);
-        jsonAddressBookStorage.saveAddressBook(original, filePath);
-        readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
-        assertEquals(original, new AddressBook(readBack));
-
-        // Save and read without specifying file path
-        original.addPerson(IDA);
-        jsonAddressBookStorage.saveAddressBook(original); // file path not specified
-        readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
-        assertEquals(original, new AddressBook(readBack));
-
-    }
-
-    @Test
-    public void saveAddressBook_nullAddressBook_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        saveAddressBook(null, "SomeFile.json");
-    }
-
-    /**
-     * Saves {@code addressBook} at the specified {@code filePath}.
-     */
-    private void saveAddressBook(ReadOnlyAddressBook addressBook, String filePath) {
-        try {
-            new JsonAddressBookStorage(Paths.get(filePath))
-                    .saveAddressBook(addressBook, addToTestDataPathIfNotNull(filePath));
-        } catch (IOException ioe) {
-            throw new AssertionError("There should not be an error writing to the file.", ioe);
-        }
-    }
-
-    @Test
-    public void saveAddressBook_nullFilePath_throwsNullPointerException() {
-        thrown.expect(NullPointerException.class);
-        saveAddressBook(new AddressBook(), null);
-    }
-}
diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
deleted file mode 100644
index 9bd56c0e6c5a..000000000000
--- a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.Assert.assertEquals;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.AddressBook;
-import seedu.address.testutil.TypicalPersons;
-
-public class JsonSerializableAddressBookTest {
-
-    private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableAddressBookTest");
-    private static final Path TYPICAL_PERSONS_FILE = TEST_DATA_FOLDER.resolve("typicalPersonsAddressBook.json");
-    private static final Path INVALID_PERSON_FILE = TEST_DATA_FOLDER.resolve("invalidPersonAddressBook.json");
-    private static final Path DUPLICATE_PERSON_FILE = TEST_DATA_FOLDER.resolve("duplicatePersonAddressBook.json");
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void toModelType_typicalPersonsFile_success() throws Exception {
-        JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(TYPICAL_PERSONS_FILE,
-                JsonSerializableAddressBook.class).get();
-        AddressBook addressBookFromFile = dataFromFile.toModelType();
-        AddressBook typicalPersonsAddressBook = TypicalPersons.getTypicalAddressBook();
-        assertEquals(addressBookFromFile, typicalPersonsAddressBook);
-    }
-
-    @Test
-    public void toModelType_invalidPersonFile_throwsIllegalValueException() throws Exception {
-        JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(INVALID_PERSON_FILE,
-                JsonSerializableAddressBook.class).get();
-        thrown.expect(IllegalValueException.class);
-        dataFromFile.toModelType();
-    }
-
-    @Test
-    public void toModelType_duplicatePersons_throwsIllegalValueException() throws Exception {
-        JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(DUPLICATE_PERSON_FILE,
-                JsonSerializableAddressBook.class).get();
-        thrown.expect(IllegalValueException.class);
-        thrown.expectMessage(JsonSerializableAddressBook.MESSAGE_DUPLICATE_PERSON);
-        dataFromFile.toModelType();
-    }
-
-}
diff --git a/src/test/java/seedu/address/testutil/AddressBookBuilder.java b/src/test/java/seedu/address/testutil/AddressBookBuilder.java
deleted file mode 100644
index d53799fd1102..000000000000
--- a/src/test/java/seedu/address/testutil/AddressBookBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package seedu.address.testutil;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * A utility class to help with building Addressbook objects.
- * Example usage: <br>
- *     {@code AddressBook ab = new AddressBookBuilder().withPerson("John", "Doe").build();}
- */
-public class AddressBookBuilder {
-
-    private AddressBook addressBook;
-
-    public AddressBookBuilder() {
-        addressBook = new AddressBook();
-    }
-
-    public AddressBookBuilder(AddressBook addressBook) {
-        this.addressBook = addressBook;
-    }
-
-    /**
-     * Adds a new {@code Person} to the {@code AddressBook} that we are building.
-     */
-    public AddressBookBuilder withPerson(Person person) {
-        addressBook.addPerson(person);
-        return this;
-    }
-
-    public AddressBook build() {
-        return addressBook;
-    }
-}
diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
deleted file mode 100644
index 4584bd5044e1..000000000000
--- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package seedu.address.testutil;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * A utility class to help with building EditPersonDescriptor objects.
- */
-public class EditPersonDescriptorBuilder {
-
-    private EditPersonDescriptor descriptor;
-
-    public EditPersonDescriptorBuilder() {
-        descriptor = new EditPersonDescriptor();
-    }
-
-    public EditPersonDescriptorBuilder(EditPersonDescriptor descriptor) {
-        this.descriptor = new EditPersonDescriptor(descriptor);
-    }
-
-    /**
-     * Returns an {@code EditPersonDescriptor} with fields containing {@code person}'s details
-     */
-    public EditPersonDescriptorBuilder(Person person) {
-        descriptor = new EditPersonDescriptor();
-        descriptor.setName(person.getName());
-        descriptor.setPhone(person.getPhone());
-        descriptor.setEmail(person.getEmail());
-        descriptor.setAddress(person.getAddress());
-        descriptor.setTags(person.getTags());
-    }
-
-    /**
-     * Sets the {@code Name} of the {@code EditPersonDescriptor} that we are building.
-     */
-    public EditPersonDescriptorBuilder withName(String name) {
-        descriptor.setName(new Name(name));
-        return this;
-    }
-
-    /**
-     * Sets the {@code Phone} of the {@code EditPersonDescriptor} that we are building.
-     */
-    public EditPersonDescriptorBuilder withPhone(String phone) {
-        descriptor.setPhone(new Phone(phone));
-        return this;
-    }
-
-    /**
-     * Sets the {@code Email} of the {@code EditPersonDescriptor} that we are building.
-     */
-    public EditPersonDescriptorBuilder withEmail(String email) {
-        descriptor.setEmail(new Email(email));
-        return this;
-    }
-
-    /**
-     * Sets the {@code Address} of the {@code EditPersonDescriptor} that we are building.
-     */
-    public EditPersonDescriptorBuilder withAddress(String address) {
-        descriptor.setAddress(new Address(address));
-        return this;
-    }
-
-    /**
-     * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code EditPersonDescriptor}
-     * that we are building.
-     */
-    public EditPersonDescriptorBuilder withTags(String... tags) {
-        Set<Tag> tagSet = Stream.of(tags).map(Tag::new).collect(Collectors.toSet());
-        descriptor.setTags(tagSet);
-        return this;
-    }
-
-    public EditPersonDescriptor build() {
-        return descriptor;
-    }
-}
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
deleted file mode 100644
index 5eff412178bd..000000000000
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package seedu.address.testutil;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.model.util.SampleDataUtil;
-
-/**
- * A utility class to help with building Person objects.
- */
-public class PersonBuilder {
-
-    public static final String DEFAULT_NAME = "Alice Pauline";
-    public static final String DEFAULT_PHONE = "85355255";
-    public static final String DEFAULT_EMAIL = "alice@gmail.com";
-    public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
-
-    private Name name;
-    private Phone phone;
-    private Email email;
-    private Address address;
-    private Set<Tag> tags;
-
-    public PersonBuilder() {
-        name = new Name(DEFAULT_NAME);
-        phone = new Phone(DEFAULT_PHONE);
-        email = new Email(DEFAULT_EMAIL);
-        address = new Address(DEFAULT_ADDRESS);
-        tags = new HashSet<>();
-    }
-
-    /**
-     * Initializes the PersonBuilder with the data of {@code personToCopy}.
-     */
-    public PersonBuilder(Person personToCopy) {
-        name = personToCopy.getName();
-        phone = personToCopy.getPhone();
-        email = personToCopy.getEmail();
-        address = personToCopy.getAddress();
-        tags = new HashSet<>(personToCopy.getTags());
-    }
-
-    /**
-     * Sets the {@code Name} of the {@code Person} that we are building.
-     */
-    public PersonBuilder withName(String name) {
-        this.name = new Name(name);
-        return this;
-    }
-
-    /**
-     * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code Person} that we are building.
-     */
-    public PersonBuilder withTags(String ... tags) {
-        this.tags = SampleDataUtil.getTagSet(tags);
-        return this;
-    }
-
-    /**
-     * Sets the {@code Address} of the {@code Person} that we are building.
-     */
-    public PersonBuilder withAddress(String address) {
-        this.address = new Address(address);
-        return this;
-    }
-
-    /**
-     * Sets the {@code Phone} of the {@code Person} that we are building.
-     */
-    public PersonBuilder withPhone(String phone) {
-        this.phone = new Phone(phone);
-        return this;
-    }
-
-    /**
-     * Sets the {@code Email} of the {@code Person} that we are building.
-     */
-    public PersonBuilder withEmail(String email) {
-        this.email = new Email(email);
-        return this;
-    }
-
-    public Person build() {
-        return new Person(name, phone, email, address, tags);
-    }
-
-}
diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java
deleted file mode 100644
index 908499451834..000000000000
--- a/src/test/java/seedu/address/testutil/PersonUtil.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package seedu.address.testutil;
-
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import java.util.Set;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Person;
-import seedu.address.model.tag.Tag;
-
-/**
- * A utility class for Person.
- */
-public class PersonUtil {
-
-    /**
-     * Returns an add command string for adding the {@code person}.
-     */
-    public static String getAddCommand(Person person) {
-        return AddCommand.COMMAND_WORD + " " + getPersonDetails(person);
-    }
-
-    /**
-     * Returns the part of command string for the given {@code person}'s details.
-     */
-    public static String getPersonDetails(Person person) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(PREFIX_NAME + person.getName().fullName + " ");
-        sb.append(PREFIX_PHONE + person.getPhone().value + " ");
-        sb.append(PREFIX_EMAIL + person.getEmail().value + " ");
-        sb.append(PREFIX_ADDRESS + person.getAddress().value + " ");
-        person.getTags().stream().forEach(
-            s -> sb.append(PREFIX_TAG + s.tagName + " ")
-        );
-        return sb.toString();
-    }
-
-    /**
-     * Returns the part of command string for the given {@code EditPersonDescriptor}'s details.
-     */
-    public static String getEditPersonDescriptorDetails(EditPersonDescriptor descriptor) {
-        StringBuilder sb = new StringBuilder();
-        descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
-        descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
-        descriptor.getEmail().ifPresent(email -> sb.append(PREFIX_EMAIL).append(email.value).append(" "));
-        descriptor.getAddress().ifPresent(address -> sb.append(PREFIX_ADDRESS).append(address.value).append(" "));
-        if (descriptor.getTags().isPresent()) {
-            Set<Tag> tags = descriptor.getTags().get();
-            if (tags.isEmpty()) {
-                sb.append(PREFIX_TAG);
-            } else {
-                tags.forEach(s -> sb.append(PREFIX_TAG).append(s.tagName).append(" "));
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java
deleted file mode 100644
index 1e6139376570..000000000000
--- a/src/test/java/seedu/address/testutil/TypicalIndexes.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package seedu.address.testutil;
-
-import seedu.address.commons.core.index.Index;
-
-/**
- * A utility class containing a list of {@code Index} objects to be used in tests.
- */
-public class TypicalIndexes {
-    public static final Index INDEX_FIRST_PERSON = Index.fromOneBased(1);
-    public static final Index INDEX_SECOND_PERSON = Index.fromOneBased(2);
-    public static final Index INDEX_THIRD_PERSON = Index.fromOneBased(3);
-}
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
deleted file mode 100644
index fec76fb71293..000000000000
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package seedu.address.testutil;
-
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * A utility class containing a list of {@code Person} objects to be used in tests.
- */
-public class TypicalPersons {
-
-    public static final Person ALICE = new PersonBuilder().withName("Alice Pauline")
-            .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
-            .withPhone("94351253")
-            .withTags("friends").build();
-    public static final Person BENSON = new PersonBuilder().withName("Benson Meier")
-            .withAddress("311, Clementi Ave 2, #02-25")
-            .withEmail("johnd@example.com").withPhone("98765432")
-            .withTags("owesMoney", "friends").build();
-    public static final Person CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
-            .withEmail("heinz@example.com").withAddress("wall street").build();
-    public static final Person DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
-            .withEmail("cornelia@example.com").withAddress("10th street").withTags("friends").build();
-    public static final Person ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
-            .withEmail("werner@example.com").withAddress("michegan ave").build();
-    public static final Person FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
-            .withEmail("lydia@example.com").withAddress("little tokyo").build();
-    public static final Person GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
-            .withEmail("anna@example.com").withAddress("4th street").build();
-
-    // Manually added
-    public static final Person HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
-            .withEmail("stefan@example.com").withAddress("little india").build();
-    public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
-            .withEmail("hans@example.com").withAddress("chicago ave").build();
-
-    // Manually added - Person's details found in {@code CommandTestUtil}
-    public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
-            .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build();
-    public static final Person BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
-            .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
-            .build();
-
-    public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER
-
-    private TypicalPersons() {} // prevents instantiation
-
-    /**
-     * Returns an {@code AddressBook} with all the typical persons.
-     */
-    public static AddressBook getTypicalAddressBook() {
-        AddressBook ab = new AddressBook();
-        for (Person person : getTypicalPersons()) {
-            ab.addPerson(person);
-        }
-        return ab;
-    }
-
-    public static List<Person> getTypicalPersons() {
-        return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE));
-    }
-}
diff --git a/src/test/java/seedu/address/ui/PersonCardTest.java b/src/test/java/seedu/address/ui/PersonCardTest.java
deleted file mode 100644
index 42f840faa3b4..000000000000
--- a/src/test/java/seedu/address/ui/PersonCardTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package seedu.address.ui;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static seedu.address.ui.testutil.GuiTestAssert.assertCardDisplaysPerson;
-
-import org.junit.Test;
-
-import guitests.guihandles.PersonCardHandle;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
-
-public class PersonCardTest extends GuiUnitTest {
-
-    @Test
-    public void display() {
-        // no tags
-        Person personWithNoTags = new PersonBuilder().withTags(new String[0]).build();
-        PersonCard personCard = new PersonCard(personWithNoTags, 1);
-        uiPartRule.setUiPart(personCard);
-        assertCardDisplay(personCard, personWithNoTags, 1);
-
-        // with tags
-        Person personWithTags = new PersonBuilder().build();
-        personCard = new PersonCard(personWithTags, 2);
-        uiPartRule.setUiPart(personCard);
-        assertCardDisplay(personCard, personWithTags, 2);
-    }
-
-    @Test
-    public void equals() {
-        Person person = new PersonBuilder().build();
-        PersonCard personCard = new PersonCard(person, 0);
-
-        // same person, same index -> returns true
-        PersonCard copy = new PersonCard(person, 0);
-        assertTrue(personCard.equals(copy));
-
-        // same object -> returns true
-        assertTrue(personCard.equals(personCard));
-
-        // null -> returns false
-        assertFalse(personCard.equals(null));
-
-        // different types -> returns false
-        assertFalse(personCard.equals(0));
-
-        // different person, same index -> returns false
-        Person differentPerson = new PersonBuilder().withName("differentName").build();
-        assertFalse(personCard.equals(new PersonCard(differentPerson, 0)));
-
-        // same person, different index -> returns false
-        assertFalse(personCard.equals(new PersonCard(person, 1)));
-    }
-
-    /**
-     * Asserts that {@code personCard} displays the details of {@code expectedPerson} correctly and matches
-     * {@code expectedId}.
-     */
-    private void assertCardDisplay(PersonCard personCard, Person expectedPerson, int expectedId) {
-        guiRobot.pauseForHuman();
-
-        PersonCardHandle personCardHandle = new PersonCardHandle(personCard.getRoot());
-
-        // verify id is displayed correctly
-        assertEquals(Integer.toString(expectedId) + ". ", personCardHandle.getId());
-
-        // verify person details are displayed correctly
-        assertCardDisplaysPerson(expectedPerson, personCardHandle);
-    }
-}
diff --git a/src/test/java/seedu/address/ui/PersonListPanelTest.java b/src/test/java/seedu/address/ui/PersonListPanelTest.java
deleted file mode 100644
index bac9d345f62d..000000000000
--- a/src/test/java/seedu/address/ui/PersonListPanelTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package seedu.address.ui;
-
-import static java.time.Duration.ofMillis;
-import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalPersons;
-import static seedu.address.ui.testutil.GuiTestAssert.assertCardDisplaysPerson;
-import static seedu.address.ui.testutil.GuiTestAssert.assertCardEquals;
-
-import java.util.Collections;
-
-import org.junit.Test;
-
-import guitests.guihandles.PersonCardHandle;
-import guitests.guihandles.PersonListPanelHandle;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-
-public class PersonListPanelTest extends GuiUnitTest {
-    private static final ObservableList<Person> TYPICAL_PERSONS =
-            FXCollections.observableList(getTypicalPersons());
-
-    private static final long CARD_CREATION_AND_DELETION_TIMEOUT = 2500;
-
-    private final SimpleObjectProperty<Person> selectedPerson = new SimpleObjectProperty<>();
-    private PersonListPanelHandle personListPanelHandle;
-
-    @Test
-    public void display() {
-        initUi(TYPICAL_PERSONS);
-
-        for (int i = 0; i < TYPICAL_PERSONS.size(); i++) {
-            personListPanelHandle.navigateToCard(TYPICAL_PERSONS.get(i));
-            Person expectedPerson = TYPICAL_PERSONS.get(i);
-            PersonCardHandle actualCard = personListPanelHandle.getPersonCardHandle(i);
-
-            assertCardDisplaysPerson(expectedPerson, actualCard);
-            assertEquals(Integer.toString(i + 1) + ". ", actualCard.getId());
-        }
-    }
-
-    @Test
-    public void selection_modelSelectedPersonChanged_selectionChanges() {
-        initUi(TYPICAL_PERSONS);
-        Person secondPerson = TYPICAL_PERSONS.get(INDEX_SECOND_PERSON.getZeroBased());
-        guiRobot.interact(() -> selectedPerson.set(secondPerson));
-        guiRobot.pauseForHuman();
-
-        PersonCardHandle expectedPerson = personListPanelHandle.getPersonCardHandle(INDEX_SECOND_PERSON.getZeroBased());
-        PersonCardHandle selectedPerson = personListPanelHandle.getHandleToSelectedCard();
-        assertCardEquals(expectedPerson, selectedPerson);
-    }
-
-    /**
-     * Verifies that creating and deleting large number of persons in {@code PersonListPanel} requires lesser than
-     * {@code CARD_CREATION_AND_DELETION_TIMEOUT} milliseconds to execute.
-     */
-    @Test
-    public void performanceTest() {
-        ObservableList<Person> backingList = createBackingList(10000);
-
-        assertTimeoutPreemptively(ofMillis(CARD_CREATION_AND_DELETION_TIMEOUT), () -> {
-            initUi(backingList);
-            guiRobot.interact(backingList::clear);
-        }, "Creation and deletion of person cards exceeded time limit");
-    }
-
-    /**
-     * Returns a list of persons containing {@code personCount} persons that is used to populate the
-     * {@code PersonListPanel}.
-     */
-    private ObservableList<Person> createBackingList(int personCount) {
-        ObservableList<Person> backingList = FXCollections.observableArrayList();
-        for (int i = 0; i < personCount; i++) {
-            Name name = new Name(i + "a");
-            Phone phone = new Phone("000");
-            Email email = new Email("a@aa");
-            Address address = new Address("a");
-            Person person = new Person(name, phone, email, address, Collections.emptySet());
-            backingList.add(person);
-        }
-        return backingList;
-    }
-
-    /**
-     * Initializes {@code personListPanelHandle} with a {@code PersonListPanel} backed by {@code backingList}.
-     * Also shows the {@code Stage} that displays only {@code PersonListPanel}.
-     */
-    private void initUi(ObservableList<Person> backingList) {
-        PersonListPanel personListPanel =
-                new PersonListPanel(backingList, selectedPerson, selectedPerson::set);
-        uiPartRule.setUiPart(personListPanel);
-
-        personListPanelHandle = new PersonListPanelHandle(getChildNode(personListPanel.getRoot(),
-                PersonListPanelHandle.PERSON_LIST_VIEW_ID));
-    }
-}
diff --git a/src/test/java/seedu/address/ui/testutil/GuiTestAssert.java b/src/test/java/seedu/address/ui/testutil/GuiTestAssert.java
deleted file mode 100644
index 6d896fc24e79..000000000000
--- a/src/test/java/seedu/address/ui/testutil/GuiTestAssert.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package seedu.address.ui.testutil;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import guitests.guihandles.PersonCardHandle;
-import guitests.guihandles.PersonListPanelHandle;
-import guitests.guihandles.ResultDisplayHandle;
-import seedu.address.model.person.Person;
-
-/**
- * A set of assertion methods useful for writing GUI tests.
- */
-public class GuiTestAssert {
-    /**
-     * Asserts that {@code actualCard} displays the same values as {@code expectedCard}.
-     */
-    public static void assertCardEquals(PersonCardHandle expectedCard, PersonCardHandle actualCard) {
-        assertEquals(expectedCard.getId(), actualCard.getId());
-        assertEquals(expectedCard.getAddress(), actualCard.getAddress());
-        assertEquals(expectedCard.getEmail(), actualCard.getEmail());
-        assertEquals(expectedCard.getName(), actualCard.getName());
-        assertEquals(expectedCard.getPhone(), actualCard.getPhone());
-        assertEquals(expectedCard.getTags(), actualCard.getTags());
-    }
-
-    /**
-     * Asserts that {@code actualCard} displays the details of {@code expectedPerson}.
-     */
-    public static void assertCardDisplaysPerson(Person expectedPerson, PersonCardHandle actualCard) {
-        assertEquals(expectedPerson.getName().fullName, actualCard.getName());
-        assertEquals(expectedPerson.getPhone().value, actualCard.getPhone());
-        assertEquals(expectedPerson.getEmail().value, actualCard.getEmail());
-        assertEquals(expectedPerson.getAddress().value, actualCard.getAddress());
-        assertEquals(expectedPerson.getTags().stream().map(tag -> tag.tagName).collect(Collectors.toList()),
-                actualCard.getTags());
-    }
-
-    /**
-     * Asserts that the list in {@code personListPanelHandle} displays the details of {@code persons} correctly and
-     * in the correct order.
-     */
-    public static void assertListMatching(PersonListPanelHandle personListPanelHandle, Person... persons) {
-        for (int i = 0; i < persons.length; i++) {
-            personListPanelHandle.navigateToCard(i);
-            assertCardDisplaysPerson(persons[i], personListPanelHandle.getPersonCardHandle(i));
-        }
-    }
-
-    /**
-     * Asserts that the list in {@code personListPanelHandle} displays the details of {@code persons} correctly and
-     * in the correct order.
-     */
-    public static void assertListMatching(PersonListPanelHandle personListPanelHandle, List<Person> persons) {
-        assertListMatching(personListPanelHandle, persons.toArray(new Person[0]));
-    }
-
-    /**
-     * Asserts the size of the list in {@code personListPanelHandle} equals to {@code size}.
-     */
-    public static void assertListSize(PersonListPanelHandle personListPanelHandle, int size) {
-        int numberOfPeople = personListPanelHandle.getListSize();
-        assertEquals(size, numberOfPeople);
-    }
-
-    /**
-     * Asserts the message shown in {@code resultDisplayHandle} equals to {@code expected}.
-     */
-    public static void assertResultMessage(ResultDisplayHandle resultDisplayHandle, String expected) {
-        assertEquals(expected, resultDisplayHandle.getText());
-    }
-}
diff --git a/src/test/java/systemtests/AddCommandSystemTest.java b/src/test/java/systemtests/AddCommandSystemTest.java
index 86a8a2dd04a7..e41415cc38ac 100644
--- a/src/test/java/systemtests/AddCommandSystemTest.java
+++ b/src/test/java/systemtests/AddCommandSystemTest.java
@@ -1,52 +1,54 @@
 package systemtests;
 
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.AMY;
-import static seedu.address.testutil.TypicalPersons.BOB;
-import static seedu.address.testutil.TypicalPersons.CARL;
-import static seedu.address.testutil.TypicalPersons.HOON;
-import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.KEYWORD_MATCHING_MEIER;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CODE_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_COREQUISITE_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CREDITS_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_SEMESTER_DESC_FIVE;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTERS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTERS_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CREDITS_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_AMY_TWO;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_BOB_FOUR;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_SEMESTER_BOB_THREE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.AMY;
+import static pwe.planner.testutil.TypicalModules.BOB;
+import static pwe.planner.testutil.TypicalModules.CARL;
+import static pwe.planner.testutil.TypicalModules.HOON;
+import static pwe.planner.testutil.TypicalModules.IDA;
+import static pwe.planner.testutil.TypicalModules.KEYWORD_MATCHING_MEIER;
 
 import org.junit.Test;
 
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.model.Model;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.PersonBuilder;
-import seedu.address.testutil.PersonUtil;
-
-public class AddCommandSystemTest extends AddressBookSystemTest {
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.AddCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.planner.Semester;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.testutil.ModuleBuilder;
+import pwe.planner.testutil.ModuleUtil;
+
+public class AddCommandSystemTest extends ApplicationSystemTest {
 
     @Test
     public void add() {
@@ -54,12 +56,12 @@ public void add() {
 
         /* ------------------------ Perform add operations on the shown unfiltered list ----------------------------- */
 
-        /* Case: add a person without tags to a non-empty address book, command with leading spaces and trailing spaces
+        /* Case: add a module without tags to a non-empty application, command with leading spaces and trailing spaces
          * -> added
          */
-        Person toAdd = AMY;
-        String command = "   " + AddCommand.COMMAND_WORD + "  " + NAME_DESC_AMY + "  " + PHONE_DESC_AMY + " "
-                + EMAIL_DESC_AMY + "   " + ADDRESS_DESC_AMY + "   " + TAG_DESC_FRIEND + " ";
+        Module toAdd = AMY;
+        String command = "   " + AddCommand.COMMAND_WORD + "  " + CODE_DESC_AMY + "   " + NAME_DESC_AMY + "  "
+                + CREDITS_DESC_AMY + "  " + SEMESTERS_DESC_AMY + "   " + TAG_DESC_FRIEND + " ";
         assertCommandSuccess(command, toAdd);
 
         /* Case: undo adding Amy to the list -> Amy deleted */
@@ -69,111 +71,116 @@ public void add() {
 
         /* Case: redo adding Amy to the list -> Amy added again */
         command = RedoCommand.COMMAND_WORD;
-        model.addPerson(toAdd);
+        model.addModule(toAdd);
         expectedResultMessage = RedoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, model, expectedResultMessage);
 
-        /* Case: add a person with all fields same as another person in the address book except name -> added */
-        toAdd = new PersonBuilder(AMY).withName(VALID_NAME_BOB).build();
-        command = AddCommand.COMMAND_WORD + NAME_DESC_BOB + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY
-                + TAG_DESC_FRIEND;
-        assertCommandSuccess(command, toAdd);
+        /* Case: add a module with all fields same as another module in the application except name -> rejected */
+        toAdd = new ModuleBuilder(AMY).withName(VALID_NAME_BOB).build();
+        command = ModuleUtil.getAddCommand(toAdd);
+        expectedResultMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, toAdd.getCode());
+        assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: add a person with all fields same as another person in the address book except phone and email
-         * -> added
+        /* Case: add a module with all fields same as another module in the application except credits -> rejected */
+        toAdd = new ModuleBuilder(AMY).withCredits(VALID_CREDITS_BOB).build();
+        command = ModuleUtil.getAddCommand(toAdd);
+        expectedResultMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, toAdd.getCode());
+        assertCommandFailure(command, expectedResultMessage);
+
+        /* Case: add a module with all fields same as another module in the application except 1/2 semesters
+         * -> rejected
          */
-        toAdd = new PersonBuilder(AMY).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).build();
-        command = PersonUtil.getAddCommand(toAdd);
-        assertCommandSuccess(command, toAdd);
+        toAdd = new ModuleBuilder(AMY).withSemesters(VALID_SEMESTER_AMY_TWO, VALID_SEMESTER_BOB_THREE).build();
+        command = ModuleUtil.getAddCommand(toAdd);
+        expectedResultMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, toAdd.getCode());
+        assertCommandFailure(command, expectedResultMessage);
+
+        /* Case: add a module with all fields same as another module in the application except all semesters
+         * -> rejected
+         */
+        toAdd = new ModuleBuilder(AMY).withSemesters(VALID_SEMESTER_BOB_THREE, VALID_SEMESTER_BOB_FOUR).build();
+        command = ModuleUtil.getAddCommand(toAdd);
+        expectedResultMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, toAdd.getCode());
+        assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: add to empty address book -> added */
-        deleteAllPersons();
+        /* Case: add to empty application -> added */
+        deleteAllModules();
         assertCommandSuccess(ALICE);
 
-        /* Case: add a person with tags, command with parameters in random order -> added */
+        /* Case: add a module with tags, command with parameters in random order -> added */
         toAdd = BOB;
-        command = AddCommand.COMMAND_WORD + TAG_DESC_FRIEND + PHONE_DESC_BOB + ADDRESS_DESC_BOB + NAME_DESC_BOB
-                + TAG_DESC_HUSBAND + EMAIL_DESC_BOB;
+        command = AddCommand.COMMAND_WORD + TAG_DESC_FRIEND + CREDITS_DESC_BOB + CODE_DESC_BOB + SEMESTERS_DESC_BOB
+                + NAME_DESC_BOB + TAG_DESC_HUSBAND;
         assertCommandSuccess(command, toAdd);
 
-        /* Case: add a person, missing tags -> added */
+        /* Case: add a module, missing tags -> added */
         assertCommandSuccess(HOON);
 
         /* -------------------------- Perform add operation on the shown filtered list ------------------------------ */
 
-        /* Case: filters the person list before adding -> added */
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
+        /* Case: filters the module list before adding -> added */
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
         assertCommandSuccess(IDA);
 
-        /* ------------------------ Perform add operation while a person card is selected --------------------------- */
+        /* ------------------------ Perform add operation while a module card is selected --------------------------- */
 
-        /* Case: selects first card in the person list, add a person -> added, card selection remains unchanged */
-        selectPerson(Index.fromOneBased(1));
+        /* Case: selects first card in the module list, add a module -> added, card selection remains unchanged */
+        selectModule(Index.fromOneBased(1));
         assertCommandSuccess(CARL);
 
         /* ----------------------------------- Perform invalid add operations --------------------------------------- */
 
-        /* Case: add a duplicate person -> rejected */
-        command = PersonUtil.getAddCommand(HOON);
-        assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON);
+        /* Case: add a duplicate module -> rejected */
+        command = ModuleUtil.getAddCommand(HOON);
+        expectedResultMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, HOON.getCode());
+        assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: add a duplicate person except with different phone -> rejected */
-        toAdd = new PersonBuilder(HOON).withPhone(VALID_PHONE_BOB).build();
-        command = PersonUtil.getAddCommand(toAdd);
-        assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: add a duplicate person except with different email -> rejected */
-        toAdd = new PersonBuilder(HOON).withEmail(VALID_EMAIL_BOB).build();
-        command = PersonUtil.getAddCommand(toAdd);
-        assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: add a duplicate person except with different address -> rejected */
-        toAdd = new PersonBuilder(HOON).withAddress(VALID_ADDRESS_BOB).build();
-        command = PersonUtil.getAddCommand(toAdd);
-        assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: add a duplicate person except with different tags -> rejected */
-        command = PersonUtil.getAddCommand(HOON) + " " + PREFIX_TAG.getPrefix() + "friends";
-        assertCommandFailure(command, AddCommand.MESSAGE_DUPLICATE_PERSON);
+        /* Case: add a duplicate module except with different tags -> rejected */
+        command = ModuleUtil.getAddCommand(HOON) + " " + PREFIX_TAG.getPrefix() + "friends";
+        expectedResultMessage = String.format(AddCommand.MESSAGE_DUPLICATE_MODULE, HOON.getCode());
+        assertCommandFailure(command, expectedResultMessage);
 
         /* Case: missing name -> rejected */
-        command = AddCommand.COMMAND_WORD + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY;
-        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+        command = AddCommand.COMMAND_WORD + CREDITS_DESC_AMY + CODE_DESC_AMY;
+        expectedResultMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
+        assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: missing phone -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY;
-        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+        /* Case: missing credits -> rejected */
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + CODE_DESC_AMY;
+        assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: missing email -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + ADDRESS_DESC_AMY;
-        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
-
-        /* Case: missing address -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY;
-        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+        /* Case: missing code -> rejected */
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + CREDITS_DESC_AMY;
+        assertCommandFailure(command, expectedResultMessage);
 
         /* Case: invalid keyword -> rejected */
-        command = "adds " + PersonUtil.getPersonDetails(toAdd);
-        assertCommandFailure(command, Messages.MESSAGE_UNKNOWN_COMMAND);
+        command = "adds " + ModuleUtil.getModuleDetails(toAdd);
+        assertCommandFailure(command, MESSAGE_UNKNOWN_COMMAND);
+
+        /* Case: invalid code -> rejected */
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + CREDITS_DESC_AMY + INVALID_CODE_DESC + SEMESTERS_DESC_AMY;
+        assertCommandFailure(command, Code.MESSAGE_CONSTRAINTS);
 
         /* Case: invalid name -> rejected */
-        command = AddCommand.COMMAND_WORD + INVALID_NAME_DESC + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY;
+        command = AddCommand.COMMAND_WORD + INVALID_NAME_DESC + CREDITS_DESC_AMY + CODE_DESC_AMY + SEMESTERS_DESC_AMY;
         assertCommandFailure(command, Name.MESSAGE_CONSTRAINTS);
 
-        /* Case: invalid phone -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + INVALID_PHONE_DESC + EMAIL_DESC_AMY + ADDRESS_DESC_AMY;
-        assertCommandFailure(command, Phone.MESSAGE_CONSTRAINTS);
+        /* Case: invalid credits -> rejected */
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + INVALID_CREDITS_DESC + CODE_DESC_AMY + SEMESTERS_DESC_AMY;
+        assertCommandFailure(command, Credits.MESSAGE_CONSTRAINTS);
 
-        /* Case: invalid email -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + INVALID_EMAIL_DESC + ADDRESS_DESC_AMY;
-        assertCommandFailure(command, Email.MESSAGE_CONSTRAINTS);
+        /* Case: invalid semester -> rejected */
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + CREDITS_DESC_AMY + CODE_DESC_AMY
+                + INVALID_SEMESTER_DESC_FIVE;
+        assertCommandFailure(command, Semester.MESSAGE_SEMESTER_CONSTRAINTS);
 
-        /* Case: invalid address -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + INVALID_ADDRESS_DESC;
-        assertCommandFailure(command, Address.MESSAGE_CONSTRAINTS);
+        /* Case: invalid corequisite code -> rejected */
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + CREDITS_DESC_AMY + CODE_DESC_AMY + SEMESTERS_DESC_AMY
+                + INVALID_COREQUISITE_DESC;
+        assertCommandFailure(command, Code.MESSAGE_CONSTRAINTS);
 
         /* Case: invalid tag -> rejected */
-        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY
+        command = AddCommand.COMMAND_WORD + NAME_DESC_AMY + CREDITS_DESC_AMY + CODE_DESC_AMY + SEMESTERS_DESC_AMY
                 + INVALID_TAG_DESC;
         assertCommandFailure(command, Tag.MESSAGE_CONSTRAINTS);
     }
@@ -184,38 +191,38 @@ public void add() {
      * 2. Command box has the default style class.<br>
      * 3. Result display box displays the success message of executing {@code AddCommand} with the details of
      * {@code toAdd}.<br>
-     * 4. {@code Storage} and {@code PersonListPanel} equal to the corresponding components in
+     * 4. {@code Storage} and {@code ModuleListPanel} equal to the corresponding components in
      * the current model added with {@code toAdd}.<br>
      * 5. Browser url and selected card remain unchanged.<br>
      * 6. Status bar's sync status changes.<br>
      * Verifications 1, 3 and 4 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
-    private void assertCommandSuccess(Person toAdd) {
-        assertCommandSuccess(PersonUtil.getAddCommand(toAdd), toAdd);
+    private void assertCommandSuccess(Module toAdd) {
+        assertCommandSuccess(ModuleUtil.getAddCommand(toAdd), toAdd);
     }
 
     /**
-     * Performs the same verification as {@code assertCommandSuccess(Person)}. Executes {@code command}
+     * Performs the same verification as {@code assertCommandSuccess(Module)}. Executes {@code command}
      * instead.
-     * @see AddCommandSystemTest#assertCommandSuccess(Person)
+     * @see AddCommandSystemTest#assertCommandSuccess(Module)
      */
-    private void assertCommandSuccess(String command, Person toAdd) {
+    private void assertCommandSuccess(String command, Module toAdd) {
         Model expectedModel = getModel();
-        expectedModel.addPerson(toAdd);
+        expectedModel.addModule(toAdd);
         String expectedResultMessage = String.format(AddCommand.MESSAGE_SUCCESS, toAdd);
 
         assertCommandSuccess(command, expectedModel, expectedResultMessage);
     }
 
     /**
-     * Performs the same verification as {@code assertCommandSuccess(String, Person)} except asserts that
+     * Performs the same verification as {@code assertCommandSuccess(String, Module)} except asserts that
      * the,<br>
      * 1. Result display box displays {@code expectedResultMessage}.<br>
-     * 2. {@code Storage} and {@code PersonListPanel} equal to the corresponding components in
+     * 2. {@code Storage} and {@code ModuleListPanel} equal to the corresponding components in
      * {@code expectedModel}.<br>
-     * @see AddCommandSystemTest#assertCommandSuccess(String, Person)
+     * @see AddCommandSystemTest#assertCommandSuccess(String, Module)
      */
     private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage) {
         executeCommand(command);
@@ -230,11 +237,11 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
      * 1. Command box displays {@code command}.<br>
      * 2. Command box has the error style class.<br>
      * 3. Result display box displays {@code expectedResultMessage}.<br>
-     * 4. {@code Storage} and {@code PersonListPanel} remain unchanged.<br>
+     * 4. {@code Storage} and {@code ModuleListPanel} remain unchanged.<br>
      * 5. Browser url, selected card and status bar remain unchanged.<br>
      * Verifications 1, 3 and 4 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandFailure(String command, String expectedResultMessage) {
         Model expectedModel = getModel();
diff --git a/src/test/java/systemtests/AddressBookSystemTest.java b/src/test/java/systemtests/ApplicationSystemTest.java
similarity index 62%
rename from src/test/java/systemtests/AddressBookSystemTest.java
rename to src/test/java/systemtests/ApplicationSystemTest.java
index 0baeaf860e6e..db2ac758fcfc 100644
--- a/src/test/java/systemtests/AddressBookSystemTest.java
+++ b/src/test/java/systemtests/ApplicationSystemTest.java
@@ -4,9 +4,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static seedu.address.ui.StatusBarFooter.SYNC_STATUS_INITIAL;
-import static seedu.address.ui.StatusBarFooter.SYNC_STATUS_UPDATED;
-import static seedu.address.ui.testutil.GuiTestAssert.assertListMatching;
+import static pwe.planner.testutil.TypicalDegreePlanners.getTypicalDegreePlannerList;
+import static pwe.planner.testutil.TypicalModules.getTypicalModuleList;
+import static pwe.planner.testutil.TypicalRequirementCategories.getTypicalRequirementCategoriesList;
+import static pwe.planner.ui.StatusBarFooter.SYNC_STATUS_INITIAL;
+import static pwe.planner.ui.StatusBarFooter.SYNC_STATUS_UPDATED;
+import static pwe.planner.ui.testutil.GuiTestAssert.assertListMatching;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -25,26 +28,28 @@
 import guitests.guihandles.CommandBoxHandle;
 import guitests.guihandles.MainMenuHandle;
 import guitests.guihandles.MainWindowHandle;
-import guitests.guihandles.PersonListPanelHandle;
+import guitests.guihandles.ModuleListPanelHandle;
 import guitests.guihandles.ResultDisplayHandle;
 import guitests.guihandles.StatusBarFooterHandle;
-import seedu.address.TestApp;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.testutil.TypicalPersons;
-import seedu.address.ui.BrowserPanel;
-import seedu.address.ui.CommandBox;
+import pwe.planner.TestApp;
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.commons.exceptions.IllegalValueException;
+import pwe.planner.logic.commands.ClearCommand;
+import pwe.planner.logic.commands.FindCommand;
+import pwe.planner.logic.commands.ListCommand;
+import pwe.planner.logic.commands.PlannerListCommand;
+import pwe.planner.logic.commands.SelectCommand;
+import pwe.planner.model.Application;
+import pwe.planner.model.Model;
+import pwe.planner.storage.JsonSerializableApplication;
+import pwe.planner.ui.BrowserPanel;
+import pwe.planner.ui.CommandBox;
 
 /**
- * A system test class for AddressBook, which provides access to handles of GUI components and helper methods
+ * A system test class for Application, which provides access to handles of GUI components and helper methods
  * for test verification.
  */
-public abstract class AddressBookSystemTest {
+public abstract class ApplicationSystemTest {
     @ClassRule
     public static ClockRule clockRule = new ClockRule();
 
@@ -64,7 +69,9 @@ public static void setupBeforeClass() {
     @Before
     public void setUp() {
         setupHelper = new SystemTestSetupHelper();
-        testApp = setupHelper.setupApplication(this::getInitialData, getDataFileLocation());
+        testApp = setupHelper
+                .setupApplication(this::getInitialData, getModuleListFileLocation(), getDegreePlannerListFileLocation(),
+                        getRequirementCategoryListFileLocation());
         mainWindowHandle = setupHelper.setupMainWindowHandle();
 
         waitUntilBrowserLoaded(getBrowserPanel());
@@ -77,17 +84,33 @@ public void tearDown() {
     }
 
     /**
-     * Returns the data to be loaded into the file in {@link #getDataFileLocation()}.
+     * Returns the data to be loaded into the file in {@link #getModuleListFileLocation()}.
      */
-    protected AddressBook getInitialData() {
-        return TypicalPersons.getTypicalAddressBook();
+    protected Application getInitialData() {
+
+        Application application = new Application();
+        try {
+            application = new JsonSerializableApplication(getTypicalModuleList(), getTypicalDegreePlannerList(),
+                    getTypicalRequirementCategoriesList()).toModelType();
+        } catch (IllegalValueException ive) {
+            assertCommandBoxShowsErrorStyle();
+        }
+        return application;
     }
 
     /**
      * Returns the directory of the data file.
      */
-    protected Path getDataFileLocation() {
-        return TestApp.SAVE_LOCATION_FOR_TESTING;
+    protected Path getModuleListFileLocation() {
+        return TestApp.SAVE_LOCATION_FOR_MODULE_LIST_TESTING;
+    }
+
+    protected Path getDegreePlannerListFileLocation() {
+        return TestApp.SAVE_LOCATION_FOR_DEGREE_PLANNER_LIST_TESTING;
+    }
+
+    protected Path getRequirementCategoryListFileLocation() {
+        return TestApp.SAVE_LOCATION_FOR_REQUIREMENT_CATEGORY_LIST_TESTING;
     }
 
     public MainWindowHandle getMainWindowHandle() {
@@ -98,8 +121,8 @@ public CommandBoxHandle getCommandBox() {
         return mainWindowHandle.getCommandBox();
     }
 
-    public PersonListPanelHandle getPersonListPanel() {
-        return mainWindowHandle.getPersonListPanel();
+    public ModuleListPanelHandle getModuleListPanel() {
+        return mainWindowHandle.getModuleListPanel();
     }
 
     public MainMenuHandle getMainMenu() {
@@ -134,52 +157,61 @@ protected void executeCommand(String command) {
     }
 
     /**
-     * Displays all persons in the address book.
+     * Displays all modules in the application.
      */
-    protected void showAllPersons() {
+    protected void showAllModules() {
         executeCommand(ListCommand.COMMAND_WORD);
-        assertEquals(getModel().getAddressBook().getPersonList().size(), getModel().getFilteredPersonList().size());
+        assertEquals(getModel().getApplication().getModuleList().size(), getModel().getFilteredModuleList().size());
     }
 
     /**
-     * Displays all persons with any parts of their names matching {@code keyword} (case-insensitive).
+     * Displays all modules with any parts of their names matching {@code keyword} (case-insensitive).
      */
-    protected void showPersonsWithName(String keyword) {
+    protected void showModulesWithName(String keyword) {
         executeCommand(FindCommand.COMMAND_WORD + " " + keyword);
-        assertTrue(getModel().getFilteredPersonList().size() < getModel().getAddressBook().getPersonList().size());
+        assertTrue(getModel().getFilteredModuleList().size() < getModel().getApplication().getModuleList().size());
     }
 
     /**
-     * Selects the person at {@code index} of the displayed list.
+     * Selects the module at {@code index} of the displayed list.
      */
-    protected void selectPerson(Index index) {
+    protected void selectModule(Index index) {
         executeCommand(SelectCommand.COMMAND_WORD + " " + index.getOneBased());
-        assertEquals(index.getZeroBased(), getPersonListPanel().getSelectedCardIndex());
+        assertEquals(index.getZeroBased(), getModuleListPanel().getSelectedCardIndex());
     }
 
     /**
-     * Deletes all persons in the address book.
+     * Deletes all modules in the application.
      */
-    protected void deleteAllPersons() {
+    protected void deleteAllModules() {
         executeCommand(ClearCommand.COMMAND_WORD);
-        assertEquals(0, getModel().getAddressBook().getPersonList().size());
+        assertEquals(0, getModel().getApplication().getModuleList().size());
+    }
+
+    /**
+     * Displays all degree planners in the application.
+     */
+    protected void showAllDegreePlanners() {
+        executeCommand(PlannerListCommand.COMMAND_WORD);
+        assertEquals(getModel().getApplication().getDegreePlannerList().size(),
+                getModel().getFilteredDegreePlannerList().size());
     }
 
     /**
      * Asserts that the {@code CommandBox} displays {@code expectedCommandInput}, the {@code ResultDisplay} displays
-     * {@code expectedResultMessage}, the storage contains the same person objects as {@code expectedModel}
-     * and the person list panel displays the persons in the model correctly.
+     * {@code expectedResultMessage}, the storage contains the same module objects as {@code expectedModel}
+     * and the module list panel displays the modules in the model correctly.
      */
     protected void assertApplicationDisplaysExpected(String expectedCommandInput, String expectedResultMessage,
             Model expectedModel) {
         assertEquals(expectedCommandInput, getCommandBox().getInput());
         assertEquals(expectedResultMessage, getResultDisplay().getText());
-        assertEquals(new AddressBook(expectedModel.getAddressBook()), testApp.readStorageAddressBook());
-        assertListMatching(getPersonListPanel(), expectedModel.getFilteredPersonList());
+        assertEquals(new Application(expectedModel.getApplication()), testApp.readStorageapplication());
+        assertListMatching(getModuleListPanel(), expectedModel.getFilteredModuleList());
     }
 
     /**
-     * Calls {@code BrowserPanelHandle}, {@code PersonListPanelHandle} and {@code StatusBarFooterHandle} to remember
+     * Calls {@code BrowserPanelHandle}, {@code ModuleListPanelHandle} and {@code StatusBarFooterHandle} to remember
      * their current state.
      */
     private void rememberStates() {
@@ -187,28 +219,30 @@ private void rememberStates() {
         getBrowserPanel().rememberUrl();
         statusBarFooterHandle.rememberSaveLocation();
         statusBarFooterHandle.rememberSyncStatus();
-        getPersonListPanel().rememberSelectedPersonCard();
+        getModuleListPanel().rememberSelectedModuleCard();
     }
 
     /**
      * Asserts that the previously selected card is now deselected and the browser's url is now displaying the
      * default page.
+     *
      * @see BrowserPanelHandle#isUrlChanged()
      */
     protected void assertSelectedCardDeselected() {
         assertEquals(BrowserPanel.DEFAULT_PAGE, getBrowserPanel().getLoadedUrl());
-        assertFalse(getPersonListPanel().isAnyCardSelected());
+        assertFalse(getModuleListPanel().isAnyCardSelected());
     }
 
     /**
-     * Asserts that the browser's url is changed to display the details of the person in the person list panel at
+     * Asserts that the browser's url is changed to display the details of the module in the module list panel at
      * {@code expectedSelectedCardIndex}, and only the card at {@code expectedSelectedCardIndex} is selected.
+     *
      * @see BrowserPanelHandle#isUrlChanged()
-     * @see PersonListPanelHandle#isSelectedPersonCardChanged()
+     * @see ModuleListPanelHandle#isSelectedModuleCardChanged()
      */
     protected void assertSelectedCardChanged(Index expectedSelectedCardIndex) {
-        getPersonListPanel().navigateToCard(getPersonListPanel().getSelectedCardIndex());
-        String selectedCardName = getPersonListPanel().getHandleToSelectedCard().getName();
+        getModuleListPanel().navigateToCard(getModuleListPanel().getSelectedCardIndex());
+        String selectedCardName = getModuleListPanel().getHandleToSelectedCard().getName();
         URL expectedUrl;
         try {
             expectedUrl = new URL(BrowserPanel.SEARCH_PAGE_URL + selectedCardName.replaceAll(" ", "%20"));
@@ -217,17 +251,18 @@ protected void assertSelectedCardChanged(Index expectedSelectedCardIndex) {
         }
         assertEquals(expectedUrl, getBrowserPanel().getLoadedUrl());
 
-        assertEquals(expectedSelectedCardIndex.getZeroBased(), getPersonListPanel().getSelectedCardIndex());
+        assertEquals(expectedSelectedCardIndex.getZeroBased(), getModuleListPanel().getSelectedCardIndex());
     }
 
     /**
-     * Asserts that the browser's url and the selected card in the person list panel remain unchanged.
+     * Asserts that the browser's url and the selected card in the module list panel remain unchanged.
+     *
      * @see BrowserPanelHandle#isUrlChanged()
-     * @see PersonListPanelHandle#isSelectedPersonCardChanged()
+     * @see ModuleListPanelHandle#isSelectedModuleCardChanged()
      */
     protected void assertSelectedCardUnchanged() {
         assertFalse(getBrowserPanel().isUrlChanged());
-        assertFalse(getPersonListPanel().isSelectedPersonCardChanged());
+        assertFalse(getModuleListPanel().isSelectedModuleCardChanged());
     }
 
     /**
@@ -271,10 +306,10 @@ protected void assertStatusBarUnchangedExceptSyncStatus() {
     private void assertApplicationStartingStateIsCorrect() {
         assertEquals("", getCommandBox().getInput());
         assertEquals("", getResultDisplay().getText());
-        assertListMatching(getPersonListPanel(), getModel().getFilteredPersonList());
+        assertListMatching(getModuleListPanel(), getModel().getFilteredModuleList());
         assertEquals(BrowserPanel.DEFAULT_PAGE, getBrowserPanel().getLoadedUrl());
-        assertEquals(Paths.get(".").resolve(testApp.getStorageSaveLocation()).toString(),
-                getStatusBarFooter().getSaveLocation());
+        assertEquals(Paths.get("").toAbsolutePath().relativize(testApp.getStorageSaveLocation().toAbsolutePath())
+                .toString(), getStatusBarFooter().getSaveLocation());
         assertEquals(SYNC_STATUS_INITIAL, getStatusBarFooter().getSyncStatus());
     }
 
diff --git a/src/test/java/systemtests/ClearCommandSystemTest.java b/src/test/java/systemtests/ClearCommandSystemTest.java
index fb01059d9fe4..1109a1c44f60 100644
--- a/src/test/java/systemtests/ClearCommandSystemTest.java
+++ b/src/test/java/systemtests/ClearCommandSystemTest.java
@@ -1,54 +1,67 @@
 package systemtests;
 
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.testutil.TypicalPersons.KEYWORD_MATCHING_MEIER;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.commands.ClearCommand.MESSAGE_USAGE;
+import static pwe.planner.model.util.InitialDataUtil.getInitialApplication;
+import static pwe.planner.testutil.TypicalModules.KEYWORD_MATCHING_MEIER;
 
 import org.junit.Test;
 
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
+import pwe.planner.commons.core.Messages;
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.ClearCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.model.Model;
+import pwe.planner.model.ModelManager;
 
-public class ClearCommandSystemTest extends AddressBookSystemTest {
+public class ClearCommandSystemTest extends ApplicationSystemTest {
 
     @Test
     public void clear() {
         final Model defaultModel = getModel();
 
-        /* Case: clear non-empty address book, command with leading spaces and trailing alphanumeric characters and
-         * spaces -> cleared
+        /* Case: clear non-empty application, command with leading spaces and trailing alphanumeric characters and
+         * spaces -> failed
          */
-        assertCommandSuccess("   " + ClearCommand.COMMAND_WORD + " ab12   ");
+        String command = ClearCommand.COMMAND_WORD + "      ab4";
+        String expectedResultMessage = String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE);
+        assertCommandFailure(command, expectedResultMessage);
         assertSelectedCardUnchanged();
 
-        /* Case: undo clearing address book -> original address book restored */
-        String command = UndoCommand.COMMAND_WORD;
-        String expectedResultMessage = UndoCommand.MESSAGE_SUCCESS;
+
+        /*
+         * Case: clear command with trailing spaces -> passed
+         */
+        assertCommandSuccess(ClearCommand.COMMAND_WORD + "              ");
+        assertSelectedCardUnchanged();
+
+        /* Case: undo clearing application -> original application restored */
+        command = UndoCommand.COMMAND_WORD;
+        expectedResultMessage = UndoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, expectedResultMessage, defaultModel);
         assertSelectedCardUnchanged();
 
-        /* Case: redo clearing address book -> cleared */
+        /* Case: redo clearing application -> cleared */
+        Model expectedModel = new ModelManager(getInitialApplication());
         command = RedoCommand.COMMAND_WORD;
         expectedResultMessage = RedoCommand.MESSAGE_SUCCESS;
-        assertCommandSuccess(command, expectedResultMessage, new ModelManager());
+        assertCommandSuccess(command, expectedResultMessage, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: selects first card in person list and clears address book -> cleared and no card selected */
-        executeCommand(UndoCommand.COMMAND_WORD); // restores the original address book
-        selectPerson(Index.fromOneBased(1));
+        /* Case: selects first card in module list and clears application -> cleared and no card selected */
+        executeCommand(UndoCommand.COMMAND_WORD); // restores the original application
+        selectModule(Index.fromOneBased(1));
         assertCommandSuccess(ClearCommand.COMMAND_WORD);
         assertSelectedCardDeselected();
 
-        /* Case: filters the person list before clearing -> entire address book cleared */
-        executeCommand(UndoCommand.COMMAND_WORD); // restores the original address book
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
+        /* Case: filters the module list before clearing -> entire application cleared */
+        executeCommand(UndoCommand.COMMAND_WORD); // restores the original application
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
         assertCommandSuccess(ClearCommand.COMMAND_WORD);
         assertSelectedCardUnchanged();
 
-        /* Case: clear empty address book -> cleared */
+        /* Case: clear empty application -> cleared */
         assertCommandSuccess(ClearCommand.COMMAND_WORD);
         assertSelectedCardUnchanged();
 
@@ -60,12 +73,13 @@ public void clear() {
      * Executes {@code command} and verifies that the command box displays an empty string, the result display
      * box displays {@code ClearCommand#MESSAGE_SUCCESS} and the model related components equal to an empty model.
      * These verifications are done by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
      * Also verifies that the command box has the default style class and the status bar's sync status changes.
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandSuccess(String command) {
-        assertCommandSuccess(command, ClearCommand.MESSAGE_SUCCESS, new ModelManager());
+        Model expectedModel = new ModelManager(getInitialApplication());
+        assertCommandSuccess(command, ClearCommand.MESSAGE_SUCCESS, expectedModel);
     }
 
     /**
@@ -84,10 +98,10 @@ private void assertCommandSuccess(String command, String expectedResultMessage,
      * Executes {@code command} and verifies that the command box displays {@code command}, the result display
      * box displays {@code expectedResultMessage} and the model related components equal to the current model.
      * These verifications are done by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
      * Also verifies that the browser url, selected card and status bar remain unchanged, and the command box has the
      * error style.
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandFailure(String command, String expectedResultMessage) {
         Model expectedModel = getModel();
diff --git a/src/test/java/systemtests/ClockRule.java b/src/test/java/systemtests/ClockRule.java
index 6beace668e61..b9cc6804f6ae 100644
--- a/src/test/java/systemtests/ClockRule.java
+++ b/src/test/java/systemtests/ClockRule.java
@@ -8,7 +8,7 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import seedu.address.ui.StatusBarFooter;
+import pwe.planner.ui.StatusBarFooter;
 
 /**
  * This rule makes the time stamp in the status bar predictable during a test.
diff --git a/src/test/java/systemtests/DeleteCommandSystemTest.java b/src/test/java/systemtests/DeleteCommandSystemTest.java
index 29fbb5fc3930..43c5cf8bd692 100644
--- a/src/test/java/systemtests/DeleteCommandSystemTest.java
+++ b/src/test/java/systemtests/DeleteCommandSystemTest.java
@@ -1,88 +1,89 @@
 package systemtests;
 
 import static org.junit.Assert.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.logic.commands.DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS;
-import static seedu.address.testutil.TestUtil.getLastIndex;
-import static seedu.address.testutil.TestUtil.getMidIndex;
-import static seedu.address.testutil.TestUtil.getPerson;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalPersons.KEYWORD_MATCHING_MEIER;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.commands.DeleteCommand.MESSAGE_DELETE_MODULE_SUCCESS;
+import static pwe.planner.testutil.TestUtil.getLastIndex;
+import static pwe.planner.testutil.TestUtil.getMidIndex;
+import static pwe.planner.testutil.TestUtil.getModule;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalModules.KEYWORD_MATCHING_MEIER;
 
 import org.junit.Test;
 
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.DeleteCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
 
-public class DeleteCommandSystemTest extends AddressBookSystemTest {
+public class DeleteCommandSystemTest extends ApplicationSystemTest {
 
     private static final String MESSAGE_INVALID_DELETE_COMMAND_FORMAT =
-            String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE);
+            String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE);
 
     @Test
     public void delete() {
         /* ----------------- Performing delete operation while an unfiltered list is being shown -------------------- */
 
-        /* Case: delete the first person in the list, command with leading spaces and trailing spaces -> deleted */
+        /* Case: delete the first module in the list, command with leading spaces and trailing spaces -> deleted */
         Model expectedModel = getModel();
-        String command = "     " + DeleteCommand.COMMAND_WORD + "      " + INDEX_FIRST_PERSON.getOneBased() + "       ";
-        Person deletedPerson = removePerson(expectedModel, INDEX_FIRST_PERSON);
-        String expectedResultMessage = String.format(MESSAGE_DELETE_PERSON_SUCCESS, deletedPerson);
+        String command = "     " + DeleteCommand.COMMAND_WORD + "      " + INDEX_FIRST_MODULE.getOneBased() + "       ";
+        Module deletedModule = removeModule(expectedModel, INDEX_FIRST_MODULE);
+        String expectedResultMessage = String.format(MESSAGE_DELETE_MODULE_SUCCESS, deletedModule);
         assertCommandSuccess(command, expectedModel, expectedResultMessage);
 
-        /* Case: delete the last person in the list -> deleted */
+        /* Case: delete the last module in the list -> deleted */
         Model modelBeforeDeletingLast = getModel();
-        Index lastPersonIndex = getLastIndex(modelBeforeDeletingLast);
-        assertCommandSuccess(lastPersonIndex);
+        Index lastModuleIndex = getLastIndex(modelBeforeDeletingLast);
+        assertCommandSuccess(lastModuleIndex);
 
-        /* Case: undo deleting the last person in the list -> last person restored */
+        /* Case: undo deleting the last module in the list -> last module restored */
         command = UndoCommand.COMMAND_WORD;
         expectedResultMessage = UndoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, modelBeforeDeletingLast, expectedResultMessage);
 
-        /* Case: redo deleting the last person in the list -> last person deleted again */
+        /* Case: redo deleting the last module in the list -> last module deleted again */
         command = RedoCommand.COMMAND_WORD;
-        removePerson(modelBeforeDeletingLast, lastPersonIndex);
+        removeModule(modelBeforeDeletingLast, lastModuleIndex);
         expectedResultMessage = RedoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, modelBeforeDeletingLast, expectedResultMessage);
 
-        /* Case: delete the middle person in the list -> deleted */
-        Index middlePersonIndex = getMidIndex(getModel());
-        assertCommandSuccess(middlePersonIndex);
+        /* Case: delete the middle module in the list -> deleted */
+        Index middleModuleIndex = getMidIndex(getModel());
+        assertCommandSuccess(middleModuleIndex);
 
         /* ------------------ Performing delete operation while a filtered list is being shown ---------------------- */
 
-        /* Case: filtered person list, delete index within bounds of address book and person list -> deleted */
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
-        Index index = INDEX_FIRST_PERSON;
-        assertTrue(index.getZeroBased() < getModel().getFilteredPersonList().size());
+        /* Case: filtered module list, delete index within bounds of application and module list -> deleted */
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
+        Index index = INDEX_FIRST_MODULE;
+        assertTrue(index.getZeroBased() < getModel().getFilteredModuleList().size());
         assertCommandSuccess(index);
 
-        /* Case: filtered person list, delete index within bounds of address book but out of bounds of person list
+        /* Case: filtered module list, delete index within bounds of application but out of bounds of module list
          * -> rejected
          */
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
-        int invalidIndex = getModel().getAddressBook().getPersonList().size();
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
+        int invalidIndex = getModel().getApplication().getModuleList().size();
         command = DeleteCommand.COMMAND_WORD + " " + invalidIndex;
-        assertCommandFailure(command, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        assertCommandFailure(command, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
 
-        /* --------------------- Performing delete operation while a person card is selected ------------------------ */
+        /* --------------------- Performing delete operation while a module card is selected ------------------------ */
 
-        /* Case: delete the selected person -> person list panel selects the person before the deleted person */
-        showAllPersons();
+        /* Case: delete the selected module -> module list panel selects the module before the deleted module */
+        showAllModules();
         expectedModel = getModel();
         Index selectedIndex = getLastIndex(expectedModel);
         Index expectedIndex = Index.fromZeroBased(selectedIndex.getZeroBased() - 1);
-        selectPerson(selectedIndex);
+        selectModule(selectedIndex);
         command = DeleteCommand.COMMAND_WORD + " " + selectedIndex.getOneBased();
-        deletedPerson = removePerson(expectedModel, selectedIndex);
-        expectedResultMessage = String.format(MESSAGE_DELETE_PERSON_SUCCESS, deletedPerson);
+        deletedModule = removeModule(expectedModel, selectedIndex);
+        expectedModel.updateFilteredModuleList(Model.PREDICATE_SHOW_ALL_MODULES);
+        expectedResultMessage = String.format(MESSAGE_DELETE_MODULE_SUCCESS, deletedModule);
         assertCommandSuccess(command, expectedModel, expectedResultMessage, expectedIndex);
 
         /* --------------------------------- Performing invalid delete operation ------------------------------------ */
@@ -97,9 +98,9 @@ public void delete() {
 
         /* Case: invalid index (size + 1) -> rejected */
         Index outOfBoundsIndex = Index.fromOneBased(
-                getModel().getAddressBook().getPersonList().size() + 1);
+                getModel().getApplication().getModuleList().size() + 1);
         command = DeleteCommand.COMMAND_WORD + " " + outOfBoundsIndex.getOneBased();
-        assertCommandFailure(command, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        assertCommandFailure(command, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
 
         /* Case: invalid arguments (alphabets) -> rejected */
         assertCommandFailure(DeleteCommand.COMMAND_WORD + " abc", MESSAGE_INVALID_DELETE_COMMAND_FORMAT);
@@ -112,24 +113,26 @@ public void delete() {
     }
 
     /**
-     * Removes the {@code Person} at the specified {@code index} in {@code model}'s address book.
-     * @return the removed person
+     * Removes the {@code Module} at the specified {@code index} in {@code model}'s application.
+     *
+     * @return the removed module
      */
-    private Person removePerson(Model model, Index index) {
-        Person targetPerson = getPerson(model, index);
-        model.deletePerson(targetPerson);
-        return targetPerson;
+    private Module removeModule(Model model, Index index) {
+        Module targetModule = getModule(model, index);
+        model.deleteModule(targetModule);
+        return targetModule;
     }
 
     /**
-     * Deletes the person at {@code toDelete} by creating a default {@code DeleteCommand} using {@code toDelete} and
+     * Deletes the module at {@code toDelete} by creating a default {@code DeleteCommand} using {@code toDelete} and
      * performs the same verification as {@code assertCommandSuccess(String, Model, String)}.
+     *
      * @see DeleteCommandSystemTest#assertCommandSuccess(String, Model, String)
      */
     private void assertCommandSuccess(Index toDelete) {
         Model expectedModel = getModel();
-        Person deletedPerson = removePerson(expectedModel, toDelete);
-        String expectedResultMessage = String.format(MESSAGE_DELETE_PERSON_SUCCESS, deletedPerson);
+        Module deletedModule = removeModule(expectedModel, toDelete);
+        String expectedResultMessage = String.format(MESSAGE_DELETE_MODULE_SUCCESS, deletedModule);
 
         assertCommandSuccess(
                 DeleteCommand.COMMAND_WORD + " " + toDelete.getOneBased(), expectedModel, expectedResultMessage);
@@ -143,8 +146,9 @@ private void assertCommandSuccess(Index toDelete) {
      * 4. Asserts that the status bar's sync status changes.<br>
      * 5. Asserts that the command box has the default style class.<br>
      * Verifications 1 and 2 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
+     *
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage) {
         assertCommandSuccess(command, expectedModel, expectedResultMessage, null);
@@ -153,8 +157,9 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
     /**
      * Performs the same verification as {@code assertCommandSuccess(String, Model, String)} except that the browser url
      * and selected card are expected to update accordingly depending on the card at {@code expectedSelectedCardIndex}.
+     *
      * @see DeleteCommandSystemTest#assertCommandSuccess(String, Model, String)
-     * @see AddressBookSystemTest#assertSelectedCardChanged(Index)
+     * @see ApplicationSystemTest#assertSelectedCardChanged(Index)
      */
     private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage,
             Index expectedSelectedCardIndex) {
@@ -178,8 +183,9 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
      * 3. Asserts that the browser url, selected card and status bar remain unchanged.<br>
      * 4. Asserts that the command box has the error style.<br>
      * Verifications 1 and 2 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     *
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandFailure(String command, String expectedResultMessage) {
         Model expectedModel = getModel();
diff --git a/src/test/java/systemtests/EditCommandSystemTest.java b/src/test/java/systemtests/EditCommandSystemTest.java
index 5046250c0016..58e966df857b 100644
--- a/src/test/java/systemtests/EditCommandSystemTest.java
+++ b/src/test/java/systemtests/EditCommandSystemTest.java
@@ -3,52 +3,49 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.AMY;
-import static seedu.address.testutil.TypicalPersons.BOB;
-import static seedu.address.testutil.TypicalPersons.KEYWORD_MATCHING_MEIER;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CODE_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.CREDITS_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CODE_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_CREDITS_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.NAME_DESC_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.SEMESTERS_DESC_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
+import static pwe.planner.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_AMY;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_CODE_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static pwe.planner.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.model.Model.PREDICATE_SHOW_ALL_MODULES;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_SECOND_MODULE;
+import static pwe.planner.testutil.TypicalModules.AMY;
+import static pwe.planner.testutil.TypicalModules.BOB;
+import static pwe.planner.testutil.TypicalModules.KEYWORD_MATCHING_MEIER;
 
 import org.junit.Test;
 
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.model.Model;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.PersonBuilder;
-import seedu.address.testutil.PersonUtil;
-
-public class EditCommandSystemTest extends AddressBookSystemTest {
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.EditCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Code;
+import pwe.planner.model.module.Credits;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.module.Name;
+import pwe.planner.model.tag.Tag;
+import pwe.planner.testutil.ModuleBuilder;
+import pwe.planner.testutil.ModuleUtil;
+
+public class EditCommandSystemTest extends ApplicationSystemTest {
 
     @Test
     public void edit() {
@@ -59,185 +56,180 @@ public void edit() {
         /* Case: edit all fields, command with leading spaces, trailing spaces and multiple spaces between each field
          * -> edited
          */
-        Index index = INDEX_FIRST_PERSON;
-        String command = " " + EditCommand.COMMAND_WORD + "  " + index.getOneBased() + "  " + NAME_DESC_BOB + "  "
-                + PHONE_DESC_BOB + " " + EMAIL_DESC_BOB + "  " + ADDRESS_DESC_BOB + " " + TAG_DESC_HUSBAND + " ";
-        Person editedPerson = new PersonBuilder(BOB).withTags(VALID_TAG_HUSBAND).build();
-        assertCommandSuccess(command, index, editedPerson);
+        Index index = INDEX_FIRST_MODULE;
+        String command = " " + EditCommand.COMMAND_WORD + "  " + index.getOneBased() + "  " + NAME_DESC_AMY + "  "
+                + CREDITS_DESC_AMY + " " + CODE_DESC_AMY + " " + SEMESTERS_DESC_AMY + "  " + TAG_DESC_HUSBAND + " ";
+        Module editedModule = new ModuleBuilder(AMY).withTags(VALID_TAG_HUSBAND).build();
+        assertCommandSuccess(command, index, editedModule);
 
-        /* Case: undo editing the last person in the list -> last person restored */
+        /* Case: undo editing the last module in the list -> last module restored */
         command = UndoCommand.COMMAND_WORD;
         String expectedResultMessage = UndoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, model, expectedResultMessage);
 
-        /* Case: redo editing the last person in the list -> last person edited again */
+        /* Case: redo editing the last module in the list -> last module edited again */
         command = RedoCommand.COMMAND_WORD;
         expectedResultMessage = RedoCommand.MESSAGE_SUCCESS;
-        model.setPerson(getModel().getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()), editedPerson);
+        model.editModule(getModel().getFilteredModuleList().get(INDEX_FIRST_MODULE.getZeroBased()), editedModule);
         assertCommandSuccess(command, model, expectedResultMessage);
 
-        /* Case: edit a person with new values same as existing values -> edited */
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        assertCommandSuccess(command, index, BOB);
-
-        /* Case: edit a person with new values same as another person's values but with different name -> edited */
-        assertTrue(getModel().getAddressBook().getPersonList().contains(BOB));
-        index = INDEX_SECOND_PERSON;
-        assertNotEquals(getModel().getFilteredPersonList().get(index.getZeroBased()), BOB);
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        editedPerson = new PersonBuilder(BOB).withName(VALID_NAME_AMY).build();
-        assertCommandSuccess(command, index, editedPerson);
-
-        /* Case: edit a person with new values same as another person's values but with different phone and email
-         * -> edited
-         */
-        index = INDEX_SECOND_PERSON;
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_AMY + EMAIL_DESC_AMY
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        editedPerson = new PersonBuilder(BOB).withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).build();
-        assertCommandSuccess(command, index, editedPerson);
+        /* Case: edit a module with new values same as existing values -> edited */
+        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_AMY + CREDITS_DESC_AMY
+                + CODE_DESC_AMY + SEMESTERS_DESC_AMY + TAG_DESC_FRIEND;
+        assertCommandSuccess(command, index, AMY);
+
+        /* Case: edit a module with new values same as another module's values but with different name -> rejected */
+        assertTrue(getModel().getApplication().getModuleList().contains(AMY));
+        index = INDEX_SECOND_MODULE;
+        assertNotEquals(getModel().getFilteredModuleList().get(index.getZeroBased()), AMY);
+        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + CREDITS_DESC_AMY
+                + CODE_DESC_AMY + SEMESTERS_DESC_AMY + TAG_DESC_FRIEND;
+        Module moduleToEdit = getModel().getFilteredModuleList().get(index.getZeroBased());
+        expectedResultMessage = String.format(
+                EditCommand.MESSAGE_DUPLICATE_MODULE, moduleToEdit.getCode(), VALID_CODE_AMY
+        );
+        assertCommandFailure(command, expectedResultMessage);
+
+        /* Case: edit a module with new values same as another module's values but with different credits -> rejected */
+        index = INDEX_SECOND_MODULE;
+        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_AMY + CREDITS_DESC_BOB
+                + CODE_DESC_AMY + SEMESTERS_DESC_AMY + TAG_DESC_FRIEND;
+        moduleToEdit = getModel().getFilteredModuleList().get(index.getZeroBased());
+        expectedResultMessage = String.format(
+                EditCommand.MESSAGE_DUPLICATE_MODULE, moduleToEdit.getCode(), VALID_CODE_AMY
+        );
+        assertCommandFailure(command, expectedResultMessage);
 
         /* Case: clear tags -> cleared */
-        index = INDEX_FIRST_PERSON;
+        index = INDEX_FIRST_MODULE;
         command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + " " + PREFIX_TAG.getPrefix();
-        Person personToEdit = getModel().getFilteredPersonList().get(index.getZeroBased());
-        editedPerson = new PersonBuilder(personToEdit).withTags().build();
-        assertCommandSuccess(command, index, editedPerson);
+        moduleToEdit = getModel().getFilteredModuleList().get(index.getZeroBased());
+        editedModule = new ModuleBuilder(moduleToEdit).withTags().build();
+        assertCommandSuccess(command, index, editedModule);
 
         /* ------------------ Performing edit operation while a filtered list is being shown ------------------------ */
 
-        /* Case: filtered person list, edit index within bounds of address book and person list -> edited */
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
-        index = INDEX_FIRST_PERSON;
-        assertTrue(index.getZeroBased() < getModel().getFilteredPersonList().size());
+        /* Case: filtered module list, edit index within bounds of application and module list -> edited */
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
+        index = INDEX_FIRST_MODULE;
+        assertTrue(index.getZeroBased() < getModel().getFilteredModuleList().size());
         command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + " " + NAME_DESC_BOB;
-        personToEdit = getModel().getFilteredPersonList().get(index.getZeroBased());
-        editedPerson = new PersonBuilder(personToEdit).withName(VALID_NAME_BOB).build();
-        assertCommandSuccess(command, index, editedPerson);
+        moduleToEdit = getModel().getFilteredModuleList().get(index.getZeroBased());
+        editedModule = new ModuleBuilder(moduleToEdit).withName(VALID_NAME_BOB).build();
+        assertCommandSuccess(command, index, editedModule);
 
-        /* Case: filtered person list, edit index within bounds of address book but out of bounds of person list
+        /* Case: filtered module list, edit index within bounds of application but out of bounds of module list
          * -> rejected
          */
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
-        int invalidIndex = getModel().getAddressBook().getPersonList().size();
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
+        int invalidIndex = getModel().getApplication().getModuleList().size();
         assertCommandFailure(EditCommand.COMMAND_WORD + " " + invalidIndex + NAME_DESC_BOB,
-                Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+                MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
 
-        /* --------------------- Performing edit operation while a person card is selected -------------------------- */
+        /* --------------------- Performing edit operation while a module card is selected -------------------------- */
 
-        /* Case: selects first card in the person list, edit a person -> edited, card selection remains unchanged but
+        /* Case: selects first card in the module list, edit a module -> edited, card selection remains unchanged but
          * browser url changes
          */
-        showAllPersons();
-        index = INDEX_FIRST_PERSON;
-        selectPerson(index);
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
-                + ADDRESS_DESC_AMY + TAG_DESC_FRIEND;
+        showAllModules();
+        index = INDEX_FIRST_MODULE;
+        selectModule(index);
+        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_AMY + CREDITS_DESC_AMY
+                + CODE_DESC_AMY + TAG_DESC_FRIEND + SEMESTERS_DESC_AMY;
         // this can be misleading: card selection actually remains unchanged but the
-        // browser's url is updated to reflect the new person's name
+        // browser's url is updated to reflect the new module's name
         assertCommandSuccess(command, index, AMY, index);
 
         /* --------------------------------- Performing invalid edit operation -------------------------------------- */
 
         /* Case: invalid index (0) -> rejected */
         assertCommandFailure(EditCommand.COMMAND_WORD + " 0" + NAME_DESC_BOB,
-                String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
 
         /* Case: invalid index (-1) -> rejected */
         assertCommandFailure(EditCommand.COMMAND_WORD + " -1" + NAME_DESC_BOB,
-                String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
 
         /* Case: invalid index (size + 1) -> rejected */
-        invalidIndex = getModel().getFilteredPersonList().size() + 1;
+        invalidIndex = getModel().getFilteredModuleList().size() + 1;
         assertCommandFailure(EditCommand.COMMAND_WORD + " " + invalidIndex + NAME_DESC_BOB,
-                Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+                MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
 
         /* Case: missing index -> rejected */
         assertCommandFailure(EditCommand.COMMAND_WORD + NAME_DESC_BOB,
-                String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
 
         /* Case: missing all fields -> rejected */
-        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased(),
+        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased(),
                 EditCommand.MESSAGE_NOT_EDITED);
 
         /* Case: invalid name -> rejected */
-        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased() + INVALID_NAME_DESC,
+        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased() + INVALID_NAME_DESC,
                 Name.MESSAGE_CONSTRAINTS);
 
-        /* Case: invalid phone -> rejected */
-        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased() + INVALID_PHONE_DESC,
-                Phone.MESSAGE_CONSTRAINTS);
+        /* Case: invalid credits -> rejected */
+        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased() + INVALID_CREDITS_DESC,
+                Credits.MESSAGE_CONSTRAINTS);
 
-        /* Case: invalid email -> rejected */
-        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased() + INVALID_EMAIL_DESC,
-                Email.MESSAGE_CONSTRAINTS);
-
-        /* Case: invalid address -> rejected */
-        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased() + INVALID_ADDRESS_DESC,
-                Address.MESSAGE_CONSTRAINTS);
+        /* Case: invalid code -> rejected */
+        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased() + INVALID_CODE_DESC,
+                Code.MESSAGE_CONSTRAINTS);
 
         /* Case: invalid tag -> rejected */
-        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased() + INVALID_TAG_DESC,
+        assertCommandFailure(EditCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased() + INVALID_TAG_DESC,
                 Tag.MESSAGE_CONSTRAINTS);
 
-        /* Case: edit a person with new values same as another person's values -> rejected */
-        executeCommand(PersonUtil.getAddCommand(BOB));
-        assertTrue(getModel().getAddressBook().getPersonList().contains(BOB));
-        index = INDEX_FIRST_PERSON;
-        assertFalse(getModel().getFilteredPersonList().get(index.getZeroBased()).equals(BOB));
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: edit a person with new values same as another person's values but with different tags -> rejected */
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND;
-        assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: edit a person with new values same as another person's values but with different address -> rejected */
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + ADDRESS_DESC_AMY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: edit a person with new values same as another person's values but with different phone -> rejected */
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_AMY + EMAIL_DESC_BOB
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON);
-
-        /* Case: edit a person with new values same as another person's values but with different email -> rejected */
-        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_AMY
-                + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
-        assertCommandFailure(command, EditCommand.MESSAGE_DUPLICATE_PERSON);
+        /* Case: edit a module with new values same as another module's values -> rejected */
+        executeCommand(ModuleUtil.getAddCommand(BOB));
+        assertTrue(getModel().getApplication().getModuleList().contains(BOB));
+        index = INDEX_FIRST_MODULE;
+        assertFalse(getModel().getFilteredModuleList().get(index.getZeroBased()).equals(BOB));
+        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + CREDITS_DESC_BOB
+                + CODE_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND;
+        moduleToEdit = getModel().getFilteredModuleList().get(index.getZeroBased());
+        expectedResultMessage = String.format(
+                EditCommand.MESSAGE_DUPLICATE_MODULE, moduleToEdit.getCode(), VALID_CODE_BOB
+        );
+        assertCommandFailure(command, expectedResultMessage);
+
+        /* Case: edit a module with new values same as another module's values but with different tags -> rejected */
+        command = EditCommand.COMMAND_WORD + " " + index.getOneBased() + NAME_DESC_BOB + CREDITS_DESC_BOB
+                + CODE_DESC_BOB + TAG_DESC_HUSBAND;
+        expectedResultMessage = String.format(
+                EditCommand.MESSAGE_DUPLICATE_MODULE, moduleToEdit.getCode(), VALID_CODE_BOB
+        );
+        assertCommandFailure(command, expectedResultMessage);
     }
 
     /**
-     * Performs the same verification as {@code assertCommandSuccess(String, Index, Person, Index)} except that
+     * Performs the same verification as {@code assertCommandSuccess(String, Index, Module, Index)} except that
      * the browser url and selected card remain unchanged.
      * @param toEdit the index of the current model's filtered list
-     * @see EditCommandSystemTest#assertCommandSuccess(String, Index, Person, Index)
+     * @see EditCommandSystemTest#assertCommandSuccess(String, Index, Module, Index)
      */
-    private void assertCommandSuccess(String command, Index toEdit, Person editedPerson) {
-        assertCommandSuccess(command, toEdit, editedPerson, null);
+    private void assertCommandSuccess(String command, Index toEdit, Module editedModule) {
+        assertCommandSuccess(command, toEdit, editedModule, null);
     }
 
     /**
      * Performs the same verification as {@code assertCommandSuccess(String, Model, String, Index)} and in addition,<br>
      * 1. Asserts that result display box displays the success message of executing {@code EditCommand}.<br>
-     * 2. Asserts that the model related components are updated to reflect the person at index {@code toEdit} being
-     * updated to values specified {@code editedPerson}.<br>
+     * 2. Asserts that the model related components are updated to reflect the module at index {@code toEdit} being
+     * updated to values specified {@code editedModule}.<br>
      * @param toEdit the index of the current model's filtered list.
      * @see EditCommandSystemTest#assertCommandSuccess(String, Model, String, Index)
      */
-    private void assertCommandSuccess(String command, Index toEdit, Person editedPerson,
+    private void assertCommandSuccess(String command, Index toEdit, Module editedModule,
             Index expectedSelectedCardIndex) {
         Model expectedModel = getModel();
-        expectedModel.setPerson(expectedModel.getFilteredPersonList().get(toEdit.getZeroBased()), editedPerson);
-        expectedModel.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-
-        assertCommandSuccess(command, expectedModel,
-                String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson), expectedSelectedCardIndex);
+        Module originalModule = expectedModel.getFilteredModuleList().get(toEdit.getZeroBased());
+        String expectedMessage = String.format(
+                EditCommand.MESSAGE_EDIT_MODULE_SUCCESS, originalModule.getCode(), editedModule
+        );
+        expectedModel.editModule(expectedModel.getFilteredModuleList().get(toEdit.getZeroBased()), editedModule);
+        expectedModel.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
+
+        assertCommandSuccess(command, expectedModel, expectedMessage, expectedSelectedCardIndex);
     }
 
     /**
@@ -258,14 +250,14 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
      * 4. Asserts that the status bar's sync status changes.<br>
      * 5. Asserts that the command box has the default style class.<br>
      * Verifications 1 and 2 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
-     * @see AddressBookSystemTest#assertSelectedCardChanged(Index)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * @see ApplicationSystemTest#assertSelectedCardChanged(Index)
      */
     private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage,
             Index expectedSelectedCardIndex) {
         executeCommand(command);
-        expectedModel.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        expectedModel.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
         assertApplicationDisplaysExpected("", expectedResultMessage, expectedModel);
         assertCommandBoxShowsDefaultStyle();
         if (expectedSelectedCardIndex != null) {
@@ -283,8 +275,8 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex
      * 3. Asserts that the browser url, selected card and status bar remain unchanged.<br>
      * 4. Asserts that the command box has the error style.<br>
      * Verifications 1 and 2 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandFailure(String command, String expectedResultMessage) {
         Model expectedModel = getModel();
diff --git a/src/test/java/systemtests/FindCommandSystemTest.java b/src/test/java/systemtests/FindCommandSystemTest.java
index 0bde83c0444b..7458abc3833d 100644
--- a/src/test/java/systemtests/FindCommandSystemTest.java
+++ b/src/test/java/systemtests/FindCommandSystemTest.java
@@ -1,32 +1,48 @@
 package systemtests;
 
 import static org.junit.Assert.assertFalse;
-import static seedu.address.commons.core.Messages.MESSAGE_PERSONS_LISTED_OVERVIEW;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.testutil.TypicalPersons.BENSON;
-import static seedu.address.testutil.TypicalPersons.CARL;
-import static seedu.address.testutil.TypicalPersons.DANIEL;
-import static seedu.address.testutil.TypicalPersons.KEYWORD_MATCHING_MEIER;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_MODULES_LISTED_OVERVIEW;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.parser.BooleanExpressionParser.MESSAGE_EMPTY_OUTPUT;
+import static pwe.planner.logic.parser.BooleanExpressionParser.MESSAGE_GENERAL_FAIL;
+import static pwe.planner.logic.parser.BooleanExpressionParser.MESSAGE_INVALID_EXPRESSION;
+import static pwe.planner.logic.parser.BooleanExpressionParser.MESSAGE_INVALID_OPERATOR_APPLICATION;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_AND;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_LEFT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_OR;
+import static pwe.planner.logic.parser.CliSyntax.OPERATOR_RIGHT_BRACKET;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CODE;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_CREDITS;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_NAME;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_SEMESTER;
+import static pwe.planner.logic.parser.CliSyntax.PREFIX_TAG;
+import static pwe.planner.testutil.TypicalModules.ALICE;
+import static pwe.planner.testutil.TypicalModules.BENSON;
+import static pwe.planner.testutil.TypicalModules.CARL;
+import static pwe.planner.testutil.TypicalModules.DANIEL;
+import static pwe.planner.testutil.TypicalModules.ELLE;
+import static pwe.planner.testutil.TypicalModules.KEYWORD_MATCHING_MEIER;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
 
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.model.Model;
-import seedu.address.model.tag.Tag;
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.DeleteCommand;
+import pwe.planner.logic.commands.FindCommand;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.model.Model;
+import pwe.planner.model.tag.Tag;
 
-public class FindCommandSystemTest extends AddressBookSystemTest {
+public class FindCommandSystemTest extends ApplicationSystemTest {
 
     @Test
     public void find() {
-        /* Case: find multiple persons in address book, command with leading spaces and trailing spaces
-         * -> 2 persons found
+        /* Case: find multiple modules in application, command with leading spaces and trailing spaces
+         * -> 2 modules found
          */
         String command = "   " + FindCommand.COMMAND_WORD + " " + KEYWORD_MATCHING_MEIER + "   ";
         Model expectedModel = getModel();
@@ -34,39 +50,43 @@ public void find() {
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: repeat previous find command where person list is displaying the persons we are finding
-         * -> 2 persons found
+        /* Case: repeat previous find command where module list is displaying the modules we are finding
+         * -> 2 modules found
          */
         command = FindCommand.COMMAND_WORD + " " + KEYWORD_MATCHING_MEIER;
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find person where person list is not displaying the person we are finding -> 1 person found */
-        command = FindCommand.COMMAND_WORD + " Carl";
+        /* Case: find module where module list is not displaying the module we are finding -> 1 module found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Carl";
         ModelHelper.setFilteredList(expectedModel, CARL);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find multiple persons in address book, 2 keywords -> 2 persons found */
-        command = FindCommand.COMMAND_WORD + " Benson Daniel";
+        /* Case: find multiple modules in application, 2 keywords -> 2 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Benson " + OPERATOR_OR + " "
+                + PREFIX_NAME + "Daniel";
         ModelHelper.setFilteredList(expectedModel, BENSON, DANIEL);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find multiple persons in address book, 2 keywords in reversed order -> 2 persons found */
-        command = FindCommand.COMMAND_WORD + " Daniel Benson";
+        /* Case: find multiple modules in application, 2 keywords in reversed order -> 2 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " "
+                + PREFIX_NAME + "Benson";
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find multiple persons in address book, 2 keywords with 1 repeat -> 2 persons found */
-        command = FindCommand.COMMAND_WORD + " Daniel Benson Daniel";
+        /* Case: find multiple modules in application, 2 keywords with 1 repeat -> 2 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " "
+                + PREFIX_NAME + "Benson " + OPERATOR_OR + " " + PREFIX_NAME + "Daniel";
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find multiple persons in address book, 2 matching keywords and 1 non-matching keyword
-         * -> 2 persons found
+        /* Case: find multiple modules in application, 2 matching keywords and 1 non-matching keyword
+         * -> 2 modules found
          */
-        command = FindCommand.COMMAND_WORD + " Daniel Benson NonMatchingKeyWord";
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " "
+                + PREFIX_NAME + "Benson " + OPERATOR_OR + " " + PREFIX_NAME + "NonMatchingKeyWord";
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
@@ -80,69 +100,123 @@ public void find() {
         expectedResultMessage = RedoCommand.MESSAGE_FAILURE;
         assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: find same persons in address book after deleting 1 of them -> 1 person found */
+        /* Case: find same modules in application after deleting 1 of them -> 1 module found */
         executeCommand(DeleteCommand.COMMAND_WORD + " 1");
-        assertFalse(getModel().getAddressBook().getPersonList().contains(BENSON));
+        assertFalse(getModel().getApplication().getModuleList().contains(BENSON));
         command = FindCommand.COMMAND_WORD + " " + KEYWORD_MATCHING_MEIER;
         expectedModel = getModel();
         ModelHelper.setFilteredList(expectedModel, DANIEL);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find person in address book, keyword is same as name but of different case -> 1 person found */
-        command = FindCommand.COMMAND_WORD + " MeIeR";
+        /* Case: find module in application, keyword is same as name but of different case -> 1 module found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "MeIeR";
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find person in address book, keyword is substring of name -> 0 persons found */
-        command = FindCommand.COMMAND_WORD + " Mei";
+        /* Case: find module in application, keyword is substring of name -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Mei";
         ModelHelper.setFilteredList(expectedModel);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find person in address book, name is substring of keyword -> 0 persons found */
-        command = FindCommand.COMMAND_WORD + " Meiers";
+        /* Case: find module in application, name is substring of keyword -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Meiers";
         ModelHelper.setFilteredList(expectedModel);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find person not in address book -> 0 persons found */
-        command = FindCommand.COMMAND_WORD + " Mark";
+        /* Case: find module not in application -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Mark";
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find phone number of person in address book -> 0 persons found */
-        command = FindCommand.COMMAND_WORD + " " + DANIEL.getPhone().value;
+        /* Case: find credits of module in application -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + DANIEL.getCredits().value;
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find address of person in address book -> 0 persons found */
-        command = FindCommand.COMMAND_WORD + " " + DANIEL.getAddress().value;
+        /* Case: find credits of module in application with PREFIX_CREDITS -> 1 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CREDITS + DANIEL.getCredits().value;
+        ModelHelper.setFilteredList(expectedModel, DANIEL);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find credits of module not in application with PREFIX_CREDITS -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CREDITS + "963";
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find module in application, credits is substring of keyword -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CREDITS + "999";
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find code of module in application -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + DANIEL.getCode().value;
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find email of person in address book -> 0 persons found */
-        command = FindCommand.COMMAND_WORD + " " + DANIEL.getEmail().value;
+        // TODO: Update the test case again after proper attribute is given in TypicalModules
+        /* Case: find code of module in application with correct PREFIX -> 1 module found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CODE + DANIEL.getCode().value;
+        ModelHelper.setFilteredList(expectedModel, DANIEL);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find tags of person in address book -> 0 persons found */
+        /* Case: find non-existent module in application with PREFIX_CODE -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CODE + "AAA1234Z";
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find module in application, code is substring of keyword -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CODE + "FS4205"; // valid partial code derived from IFS4205
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find code of module in application with correct PREFIX -> 3 module found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_TAG + "friends";
+        ModelHelper.setFilteredList(expectedModel, ALICE, BENSON, DANIEL);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find non-existent module in application with PREFIX_TAG -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_TAG + "NotExisting";
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find module in application with PREFIX_TAG, keyword is substring of a valid tag -> 0 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_TAG + "frie"; // derived from friends
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find tags of module in application -> 0 modules found */
         List<Tag> tags = new ArrayList<>(DANIEL.getTags());
-        command = FindCommand.COMMAND_WORD + " " + tags.get(0).tagName;
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + tags.get(0).tagName;
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardUnchanged();
 
-        /* Case: find while a person is selected -> selected card deselected */
-        showAllPersons();
-        selectPerson(Index.fromOneBased(1));
-        assertFalse(getPersonListPanel().getHandleToSelectedCard().getName().equals(DANIEL.getName().fullName));
-        command = FindCommand.COMMAND_WORD + " Daniel";
+        /* Case: find module in the application with PREFIX_SEM/4 -> 2 modules found */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_SEMESTER + "4";
+        ModelHelper.setFilteredList(expectedModel, ALICE);
+        assertCommandSuccess(command, expectedModel);
+        assertSelectedCardUnchanged();
+
+        /* Case: find while a module is selected -> selected card deselected */
+        showAllModules();
+        selectModule(Index.fromOneBased(1));
+        assertFalse(getModuleListPanel().getHandleToSelectedCard().getName().equals(DANIEL.getName().fullName));
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel";
         ModelHelper.setFilteredList(expectedModel, DANIEL);
         assertCommandSuccess(command, expectedModel);
         assertSelectedCardDeselected();
 
-        /* Case: find person in empty address book -> 0 persons found */
-        deleteAllPersons();
+        /* Case: find module in empty application -> 0 modules found */
+        deleteAllModules();
         command = FindCommand.COMMAND_WORD + " " + KEYWORD_MATCHING_MEIER;
         expectedModel = getModel();
         ModelHelper.setFilteredList(expectedModel, DANIEL);
@@ -150,23 +224,158 @@ public void find() {
         assertSelectedCardUnchanged();
 
         /* Case: mixed case command word -> rejected */
-        command = "FiNd Meier";
+        command = "FiNd " + PREFIX_NAME + "Meier";
         assertCommandFailure(command, MESSAGE_UNKNOWN_COMMAND);
     }
 
+    @Test
+    public void multiFind() {
+        /* Case: find module with name daniel, code 'CS1231' and credits '2'-> 3 modules return */
+        String command =
+                FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " " + PREFIX_CODE + "CS1231 "
+                        + OPERATOR_OR + " " + PREFIX_CREDITS + "2";
+        Model expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel, DANIEL, BENSON, CARL);
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: find module with name, code and credits in different order -> 3 modules return */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CODE + "CS1231 " + OPERATOR_OR + " "
+                + PREFIX_CREDITS + "2 " + OPERATOR_OR + " " + PREFIX_NAME + "Daniel ";
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: find module with name daniel, credits '95352563' and invalid code -> 2 modules return */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " "
+                + PREFIX_CODE + "AZ0000 " + OPERATOR_OR + " " + PREFIX_CREDITS + "2";
+        expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel, DANIEL, CARL);
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: find module with valid name, code and non-existent credits -> 2 modules return */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " "
+                + PREFIX_CODE + "CS1231 " + OPERATOR_OR + " " + PREFIX_CREDITS + "968";
+        expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel, DANIEL, BENSON);
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: find module with valid name but non-existent code and credits -> 1 modules return */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_OR + " "
+                + PREFIX_CODE + "FAS1234 " + OPERATOR_OR + " " + PREFIX_CREDITS + "999";
+        expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel, DANIEL);
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: find module with non-existent name, code and credits -> 0 modules return */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Programmmmming " + OPERATOR_OR + " "
+                + PREFIX_CODE + "FAS1234 " + OPERATOR_OR + " " + PREFIX_CREDITS + "999";
+        expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+    }
+
+    @Test
+    public void multiBooleanAndFind() {
+
+        /* Case: Find module name which contain both Daniel and Meier -> Return exactly 1 module
+          e.g. find ( name/Daniel && name/Meier )
+        */
+        String command = FindCommand.COMMAND_WORD + " ( " + PREFIX_NAME + "Daniel " + OPERATOR_AND + " "
+                + PREFIX_NAME + "Meier )";
+        Model expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel, DANIEL);
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: Find module name which contain both Daniel and Meier -> Return exactly 1 module
+          e.g. find name/Daniel && name/Meier
+        */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_NAME + "Daniel " + OPERATOR_AND + " "
+                + PREFIX_NAME + "Meier";
+        expectedModel = getModel();
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: Find module code which contain CS1231 and CS2100 -> Return exactly 0 module */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CODE + "CS2100 " + OPERATOR_AND + " " + PREFIX_CODE
+                + "CS1231";
+        expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+
+        /* Case: Find module credits that are 4 and 0 -> Return exactly 0 module */
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_CREDITS + "4 " + OPERATOR_AND + " " + PREFIX_CREDITS
+                + "0";
+        expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel);
+        assertCommandSuccess(command, expectedModel);
+
+        command = FindCommand.COMMAND_WORD + " " + PREFIX_SEMESTER + "4" + OPERATOR_AND + " " + PREFIX_SEMESTER
+                + "2";
+        ModelHelper.setFilteredList(expectedModel, ALICE);
+        assertCommandSuccess(command, expectedModel);
+    }
+
+    @Test
+    public void complexMultiFind() {
+        /*  find code/CS2102 || ( name/Daniel && name/Meier )  -> Return 2 modules */
+        String command =
+                FindCommand.COMMAND_WORD + " " + PREFIX_CODE + "CS2040C" + " " + OPERATOR_OR + " "
+                        + OPERATOR_LEFT_BRACKET + PREFIX_NAME + "Daniel " + OPERATOR_AND + " "
+                        + PREFIX_NAME + "Meier " + OPERATOR_RIGHT_BRACKET;
+        Model expectedModel = getModel();
+        ModelHelper.setFilteredList(expectedModel, DANIEL, CARL);
+        assertCommandSuccess(command, expectedModel);
+
+        /* find (sem/1 || sem/2) && credits/4 -> Return 1 module */
+        command = FindCommand.COMMAND_WORD + " " + OPERATOR_LEFT_BRACKET + PREFIX_SEMESTER + "1" + OPERATOR_OR
+                + PREFIX_SEMESTER + "2" + OPERATOR_RIGHT_BRACKET + OPERATOR_AND + PREFIX_CREDITS + "4";
+        ModelHelper.setFilteredList(expectedModel, ELLE);
+        assertCommandSuccess(command, expectedModel);
+    }
+
+    @Test
+    public void negativeTest() {
+        // invalid operator
+        String command = FindCommand.COMMAND_WORD + " name/Programming !! code/CS1231";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_INVALID_OPERATOR_APPLICATION));
+        // invalid operator
+        command = FindCommand.COMMAND_WORD + " name/Programming ## code/CS1231";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_INVALID_OPERATOR_APPLICATION));
+
+        // missing operator
+        command = FindCommand.COMMAND_WORD + " name/Programming code/CS1231";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_INVALID_OPERATOR_APPLICATION));
+
+        // valid + invalid prefix
+        command = FindCommand.COMMAND_WORD + " name/Programming " + OPERATOR_OR + " nonExisting/CS1231";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+        // single invalid prefix
+        command = FindCommand.COMMAND_WORD + " nonExisting/CS1231";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+        // single invalid prefix with multiple white space
+        command = FindCommand.COMMAND_WORD + "                          nonExisting/CS1231                ";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+
+        // empty criteria with ()
+        command = FindCommand.COMMAND_WORD + " ()";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_EMPTY_OUTPUT));
+
+        command = FindCommand.COMMAND_WORD + " (name/Programming))";
+        assertCommandFailure(command, String.format(MESSAGE_INVALID_EXPRESSION, MESSAGE_GENERAL_FAIL));
+
+
+    }
+
     /**
      * Executes {@code command} and verifies that the command box displays an empty string, the result display
-     * box displays {@code Messages#MESSAGE_PERSONS_LISTED_OVERVIEW} with the number of people in the filtered list,
+     * box displays {@code Messages#MESSAGE_MODULES_LISTED_OVERVIEW} with the number of modules in the filtered list,
      * and the model related components equal to {@code expectedModel}.
      * These verifications are done by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
      * Also verifies that the status bar remains unchanged, and the command box has the default style class, and the
      * selected card updated accordingly, depending on {@code cardStatus}.
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandSuccess(String command, Model expectedModel) {
         String expectedResultMessage = String.format(
-                MESSAGE_PERSONS_LISTED_OVERVIEW, expectedModel.getFilteredPersonList().size());
+                MESSAGE_MODULES_LISTED_OVERVIEW, expectedModel.getFilteredModuleList().size());
 
         executeCommand(command);
         assertApplicationDisplaysExpected("", expectedResultMessage, expectedModel);
@@ -178,10 +387,10 @@ private void assertCommandSuccess(String command, Model expectedModel) {
      * Executes {@code command} and verifies that the command box displays {@code command}, the result display
      * box displays {@code expectedResultMessage} and the model related components equal to the current model.
      * These verifications are done by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
      * Also verifies that the browser url, selected card and status bar remain unchanged, and the command box has the
      * error style.
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandFailure(String command, String expectedResultMessage) {
         Model expectedModel = getModel();
diff --git a/src/test/java/systemtests/HelpCommandSystemTest.java b/src/test/java/systemtests/HelpCommandSystemTest.java
index 3fa0cc98236e..ef0008db1fb4 100644
--- a/src/test/java/systemtests/HelpCommandSystemTest.java
+++ b/src/test/java/systemtests/HelpCommandSystemTest.java
@@ -4,23 +4,23 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.ui.testutil.GuiTestAssert.assertListMatching;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.ui.testutil.GuiTestAssert.assertListMatching;
 
 import org.junit.Test;
 
 import guitests.GuiRobot;
 import guitests.guihandles.HelpWindowHandle;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.ui.BrowserPanel;
-import seedu.address.ui.StatusBarFooter;
+import pwe.planner.logic.commands.DeleteCommand;
+import pwe.planner.logic.commands.HelpCommand;
+import pwe.planner.logic.commands.SelectCommand;
+import pwe.planner.ui.BrowserPanel;
+import pwe.planner.ui.StatusBarFooter;
 
 /**
  * A system test class for the help window, which contains interaction with other UI components.
  */
-public class HelpCommandSystemTest extends AddressBookSystemTest {
+public class HelpCommandSystemTest extends ApplicationSystemTest {
     private static final String ERROR_MESSAGE = "ATTENTION!!!! : On some computers, this test may fail when run on "
             + "non-headless mode as FxRobot#clickOn(Node, MouseButton...) clicks on the wrong location. We suspect "
             + "that this is a bug with TestFX library that we are using. If this test fails, you have to run your "
@@ -39,14 +39,10 @@ public void openHelpWindow() {
         getMainMenu().openHelpWindowUsingAccelerator();
         assertHelpWindowOpen();
 
-        getPersonListPanel().click();
+        getModuleListPanel().click();
         getMainMenu().openHelpWindowUsingAccelerator();
         assertHelpWindowOpen();
 
-        getBrowserPanel().click();
-        getMainMenu().openHelpWindowUsingAccelerator();
-        assertHelpWindowNotOpen();
-
         //use menu button
         getMainMenu().openHelpWindowUsingMenu();
         assertHelpWindowOpen();
@@ -60,16 +56,16 @@ public void openHelpWindow() {
         getMainWindowHandle().focus();
 
         // assert that while the help window is open the UI updates correctly for a command execution
-        executeCommand(SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
+        executeCommand(SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased());
         assertEquals("", getCommandBox().getInput());
         assertCommandBoxShowsDefaultStyle();
         assertNotEquals(HelpCommand.SHOWING_HELP_MESSAGE, getResultDisplay().getText());
         assertNotEquals(BrowserPanel.DEFAULT_PAGE, getBrowserPanel().getLoadedUrl());
-        assertListMatching(getPersonListPanel(), getModel().getFilteredPersonList());
+        assertListMatching(getModuleListPanel(), getModel().getFilteredModuleList());
 
         // assert that the status bar too is updated correctly while the help window is open
         // note: the select command tested above does not update the status bar
-        executeCommand(DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
+        executeCommand(DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased());
         assertNotEquals(StatusBarFooter.SYNC_STATUS_INITIAL, getStatusBarFooter().getSyncStatus());
     }
 
diff --git a/src/test/java/systemtests/ModelHelper.java b/src/test/java/systemtests/ModelHelper.java
index b7950598d36b..687de75f7d3b 100644
--- a/src/test/java/systemtests/ModelHelper.java
+++ b/src/test/java/systemtests/ModelHelper.java
@@ -5,35 +5,60 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import pwe.planner.model.Model;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.planner.DegreePlanner;
 
 /**
  * Contains helper methods to set up {@code Model} for testing.
  */
 public class ModelHelper {
-    private static final Predicate<Person> PREDICATE_MATCHING_NO_PERSONS = unused -> false;
+    private static final Predicate<Module> PREDICATE_MATCHING_NO_MODULES = unused -> false;
+    private static final Predicate<DegreePlanner> PREDICATE_MATCHING_NO_DEGREE_PLANNERS = unused -> false;
 
     /**
      * Updates {@code model}'s filtered list to display only {@code toDisplay}.
      */
-    public static void setFilteredList(Model model, List<Person> toDisplay) {
-        Optional<Predicate<Person>> predicate =
+    public static void setFilteredList(Model model, List<Module> toDisplay) {
+        Optional<Predicate<Module>> predicate =
                 toDisplay.stream().map(ModelHelper::getPredicateMatching).reduce(Predicate::or);
-        model.updateFilteredPersonList(predicate.orElse(PREDICATE_MATCHING_NO_PERSONS));
+        model.updateFilteredModuleList(predicate.orElse(PREDICATE_MATCHING_NO_MODULES));
     }
 
     /**
      * @see ModelHelper#setFilteredList(Model, List)
      */
-    public static void setFilteredList(Model model, Person... toDisplay) {
+    public static void setFilteredList(Model model, Module... toDisplay) {
         setFilteredList(model, Arrays.asList(toDisplay));
     }
 
     /**
-     * Returns a predicate that evaluates to true if this {@code Person} equals to {@code other}.
+     * Returns a predicate that evaluates to true if this {@code Module} equals to {@code other}.
      */
-    private static Predicate<Person> getPredicateMatching(Person other) {
-        return person -> person.equals(other);
+    private static Predicate<Module> getPredicateMatching(Module other) {
+        return module -> module.equals(other);
+    }
+
+    /**
+     * Updates {@code model}'s filtered degree planner list to display only {@code toDisplay}.
+     */
+    public static void setFilteredDegreePlannerList(Model model, List<DegreePlanner> toDisplay) {
+        Optional<Predicate<DegreePlanner>> predicate =
+                toDisplay.stream().map(ModelHelper::getDegreePlannerPredicateMatching).reduce(Predicate::or);
+        model.updateFilteredDegreePlannerList(predicate.orElse(PREDICATE_MATCHING_NO_DEGREE_PLANNERS));
+    }
+
+    /**
+     * @see ModelHelper#setFilteredDegreePlannerList(Model, DegreePlanner...)
+     */
+    public static void setFilteredDegreePlannerList(Model model, DegreePlanner... toDisplay) {
+        setFilteredDegreePlannerList(model, Arrays.asList(toDisplay));
+    }
+
+    /**
+     * Returns a predicate that evaluates to true if this {@code DegreePlanner} equals to {@code other}.
+     */
+    private static Predicate<DegreePlanner> getDegreePlannerPredicateMatching(DegreePlanner other) {
+        return degreePlanner -> degreePlanner.equals(other);
     }
 }
diff --git a/src/test/java/systemtests/SampleDataTest.java b/src/test/java/systemtests/SampleDataTest.java
index 6a1cfac1ea75..fb10f0356201 100644
--- a/src/test/java/systemtests/SampleDataTest.java
+++ b/src/test/java/systemtests/SampleDataTest.java
@@ -1,6 +1,6 @@
 package systemtests;
 
-import static seedu.address.ui.testutil.GuiTestAssert.assertListMatching;
+import static pwe.planner.ui.testutil.GuiTestAssert.assertListMatching;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -8,17 +8,17 @@
 
 import org.junit.Test;
 
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-import seedu.address.model.util.SampleDataUtil;
-import seedu.address.testutil.TestUtil;
+import pwe.planner.model.Application;
+import pwe.planner.model.module.Module;
+import pwe.planner.model.util.SampleDataUtil;
+import pwe.planner.testutil.TestUtil;
 
-public class SampleDataTest extends AddressBookSystemTest {
+public class SampleDataTest extends ApplicationSystemTest {
     /**
      * Returns null to force test app to load data of the file in {@code getDataFileLocation()}.
      */
     @Override
-    protected AddressBook getInitialData() {
+    protected Application getInitialData() {
         return null;
     }
 
@@ -26,8 +26,30 @@ protected AddressBook getInitialData() {
      * Returns a non-existent file location to force test app to load sample data.
      */
     @Override
-    protected Path getDataFileLocation() {
-        Path filePath = TestUtil.getFilePathInSandboxFolder("SomeFileThatDoesNotExist1234567890.xml");
+    protected Path getModuleListFileLocation() {
+        Path filePath = TestUtil.getFilePathInSandboxFolder("SomeModuleListFileThatDoesNotExist1234567890.xml");
+        deleteFileIfExists(filePath);
+        return filePath;
+    }
+
+    /**
+     * Returns a non-existent file location to force test app to load sample data.
+     */
+    @Override
+    protected Path getDegreePlannerListFileLocation() {
+        Path filePath =
+                TestUtil.getFilePathInSandboxFolder("SomeDegreePlannerListFileThatDoesNotExist1234567890.xml");
+        deleteFileIfExists(filePath);
+        return filePath;
+    }
+
+    /**
+     * Returns a non-existent file location to force test app to load sample data.
+     */
+    @Override
+    protected Path getRequirementCategoryListFileLocation() {
+        Path filePath =
+                TestUtil.getFilePathInSandboxFolder("SomeRequirementCategoryFileThatDoesNotExist1234567890.xml");
         deleteFileIfExists(filePath);
         return filePath;
     }
@@ -44,8 +66,8 @@ private void deleteFileIfExists(Path filePath) {
     }
 
     @Test
-    public void addressBook_dataFileDoesNotExist_loadSampleData() {
-        Person[] expectedList = SampleDataUtil.getSamplePersons();
-        assertListMatching(getPersonListPanel(), expectedList);
+    public void application_dataFileDoesNotExist_loadSampleData() {
+        Module[] expectedList = SampleDataUtil.getSampleModules();
+        assertListMatching(getModuleListPanel(), expectedList);
     }
 }
diff --git a/src/test/java/systemtests/SelectCommandSystemTest.java b/src/test/java/systemtests/SelectCommandSystemTest.java
index 68d024c22e64..ea3c1b60dcff 100644
--- a/src/test/java/systemtests/SelectCommandSystemTest.java
+++ b/src/test/java/systemtests/SelectCommandSystemTest.java
@@ -1,38 +1,38 @@
 package systemtests;
 
 import static org.junit.Assert.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.logic.commands.SelectCommand.MESSAGE_SELECT_PERSON_SUCCESS;
-import static seedu.address.testutil.TestUtil.getLastIndex;
-import static seedu.address.testutil.TestUtil.getMidIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalPersons.KEYWORD_MATCHING_MEIER;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static pwe.planner.commons.core.Messages.MESSAGE_INVALID_MODULE_DISPLAYED_INDEX;
+import static pwe.planner.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static pwe.planner.logic.commands.SelectCommand.MESSAGE_SELECT_MODULE_SUCCESS;
+import static pwe.planner.testutil.TestUtil.getLastIndex;
+import static pwe.planner.testutil.TestUtil.getMidIndex;
+import static pwe.planner.testutil.TypicalIndexes.INDEX_FIRST_MODULE;
+import static pwe.planner.testutil.TypicalModules.KEYWORD_MATCHING_MEIER;
 
 import org.junit.Test;
 
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.model.Model;
+import pwe.planner.commons.core.index.Index;
+import pwe.planner.logic.commands.RedoCommand;
+import pwe.planner.logic.commands.SelectCommand;
+import pwe.planner.logic.commands.UndoCommand;
+import pwe.planner.model.Model;
 
-public class SelectCommandSystemTest extends AddressBookSystemTest {
+public class SelectCommandSystemTest extends ApplicationSystemTest {
     @Test
     public void select() {
         /* ------------------------ Perform select operations on the shown unfiltered list -------------------------- */
 
-        /* Case: select the first card in the person list, command with leading spaces and trailing spaces
+        /* Case: select the first card in the module list, command with leading spaces and trailing spaces
          * -> selected
          */
-        String command = "   " + SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased() + "   ";
-        assertCommandSuccess(command, INDEX_FIRST_PERSON);
+        String command = "   " + SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased() + "   ";
+        assertCommandSuccess(command, INDEX_FIRST_MODULE);
 
-        /* Case: select the last card in the person list -> selected */
-        Index personCount = getLastIndex(getModel());
-        command = SelectCommand.COMMAND_WORD + " " + personCount.getOneBased();
-        assertCommandSuccess(command, personCount);
+        /* Case: select the last card in the module list -> selected */
+        Index moduleCount = getLastIndex(getModel());
+        command = SelectCommand.COMMAND_WORD + " " + moduleCount.getOneBased();
+        assertCommandSuccess(command, moduleCount);
 
         /* Case: undo previous selection -> rejected */
         command = UndoCommand.COMMAND_WORD;
@@ -44,7 +44,7 @@ public void select() {
         expectedResultMessage = RedoCommand.MESSAGE_FAILURE;
         assertCommandFailure(command, expectedResultMessage);
 
-        /* Case: select the middle card in the person list -> selected */
+        /* Case: select the middle card in the module list -> selected */
         Index middleIndex = getMidIndex(getModel());
         command = SelectCommand.COMMAND_WORD + " " + middleIndex.getOneBased();
         assertCommandSuccess(command, middleIndex);
@@ -54,16 +54,16 @@ public void select() {
 
         /* ------------------------ Perform select operations on the shown filtered list ---------------------------- */
 
-        /* Case: filtered person list, select index within bounds of address book but out of bounds of person list
+        /* Case: filtered module list, select index within bounds of application but out of bounds of module list
          * -> rejected
          */
-        showPersonsWithName(KEYWORD_MATCHING_MEIER);
-        int invalidIndex = getModel().getAddressBook().getPersonList().size();
-        assertCommandFailure(SelectCommand.COMMAND_WORD + " " + invalidIndex, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        showModulesWithName(KEYWORD_MATCHING_MEIER);
+        int invalidIndex = getModel().getApplication().getModuleList().size();
+        assertCommandFailure(SelectCommand.COMMAND_WORD + " " + invalidIndex, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
 
-        /* Case: filtered person list, select index within bounds of address book and person list -> selected */
+        /* Case: filtered module list, select index within bounds of application and module list -> selected */
         Index validIndex = Index.fromOneBased(1);
-        assertTrue(validIndex.getZeroBased() < getModel().getFilteredPersonList().size());
+        assertTrue(validIndex.getZeroBased() < getModel().getFilteredModuleList().size());
         command = SelectCommand.COMMAND_WORD + " " + validIndex.getOneBased();
         assertCommandSuccess(command, validIndex);
 
@@ -78,8 +78,8 @@ public void select() {
                 String.format(MESSAGE_INVALID_COMMAND_FORMAT, SelectCommand.MESSAGE_USAGE));
 
         /* Case: invalid index (size + 1) -> rejected */
-        invalidIndex = getModel().getFilteredPersonList().size() + 1;
-        assertCommandFailure(SelectCommand.COMMAND_WORD + " " + invalidIndex, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        invalidIndex = getModel().getFilteredModuleList().size() + 1;
+        assertCommandFailure(SelectCommand.COMMAND_WORD + " " + invalidIndex, MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
 
         /* Case: invalid arguments (alphabets) -> rejected */
         assertCommandFailure(SelectCommand.COMMAND_WORD + " abc",
@@ -92,10 +92,10 @@ public void select() {
         /* Case: mixed case command word -> rejected */
         assertCommandFailure("SeLeCt 1", MESSAGE_UNKNOWN_COMMAND);
 
-        /* Case: select from empty address book -> rejected */
-        deleteAllPersons();
-        assertCommandFailure(SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased(),
-                MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        /* Case: select from empty application -> rejected */
+        deleteAllModules();
+        assertCommandFailure(SelectCommand.COMMAND_WORD + " " + INDEX_FIRST_MODULE.getOneBased(),
+                MESSAGE_INVALID_MODULE_DISPLAYED_INDEX);
     }
 
     /**
@@ -103,20 +103,20 @@ public void select() {
      * 1. Command box displays an empty string.<br>
      * 2. Command box has the default style class.<br>
      * 3. Result display box displays the success message of executing select command with the
-     * {@code expectedSelectedCardIndex} of the selected person.<br>
-     * 4. {@code Storage} and {@code PersonListPanel} remain unchanged.<br>
+     * {@code expectedSelectedCardIndex} of the selected module.<br>
+     * 4. {@code Storage} and {@code ModuleListPanel} remain unchanged.<br>
      * 5. Selected card is at {@code expectedSelectedCardIndex} and the browser url is updated accordingly.<br>
      * 6. Status bar remains unchanged.<br>
      * Verifications 1, 3 and 4 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
-     * @see AddressBookSystemTest#assertSelectedCardChanged(Index)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * @see ApplicationSystemTest#assertSelectedCardChanged(Index)
      */
     private void assertCommandSuccess(String command, Index expectedSelectedCardIndex) {
         Model expectedModel = getModel();
         String expectedResultMessage = String.format(
-                MESSAGE_SELECT_PERSON_SUCCESS, expectedSelectedCardIndex.getOneBased());
-        int preExecutionSelectedCardIndex = getPersonListPanel().getSelectedCardIndex();
+                MESSAGE_SELECT_MODULE_SUCCESS, expectedSelectedCardIndex.getOneBased());
+        int preExecutionSelectedCardIndex = getModuleListPanel().getSelectedCardIndex();
 
         executeCommand(command);
         assertApplicationDisplaysExpected("", expectedResultMessage, expectedModel);
@@ -136,11 +136,11 @@ private void assertCommandSuccess(String command, Index expectedSelectedCardInde
      * 1. Command box displays {@code command}.<br>
      * 2. Command box has the error style class.<br>
      * 3. Result display box displays {@code expectedResultMessage}.<br>
-     * 4. {@code Storage} and {@code PersonListPanel} remain unchanged.<br>
+     * 4. {@code Storage} and {@code ModuleListPanel} remain unchanged.<br>
      * 5. Browser url, selected card and status bar remain unchanged.<br>
      * Verifications 1, 3 and 4 are performed by
-     * {@code AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
-     * @see AddressBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)
+     * {@code ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.<br>
+     * @see ApplicationSystemTest#assertApplicationDisplaysExpected(String, String, Model)
      */
     private void assertCommandFailure(String command, String expectedResultMessage) {
         Model expectedModel = getModel();
diff --git a/src/test/java/systemtests/SystemTestSetupHelper.java b/src/test/java/systemtests/SystemTestSetupHelper.java
index 82811ba874f0..f8149c3cc0f2 100644
--- a/src/test/java/systemtests/SystemTestSetupHelper.java
+++ b/src/test/java/systemtests/SystemTestSetupHelper.java
@@ -8,8 +8,8 @@
 
 import guitests.guihandles.MainWindowHandle;
 import javafx.stage.Stage;
-import seedu.address.TestApp;
-import seedu.address.model.ReadOnlyAddressBook;
+import pwe.planner.TestApp;
+import pwe.planner.model.ReadOnlyApplication;
 
 /**
  * Contains helper methods that system tests require.
@@ -21,10 +21,13 @@ public class SystemTestSetupHelper {
     /**
      * Sets up a new {@code TestApp} and returns it.
      */
-    public TestApp setupApplication(Supplier<ReadOnlyAddressBook> addressBook, Path saveFileLocation) {
+    public TestApp setupApplication(Supplier<ReadOnlyApplication> application, Path saveModuleListFileLocation,
+            Path saveDegreePlannerListFileLocation, Path saveRequirementCategoryListFileLocation) {
         try {
             FxToolkit.registerStage(Stage::new);
-            FxToolkit.setupApplication(() -> testApp = new TestApp(addressBook, saveFileLocation));
+            FxToolkit.setupApplication(() -> testApp =
+                    new TestApp(application, saveModuleListFileLocation, saveDegreePlannerListFileLocation,
+                            saveRequirementCategoryListFileLocation));
         } catch (TimeoutException te) {
             throw new AssertionError("Application takes too long to set up.", te);
         }
diff --git a/src/test/resources/view/UiPartTest/validFile.fxml b/src/test/resources/view/UiPartTest/validFile.fxml
index bab836af0db6..2cb588e8cca8 100644
--- a/src/test/resources/view/UiPartTest/validFile.fxml
+++ b/src/test/resources/view/UiPartTest/validFile.fxml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import seedu.address.ui.TestFxmlObject?>
+<?import pwe.planner.ui.TestFxmlObject?>
 <TestFxmlObject xmlns:fx="http://javafx.com/fxml/1" fx:id="validFileRoot">Hello World!</TestFxmlObject>
diff --git a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
index 151e09ce926f..c31491dbbf29 100644
--- a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
+++ b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fx:root type="seedu.address.ui.TestFxmlObject" xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml">
+<fx:root type="pwe.planner.ui.TestFxmlObject" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
     <text>Hello World!</text>
 </fx:root>