diff --git a/.classpath b/.classpath
index fceb480..2de5cc5 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_101">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..84c048a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/.project b/.project
index 63896e3..4637376 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,22 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 0000000..5cee5ac
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a21537..295926d 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..82df264
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="2017-CSE-Senior-Project-Team-2">
+        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="2017-CSE-Senior-Project-Team-2"/>
+        <property name="java-output-path" value="/2017-CSE-Senior-Project-Team-2/build/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..dfd38d9
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v9.0"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/WebContent/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css
similarity index 100%
rename from html/css/stylesheet.css
rename to WebContent/html/css/stylesheet.css
diff --git a/html/frameworks/Admin Page Returns 2.png b/WebContent/html/frameworks/Admin Page Returns 2.png
similarity index 100%
rename from html/frameworks/Admin Page Returns 2.png
rename to WebContent/html/frameworks/Admin Page Returns 2.png
diff --git a/html/frameworks/Admin Page Returns.png b/WebContent/html/frameworks/Admin Page Returns.png
similarity index 100%
rename from html/frameworks/Admin Page Returns.png
rename to WebContent/html/frameworks/Admin Page Returns.png
diff --git a/html/frameworks/All Items.png b/WebContent/html/frameworks/All Items.png
similarity index 100%
rename from html/frameworks/All Items.png
rename to WebContent/html/frameworks/All Items.png
diff --git a/html/frameworks/Data Page.png b/WebContent/html/frameworks/Data Page.png
similarity index 100%
rename from html/frameworks/Data Page.png
rename to WebContent/html/frameworks/Data Page.png
diff --git a/html/frameworks/Header Example.png b/WebContent/html/frameworks/Header Example.png
similarity index 100%
rename from html/frameworks/Header Example.png
rename to WebContent/html/frameworks/Header Example.png
diff --git a/html/frameworks/Main Page.png b/WebContent/html/frameworks/Main Page.png
similarity index 100%
rename from html/frameworks/Main Page.png
rename to WebContent/html/frameworks/Main Page.png
diff --git a/html/frameworks/Order Page.png b/WebContent/html/frameworks/Order Page.png
similarity index 100%
rename from html/frameworks/Order Page.png
rename to WebContent/html/frameworks/Order Page.png
diff --git a/html/frameworks/Return 1.png b/WebContent/html/frameworks/Return 1.png
similarity index 100%
rename from html/frameworks/Return 1.png
rename to WebContent/html/frameworks/Return 1.png
diff --git a/html/frameworks/Return 2.png b/WebContent/html/frameworks/Return 2.png
similarity index 100%
rename from html/frameworks/Return 2.png
rename to WebContent/html/frameworks/Return 2.png
diff --git a/html/frameworks/Shopping List.png b/WebContent/html/frameworks/Shopping List.png
similarity index 100%
rename from html/frameworks/Shopping List.png
rename to WebContent/html/frameworks/Shopping List.png
diff --git a/html/imgs/computerStick.png b/WebContent/html/imgs/computerStick.png
similarity index 100%
rename from html/imgs/computerStick.png
rename to WebContent/html/imgs/computerStick.png
diff --git a/html/imgs/ipad.png b/WebContent/html/imgs/ipad.png
similarity index 100%
rename from html/imgs/ipad.png
rename to WebContent/html/imgs/ipad.png
diff --git a/html/imgs/iphone.png b/WebContent/html/imgs/iphone.png
similarity index 100%
rename from html/imgs/iphone.png
rename to WebContent/html/imgs/iphone.png
diff --git a/html/imgs/synchrony-financial-logo-dlpx.png b/WebContent/html/imgs/synchrony-financial-logo-dlpx.png
similarity index 100%
rename from html/imgs/synchrony-financial-logo-dlpx.png
rename to WebContent/html/imgs/synchrony-financial-logo-dlpx.png
diff --git a/html/imgs/synchrony-financial-logo-dlpx_1.ico b/WebContent/html/imgs/synchrony-financial-logo-dlpx_1.ico
similarity index 100%
rename from html/imgs/synchrony-financial-logo-dlpx_1.ico
rename to WebContent/html/imgs/synchrony-financial-logo-dlpx_1.ico
diff --git a/html/imgs/synchrony-financial-logo-dlpx_1.png b/WebContent/html/imgs/synchrony-financial-logo-dlpx_1.png
similarity index 100%
rename from html/imgs/synchrony-financial-logo-dlpx_1.png
rename to WebContent/html/imgs/synchrony-financial-logo-dlpx_1.png
diff --git a/html/imgs/ticket.png b/WebContent/html/imgs/ticket.png
similarity index 100%
rename from html/imgs/ticket.png
rename to WebContent/html/imgs/ticket.png
diff --git a/html/imgs/user_icon.png b/WebContent/html/imgs/user_icon.png
similarity index 100%
rename from html/imgs/user_icon.png
rename to WebContent/html/imgs/user_icon.png
diff --git a/html/javascript/listing.js b/WebContent/html/javascript/listing.js
similarity index 100%
rename from html/javascript/listing.js
rename to WebContent/html/javascript/listing.js
diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js
new file mode 100644
index 0000000..6e62706
--- /dev/null
+++ b/WebContent/html/javascript/navbar.js
@@ -0,0 +1 @@
+document.getElementById('navbaruniversal').innerHTML = '<div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand" href="../webpages/index.html"><img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%;"></a></div><div id="navbar" class="navbar-collapse collapse" aria-expanded="false"><ul class="nav navbar-nav navbar-right"><li><a href="index.html">Home</a></li><li><a href="requestPage.html">Request Device</a></li><li><a href="returnPage.html">Return Device</a></li><li><a href="listingPage.html">Device Listing</a></li><li><a href="shoppingCart.html">Shopping Cart</a></li></ul></div></div>'
\ No newline at end of file
diff --git a/html/javascript/nhpup_1.1.js b/WebContent/html/javascript/nhpup_1.1.js
similarity index 100%
rename from html/javascript/nhpup_1.1.js
rename to WebContent/html/javascript/nhpup_1.1.js
diff --git a/html/javascript/request.js b/WebContent/html/javascript/request.js
similarity index 100%
rename from html/javascript/request.js
rename to WebContent/html/javascript/request.js
diff --git a/html/javascript/return.js b/WebContent/html/javascript/return.js
similarity index 100%
rename from html/javascript/return.js
rename to WebContent/html/javascript/return.js
diff --git a/html/javascript/shoppingCart.js b/WebContent/html/javascript/shoppingCart.js
similarity index 100%
rename from html/javascript/shoppingCart.js
rename to WebContent/html/javascript/shoppingCart.js
diff --git a/html/table.css b/WebContent/html/table.css
similarity index 100%
rename from html/table.css
rename to WebContent/html/table.css
diff --git a/html/webpages/homePage.html b/WebContent/html/webpages/index.html
similarity index 100%
rename from html/webpages/homePage.html
rename to WebContent/html/webpages/index.html
diff --git a/html/webpages/listingPage.html b/WebContent/html/webpages/listingPage.html
similarity index 100%
rename from html/webpages/listingPage.html
rename to WebContent/html/webpages/listingPage.html
diff --git a/html/webpages/map.html b/WebContent/html/webpages/map.html
similarity index 100%
rename from html/webpages/map.html
rename to WebContent/html/webpages/map.html
diff --git a/html/webpages/requestPage.html b/WebContent/html/webpages/requestPage.html
similarity index 100%
rename from html/webpages/requestPage.html
rename to WebContent/html/webpages/requestPage.html
diff --git a/html/webpages/returnPage.html b/WebContent/html/webpages/returnPage.html
similarity index 100%
rename from html/webpages/returnPage.html
rename to WebContent/html/webpages/returnPage.html
diff --git a/html/webpages/shoppingCart.html b/WebContent/html/webpages/shoppingCart.html
similarity index 100%
rename from html/webpages/shoppingCart.html
rename to WebContent/html/webpages/shoppingCart.html
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
new file mode 100644
index 0000000..7908735
--- /dev/null
+++ b/WebContent/index.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index c2b3b41..0000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/database/
-/entities/
-/features/
-/functionality_managers/
-/main/
diff --git a/bin/entities/Admin.class b/bin/entities/Admin.class
deleted file mode 100644
index 44f85ec..0000000
Binary files a/bin/entities/Admin.class and /dev/null differ
diff --git a/bin/entities/Device.class b/bin/entities/Device.class
deleted file mode 100644
index 00ef94f..0000000
Binary files a/bin/entities/Device.class and /dev/null differ
diff --git a/bin/entities/User.class b/bin/entities/User.class
deleted file mode 100644
index af8582a..0000000
Binary files a/bin/entities/User.class and /dev/null differ
diff --git a/bin/main/Main.class b/bin/main/Main.class
deleted file mode 100644
index 4cc5f7c..0000000
Binary files a/bin/main/Main.class and /dev/null differ
diff --git a/db/Workbench Schema.mwb b/db/Workbench Schema.mwb
index 8683818..25df763 100644
Binary files a/db/Workbench Schema.mwb and b/db/Workbench Schema.mwb differ
diff --git a/db/Workbench Schema.mwb.bak b/db/Workbench Schema.mwb.bak
index 499f83d..8683818 100644
Binary files a/db/Workbench Schema.mwb.bak and b/db/Workbench Schema.mwb.bak differ
diff --git a/html/javascript/navbar.js b/html/javascript/navbar.js
deleted file mode 100644
index f34276e..0000000
--- a/html/javascript/navbar.js
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('navbaruniversal').innerHTML = '<div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand" href="../webpages/homePage.html"><img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%;"></a></div><div id="navbar" class="navbar-collapse collapse" aria-expanded="false"><ul class="nav navbar-nav navbar-right"><li><a href="homePage.html">Home</a></li><li><a href="requestPage.html">Request Device</a></li><li><a href="returnPage.html">Return Device</a></li><li><a href="listingPage.html">Device Listing</a></li><li><a href="shoppingCart.html">Shopping Cart</a></li></ul></div></div>'
\ No newline at end of file
diff --git a/src/features/ReturnHandler.java b/src/features/ReturnHandler.java
index 4a795b9..4d73b34 100644
--- a/src/features/ReturnHandler.java
+++ b/src/features/ReturnHandler.java
@@ -17,8 +17,6 @@ public boolean changeAvailability(String type, Device[] db)
 		return true;
 	
 	}
-	
-	public