diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f35f60a357424aa265b3a6c1933c26af537c57ad
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,62 @@
+# Mac file finder metadata
+.DS_Store
+# Windows file metadata
+._*
+# Thumbnail image caches
+Thumbs.db
+ethumbs.db
+# MS Office temporary file
+~*
+# Emacs backup file
+*~
+
+# Common
+[Bb]in/
+[Bb]uild/
+[Oo]bj/
+[Oo]ut/
+[Tt]mp/
+[Xx]86/
+[Ii][Aa]32/
+[Xx]64/
+[Xx]86_64/
+[Xx]86-64/
+[Aa]rm
+[Aa]32
+[Tt]32
+[Aa]64
+*.tmp
+*.bak
+*.bk
+*.swp
+
+# Java files
+*.class
+javadoc/
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# JetBrains (IntelliJ IDEA, PyCharm, etc) files
+.idea/
+cmake-build-*/
+*.iml
+*.iws
+*.ipr
+
+# Eclipse files
+.settings/
+.project
+.classpath
+.buildpath
+.loadpath
+.factorypath
+local.properties
diff --git a/chart_inheritance/.gitignore b/chart_inheritance/.gitignore
deleted file mode 100644
index b83d22266ac8aa2f8df2edef68082c789727841d..0000000000000000000000000000000000000000
--- a/chart_inheritance/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/chart_inheritance/pom.xml b/chart_inheritance/pom.xml
deleted file mode 100644
index 063760e0487e024eae9672e7a590ddc27cc4c24e..0000000000000000000000000000000000000000
--- a/chart_inheritance/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>edu.unl.cse.soft161.chart_inheritance</groupId>
-  <artifactId>chart_inheritance</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>chart_inheritance</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.0</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d07e066246bb089302b4b50d077cac2ba6dddb1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>edu.unl.cse.soft161.chart_inheritance</groupId>
+  <artifactId>chart_inheritance</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>chart_inheritance</name>
+  <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java
diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java b/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java
similarity index 100%
rename from chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java
rename to src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java