diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index e1401cd4..ee30cbd5 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="onlinebookstore-0.0.1-SNAPSHOT">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/OnlineBookStore"/>
-        <property name="context-root" value="onlinebookstore"/>
-        <property name="java-output-path" value="/onlinebookstore/build/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+        
+    <wb-module deploy-name="onlinebookstore-0.0.1-SNAPSHOT">
+                
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+                
+        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                
+        <property name="context-root" value="onlinebookstore"/>
+                
+        <property name="java-output-path" value="/onlinebookstore/build/classes"/>
+            
+    </wb-module>
+    
+</project-modules>
diff --git a/pom.xml b/pom.xml
index 602979b4..5f94bc56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,49 +1,75 @@
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>onlinebookstore</groupId>
-  <artifactId>onlinebookstore</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>war</packaging>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.1</version>
-        <configuration>
-          <warSourceDirectory>WebContent</warSourceDirectory>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  	
-  	<dependency>
-  		<groupId>org.postgresql</groupId>
-  		<artifactId>postgresql</artifactId>
-  		<version>42.3.7</version>
-  	</dependency>
-  	
-  	
-	<dependency>
-	    <groupId>mysql</groupId>
-	    <artifactId>mysql-connector-java</artifactId>
-	    <version>8.0.28</version>
-	</dependency>
-  	
-  
-  	<dependency>
-  		<groupId>javax.servlet</groupId>
-  		<artifactId>javax.servlet-api</artifactId>
-  		<version>3.1.0</version>
-  	</dependency>
-  </dependencies>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>theonlinebookstore</groupId>
+	<artifactId>theonlinebookstore</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<finalName>theonlinebookstore</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.3</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.github.jsimone</groupId>
+									<artifactId>webapp-runner</artifactId>
+									<version>8.0.30.2</version>
+									<destFileName>webapp-runner.jar</destFileName>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.2.1</version>
+				<configuration>
+					<warSourceDirectory>WebContent</warSourceDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>42.3.7</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.28</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/OnlineBookStore/constants/IDatabase.java b/src/main/java/constants/IDatabase.java
similarity index 100%
rename from OnlineBookStore/constants/IDatabase.java
rename to src/main/java/constants/IDatabase.java
diff --git a/OnlineBookStore/constants/IOnlineBookStoreConstants.java b/src/main/java/constants/IOnlineBookStoreConstants.java
similarity index 94%
rename from OnlineBookStore/constants/IOnlineBookStoreConstants.java
rename to src/main/java/constants/IOnlineBookStoreConstants.java
index ba00835d..9a2ba480 100644
--- a/OnlineBookStore/constants/IOnlineBookStoreConstants.java
+++ b/src/main/java/constants/IOnlineBookStoreConstants.java
@@ -1,7 +1,7 @@
-package constants;
-
-public interface IOnlineBookStoreConstants {
-	public static String CONTENT_TYPE_TEXT_HTML = "text/html";
-	
-	
-}
+package constants;
+
+public interface IOnlineBookStoreConstants {
+	public static String CONTENT_TYPE_TEXT_HTML = "text/html";
+	
+	
+}
diff --git a/OnlineBookStore/servlets/AddBookServlet.java b/src/main/java/servlets/AddBookServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/AddBookServlet.java
rename to src/main/java/servlets/AddBookServlet.java
diff --git a/OnlineBookStore/servlets/AdminLoginServlet.java b/src/main/java/servlets/AdminLoginServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/AdminLoginServlet.java
rename to src/main/java/servlets/AdminLoginServlet.java
diff --git a/OnlineBookStore/servlets/BuyBooksServlet.java b/src/main/java/servlets/BuyBooksServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/BuyBooksServlet.java
rename to src/main/java/servlets/BuyBooksServlet.java
diff --git a/OnlineBookStore/servlets/DBConnection.java b/src/main/java/servlets/DBConnection.java
similarity index 100%
rename from OnlineBookStore/servlets/DBConnection.java
rename to src/main/java/servlets/DBConnection.java
diff --git a/OnlineBookStore/servlets/ReceiptServlet.java b/src/main/java/servlets/ReceiptServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/ReceiptServlet.java
rename to src/main/java/servlets/ReceiptServlet.java
diff --git a/OnlineBookStore/servlets/RemoveBookServlet.java b/src/main/java/servlets/RemoveBookServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/RemoveBookServlet.java
rename to src/main/java/servlets/RemoveBookServlet.java
diff --git a/OnlineBookStore/servlets/UserLoginServlet.java b/src/main/java/servlets/UserLoginServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/UserLoginServlet.java
rename to src/main/java/servlets/UserLoginServlet.java
diff --git a/OnlineBookStore/servlets/UserRegisterServlet.java b/src/main/java/servlets/UserRegisterServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/UserRegisterServlet.java
rename to src/main/java/servlets/UserRegisterServlet.java
diff --git a/OnlineBookStore/servlets/ViewBookServlet.java b/src/main/java/servlets/ViewBookServlet.java
similarity index 100%
rename from OnlineBookStore/servlets/ViewBookServlet.java
rename to src/main/java/servlets/ViewBookServlet.java
diff --git a/OnlineBookStore/sql/IBookConstants.java b/src/main/java/sql/IBookConstants.java
similarity index 96%
rename from OnlineBookStore/sql/IBookConstants.java
rename to src/main/java/sql/IBookConstants.java
index 137383b6..f3736981 100644
--- a/OnlineBookStore/sql/IBookConstants.java
+++ b/src/main/java/sql/IBookConstants.java
@@ -1,12 +1,12 @@
-package sql;
-
-public interface IBookConstants {
-	
-    public static String TABLE_BOOK = "books";
-	
-	public static String COLUMN_NAME = "name";
-	public static String COLUMN_BARCODE = "barcode";
-	public static String COLUMN_AUTHOR = "author";
-	public static String COLUMN_PRICE = "price";
-	public static String COLUMN_QUANTITY = "quantity";
-}
+package sql;
+
+public interface IBookConstants {
+	
+    public static String TABLE_BOOK = "books";
+	
+	public static String COLUMN_NAME = "name";
+	public static String COLUMN_BARCODE = "barcode";
+	public static String COLUMN_AUTHOR = "author";
+	public static String COLUMN_PRICE = "price";
+	public static String COLUMN_QUANTITY = "quantity";
+}
diff --git a/OnlineBookStore/sql/IUserContants.java b/src/main/java/sql/IUserContants.java
similarity index 97%
rename from OnlineBookStore/sql/IUserContants.java
rename to src/main/java/sql/IUserContants.java
index fc4a911c..bac6b48d 100644
--- a/OnlineBookStore/sql/IUserContants.java
+++ b/src/main/java/sql/IUserContants.java
@@ -1,15 +1,15 @@
-package sql;
-
-public interface IUserContants {
-
-	public static String TABLE_USERS = "users";
-	
-	public static String COLUMN_USERNAME = "username";
-	public static String COLUMN_PASSWORD = "password";
-	public static String COLUMN_FIRSTNAME = "firstname";
-	public static String COLUMN_LASTNAME = "lastname";
-	public static String COLUMN_ADDRESS = "address";
-	public static String COLUMN_PHONE = "phone";
-	public static String COLUMN_MAILID = "mailid";
-	public static String COLUMN_USERTYPE = "usertype";
-}
+package sql;
+
+public interface IUserContants {
+
+	public static String TABLE_USERS = "users";
+	
+	public static String COLUMN_USERNAME = "username";
+	public static String COLUMN_PASSWORD = "password";
+	public static String COLUMN_FIRSTNAME = "firstname";
+	public static String COLUMN_LASTNAME = "lastname";
+	public static String COLUMN_ADDRESS = "address";
+	public static String COLUMN_PHONE = "phone";
+	public static String COLUMN_MAILID = "mailid";
+	public static String COLUMN_USERTYPE = "usertype";
+}