diff --git a/build.gradle b/build.gradle
index 2c1803f..680d5da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,8 @@ allprojects {
         minSdkVersion = 21
         targetSdkVersion = 28
         buildToolsVersion = '28.0.3'
-        jetpackVersion = '1.0.0'
+        appCompatVersion = '1.0.2'
+        materialVersion = '1.0.0'
         lifecycleVersion = '2.0.0'
         constraintLayoutVersion = '2.0.0-alpha3'
         mockitoVersion = '2.23.0'
diff --git a/core/.gitignore b/core/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/core/README.md b/core/README.md
deleted file mode 100644
index 782b9cb..0000000
--- a/core/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# CORE
-
-This module contains any core code that affects more than one of the individual models. That includes mostly the activity layouts that are the same in each module. 
-
-We want to emphasize the different architecture patterns, and not clutter each module with repeated XML files, or model classes, that appear in each one.
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
deleted file mode 100644
index a8c6436..0000000
--- a/core/build.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion project.ext.targetSdkVersion
-
-    defaultConfig {
-        minSdkVersion project.ext.minSdkVersion
-        targetSdkVersion project.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation "androidx.appcompat:appcompat:$jetpackVersion"
-    implementation "androidx.recyclerview:recyclerview:$jetpackVersion"
-    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
-    implementation "com.google.android.material:material:$jetpackVersion"
-    testImplementation "junit:junit:$junitVersion"
-    androidTestImplementation "androidx.test:runner:$androidTestVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-repositories {
-    mavenCentral()
-}
diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/core/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
deleted file mode 100644
index 664f1d2..0000000
--- a/core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="com.adammcneilly.todo_core" />
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseAddTaskActivity.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseAddTaskActivity.kt
deleted file mode 100644
index cf95789..0000000
--- a/core/src/main/java/com/adammcneilly/todo_core/BaseAddTaskActivity.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.adammcneilly.todo_core
-
-import android.os.Bundle
-import android.widget.Button
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.textfield.TextInputEditText
-
-/**
- * This base class sets up the UI for adding a task, and defines any UI components that implementations
- * need to reference. This was just for ease of use as the various modules will all have the same UI,
- * so there was no need to repeat these files across each one.
- */
-open class BaseAddTaskActivity : AppCompatActivity() {
-    protected val taskDescriptionEditText: TextInputEditText by lazy {
-        findViewById<TextInputEditText>(R.id.task_description)
-    }
-
-    protected val submitTaskButton: Button by lazy {
-        findViewById<Button>(R.id.submit_task)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_add_task)
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseTask.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseTask.kt
deleted file mode 100644
index e6c433b..0000000
--- a/core/src/main/java/com/adammcneilly/todo_core/BaseTask.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.adammcneilly.todo_core
-
-/**
- * Since many modules will just be using the same model class for displaying a task, we can create a
- * base version rather than repeat it in each module.
- */
-data class BaseTask(
-        val description: String
-)
\ No newline at end of file
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseTaskAdapter.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseTaskAdapter.kt
deleted file mode 100644
index 9ae31b3..0000000
--- a/core/src/main/java/com/adammcneilly/todo_core/BaseTaskAdapter.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.adammcneilly.todo_core
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.adammcneilly.todo_core.R
-
-/**
- * A number of the modules will use the same type of adapter for displaying tasks, so we abstracted
- * the base code into the core module to avoid repeating it.
- */
-class BaseTaskAdapter : RecyclerView.Adapter<BaseTaskAdapter.BaseTaskViewHolder>() {
-    var tasks: List<BaseTask> = emptyList()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseTaskViewHolder {
-        val context = parent.context
-        val inflater = LayoutInflater.from(context)
-        val view = inflater.inflate(R.layout.list_item_task, parent, false)
-        return BaseTaskViewHolder(view)
-    }
-
-    override fun getItemCount(): Int {
-        return tasks.size
-    }
-
-    override fun onBindViewHolder(holder: BaseTaskViewHolder, position: Int) {
-        holder.bindTask(tasks[position])
-    }
-
-    class BaseTaskViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        private val taskDescriptionTextView = view.findViewById<TextView>(R.id.task_description)
-
-        fun bindTask(task: BaseTask) {
-            taskDescriptionTextView.text = task.description
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseTaskListActivity.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseTaskListActivity.kt
deleted file mode 100644
index 9e0b14e..0000000
--- a/core/src/main/java/com/adammcneilly/todo_core/BaseTaskListActivity.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.adammcneilly.todo_core
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-
-/**
- * This base class sets up the UI for viewing tasks, and defines any UI components that implementations
- * need to reference. This was just for ease of use as the various modules will all have the same UI,
- * so there was no need to repeat these files across each one.
- */
-open class BaseTaskListActivity : AppCompatActivity() {
-
-    protected val toolbar: Toolbar by lazy {
-        findViewById<Toolbar>(R.id.toolbar)
-    }
-
-    protected val fab: FloatingActionButton by lazy {
-        findViewById<FloatingActionButton>(R.id.fab)
-    }
-
-    protected val taskList: RecyclerView by lazy {
-        findViewById<RecyclerView>(R.id.task_list)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_task_list)
-        setSupportActionBar(toolbar)
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_add_white_24dp.xml b/core/src/main/res/drawable/ic_add_white_24dp.xml
deleted file mode 100644
index e3979cd..0000000
--- a/core/src/main/res/drawable/ic_add_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/core/src/main/res/layout/activity_add_task.xml b/core/src/main/res/layout/activity_add_task.xml
deleted file mode 100644
index 89a1795..0000000
--- a/core/src/main/res/layout/activity_add_task.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/add_task_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="8dp">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/task_description_layout"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/task_description"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:hint="@string/task_description" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <Button
-        android:id="@+id/submit_task"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/submit_task"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/task_description_layout" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/src/main/res/layout/activity_task_list.xml b/core/src/main/res/layout/activity_task_list.xml
deleted file mode 100644
index 7c8a79b..0000000
--- a/core/src/main/res/layout/activity_task_list.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/task_list_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/task_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@drawable/ic_add_white_24dp" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/core/src/main/res/layout/list_item_task.xml b/core/src/main/res/layout/list_item_task.xml
deleted file mode 100644
index 96701a8..0000000
--- a/core/src/main/res/layout/list_item_task.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/task_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
deleted file mode 100644
index 69b2233..0000000
--- a/core/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-</resources>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
deleted file mode 100644
index 59a0b0c..0000000
--- a/core/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
deleted file mode 100644
index 255d2f0..0000000
--- a/core/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-    <string name="app_name">core</string>
-    <string name="task_description">Task Description</string>
-    <string name="submit_task">Submit Task</string>
-</resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
deleted file mode 100644
index 545b9c6..0000000
--- a/core/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-</resources>
diff --git a/settings.gradle b/settings.gradle
index 9b6c4e7..c98d418 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':todo-mvp', ':todo-mvvm', ':core'
+include ':todo-mvp', ':todo-mvvm'
diff --git a/todo-mvp/build.gradle b/todo-mvp/build.gradle
index a1e1e6f..ccdd6bd 100644
--- a/todo-mvp/build.gradle
+++ b/todo-mvp/build.gradle
@@ -25,9 +25,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$jetpackVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
-    implementation "com.google.android.material:material:$jetpackVersion"
+    implementation "com.google.android.material:material:$materialVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation "junit:junit:$junitVersion"
diff --git a/todo-mvvm/build.gradle b/todo-mvvm/build.gradle
index b7df9e7..603bc81 100644
--- a/todo-mvvm/build.gradle
+++ b/todo-mvvm/build.gradle
@@ -28,9 +28,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$jetpackVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
-    implementation "com.google.android.material:material:$jetpackVersion"
+    implementation "com.google.android.material:material:$materialVersion"
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
     implementation "androidx.arch.core:core-testing:$lifecycleVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"