diff --git a/main/project/build.xml b/main/project/build.xml
index f9a9261e7..60259f725 100644
--- a/main/project/build.xml
+++ b/main/project/build.xml
@@ -83,8 +83,8 @@
   <property name="manager.url"   		   value="http://localhost/manager"/>
   <property name="manager.username"   	   value="admin"/> 			<!-- UPDATE THIS! -->
   <property name="manager.password"   	   value="admin"/> 			<!-- UPDATE THIS! -->
-  <property name="src.home"     		   value="${basedir}/JavaSource"/>
-  <property name="web.home"      		   value="${basedir}/WebContent"/>
+  <property name="src.home"     		   value="${basedir}/java"/>
+  <property name="web.home"      		   value="${basedir}/webapp"/>
   <property name="zip_distributions.home"  value="${basedir}/zip_distributions"/>
 
 <!-- ==================== External Dependencies =========================== -->
@@ -103,7 +103,7 @@
   files that you are going to include inside your "/WEB-INF/lib" directory.
 -->
 
-  <property name="jars"      value="${basedir}/WebContent/WEB-INF/lib"/>
+  <property name="jars"      value="${basedir}/webapp/WEB-INF/lib"/>
 
 <!-- ==================== Compilation Classpath =========================== -->
 
@@ -123,10 +123,10 @@
 		<include name="*.jar"/>
 	</fileset> 
     <pathelement location="${catalina.home}/common/classes"/>
-    <fileset dir="${catalina.home}/common/lib">
+    <fileset dir="${catalina.home}/lib">
       <include name="*.jar"/>
     </fileset>
-     <fileset dir="${catalina.home}/server/lib">
+     <fileset dir="${catalina.home}/lib">
       <include name="*.jar"/>
     </fileset>
  </path>
@@ -224,17 +224,17 @@
 <!-- =================== Internal Tasks to prepare war file  ============ -->
 
 	<!-- Copying the Java source code into the build directory -->
-	<!-- We must also copy the source into WebContent, since WTP will overwrite the 
+	<!-- We must also copy the source into webapp, since WTP will overwrite the 
 		app as it was deployed from the WAR. -->
-	<!-- We must also copy the doc dir into WebContent, for the "how to create a new lesson" lesson -->
+	<!-- We must also copy the doc dir into webapp, for the "how to create a new lesson" lesson -->
 	<target name="-CopySourceToBuild" depends="prepare" >
-		<delete dir="${build.home}/JavaSource"/>
-		<copy todir="${build.home}/JavaSource">
-			<fileset dir="${basedir}/JavaSource"/>
+		<delete dir="${build.home}/java"/>
+		<copy todir="${build.home}/java">
+			<fileset dir="${basedir}/java"/>
 		</copy>
-		<delete dir="${web.home}/JavaSource"/>
-		<copy todir="${web.home}/JavaSource">
-			<fileset dir="${basedir}/JavaSource"/>
+		<delete dir="${web.home}/java"/>
+		<copy todir="${web.home}/java">
+			<fileset dir="${basedir}/java"/>
 		</copy>
 		<delete dir="${web.home}/doc"/>
 		<copy todir="${web.home}/doc">
diff --git a/main/project/JavaSource/WebGoatLabels_english.properties b/main/project/java/WebGoatLabels_english.properties
similarity index 100%
rename from main/project/JavaSource/WebGoatLabels_english.properties
rename to main/project/java/WebGoatLabels_english.properties
diff --git a/main/project/JavaSource/WebGoatLabels_german.properties b/main/project/java/WebGoatLabels_german.properties
similarity index 100%
rename from main/project/JavaSource/WebGoatLabels_german.properties
rename to main/project/java/WebGoatLabels_german.properties
diff --git a/main/project/JavaSource/org/owasp/webgoat/Catcher.java b/main/project/java/org/owasp/webgoat/Catcher.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/Catcher.java
rename to main/project/java/org/owasp/webgoat/Catcher.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/HammerHead.java b/main/project/java/org/owasp/webgoat/HammerHead.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/HammerHead.java
rename to main/project/java/org/owasp/webgoat/HammerHead.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/LessonSource.java b/main/project/java/org/owasp/webgoat/LessonSource.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/LessonSource.java
rename to main/project/java/org/owasp/webgoat/LessonSource.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java b/main/project/java/org/owasp/webgoat/lessons/AbstractLesson.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java
rename to main/project/java/org/owasp/webgoat/lessons/AbstractLesson.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java b/main/project/java/org/owasp/webgoat/lessons/AccessControlMatrix.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java
rename to main/project/java/org/owasp/webgoat/lessons/AccessControlMatrix.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java b/main/project/java/org/owasp/webgoat/lessons/BackDoors.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java
rename to main/project/java/org/owasp/webgoat/lessons/BackDoors.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java b/main/project/java/org/owasp/webgoat/lessons/BasicAuthentication.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java
rename to main/project/java/org/owasp/webgoat/lessons/BasicAuthentication.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java b/main/project/java/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BlindScript.java b/main/project/java/org/owasp/webgoat/lessons/BlindScript.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BlindScript.java
rename to main/project/java/org/owasp/webgoat/lessons/BlindScript.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BlindStringSqlInjection.java b/main/project/java/org/owasp/webgoat/lessons/BlindStringSqlInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BlindStringSqlInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/BlindStringSqlInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java b/main/project/java/org/owasp/webgoat/lessons/BufferOverflow.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java
rename to main/project/java/org/owasp/webgoat/lessons/BufferOverflow.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java b/main/project/java/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java
rename to main/project/java/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java b/main/project/java/org/owasp/webgoat/lessons/CSRF.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java
rename to main/project/java/org/owasp/webgoat/lessons/CSRF.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java b/main/project/java/org/owasp/webgoat/lessons/Category.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/Category.java
rename to main/project/java/org/owasp/webgoat/lessons/Category.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java b/main/project/java/org/owasp/webgoat/lessons/Challenge2Screen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java
rename to main/project/java/org/owasp/webgoat/lessons/Challenge2Screen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java b/main/project/java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java
rename to main/project/java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ClientSideValidation.java b/main/project/java/org/owasp/webgoat/lessons/ClientSideValidation.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ClientSideValidation.java
rename to main/project/java/org/owasp/webgoat/lessons/ClientSideValidation.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java b/main/project/java/org/owasp/webgoat/lessons/CommandInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/CommandInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ConcurrencyCart.java b/main/project/java/org/owasp/webgoat/lessons/ConcurrencyCart.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ConcurrencyCart.java
rename to main/project/java/org/owasp/webgoat/lessons/ConcurrencyCart.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java b/main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java
rename to main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java b/main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java b/main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java b/main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java b/main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CsrfPromptByPass.java b/main/project/java/org/owasp/webgoat/lessons/CsrfPromptByPass.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CsrfPromptByPass.java
rename to main/project/java/org/owasp/webgoat/lessons/CsrfPromptByPass.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/CsrfTokenByPass.java b/main/project/java/org/owasp/webgoat/lessons/CsrfTokenByPass.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/CsrfTokenByPass.java
rename to main/project/java/org/owasp/webgoat/lessons/CsrfTokenByPass.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java b/main/project/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java
rename to main/project/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java b/main/project/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java b/main/project/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DBSQLInjection/Login.java b/main/project/java/org/owasp/webgoat/lessons/DBSQLInjection/Login.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DBSQLInjection/Login.java
rename to main/project/java/org/owasp/webgoat/lessons/DBSQLInjection/Login.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java b/main/project/java/org/owasp/webgoat/lessons/DOMInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/DOMInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DOMXSS.java b/main/project/java/org/owasp/webgoat/lessons/DOMXSS.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DOMXSS.java
rename to main/project/java/org/owasp/webgoat/lessons/DOMXSS.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java b/main/project/java/org/owasp/webgoat/lessons/DOS_Login.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java
rename to main/project/java/org/owasp/webgoat/lessons/DOS_Login.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java b/main/project/java/org/owasp/webgoat/lessons/DangerousEval.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java
rename to main/project/java/org/owasp/webgoat/lessons/DangerousEval.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java b/main/project/java/org/owasp/webgoat/lessons/Encoding.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java
rename to main/project/java/org/owasp/webgoat/lessons/Encoding.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java b/main/project/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java
rename to main/project/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java b/main/project/java/org/owasp/webgoat/lessons/ForcedBrowsing.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java
rename to main/project/java/org/owasp/webgoat/lessons/ForcedBrowsing.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java b/main/project/java/org/owasp/webgoat/lessons/ForgotPassword.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java
rename to main/project/java/org/owasp/webgoat/lessons/ForgotPassword.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java b/main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java b/main/project/java/org/owasp/webgoat/lessons/HiddenFieldTampering.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java
rename to main/project/java/org/owasp/webgoat/lessons/HiddenFieldTampering.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/HowToWork.java b/main/project/java/org/owasp/webgoat/lessons/HowToWork.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/HowToWork.java
rename to main/project/java/org/owasp/webgoat/lessons/HowToWork.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java b/main/project/java/org/owasp/webgoat/lessons/HtmlClues.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java
rename to main/project/java/org/owasp/webgoat/lessons/HtmlClues.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java b/main/project/java/org/owasp/webgoat/lessons/HttpBasics.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java
rename to main/project/java/org/owasp/webgoat/lessons/HttpBasics.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java b/main/project/java/org/owasp/webgoat/lessons/HttpOnly.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java
rename to main/project/java/org/owasp/webgoat/lessons/HttpOnly.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java b/main/project/java/org/owasp/webgoat/lessons/HttpSplitting.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java
rename to main/project/java/org/owasp/webgoat/lessons/HttpSplitting.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/InsecureLogin.java b/main/project/java/org/owasp/webgoat/lessons/InsecureLogin.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/InsecureLogin.java
rename to main/project/java/org/owasp/webgoat/lessons/InsecureLogin.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java b/main/project/java/org/owasp/webgoat/lessons/JSONInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/JSONInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java b/main/project/java/org/owasp/webgoat/lessons/JavaScriptValidation.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java
rename to main/project/java/org/owasp/webgoat/lessons/JavaScriptValidation.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java b/main/project/java/org/owasp/webgoat/lessons/LessonAdapter.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java
rename to main/project/java/org/owasp/webgoat/lessons/LessonAdapter.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java b/main/project/java/org/owasp/webgoat/lessons/LogSpoofing.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java
rename to main/project/java/org/owasp/webgoat/lessons/LogSpoofing.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/MaliciousFileExecution.java b/main/project/java/org/owasp/webgoat/lessons/MaliciousFileExecution.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/MaliciousFileExecution.java
rename to main/project/java/org/owasp/webgoat/lessons/MaliciousFileExecution.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/MultiLevelLogin1.java b/main/project/java/org/owasp/webgoat/lessons/MultiLevelLogin1.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/MultiLevelLogin1.java
rename to main/project/java/org/owasp/webgoat/lessons/MultiLevelLogin1.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/MultiLevelLogin2.java b/main/project/java/org/owasp/webgoat/lessons/MultiLevelLogin2.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/MultiLevelLogin2.java
rename to main/project/java/org/owasp/webgoat/lessons/MultiLevelLogin2.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java b/main/project/java/org/owasp/webgoat/lessons/NewLesson.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java
rename to main/project/java/org/owasp/webgoat/lessons/NewLesson.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/PasswordStrength.java b/main/project/java/org/owasp/webgoat/lessons/PasswordStrength.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/PasswordStrength.java
rename to main/project/java/org/owasp/webgoat/lessons/PasswordStrength.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java b/main/project/java/org/owasp/webgoat/lessons/PathBasedAccessControl.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java
rename to main/project/java/org/owasp/webgoat/lessons/PathBasedAccessControl.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java b/main/project/java/org/owasp/webgoat/lessons/Phishing.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java
rename to main/project/java/org/owasp/webgoat/lessons/Phishing.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RandomLessonAdapter.java b/main/project/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RandomLessonAdapter.java
rename to main/project/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java b/main/project/java/org/owasp/webgoat/lessons/ReflectedXSS.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java
rename to main/project/java/org/owasp/webgoat/lessons/ReflectedXSS.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java b/main/project/java/org/owasp/webgoat/lessons/RemoteAdminFlaw.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java
rename to main/project/java/org/owasp/webgoat/lessons/RemoteAdminFlaw.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java b/main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java b/main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java b/main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java
rename to main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java b/main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java b/main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java b/main/project/java/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java
rename to main/project/java/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java b/main/project/java/org/owasp/webgoat/lessons/SQLInjection/Login.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java
rename to main/project/java/org/owasp/webgoat/lessons/SQLInjection/Login.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java b/main/project/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java b/main/project/java/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java
rename to main/project/java/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java b/main/project/java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
rename to main/project/java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SequentialLessonAdapter.java b/main/project/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
rename to main/project/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SessionFixation.java b/main/project/java/org/owasp/webgoat/lessons/SessionFixation.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SessionFixation.java
rename to main/project/java/org/owasp/webgoat/lessons/SessionFixation.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java b/main/project/java/org/owasp/webgoat/lessons/SilentTransactions.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java
rename to main/project/java/org/owasp/webgoat/lessons/SilentTransactions.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java b/main/project/java/org/owasp/webgoat/lessons/SoapRequest.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java
rename to main/project/java/org/owasp/webgoat/lessons/SoapRequest.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SqlAddData.java b/main/project/java/org/owasp/webgoat/lessons/SqlAddData.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SqlAddData.java
rename to main/project/java/org/owasp/webgoat/lessons/SqlAddData.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SqlModifyData.java b/main/project/java/org/owasp/webgoat/lessons/SqlModifyData.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SqlModifyData.java
rename to main/project/java/org/owasp/webgoat/lessons/SqlModifyData.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java b/main/project/java/org/owasp/webgoat/lessons/SqlNumericInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/SqlNumericInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java b/main/project/java/org/owasp/webgoat/lessons/SqlStringInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/SqlStringInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java b/main/project/java/org/owasp/webgoat/lessons/StoredXss.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java
rename to main/project/java/org/owasp/webgoat/lessons/StoredXss.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java b/main/project/java/org/owasp/webgoat/lessons/ThreadSafetyProblem.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java
rename to main/project/java/org/owasp/webgoat/lessons/ThreadSafetyProblem.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/TomcatSetup.java b/main/project/java/org/owasp/webgoat/lessons/TomcatSetup.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/TomcatSetup.java
rename to main/project/java/org/owasp/webgoat/lessons/TomcatSetup.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java b/main/project/java/org/owasp/webgoat/lessons/TraceXSS.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java
rename to main/project/java/org/owasp/webgoat/lessons/TraceXSS.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java b/main/project/java/org/owasp/webgoat/lessons/UncheckedEmail.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java
rename to main/project/java/org/owasp/webgoat/lessons/UncheckedEmail.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/UsefulTools.java b/main/project/java/org/owasp/webgoat/lessons/UsefulTools.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/UsefulTools.java
rename to main/project/java/org/owasp/webgoat/lessons/UsefulTools.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java b/main/project/java/org/owasp/webgoat/lessons/WSDLScanning.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java
rename to main/project/java/org/owasp/webgoat/lessons/WSDLScanning.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java b/main/project/java/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java
rename to main/project/java/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java b/main/project/java/org/owasp/webgoat/lessons/WeakSessionID.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java
rename to main/project/java/org/owasp/webgoat/lessons/WeakSessionID.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/WelcomeScreen.java b/main/project/java/org/owasp/webgoat/lessons/WelcomeScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/WelcomeScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/WelcomeScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java b/main/project/java/org/owasp/webgoat/lessons/WsSAXInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/WsSAXInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java b/main/project/java/org/owasp/webgoat/lessons/WsSqlInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/WsSqlInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java b/main/project/java/org/owasp/webgoat/lessons/XMLInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/XMLInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java b/main/project/java/org/owasp/webgoat/lessons/XPATHInjection.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java
rename to main/project/java/org/owasp/webgoat/lessons/XPATHInjection.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/AdminScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/AdminScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/AdminScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/AdminScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/ReportCardScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/ReportCardScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/UserAdminScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/UserAdminScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java b/main/project/java/org/owasp/webgoat/lessons/admin/ViewDatabase.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/ViewDatabase.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java b/main/project/java/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java
rename to main/project/java/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs b/main/project/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs
rename to main/project/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll b/main/project/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll
rename to main/project/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java b/main/project/java/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java
rename to main/project/java/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/servlets/Controller.java b/main/project/java/org/owasp/webgoat/servlets/Controller.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/servlets/Controller.java
rename to main/project/java/org/owasp/webgoat/servlets/Controller.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java b/main/project/java/org/owasp/webgoat/session/Authorization.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/Authorization.java
rename to main/project/java/org/owasp/webgoat/session/Authorization.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/Course.java b/main/project/java/org/owasp/webgoat/session/Course.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/Course.java
rename to main/project/java/org/owasp/webgoat/session/Course.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/CreateDB.java b/main/project/java/org/owasp/webgoat/session/CreateDB.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/CreateDB.java
rename to main/project/java/org/owasp/webgoat/session/CreateDB.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java b/main/project/java/org/owasp/webgoat/session/DatabaseUtilities.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java
rename to main/project/java/org/owasp/webgoat/session/DatabaseUtilities.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java b/main/project/java/org/owasp/webgoat/session/ECSFactory.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java
rename to main/project/java/org/owasp/webgoat/session/ECSFactory.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/Employee.java b/main/project/java/org/owasp/webgoat/session/Employee.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/Employee.java
rename to main/project/java/org/owasp/webgoat/session/Employee.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java b/main/project/java/org/owasp/webgoat/session/EmployeeStub.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java
rename to main/project/java/org/owasp/webgoat/session/EmployeeStub.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/ErrorScreen.java b/main/project/java/org/owasp/webgoat/session/ErrorScreen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/ErrorScreen.java
rename to main/project/java/org/owasp/webgoat/session/ErrorScreen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/LessonSession.java b/main/project/java/org/owasp/webgoat/session/LessonSession.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/LessonSession.java
rename to main/project/java/org/owasp/webgoat/session/LessonSession.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/LessonTracker.java b/main/project/java/org/owasp/webgoat/session/LessonTracker.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/LessonTracker.java
rename to main/project/java/org/owasp/webgoat/session/LessonTracker.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/Parameter.java b/main/project/java/org/owasp/webgoat/session/Parameter.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/Parameter.java
rename to main/project/java/org/owasp/webgoat/session/Parameter.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java b/main/project/java/org/owasp/webgoat/session/ParameterNotFoundException.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java
rename to main/project/java/org/owasp/webgoat/session/ParameterNotFoundException.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java b/main/project/java/org/owasp/webgoat/session/ParameterParser.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java
rename to main/project/java/org/owasp/webgoat/session/ParameterParser.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/RandomLessonTracker.java b/main/project/java/org/owasp/webgoat/session/RandomLessonTracker.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/RandomLessonTracker.java
rename to main/project/java/org/owasp/webgoat/session/RandomLessonTracker.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/Screen.java b/main/project/java/org/owasp/webgoat/session/Screen.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/Screen.java
rename to main/project/java/org/owasp/webgoat/session/Screen.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/SequentialLessonTracker.java b/main/project/java/org/owasp/webgoat/session/SequentialLessonTracker.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/SequentialLessonTracker.java
rename to main/project/java/org/owasp/webgoat/session/SequentialLessonTracker.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java b/main/project/java/org/owasp/webgoat/session/UnauthenticatedException.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java
rename to main/project/java/org/owasp/webgoat/session/UnauthenticatedException.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java b/main/project/java/org/owasp/webgoat/session/UnauthorizedException.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java
rename to main/project/java/org/owasp/webgoat/session/UnauthorizedException.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java b/main/project/java/org/owasp/webgoat/session/UserTracker.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java
rename to main/project/java/org/owasp/webgoat/session/UserTracker.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java b/main/project/java/org/owasp/webgoat/session/ValidationException.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java
rename to main/project/java/org/owasp/webgoat/session/ValidationException.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java b/main/project/java/org/owasp/webgoat/session/WebSession.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/WebSession.java
rename to main/project/java/org/owasp/webgoat/session/WebSession.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/WebgoatContext.java b/main/project/java/org/owasp/webgoat/session/WebgoatContext.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/WebgoatContext.java
rename to main/project/java/org/owasp/webgoat/session/WebgoatContext.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java b/main/project/java/org/owasp/webgoat/session/WebgoatProperties.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java
rename to main/project/java/org/owasp/webgoat/session/WebgoatProperties.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/Exec.java b/main/project/java/org/owasp/webgoat/util/Exec.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/Exec.java
rename to main/project/java/org/owasp/webgoat/util/Exec.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/ExecResults.java b/main/project/java/org/owasp/webgoat/util/ExecResults.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/ExecResults.java
rename to main/project/java/org/owasp/webgoat/util/ExecResults.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java b/main/project/java/org/owasp/webgoat/util/ExecutionException.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java
rename to main/project/java/org/owasp/webgoat/util/ExecutionException.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java b/main/project/java/org/owasp/webgoat/util/HtmlEncoder.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java
rename to main/project/java/org/owasp/webgoat/util/HtmlEncoder.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/Interceptor.java b/main/project/java/org/owasp/webgoat/util/Interceptor.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/Interceptor.java
rename to main/project/java/org/owasp/webgoat/util/Interceptor.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/ThreadWatcher.java b/main/project/java/org/owasp/webgoat/util/ThreadWatcher.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/ThreadWatcher.java
rename to main/project/java/org/owasp/webgoat/util/ThreadWatcher.java
diff --git a/main/project/JavaSource/org/owasp/webgoat/util/WebGoatI18N.java b/main/project/java/org/owasp/webgoat/util/WebGoatI18N.java
similarity index 100%
rename from main/project/JavaSource/org/owasp/webgoat/util/WebGoatI18N.java
rename to main/project/java/org/owasp/webgoat/util/WebGoatI18N.java
diff --git a/main/project/WebContent/META-INF/MANIFEST.MF b/main/project/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from main/project/WebContent/META-INF/MANIFEST.MF
rename to main/project/webapp/META-INF/MANIFEST.MF
diff --git a/main/project/WebContent/WEB-INF/lib/activation-1.1.jar b/main/project/webapp/WEB-INF/lib/activation-1.1.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/activation-1.1.jar
rename to main/project/webapp/WEB-INF/lib/activation-1.1.jar
diff --git a/main/project/WebContent/WEB-INF/lib/axis-1.2.jar b/main/project/webapp/WEB-INF/lib/axis-1.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/axis-1.2.jar
rename to main/project/webapp/WEB-INF/lib/axis-1.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/axis-ant-1.2.jar b/main/project/webapp/WEB-INF/lib/axis-ant-1.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/axis-ant-1.2.jar
rename to main/project/webapp/WEB-INF/lib/axis-ant-1.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/axis-jaxrpc-1.2.jar b/main/project/webapp/WEB-INF/lib/axis-jaxrpc-1.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/axis-jaxrpc-1.2.jar
rename to main/project/webapp/WEB-INF/lib/axis-jaxrpc-1.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/axis-saaj-1.2.jar b/main/project/webapp/WEB-INF/lib/axis-saaj-1.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/axis-saaj-1.2.jar
rename to main/project/webapp/WEB-INF/lib/axis-saaj-1.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/catalina.jar b/main/project/webapp/WEB-INF/lib/catalina.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/catalina.jar
rename to main/project/webapp/WEB-INF/lib/catalina.jar
diff --git a/main/project/WebContent/WEB-INF/lib/commons-collections-3.1.jar b/main/project/webapp/WEB-INF/lib/commons-collections-3.1.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/commons-collections-3.1.jar
rename to main/project/webapp/WEB-INF/lib/commons-collections-3.1.jar
diff --git a/main/project/WebContent/WEB-INF/lib/commons-digester-1.4.1.jar b/main/project/webapp/WEB-INF/lib/commons-digester-1.4.1.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/commons-digester-1.4.1.jar
rename to main/project/webapp/WEB-INF/lib/commons-digester-1.4.1.jar
diff --git a/main/project/WebContent/WEB-INF/lib/commons-discovery-0.2.jar b/main/project/webapp/WEB-INF/lib/commons-discovery-0.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/commons-discovery-0.2.jar
rename to main/project/webapp/WEB-INF/lib/commons-discovery-0.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar b/main/project/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
rename to main/project/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar
diff --git a/main/project/WebContent/WEB-INF/lib/commons-io-1.4.jar b/main/project/webapp/WEB-INF/lib/commons-io-1.4.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/commons-io-1.4.jar
rename to main/project/webapp/WEB-INF/lib/commons-io-1.4.jar
diff --git a/main/project/WebContent/WEB-INF/lib/commons-logging-1.0.4.jar b/main/project/webapp/WEB-INF/lib/commons-logging-1.0.4.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/commons-logging-1.0.4.jar
rename to main/project/webapp/WEB-INF/lib/commons-logging-1.0.4.jar
diff --git a/main/project/WebContent/WEB-INF/lib/dependencies.txt b/main/project/webapp/WEB-INF/lib/dependencies.txt
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/dependencies.txt
rename to main/project/webapp/WEB-INF/lib/dependencies.txt
diff --git a/main/project/WebContent/WEB-INF/lib/dsn-1.4.2.jar b/main/project/webapp/WEB-INF/lib/dsn-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/dsn-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/dsn-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/ecs-1.4.2.jar b/main/project/webapp/WEB-INF/lib/ecs-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/ecs-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/ecs-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/hsqldb-1.8.0.7.jar b/main/project/webapp/WEB-INF/lib/hsqldb-1.8.0.7.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/hsqldb-1.8.0.7.jar
rename to main/project/webapp/WEB-INF/lib/hsqldb-1.8.0.7.jar
diff --git a/main/project/WebContent/WEB-INF/lib/imap-1.4.2.jar b/main/project/webapp/WEB-INF/lib/imap-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/imap-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/imap-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/j2h-1.3.1.jar b/main/project/webapp/WEB-INF/lib/j2h-1.3.1.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/j2h-1.3.1.jar
rename to main/project/webapp/WEB-INF/lib/j2h-1.3.1.jar
diff --git a/main/project/WebContent/WEB-INF/lib/jta-1.0.1B.jar b/main/project/webapp/WEB-INF/lib/jta-1.0.1B.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/jta-1.0.1B.jar
rename to main/project/webapp/WEB-INF/lib/jta-1.0.1B.jar
diff --git a/main/project/WebContent/WEB-INF/lib/jtds-1.2.2.jar b/main/project/webapp/WEB-INF/lib/jtds-1.2.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/jtds-1.2.2.jar
rename to main/project/webapp/WEB-INF/lib/jtds-1.2.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/log4j-1.2.8.jar b/main/project/webapp/WEB-INF/lib/log4j-1.2.8.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/log4j-1.2.8.jar
rename to main/project/webapp/WEB-INF/lib/log4j-1.2.8.jar
diff --git a/main/project/WebContent/WEB-INF/lib/mail-1.4.2.jar b/main/project/webapp/WEB-INF/lib/mail-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/mail-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/mail-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/mailapi-1.4.2.jar b/main/project/webapp/WEB-INF/lib/mailapi-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/mailapi-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/mailapi-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/ojdbc14.jar b/main/project/webapp/WEB-INF/lib/ojdbc14.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/ojdbc14.jar
rename to main/project/webapp/WEB-INF/lib/ojdbc14.jar
diff --git a/main/project/WebContent/WEB-INF/lib/pop3-1.4.2.jar b/main/project/webapp/WEB-INF/lib/pop3-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/pop3-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/pop3-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/smtp-1.4.2.jar b/main/project/webapp/WEB-INF/lib/smtp-1.4.2.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/smtp-1.4.2.jar
rename to main/project/webapp/WEB-INF/lib/smtp-1.4.2.jar
diff --git a/main/project/WebContent/WEB-INF/lib/wsdl4j-1.5.1.jar b/main/project/webapp/WEB-INF/lib/wsdl4j-1.5.1.jar
similarity index 100%
rename from main/project/WebContent/WEB-INF/lib/wsdl4j-1.5.1.jar
rename to main/project/webapp/WEB-INF/lib/wsdl4j-1.5.1.jar
diff --git a/main/project/WebContent/WEB-INF/server-config.wsdd b/main/project/webapp/WEB-INF/server-config.wsdd
similarity index 100%
rename from main/project/WebContent/WEB-INF/server-config.wsdd
rename to main/project/webapp/WEB-INF/server-config.wsdd
diff --git a/main/project/WebContent/WEB-INF/web.xml b/main/project/webapp/WEB-INF/web.xml
similarity index 100%
rename from main/project/WebContent/WEB-INF/web.xml
rename to main/project/webapp/WEB-INF/web.xml
diff --git a/main/project/WebContent/WEB-INF/webgoat-class.properties b/main/project/webapp/WEB-INF/webgoat-class.properties
similarity index 100%
rename from main/project/WebContent/WEB-INF/webgoat-class.properties
rename to main/project/webapp/WEB-INF/webgoat-class.properties
diff --git a/main/project/WebContent/WEB-INF/webgoat-lab.properties b/main/project/webapp/WEB-INF/webgoat-lab.properties
similarity index 100%
rename from main/project/WebContent/WEB-INF/webgoat-lab.properties
rename to main/project/webapp/WEB-INF/webgoat-lab.properties
diff --git a/main/project/WebContent/WEB-INF/webgoat-owasp.properties b/main/project/webapp/WEB-INF/webgoat-owasp.properties
similarity index 100%
rename from main/project/WebContent/WEB-INF/webgoat-owasp.properties
rename to main/project/webapp/WEB-INF/webgoat-owasp.properties
diff --git a/main/project/WebContent/WEB-INF/webgoat.properties b/main/project/webapp/WEB-INF/webgoat.properties
similarity index 100%
rename from main/project/WebContent/WEB-INF/webgoat.properties
rename to main/project/webapp/WEB-INF/webgoat.properties
diff --git a/main/project/WebContent/WEB-INF/webgoat_oracle.sql b/main/project/webapp/WEB-INF/webgoat_oracle.sql
similarity index 100%
rename from main/project/WebContent/WEB-INF/webgoat_oracle.sql
rename to main/project/webapp/WEB-INF/webgoat_oracle.sql
diff --git a/main/project/WebContent/WEB-INF/webgoat_sqlserver.sql b/main/project/webapp/WEB-INF/webgoat_sqlserver.sql
similarity index 100%
rename from main/project/WebContent/WEB-INF/webgoat_sqlserver.sql
rename to main/project/webapp/WEB-INF/webgoat_sqlserver.sql
diff --git a/main/project/WebContent/css/layers.css b/main/project/webapp/css/layers.css
similarity index 100%
rename from main/project/WebContent/css/layers.css
rename to main/project/webapp/css/layers.css
diff --git a/main/project/WebContent/css/lesson.css b/main/project/webapp/css/lesson.css
similarity index 100%
rename from main/project/WebContent/css/lesson.css
rename to main/project/webapp/css/lesson.css
diff --git a/main/project/WebContent/css/menu.css b/main/project/webapp/css/menu.css
similarity index 100%
rename from main/project/WebContent/css/menu.css
rename to main/project/webapp/css/menu.css
diff --git a/main/project/WebContent/css/webgoat.css b/main/project/webapp/css/webgoat.css
similarity index 100%
rename from main/project/WebContent/css/webgoat.css
rename to main/project/webapp/css/webgoat.css
diff --git a/main/project/WebContent/css/webgoat_challenge.css b/main/project/webapp/css/webgoat_challenge.css
similarity index 100%
rename from main/project/WebContent/css/webgoat_challenge.css
rename to main/project/webapp/css/webgoat_challenge.css
diff --git a/main/project/WebContent/database/database.prp b/main/project/webapp/database/database.prp
similarity index 100%
rename from main/project/WebContent/database/database.prp
rename to main/project/webapp/database/database.prp
diff --git a/main/project/WebContent/images/WebGoatFinancial/banklogo.jpg b/main/project/webapp/images/WebGoatFinancial/banklogo.jpg
similarity index 100%
rename from main/project/WebContent/images/WebGoatFinancial/banklogo.jpg
rename to main/project/webapp/images/WebGoatFinancial/banklogo.jpg
diff --git a/main/project/WebContent/images/buttons/catStarted.jpg b/main/project/webapp/images/buttons/catStarted.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/catStarted.jpg
rename to main/project/webapp/images/buttons/catStarted.jpg
diff --git a/main/project/WebContent/images/buttons/cookies.jpg b/main/project/webapp/images/buttons/cookies.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/cookies.jpg
rename to main/project/webapp/images/buttons/cookies.jpg
diff --git a/main/project/WebContent/images/buttons/cookiesOver.jpg b/main/project/webapp/images/buttons/cookiesOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/cookiesOver.jpg
rename to main/project/webapp/images/buttons/cookiesOver.jpg
diff --git a/main/project/WebContent/images/buttons/help.jpg b/main/project/webapp/images/buttons/help.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/help.jpg
rename to main/project/webapp/images/buttons/help.jpg
diff --git a/main/project/WebContent/images/buttons/helpOver.jpg b/main/project/webapp/images/buttons/helpOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/helpOver.jpg
rename to main/project/webapp/images/buttons/helpOver.jpg
diff --git a/main/project/WebContent/images/buttons/hint.jpg b/main/project/webapp/images/buttons/hint.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/hint.jpg
rename to main/project/webapp/images/buttons/hint.jpg
diff --git a/main/project/WebContent/images/buttons/hintLeft.jpg b/main/project/webapp/images/buttons/hintLeft.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/hintLeft.jpg
rename to main/project/webapp/images/buttons/hintLeft.jpg
diff --git a/main/project/WebContent/images/buttons/hintLeftOver.jpg b/main/project/webapp/images/buttons/hintLeftOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/hintLeftOver.jpg
rename to main/project/webapp/images/buttons/hintLeftOver.jpg
diff --git a/main/project/WebContent/images/buttons/hintOver.jpg b/main/project/webapp/images/buttons/hintOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/hintOver.jpg
rename to main/project/webapp/images/buttons/hintOver.jpg
diff --git a/main/project/WebContent/images/buttons/hintRight.jpg b/main/project/webapp/images/buttons/hintRight.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/hintRight.jpg
rename to main/project/webapp/images/buttons/hintRight.jpg
diff --git a/main/project/WebContent/images/buttons/hintRightOver.jpg b/main/project/webapp/images/buttons/hintRightOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/hintRightOver.jpg
rename to main/project/webapp/images/buttons/hintRightOver.jpg
diff --git a/main/project/WebContent/images/buttons/html.jpg b/main/project/webapp/images/buttons/html.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/html.jpg
rename to main/project/webapp/images/buttons/html.jpg
diff --git a/main/project/WebContent/images/buttons/htmlOver.jpg b/main/project/webapp/images/buttons/htmlOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/htmlOver.jpg
rename to main/project/webapp/images/buttons/htmlOver.jpg
diff --git a/main/project/WebContent/images/buttons/java.jpg b/main/project/webapp/images/buttons/java.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/java.jpg
rename to main/project/webapp/images/buttons/java.jpg
diff --git a/main/project/WebContent/images/buttons/javaOver.jpg b/main/project/webapp/images/buttons/javaOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/javaOver.jpg
rename to main/project/webapp/images/buttons/javaOver.jpg
diff --git a/main/project/WebContent/images/buttons/lessonComplete.jpg b/main/project/webapp/images/buttons/lessonComplete.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/lessonComplete.jpg
rename to main/project/webapp/images/buttons/lessonComplete.jpg
diff --git a/main/project/WebContent/images/buttons/logout.jpg b/main/project/webapp/images/buttons/logout.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/logout.jpg
rename to main/project/webapp/images/buttons/logout.jpg
diff --git a/main/project/WebContent/images/buttons/logoutOver.jpg b/main/project/webapp/images/buttons/logoutOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/logoutOver.jpg
rename to main/project/webapp/images/buttons/logoutOver.jpg
diff --git a/main/project/WebContent/images/buttons/params.jpg b/main/project/webapp/images/buttons/params.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/params.jpg
rename to main/project/webapp/images/buttons/params.jpg
diff --git a/main/project/WebContent/images/buttons/paramsOver.jpg b/main/project/webapp/images/buttons/paramsOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/paramsOver.jpg
rename to main/project/webapp/images/buttons/paramsOver.jpg
diff --git a/main/project/WebContent/images/buttons/plans.jpg b/main/project/webapp/images/buttons/plans.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/plans.jpg
rename to main/project/webapp/images/buttons/plans.jpg
diff --git a/main/project/WebContent/images/buttons/plansOver.jpg b/main/project/webapp/images/buttons/plansOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/plansOver.jpg
rename to main/project/webapp/images/buttons/plansOver.jpg
diff --git a/main/project/WebContent/images/buttons/solutions.jpg b/main/project/webapp/images/buttons/solutions.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/solutions.jpg
rename to main/project/webapp/images/buttons/solutions.jpg
diff --git a/main/project/WebContent/images/buttons/solutionsOver.jpg b/main/project/webapp/images/buttons/solutionsOver.jpg
similarity index 100%
rename from main/project/WebContent/images/buttons/solutionsOver.jpg
rename to main/project/webapp/images/buttons/solutionsOver.jpg
diff --git a/main/project/WebContent/images/header/header.jpg b/main/project/webapp/images/header/header.jpg
similarity index 100%
rename from main/project/WebContent/images/header/header.jpg
rename to main/project/webapp/images/header/header.jpg
diff --git a/main/project/WebContent/images/header/header_ASP.jpg b/main/project/webapp/images/header/header_ASP.jpg
similarity index 100%
rename from main/project/WebContent/images/header/header_ASP.jpg
rename to main/project/webapp/images/header/header_ASP.jpg
diff --git a/main/project/WebContent/images/header/header_CShrp.jpg b/main/project/webapp/images/header/header_CShrp.jpg
similarity index 100%
rename from main/project/WebContent/images/header/header_CShrp.jpg
rename to main/project/webapp/images/header/header_CShrp.jpg
diff --git a/main/project/WebContent/images/header/header_coldFusion.jpg b/main/project/webapp/images/header/header_coldFusion.jpg
similarity index 100%
rename from main/project/WebContent/images/header/header_coldFusion.jpg
rename to main/project/webapp/images/header/header_coldFusion.jpg
diff --git a/main/project/WebContent/images/header/header_dotNet.jpg b/main/project/webapp/images/header/header_dotNet.jpg
similarity index 100%
rename from main/project/WebContent/images/header/header_dotNet.jpg
rename to main/project/webapp/images/header/header_dotNet.jpg
diff --git a/main/project/WebContent/images/icons/rightArrow.jpg b/main/project/webapp/images/icons/rightArrow.jpg
similarity index 100%
rename from main/project/WebContent/images/icons/rightArrow.jpg
rename to main/project/webapp/images/icons/rightArrow.jpg
diff --git a/main/project/WebContent/images/introduction/HowToUse_1.jpg b/main/project/webapp/images/introduction/HowToUse_1.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/HowToUse_1.jpg
rename to main/project/webapp/images/introduction/HowToUse_1.jpg
diff --git a/main/project/WebContent/images/introduction/HowToUse_2.jpg b/main/project/webapp/images/introduction/HowToUse_2.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/HowToUse_2.jpg
rename to main/project/webapp/images/introduction/HowToUse_2.jpg
diff --git a/main/project/WebContent/images/introduction/HowToUse_3.jpg b/main/project/webapp/images/introduction/HowToUse_3.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/HowToUse_3.jpg
rename to main/project/webapp/images/introduction/HowToUse_3.jpg
diff --git a/main/project/WebContent/images/introduction/firebug.jpg b/main/project/webapp/images/introduction/firebug.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/firebug.jpg
rename to main/project/webapp/images/introduction/firebug.jpg
diff --git a/main/project/WebContent/images/introduction/iewatch.jpg b/main/project/webapp/images/introduction/iewatch.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/iewatch.jpg
rename to main/project/webapp/images/introduction/iewatch.jpg
diff --git a/main/project/WebContent/images/introduction/interface.jpg b/main/project/webapp/images/introduction/interface.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/interface.jpg
rename to main/project/webapp/images/introduction/interface.jpg
diff --git a/main/project/WebContent/images/introduction/webscarab.jpg b/main/project/webapp/images/introduction/webscarab.jpg
similarity index 100%
rename from main/project/WebContent/images/introduction/webscarab.jpg
rename to main/project/webapp/images/introduction/webscarab.jpg
diff --git a/main/project/WebContent/images/introduction/wireshark.png b/main/project/webapp/images/introduction/wireshark.png
similarity index 100%
rename from main/project/WebContent/images/introduction/wireshark.png
rename to main/project/webapp/images/introduction/wireshark.png
diff --git a/main/project/WebContent/images/logos/aspect.jpg b/main/project/webapp/images/logos/aspect.jpg
similarity index 100%
rename from main/project/WebContent/images/logos/aspect.jpg
rename to main/project/webapp/images/logos/aspect.jpg
diff --git a/main/project/WebContent/images/logos/macadamian.gif b/main/project/webapp/images/logos/macadamian.gif
similarity index 100%
rename from main/project/WebContent/images/logos/macadamian.gif
rename to main/project/webapp/images/logos/macadamian.gif
diff --git a/main/project/WebContent/images/logos/mandiant.png b/main/project/webapp/images/logos/mandiant.png
similarity index 100%
rename from main/project/WebContent/images/logos/mandiant.png
rename to main/project/webapp/images/logos/mandiant.png
diff --git a/main/project/WebContent/images/logos/ounce.jpg b/main/project/webapp/images/logos/ounce.jpg
similarity index 100%
rename from main/project/WebContent/images/logos/ounce.jpg
rename to main/project/webapp/images/logos/ounce.jpg
diff --git a/main/project/WebContent/images/logos/owasp.jpg b/main/project/webapp/images/logos/owasp.jpg
similarity index 100%
rename from main/project/WebContent/images/logos/owasp.jpg
rename to main/project/webapp/images/logos/owasp.jpg
diff --git a/main/project/WebContent/images/logos/parasoft.jpg b/main/project/webapp/images/logos/parasoft.jpg
similarity index 100%
rename from main/project/WebContent/images/logos/parasoft.jpg
rename to main/project/webapp/images/logos/parasoft.jpg
diff --git a/main/project/WebContent/images/logos/zionsecurity.gif b/main/project/webapp/images/logos/zionsecurity.gif
similarity index 100%
rename from main/project/WebContent/images/logos/zionsecurity.gif
rename to main/project/webapp/images/logos/zionsecurity.gif
diff --git a/main/project/WebContent/images/menu_images/1x1.gif b/main/project/webapp/images/menu_images/1x1.gif
similarity index 100%
rename from main/project/WebContent/images/menu_images/1x1.gif
rename to main/project/webapp/images/menu_images/1x1.gif
diff --git a/main/project/WebContent/javascript/DOMXSS.js b/main/project/webapp/javascript/DOMXSS.js
similarity index 100%
rename from main/project/WebContent/javascript/DOMXSS.js
rename to main/project/webapp/javascript/DOMXSS.js
diff --git a/main/project/WebContent/javascript/DOMXSS_backup.js b/main/project/webapp/javascript/DOMXSS_backup.js
similarity index 100%
rename from main/project/WebContent/javascript/DOMXSS_backup.js
rename to main/project/webapp/javascript/DOMXSS_backup.js
diff --git a/main/project/WebContent/javascript/clientSideFiltering.js b/main/project/webapp/javascript/clientSideFiltering.js
similarity index 100%
rename from main/project/WebContent/javascript/clientSideFiltering.js
rename to main/project/webapp/javascript/clientSideFiltering.js
diff --git a/main/project/WebContent/javascript/clientSideValidation.js b/main/project/webapp/javascript/clientSideValidation.js
similarity index 100%
rename from main/project/WebContent/javascript/clientSideValidation.js
rename to main/project/webapp/javascript/clientSideValidation.js
diff --git a/main/project/WebContent/javascript/escape.js b/main/project/webapp/javascript/escape.js
similarity index 100%
rename from main/project/WebContent/javascript/escape.js
rename to main/project/webapp/javascript/escape.js
diff --git a/main/project/WebContent/javascript/eval.js b/main/project/webapp/javascript/eval.js
similarity index 100%
rename from main/project/WebContent/javascript/eval.js
rename to main/project/webapp/javascript/eval.js
diff --git a/main/project/WebContent/javascript/instructor/DOMXSS_i.js b/main/project/webapp/javascript/instructor/DOMXSS_i.js
similarity index 100%
rename from main/project/WebContent/javascript/instructor/DOMXSS_i.js
rename to main/project/webapp/javascript/instructor/DOMXSS_i.js
diff --git a/main/project/WebContent/javascript/javascript.js b/main/project/webapp/javascript/javascript.js
similarity index 100%
rename from main/project/WebContent/javascript/javascript.js
rename to main/project/webapp/javascript/javascript.js
diff --git a/main/project/WebContent/javascript/lessonNav.js b/main/project/webapp/javascript/lessonNav.js
similarity index 100%
rename from main/project/WebContent/javascript/lessonNav.js
rename to main/project/webapp/javascript/lessonNav.js
diff --git a/main/project/WebContent/javascript/makeWindow.js b/main/project/webapp/javascript/makeWindow.js
similarity index 100%
rename from main/project/WebContent/javascript/makeWindow.js
rename to main/project/webapp/javascript/makeWindow.js
diff --git a/main/project/WebContent/javascript/menu_system.js b/main/project/webapp/javascript/menu_system.js
similarity index 100%
rename from main/project/WebContent/javascript/menu_system.js
rename to main/project/webapp/javascript/menu_system.js
diff --git a/main/project/WebContent/javascript/sameOrigin.js b/main/project/webapp/javascript/sameOrigin.js
similarity index 100%
rename from main/project/WebContent/javascript/sameOrigin.js
rename to main/project/webapp/javascript/sameOrigin.js
diff --git a/main/project/WebContent/javascript/toggle.js b/main/project/webapp/javascript/toggle.js
similarity index 100%
rename from main/project/WebContent/javascript/toggle.js
rename to main/project/webapp/javascript/toggle.js
diff --git a/main/project/WebContent/lesson_plans/English/AccessControlMatrix.html b/main/project/webapp/lesson_plans/English/AccessControlMatrix.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/AccessControlMatrix.html
rename to main/project/webapp/lesson_plans/English/AccessControlMatrix.html
diff --git a/main/project/WebContent/lesson_plans/English/BackDoors.html b/main/project/webapp/lesson_plans/English/BackDoors.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/BackDoors.html
rename to main/project/webapp/lesson_plans/English/BackDoors.html
diff --git a/main/project/WebContent/lesson_plans/English/BasicAuthentication.html b/main/project/webapp/lesson_plans/English/BasicAuthentication.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/BasicAuthentication.html
rename to main/project/webapp/lesson_plans/English/BasicAuthentication.html
diff --git a/main/project/WebContent/lesson_plans/English/BlindSqlInjection.html b/main/project/webapp/lesson_plans/English/BlindSqlInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/BlindSqlInjection.html
rename to main/project/webapp/lesson_plans/English/BlindSqlInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/BufferOverflow.html b/main/project/webapp/lesson_plans/English/BufferOverflow.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/BufferOverflow.html
rename to main/project/webapp/lesson_plans/English/BufferOverflow.html
diff --git a/main/project/WebContent/lesson_plans/English/CSRF.html b/main/project/webapp/lesson_plans/English/CSRF.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/CSRF.html
rename to main/project/webapp/lesson_plans/English/CSRF.html
diff --git a/main/project/WebContent/lesson_plans/English/ChallengeScreen.html b/main/project/webapp/lesson_plans/English/ChallengeScreen.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ChallengeScreen.html
rename to main/project/webapp/lesson_plans/English/ChallengeScreen.html
diff --git a/main/project/WebContent/lesson_plans/English/ClientSideFiltering.html b/main/project/webapp/lesson_plans/English/ClientSideFiltering.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ClientSideFiltering.html
rename to main/project/webapp/lesson_plans/English/ClientSideFiltering.html
diff --git a/main/project/WebContent/lesson_plans/English/ClientSideValidation.html b/main/project/webapp/lesson_plans/English/ClientSideValidation.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ClientSideValidation.html
rename to main/project/webapp/lesson_plans/English/ClientSideValidation.html
diff --git a/main/project/WebContent/lesson_plans/English/CommandInjection.html b/main/project/webapp/lesson_plans/English/CommandInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/CommandInjection.html
rename to main/project/webapp/lesson_plans/English/CommandInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/ConcurrencyCart.html b/main/project/webapp/lesson_plans/English/ConcurrencyCart.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ConcurrencyCart.html
rename to main/project/webapp/lesson_plans/English/ConcurrencyCart.html
diff --git a/main/project/WebContent/lesson_plans/English/CrossSiteScripting.html b/main/project/webapp/lesson_plans/English/CrossSiteScripting.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/CrossSiteScripting.html
rename to main/project/webapp/lesson_plans/English/CrossSiteScripting.html
diff --git a/main/project/WebContent/lesson_plans/English/CsrfPromptByPass.html b/main/project/webapp/lesson_plans/English/CsrfPromptByPass.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/CsrfPromptByPass.html
rename to main/project/webapp/lesson_plans/English/CsrfPromptByPass.html
diff --git a/main/project/WebContent/lesson_plans/English/CsrfTokenByPass.html b/main/project/webapp/lesson_plans/English/CsrfTokenByPass.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/CsrfTokenByPass.html
rename to main/project/webapp/lesson_plans/English/CsrfTokenByPass.html
diff --git a/main/project/WebContent/lesson_plans/English/DBCrossSiteScripting.html b/main/project/webapp/lesson_plans/English/DBCrossSiteScripting.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/DBCrossSiteScripting.html
rename to main/project/webapp/lesson_plans/English/DBCrossSiteScripting.html
diff --git a/main/project/WebContent/lesson_plans/English/DBSQLInjection.html b/main/project/webapp/lesson_plans/English/DBSQLInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/DBSQLInjection.html
rename to main/project/webapp/lesson_plans/English/DBSQLInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/DOMInjection.html b/main/project/webapp/lesson_plans/English/DOMInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/DOMInjection.html
rename to main/project/webapp/lesson_plans/English/DOMInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/DOMXSS.html b/main/project/webapp/lesson_plans/English/DOMXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/DOMXSS.html
rename to main/project/webapp/lesson_plans/English/DOMXSS.html
diff --git a/main/project/WebContent/lesson_plans/English/DOS_Login.html b/main/project/webapp/lesson_plans/English/DOS_Login.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/DOS_Login.html
rename to main/project/webapp/lesson_plans/English/DOS_Login.html
diff --git a/main/project/WebContent/lesson_plans/English/DangerousEval.html b/main/project/webapp/lesson_plans/English/DangerousEval.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/DangerousEval.html
rename to main/project/webapp/lesson_plans/English/DangerousEval.html
diff --git a/main/project/WebContent/lesson_plans/English/Encoding.html b/main/project/webapp/lesson_plans/English/Encoding.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/Encoding.html
rename to main/project/webapp/lesson_plans/English/Encoding.html
diff --git a/main/project/WebContent/lesson_plans/English/FailOpenAuthentication.html b/main/project/webapp/lesson_plans/English/FailOpenAuthentication.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/FailOpenAuthentication.html
rename to main/project/webapp/lesson_plans/English/FailOpenAuthentication.html
diff --git a/main/project/WebContent/lesson_plans/English/ForcedBrowsing.html b/main/project/webapp/lesson_plans/English/ForcedBrowsing.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ForcedBrowsing.html
rename to main/project/webapp/lesson_plans/English/ForcedBrowsing.html
diff --git a/main/project/WebContent/lesson_plans/English/ForgotPassword.html b/main/project/webapp/lesson_plans/English/ForgotPassword.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ForgotPassword.html
rename to main/project/webapp/lesson_plans/English/ForgotPassword.html
diff --git a/main/project/WebContent/lesson_plans/English/HiddenFieldTampering.html b/main/project/webapp/lesson_plans/English/HiddenFieldTampering.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/HiddenFieldTampering.html
rename to main/project/webapp/lesson_plans/English/HiddenFieldTampering.html
diff --git a/main/project/WebContent/lesson_plans/English/HowToWork.html b/main/project/webapp/lesson_plans/English/HowToWork.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/HowToWork.html
rename to main/project/webapp/lesson_plans/English/HowToWork.html
diff --git a/main/project/WebContent/lesson_plans/English/HtmlClues.html b/main/project/webapp/lesson_plans/English/HtmlClues.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/HtmlClues.html
rename to main/project/webapp/lesson_plans/English/HtmlClues.html
diff --git a/main/project/WebContent/lesson_plans/English/HttpBasics.html b/main/project/webapp/lesson_plans/English/HttpBasics.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/HttpBasics.html
rename to main/project/webapp/lesson_plans/English/HttpBasics.html
diff --git a/main/project/WebContent/lesson_plans/English/HttpOnly.html b/main/project/webapp/lesson_plans/English/HttpOnly.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/HttpOnly.html
rename to main/project/webapp/lesson_plans/English/HttpOnly.html
diff --git a/main/project/WebContent/lesson_plans/English/HttpSplitting.html b/main/project/webapp/lesson_plans/English/HttpSplitting.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/HttpSplitting.html
rename to main/project/webapp/lesson_plans/English/HttpSplitting.html
diff --git a/main/project/WebContent/lesson_plans/English/InsecureLogin.html b/main/project/webapp/lesson_plans/English/InsecureLogin.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/InsecureLogin.html
rename to main/project/webapp/lesson_plans/English/InsecureLogin.html
diff --git a/main/project/WebContent/lesson_plans/English/JSONInjection.html b/main/project/webapp/lesson_plans/English/JSONInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/JSONInjection.html
rename to main/project/webapp/lesson_plans/English/JSONInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/JavaScriptValidation.html b/main/project/webapp/lesson_plans/English/JavaScriptValidation.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/JavaScriptValidation.html
rename to main/project/webapp/lesson_plans/English/JavaScriptValidation.html
diff --git a/main/project/WebContent/lesson_plans/English/Lesson_Plan_Template.html b/main/project/webapp/lesson_plans/English/Lesson_Plan_Template.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/Lesson_Plan_Template.html
rename to main/project/webapp/lesson_plans/English/Lesson_Plan_Template.html
diff --git a/main/project/WebContent/lesson_plans/English/LogSpoofing.html b/main/project/webapp/lesson_plans/English/LogSpoofing.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/LogSpoofing.html
rename to main/project/webapp/lesson_plans/English/LogSpoofing.html
diff --git a/main/project/WebContent/lesson_plans/English/MultiLevelLogin1.html b/main/project/webapp/lesson_plans/English/MultiLevelLogin1.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/MultiLevelLogin1.html
rename to main/project/webapp/lesson_plans/English/MultiLevelLogin1.html
diff --git a/main/project/WebContent/lesson_plans/English/MultiLevelLogin2.html b/main/project/webapp/lesson_plans/English/MultiLevelLogin2.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/MultiLevelLogin2.html
rename to main/project/webapp/lesson_plans/English/MultiLevelLogin2.html
diff --git a/main/project/WebContent/lesson_plans/English/NewLesson.html b/main/project/webapp/lesson_plans/English/NewLesson.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/NewLesson.html
rename to main/project/webapp/lesson_plans/English/NewLesson.html
diff --git a/main/project/WebContent/lesson_plans/English/PasswordStrength.html b/main/project/webapp/lesson_plans/English/PasswordStrength.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/PasswordStrength.html
rename to main/project/webapp/lesson_plans/English/PasswordStrength.html
diff --git a/main/project/WebContent/lesson_plans/English/PathBasedAccessControl.html b/main/project/webapp/lesson_plans/English/PathBasedAccessControl.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/PathBasedAccessControl.html
rename to main/project/webapp/lesson_plans/English/PathBasedAccessControl.html
diff --git a/main/project/WebContent/lesson_plans/English/Phishing.html b/main/project/webapp/lesson_plans/English/Phishing.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/Phishing.html
rename to main/project/webapp/lesson_plans/English/Phishing.html
diff --git a/main/project/WebContent/lesson_plans/English/ReflectedXSS.html b/main/project/webapp/lesson_plans/English/ReflectedXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ReflectedXSS.html
rename to main/project/webapp/lesson_plans/English/ReflectedXSS.html
diff --git a/main/project/WebContent/lesson_plans/English/RemoteAdminFlaw.html b/main/project/webapp/lesson_plans/English/RemoteAdminFlaw.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/RemoteAdminFlaw.html
rename to main/project/webapp/lesson_plans/English/RemoteAdminFlaw.html
diff --git a/main/project/WebContent/lesson_plans/English/RoleBasedAccessControl.html b/main/project/webapp/lesson_plans/English/RoleBasedAccessControl.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/RoleBasedAccessControl.html
rename to main/project/webapp/lesson_plans/English/RoleBasedAccessControl.html
diff --git a/main/project/WebContent/lesson_plans/English/SQLInjection.html b/main/project/webapp/lesson_plans/English/SQLInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SQLInjection.html
rename to main/project/webapp/lesson_plans/English/SQLInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/SameOriginPolicyProtection.html b/main/project/webapp/lesson_plans/English/SameOriginPolicyProtection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SameOriginPolicyProtection.html
rename to main/project/webapp/lesson_plans/English/SameOriginPolicyProtection.html
diff --git a/main/project/WebContent/lesson_plans/English/SessionFixation.html b/main/project/webapp/lesson_plans/English/SessionFixation.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SessionFixation.html
rename to main/project/webapp/lesson_plans/English/SessionFixation.html
diff --git a/main/project/WebContent/lesson_plans/English/SilentTransactions.html b/main/project/webapp/lesson_plans/English/SilentTransactions.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SilentTransactions.html
rename to main/project/webapp/lesson_plans/English/SilentTransactions.html
diff --git a/main/project/WebContent/lesson_plans/English/SoapRequest.html b/main/project/webapp/lesson_plans/English/SoapRequest.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SoapRequest.html
rename to main/project/webapp/lesson_plans/English/SoapRequest.html
diff --git a/main/project/WebContent/lesson_plans/English/SqlNumericInjection.html b/main/project/webapp/lesson_plans/English/SqlNumericInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SqlNumericInjection.html
rename to main/project/webapp/lesson_plans/English/SqlNumericInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/SqlStringInjection.html b/main/project/webapp/lesson_plans/English/SqlStringInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/SqlStringInjection.html
rename to main/project/webapp/lesson_plans/English/SqlStringInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/StoredXss.html b/main/project/webapp/lesson_plans/English/StoredXss.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/StoredXss.html
rename to main/project/webapp/lesson_plans/English/StoredXss.html
diff --git a/main/project/WebContent/lesson_plans/English/ThreadSafetyProblem.html b/main/project/webapp/lesson_plans/English/ThreadSafetyProblem.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/ThreadSafetyProblem.html
rename to main/project/webapp/lesson_plans/English/ThreadSafetyProblem.html
diff --git a/main/project/WebContent/lesson_plans/English/TomcatSetup.html b/main/project/webapp/lesson_plans/English/TomcatSetup.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/TomcatSetup.html
rename to main/project/webapp/lesson_plans/English/TomcatSetup.html
diff --git a/main/project/WebContent/lesson_plans/English/TraceXSS.html b/main/project/webapp/lesson_plans/English/TraceXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/TraceXSS.html
rename to main/project/webapp/lesson_plans/English/TraceXSS.html
diff --git a/main/project/WebContent/lesson_plans/English/UncheckedEmail.html b/main/project/webapp/lesson_plans/English/UncheckedEmail.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/UncheckedEmail.html
rename to main/project/webapp/lesson_plans/English/UncheckedEmail.html
diff --git a/main/project/WebContent/lesson_plans/English/UsefulTools.html b/main/project/webapp/lesson_plans/English/UsefulTools.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/UsefulTools.html
rename to main/project/webapp/lesson_plans/English/UsefulTools.html
diff --git a/main/project/WebContent/lesson_plans/English/WSDLScanning.html b/main/project/webapp/lesson_plans/English/WSDLScanning.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/WSDLScanning.html
rename to main/project/webapp/lesson_plans/English/WSDLScanning.html
diff --git a/main/project/WebContent/lesson_plans/English/WeakAuthenticationCookie.html b/main/project/webapp/lesson_plans/English/WeakAuthenticationCookie.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/WeakAuthenticationCookie.html
rename to main/project/webapp/lesson_plans/English/WeakAuthenticationCookie.html
diff --git a/main/project/WebContent/lesson_plans/English/WeakSessionID.html b/main/project/webapp/lesson_plans/English/WeakSessionID.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/WeakSessionID.html
rename to main/project/webapp/lesson_plans/English/WeakSessionID.html
diff --git a/main/project/WebContent/lesson_plans/English/WelcomeScreeen.html b/main/project/webapp/lesson_plans/English/WelcomeScreeen.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/WelcomeScreeen.html
rename to main/project/webapp/lesson_plans/English/WelcomeScreeen.html
diff --git a/main/project/WebContent/lesson_plans/English/WsSAXInjection.html b/main/project/webapp/lesson_plans/English/WsSAXInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/WsSAXInjection.html
rename to main/project/webapp/lesson_plans/English/WsSAXInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/WsSqlInjection.html b/main/project/webapp/lesson_plans/English/WsSqlInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/WsSqlInjection.html
rename to main/project/webapp/lesson_plans/English/WsSqlInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/XMLInjection.html b/main/project/webapp/lesson_plans/English/XMLInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/XMLInjection.html
rename to main/project/webapp/lesson_plans/English/XMLInjection.html
diff --git a/main/project/WebContent/lesson_plans/English/XPATHInjection.html b/main/project/webapp/lesson_plans/English/XPATHInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/English/XPATHInjection.html
rename to main/project/webapp/lesson_plans/English/XPATHInjection.html
diff --git a/main/project/WebContent/lesson_plans/German/BasicAuthentication.html b/main/project/webapp/lesson_plans/German/BasicAuthentication.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/BasicAuthentication.html
rename to main/project/webapp/lesson_plans/German/BasicAuthentication.html
diff --git a/main/project/WebContent/lesson_plans/German/CommandInjection.html b/main/project/webapp/lesson_plans/German/CommandInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/CommandInjection.html
rename to main/project/webapp/lesson_plans/German/CommandInjection.html
diff --git a/main/project/WebContent/lesson_plans/German/HiddenFieldTampering.html b/main/project/webapp/lesson_plans/German/HiddenFieldTampering.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/HiddenFieldTampering.html
rename to main/project/webapp/lesson_plans/German/HiddenFieldTampering.html
diff --git a/main/project/WebContent/lesson_plans/German/HtmlClues.html b/main/project/webapp/lesson_plans/German/HtmlClues.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/HtmlClues.html
rename to main/project/webapp/lesson_plans/German/HtmlClues.html
diff --git a/main/project/WebContent/lesson_plans/German/HttpBasics.html b/main/project/webapp/lesson_plans/German/HttpBasics.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/HttpBasics.html
rename to main/project/webapp/lesson_plans/German/HttpBasics.html
diff --git a/main/project/WebContent/lesson_plans/German/JavaScriptValidation.html b/main/project/webapp/lesson_plans/German/JavaScriptValidation.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/JavaScriptValidation.html
rename to main/project/webapp/lesson_plans/German/JavaScriptValidation.html
diff --git a/main/project/WebContent/lesson_plans/German/LogSpoofing.html b/main/project/webapp/lesson_plans/German/LogSpoofing.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/LogSpoofing.html
rename to main/project/webapp/lesson_plans/German/LogSpoofing.html
diff --git a/main/project/WebContent/lesson_plans/German/PathBasedAccessControl.html b/main/project/webapp/lesson_plans/German/PathBasedAccessControl.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/PathBasedAccessControl.html
rename to main/project/webapp/lesson_plans/German/PathBasedAccessControl.html
diff --git a/main/project/WebContent/lesson_plans/German/ReflectedXSS.html b/main/project/webapp/lesson_plans/German/ReflectedXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/ReflectedXSS.html
rename to main/project/webapp/lesson_plans/German/ReflectedXSS.html
diff --git a/main/project/WebContent/lesson_plans/German/RemoteAdminFlaw.html b/main/project/webapp/lesson_plans/German/RemoteAdminFlaw.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/RemoteAdminFlaw.html
rename to main/project/webapp/lesson_plans/German/RemoteAdminFlaw.html
diff --git a/main/project/WebContent/lesson_plans/German/SqlNumericInjection.html b/main/project/webapp/lesson_plans/German/SqlNumericInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/SqlNumericInjection.html
rename to main/project/webapp/lesson_plans/German/SqlNumericInjection.html
diff --git a/main/project/WebContent/lesson_plans/German/SqlStringInjection.html b/main/project/webapp/lesson_plans/German/SqlStringInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/SqlStringInjection.html
rename to main/project/webapp/lesson_plans/German/SqlStringInjection.html
diff --git a/main/project/WebContent/lesson_plans/German/StoredXss.html b/main/project/webapp/lesson_plans/German/StoredXss.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/StoredXss.html
rename to main/project/webapp/lesson_plans/German/StoredXss.html
diff --git a/main/project/WebContent/lesson_plans/German/WeakAuthenticationCookie.html b/main/project/webapp/lesson_plans/German/WeakAuthenticationCookie.html
similarity index 100%
rename from main/project/WebContent/lesson_plans/German/WeakAuthenticationCookie.html
rename to main/project/webapp/lesson_plans/German/WeakAuthenticationCookie.html
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix.html b/main/project/webapp/lesson_solutions/AccessControlMatrix.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix.html
rename to main/project/webapp/lesson_solutions/AccessControlMatrix.html
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/Thumbs.db b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/Thumbs.db
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/Thumbs.db
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/Thumbs.db
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/filelist.xml b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/filelist.xml
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image001.png b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image001.png
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image002.jpg b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image002.jpg
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image003.png b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image003.png
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image004.jpg b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/image004.jpg
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/AccessControlMatrix_files/themedata.thmx b/main/project/webapp/lesson_solutions/AccessControlMatrix_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/AccessControlMatrix_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/AccessControlMatrix_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/BackDoors.html b/main/project/webapp/lesson_solutions/BackDoors.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors.html
rename to main/project/webapp/lesson_solutions/BackDoors.html
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/BackDoors_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/BackDoors_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/filelist.xml b/main/project/webapp/lesson_solutions/BackDoors_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/filelist.xml
rename to main/project/webapp/lesson_solutions/BackDoors_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image001.png b/main/project/webapp/lesson_solutions/BackDoors_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image001.png
rename to main/project/webapp/lesson_solutions/BackDoors_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image003.png b/main/project/webapp/lesson_solutions/BackDoors_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image003.png
rename to main/project/webapp/lesson_solutions/BackDoors_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image005.png b/main/project/webapp/lesson_solutions/BackDoors_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image005.png
rename to main/project/webapp/lesson_solutions/BackDoors_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image007.png b/main/project/webapp/lesson_solutions/BackDoors_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image007.png
rename to main/project/webapp/lesson_solutions/BackDoors_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image009.png b/main/project/webapp/lesson_solutions/BackDoors_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image009.png
rename to main/project/webapp/lesson_solutions/BackDoors_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image011.png b/main/project/webapp/lesson_solutions/BackDoors_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image011.png
rename to main/project/webapp/lesson_solutions/BackDoors_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image013.jpg b/main/project/webapp/lesson_solutions/BackDoors_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image013.jpg
rename to main/project/webapp/lesson_solutions/BackDoors_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image014.jpg b/main/project/webapp/lesson_solutions/BackDoors_files/image014.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image014.jpg
rename to main/project/webapp/lesson_solutions/BackDoors_files/image014.jpg
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image015.jpg b/main/project/webapp/lesson_solutions/BackDoors_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image015.jpg
rename to main/project/webapp/lesson_solutions/BackDoors_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image016.jpg b/main/project/webapp/lesson_solutions/BackDoors_files/image016.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image016.jpg
rename to main/project/webapp/lesson_solutions/BackDoors_files/image016.jpg
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image017.jpg b/main/project/webapp/lesson_solutions/BackDoors_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image017.jpg
rename to main/project/webapp/lesson_solutions/BackDoors_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/image018.jpg b/main/project/webapp/lesson_solutions/BackDoors_files/image018.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/image018.jpg
rename to main/project/webapp/lesson_solutions/BackDoors_files/image018.jpg
diff --git a/main/project/WebContent/lesson_solutions/BackDoors_files/themedata.thmx b/main/project/webapp/lesson_solutions/BackDoors_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BackDoors_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/BackDoors_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication.html b/main/project/webapp/lesson_solutions/BasicAuthentication.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication.html
rename to main/project/webapp/lesson_solutions/BasicAuthentication.html
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/BasicAuthentication_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/filelist.xml b/main/project/webapp/lesson_solutions/BasicAuthentication_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/filelist.xml
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image001.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image001.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image003.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image003.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image005.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image005.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image007.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image007.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image009.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image009.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image011.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image011.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image013.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image013.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image013.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image013.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image015.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image015.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image015.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image015.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image017.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image017.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image017.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image017.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image019.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image019.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image019.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image019.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image021.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image021.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image021.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image021.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image023.png b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image023.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image023.png
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image023.png
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image025.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image025.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image025.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image025.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image026.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image026.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image026.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image026.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image027.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image027.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image027.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image027.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image028.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image028.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image028.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image028.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image029.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image029.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image029.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image029.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image030.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image030.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image030.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image030.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image031.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image031.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image031.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image031.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image032.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image032.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image032.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image032.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image033.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image033.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image033.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image033.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image034.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image034.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image034.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image034.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image035.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image035.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image035.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image035.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/image036.jpg b/main/project/webapp/lesson_solutions/BasicAuthentication_files/image036.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/image036.jpg
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/image036.jpg
diff --git a/main/project/WebContent/lesson_solutions/BasicAuthentication_files/themedata.thmx b/main/project/webapp/lesson_solutions/BasicAuthentication_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BasicAuthentication_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/BasicAuthentication_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection.html b/main/project/webapp/lesson_solutions/BlindSqlInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection.html
rename to main/project/webapp/lesson_solutions/BlindSqlInjection.html
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image001.png b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image003.png b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image005.png b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image007.png b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image007.png
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image009.png b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image009.png
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image011.png b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image011.png
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image013.jpg b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image013.jpg
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image014.jpg b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image014.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image014.jpg
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image014.jpg
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image015.jpg b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image015.jpg
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image016.jpg b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image016.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image016.jpg
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image016.jpg
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image017.jpg b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image017.jpg
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image018.jpg b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/image018.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/image018.jpg
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/image018.jpg
diff --git a/main/project/WebContent/lesson_solutions/BlindSqlInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/BlindSqlInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/BlindSqlInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/BlindSqlInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/CSRF.html b/main/project/webapp/lesson_solutions/CSRF.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF.html
rename to main/project/webapp/lesson_solutions/CSRF.html
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/CSRF_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/CSRF_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/filelist.xml b/main/project/webapp/lesson_solutions/CSRF_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/filelist.xml
rename to main/project/webapp/lesson_solutions/CSRF_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image001.png b/main/project/webapp/lesson_solutions/CSRF_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image001.png
rename to main/project/webapp/lesson_solutions/CSRF_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image003.png b/main/project/webapp/lesson_solutions/CSRF_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image003.png
rename to main/project/webapp/lesson_solutions/CSRF_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image005.png b/main/project/webapp/lesson_solutions/CSRF_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image005.png
rename to main/project/webapp/lesson_solutions/CSRF_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image007.png b/main/project/webapp/lesson_solutions/CSRF_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image007.png
rename to main/project/webapp/lesson_solutions/CSRF_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image009.png b/main/project/webapp/lesson_solutions/CSRF_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image009.png
rename to main/project/webapp/lesson_solutions/CSRF_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image011.jpg b/main/project/webapp/lesson_solutions/CSRF_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image011.jpg
rename to main/project/webapp/lesson_solutions/CSRF_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image012.jpg b/main/project/webapp/lesson_solutions/CSRF_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image012.jpg
rename to main/project/webapp/lesson_solutions/CSRF_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image013.jpg b/main/project/webapp/lesson_solutions/CSRF_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image013.jpg
rename to main/project/webapp/lesson_solutions/CSRF_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image014.jpg b/main/project/webapp/lesson_solutions/CSRF_files/image014.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image014.jpg
rename to main/project/webapp/lesson_solutions/CSRF_files/image014.jpg
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/image015.jpg b/main/project/webapp/lesson_solutions/CSRF_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/image015.jpg
rename to main/project/webapp/lesson_solutions/CSRF_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/CSRF_files/themedata.thmx b/main/project/webapp/lesson_solutions/CSRF_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CSRF_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/CSRF_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/ClientSideFiltering.html b/main/project/webapp/lesson_solutions/ClientSideFiltering.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ClientSideFiltering.html
rename to main/project/webapp/lesson_solutions/ClientSideFiltering.html
diff --git a/main/project/WebContent/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg b/main/project/webapp/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg
rename to main/project/webapp/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg
diff --git a/main/project/WebContent/lesson_solutions/ClientSideValidation.html b/main/project/webapp/lesson_solutions/ClientSideValidation.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ClientSideValidation.html
rename to main/project/webapp/lesson_solutions/ClientSideValidation.html
diff --git a/main/project/WebContent/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png b/main/project/webapp/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png
rename to main/project/webapp/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection.html b/main/project/webapp/lesson_solutions/CommandInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection.html
rename to main/project/webapp/lesson_solutions/CommandInjection.html
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/CommandInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/CommandInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/CommandInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/CommandInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/image001.png b/main/project/webapp/lesson_solutions/CommandInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/CommandInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/image003.png b/main/project/webapp/lesson_solutions/CommandInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/CommandInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/image005.png b/main/project/webapp/lesson_solutions/CommandInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/CommandInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/image007.jpg b/main/project/webapp/lesson_solutions/CommandInjection_files/image007.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/image007.jpg
rename to main/project/webapp/lesson_solutions/CommandInjection_files/image007.jpg
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/image008.jpg b/main/project/webapp/lesson_solutions/CommandInjection_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/image008.jpg
rename to main/project/webapp/lesson_solutions/CommandInjection_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/image009.jpg b/main/project/webapp/lesson_solutions/CommandInjection_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/image009.jpg
rename to main/project/webapp/lesson_solutions/CommandInjection_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/CommandInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/CommandInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CommandInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/CommandInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/ConcurrencyCart.html b/main/project/webapp/lesson_solutions/ConcurrencyCart.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ConcurrencyCart.html
rename to main/project/webapp/lesson_solutions/ConcurrencyCart.html
diff --git a/main/project/WebContent/lesson_solutions/ConcurrencyCart_files/image001.jpg b/main/project/webapp/lesson_solutions/ConcurrencyCart_files/image001.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ConcurrencyCart_files/image001.jpg
rename to main/project/webapp/lesson_solutions/ConcurrencyCart_files/image001.jpg
diff --git a/main/project/WebContent/lesson_solutions/ConcurrencyCart_files/image002.jpg b/main/project/webapp/lesson_solutions/ConcurrencyCart_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ConcurrencyCart_files/image002.jpg
rename to main/project/webapp/lesson_solutions/ConcurrencyCart_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/ConcurrencyCart_files/image003.jpg b/main/project/webapp/lesson_solutions/ConcurrencyCart_files/image003.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ConcurrencyCart_files/image003.jpg
rename to main/project/webapp/lesson_solutions/ConcurrencyCart_files/image003.jpg
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass.html b/main/project/webapp/lesson_solutions/CsrfPromptByPass.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass.html
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass.html
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png b/main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png
rename to main/project/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfTokenByPass.html b/main/project/webapp/lesson_solutions/CsrfTokenByPass.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfTokenByPass.html
rename to main/project/webapp/lesson_solutions/CsrfTokenByPass.html
diff --git a/main/project/WebContent/lesson_solutions/CsrfTokenByPass_files/tokenHack.png b/main/project/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHack.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfTokenByPass_files/tokenHack.png
rename to main/project/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHack.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png b/main/project/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png
rename to main/project/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png
diff --git a/main/project/WebContent/lesson_solutions/CsrfTokenByPass_files/tokenPage.png b/main/project/webapp/lesson_solutions/CsrfTokenByPass_files/tokenPage.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/CsrfTokenByPass_files/tokenPage.png
rename to main/project/webapp/lesson_solutions/CsrfTokenByPass_files/tokenPage.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection.html b/main/project/webapp/lesson_solutions/DOMInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection.html
rename to main/project/webapp/lesson_solutions/DOMInjection.html
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/DOMInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/DOMInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/DOMInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/DOMInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image001.png b/main/project/webapp/lesson_solutions/DOMInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image002.jpg b/main/project/webapp/lesson_solutions/DOMInjection_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image002.jpg
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image003.png b/main/project/webapp/lesson_solutions/DOMInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image004.jpg b/main/project/webapp/lesson_solutions/DOMInjection_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image004.jpg
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image005.png b/main/project/webapp/lesson_solutions/DOMInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image006.jpg b/main/project/webapp/lesson_solutions/DOMInjection_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image006.jpg
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image007.png b/main/project/webapp/lesson_solutions/DOMInjection_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image007.png
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image008.jpg b/main/project/webapp/lesson_solutions/DOMInjection_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image008.jpg
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image009.png b/main/project/webapp/lesson_solutions/DOMInjection_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image009.png
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image010.jpg b/main/project/webapp/lesson_solutions/DOMInjection_files/image010.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image010.jpg
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image010.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image011.png b/main/project/webapp/lesson_solutions/DOMInjection_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image011.png
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/image012.jpg b/main/project/webapp/lesson_solutions/DOMInjection_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/image012.jpg
rename to main/project/webapp/lesson_solutions/DOMInjection_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/DOMInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/DOMInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/DOMXSS.html b/main/project/webapp/lesson_solutions/DOMXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMXSS.html
rename to main/project/webapp/lesson_solutions/DOMXSS.html
diff --git a/main/project/WebContent/lesson_solutions/DOMXSS_files/image001.jpg b/main/project/webapp/lesson_solutions/DOMXSS_files/image001.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMXSS_files/image001.jpg
rename to main/project/webapp/lesson_solutions/DOMXSS_files/image001.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMXSS_files/image002.jpg b/main/project/webapp/lesson_solutions/DOMXSS_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMXSS_files/image002.jpg
rename to main/project/webapp/lesson_solutions/DOMXSS_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMXSS_files/image003.jpg b/main/project/webapp/lesson_solutions/DOMXSS_files/image003.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMXSS_files/image003.jpg
rename to main/project/webapp/lesson_solutions/DOMXSS_files/image003.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOMXSS_files/image004.jpg b/main/project/webapp/lesson_solutions/DOMXSS_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOMXSS_files/image004.jpg
rename to main/project/webapp/lesson_solutions/DOMXSS_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login.html b/main/project/webapp/lesson_solutions/DOS_Login.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login.html
rename to main/project/webapp/lesson_solutions/DOS_Login.html
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/DOS_Login_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/DOS_Login_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/filelist.xml b/main/project/webapp/lesson_solutions/DOS_Login_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/filelist.xml
rename to main/project/webapp/lesson_solutions/DOS_Login_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/image001.png b/main/project/webapp/lesson_solutions/DOS_Login_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/image001.png
rename to main/project/webapp/lesson_solutions/DOS_Login_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/image002.jpg b/main/project/webapp/lesson_solutions/DOS_Login_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/image002.jpg
rename to main/project/webapp/lesson_solutions/DOS_Login_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/image003.png b/main/project/webapp/lesson_solutions/DOS_Login_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/image003.png
rename to main/project/webapp/lesson_solutions/DOS_Login_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/image004.jpg b/main/project/webapp/lesson_solutions/DOS_Login_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/image004.jpg
rename to main/project/webapp/lesson_solutions/DOS_Login_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/DOS_Login_files/themedata.thmx b/main/project/webapp/lesson_solutions/DOS_Login_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DOS_Login_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/DOS_Login_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/DangerousEval.html b/main/project/webapp/lesson_solutions/DangerousEval.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/DangerousEval.html
rename to main/project/webapp/lesson_solutions/DangerousEval.html
diff --git a/main/project/WebContent/lesson_solutions/Encoding.html b/main/project/webapp/lesson_solutions/Encoding.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Encoding.html
rename to main/project/webapp/lesson_solutions/Encoding.html
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication.html b/main/project/webapp/lesson_solutions/FailOpenAuthentication.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication.html
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication.html
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/filelist.xml b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/filelist.xml
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image001.png b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image001.png
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image003.png b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image003.png
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image005.png b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image005.png
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image007.png b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image007.png
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image009.jpg b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image009.jpg
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image010.jpg b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image010.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image010.jpg
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image010.jpg
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image011.jpg b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image011.jpg
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image012.jpg b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/image012.jpg
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/themedata.thmx b/main/project/webapp/lesson_solutions/FailOpenAuthentication_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/FailOpenAuthentication_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/FailOpenAuthentication_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing.html b/main/project/webapp/lesson_solutions/ForcedBrowsing.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing.html
rename to main/project/webapp/lesson_solutions/ForcedBrowsing.html
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/filelist.xml b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/filelist.xml
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image001.png b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image001.png
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image002.jpg b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image002.jpg
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image003.png b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image003.png
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image004.jpg b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image004.jpg
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image005.png b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image005.png
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image006.jpg b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image006.jpg
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image007.png b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image007.png
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image008.jpg b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/image008.jpg
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForcedBrowsing_files/themedata.thmx b/main/project/webapp/lesson_solutions/ForcedBrowsing_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForcedBrowsing_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/ForcedBrowsing_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword.html b/main/project/webapp/lesson_solutions/ForgotPassword.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword.html
rename to main/project/webapp/lesson_solutions/ForgotPassword.html
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/ForgotPassword_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/filelist.xml b/main/project/webapp/lesson_solutions/ForgotPassword_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/filelist.xml
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image001.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image001.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image003.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image003.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image005.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image005.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image007.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image007.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image009.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image009.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image011.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image011.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image013.png b/main/project/webapp/lesson_solutions/ForgotPassword_files/image013.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image013.png
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image013.png
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image015.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image015.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image016.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image016.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image016.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image016.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image017.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image017.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image018.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image018.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image018.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image018.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image019.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image019.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image019.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image019.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image020.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image020.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image020.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image020.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/image021.jpg b/main/project/webapp/lesson_solutions/ForgotPassword_files/image021.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/image021.jpg
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/image021.jpg
diff --git a/main/project/WebContent/lesson_solutions/ForgotPassword_files/themedata.thmx b/main/project/webapp/lesson_solutions/ForgotPassword_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ForgotPassword_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/ForgotPassword_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering.html b/main/project/webapp/lesson_solutions/HiddenFieldTampering.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering.html
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering.html
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/filelist.xml b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/filelist.xml
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image001.png b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image001.png
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image003.png b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image003.png
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image005.png b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image005.png
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image007.png b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image007.png
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image009.png b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image009.png
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image011.jpg b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image011.jpg
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image012.jpg b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image012.jpg
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image013.jpg b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image013.jpg
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image014.jpg b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image014.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image014.jpg
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image014.jpg
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image015.jpg b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/image015.jpg
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/themedata.thmx b/main/project/webapp/lesson_solutions/HiddenFieldTampering_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HiddenFieldTampering_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/HiddenFieldTampering_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues.html b/main/project/webapp/lesson_solutions/HtmlClues.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues.html
rename to main/project/webapp/lesson_solutions/HtmlClues.html
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/HtmlClues_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/HtmlClues_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/filelist.xml b/main/project/webapp/lesson_solutions/HtmlClues_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/filelist.xml
rename to main/project/webapp/lesson_solutions/HtmlClues_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image001.png b/main/project/webapp/lesson_solutions/HtmlClues_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image001.png
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image003.png b/main/project/webapp/lesson_solutions/HtmlClues_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image003.png
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image005.png b/main/project/webapp/lesson_solutions/HtmlClues_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image005.png
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image007.png b/main/project/webapp/lesson_solutions/HtmlClues_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image007.png
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image009.png b/main/project/webapp/lesson_solutions/HtmlClues_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image009.png
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image011.jpg b/main/project/webapp/lesson_solutions/HtmlClues_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image011.jpg
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image012.jpg b/main/project/webapp/lesson_solutions/HtmlClues_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image012.jpg
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image013.jpg b/main/project/webapp/lesson_solutions/HtmlClues_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image013.jpg
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image014.jpg b/main/project/webapp/lesson_solutions/HtmlClues_files/image014.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image014.jpg
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image014.jpg
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/image015.jpg b/main/project/webapp/lesson_solutions/HtmlClues_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/image015.jpg
rename to main/project/webapp/lesson_solutions/HtmlClues_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/HtmlClues_files/themedata.thmx b/main/project/webapp/lesson_solutions/HtmlClues_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HtmlClues_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/HtmlClues_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics.html b/main/project/webapp/lesson_solutions/HttpBasics.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics.html
rename to main/project/webapp/lesson_solutions/HttpBasics.html
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/HttpBasics_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/HttpBasics_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/filelist.xml b/main/project/webapp/lesson_solutions/HttpBasics_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/filelist.xml
rename to main/project/webapp/lesson_solutions/HttpBasics_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/image001.png b/main/project/webapp/lesson_solutions/HttpBasics_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/image001.png
rename to main/project/webapp/lesson_solutions/HttpBasics_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/image003.png b/main/project/webapp/lesson_solutions/HttpBasics_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/image003.png
rename to main/project/webapp/lesson_solutions/HttpBasics_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/image005.jpg b/main/project/webapp/lesson_solutions/HttpBasics_files/image005.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/image005.jpg
rename to main/project/webapp/lesson_solutions/HttpBasics_files/image005.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/image006.jpg b/main/project/webapp/lesson_solutions/HttpBasics_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/image006.jpg
rename to main/project/webapp/lesson_solutions/HttpBasics_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/themedata.thmx b/main/project/webapp/lesson_solutions/HttpBasics_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/HttpBasics_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/webscarab1.jpg b/main/project/webapp/lesson_solutions/HttpBasics_files/webscarab1.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/webscarab1.jpg
rename to main/project/webapp/lesson_solutions/HttpBasics_files/webscarab1.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpBasics_files/webscarab2.jpg b/main/project/webapp/lesson_solutions/HttpBasics_files/webscarab2.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpBasics_files/webscarab2.jpg
rename to main/project/webapp/lesson_solutions/HttpBasics_files/webscarab2.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly.html b/main/project/webapp/lesson_solutions/HttpOnly.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly.html
rename to main/project/webapp/lesson_solutions/HttpOnly.html
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/HttpOnly_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/HttpOnly_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/filelist.xml b/main/project/webapp/lesson_solutions/HttpOnly_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/filelist.xml
rename to main/project/webapp/lesson_solutions/HttpOnly_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image001.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image001.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image003.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image003.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image005.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image005.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image007.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image007.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image009.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image009.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image011.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image011.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image013.png b/main/project/webapp/lesson_solutions/HttpOnly_files/image013.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image013.png
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image013.png
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image015.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image015.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image016.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image016.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image016.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image016.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image017.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image017.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image018.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image018.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image018.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image018.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image019.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image019.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image019.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image019.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image020.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image020.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image020.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image020.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/image021.jpg b/main/project/webapp/lesson_solutions/HttpOnly_files/image021.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/image021.jpg
rename to main/project/webapp/lesson_solutions/HttpOnly_files/image021.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpOnly_files/themedata.thmx b/main/project/webapp/lesson_solutions/HttpOnly_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpOnly_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/HttpOnly_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting.html b/main/project/webapp/lesson_solutions/HttpSplitting.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting.html
rename to main/project/webapp/lesson_solutions/HttpSplitting.html
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/HttpSplitting_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/filelist.xml b/main/project/webapp/lesson_solutions/HttpSplitting_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/filelist.xml
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image001.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image001.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image003.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image003.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image005.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image005.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image007.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image007.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image009.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image009.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image011.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image011.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image013.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image013.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image013.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image013.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image015.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image015.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image015.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image015.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image017.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image017.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image017.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image017.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image019.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image019.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image019.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image019.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image021.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image021.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image021.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image021.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image023.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image023.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image023.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image023.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image025.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image025.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image025.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image025.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image027.png b/main/project/webapp/lesson_solutions/HttpSplitting_files/image027.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image027.png
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image027.png
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image029.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image029.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image029.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image029.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image030.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image030.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image030.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image030.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image031.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image031.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image031.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image031.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image032.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image032.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image032.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image032.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image033.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image033.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image033.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image033.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image034.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image034.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image034.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image034.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image035.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image035.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image035.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image035.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image036.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image036.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image036.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image036.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image037.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image037.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image037.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image037.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image038.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image038.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image038.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image038.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image039.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image039.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image039.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image039.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image040.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image040.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image040.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image040.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image041.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image041.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image041.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image041.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/image042.jpg b/main/project/webapp/lesson_solutions/HttpSplitting_files/image042.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/image042.jpg
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/image042.jpg
diff --git a/main/project/WebContent/lesson_solutions/HttpSplitting_files/themedata.thmx b/main/project/webapp/lesson_solutions/HttpSplitting_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/HttpSplitting_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/HttpSplitting_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/InsecureLogin.html b/main/project/webapp/lesson_solutions/InsecureLogin.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/InsecureLogin.html
rename to main/project/webapp/lesson_solutions/InsecureLogin.html
diff --git a/main/project/WebContent/lesson_solutions/InsecureLogin_files/wireshark1.png b/main/project/webapp/lesson_solutions/InsecureLogin_files/wireshark1.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/InsecureLogin_files/wireshark1.png
rename to main/project/webapp/lesson_solutions/InsecureLogin_files/wireshark1.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection.html b/main/project/webapp/lesson_solutions/JSONInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection.html
rename to main/project/webapp/lesson_solutions/JSONInjection.html
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/JSONInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/JSONInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/JSONInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/JSONInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image001.png b/main/project/webapp/lesson_solutions/JSONInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image003.png b/main/project/webapp/lesson_solutions/JSONInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image005.png b/main/project/webapp/lesson_solutions/JSONInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image007.png b/main/project/webapp/lesson_solutions/JSONInjection_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image007.png
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image009.png b/main/project/webapp/lesson_solutions/JSONInjection_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image009.png
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image011.png b/main/project/webapp/lesson_solutions/JSONInjection_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image011.png
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image013.jpg b/main/project/webapp/lesson_solutions/JSONInjection_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image013.jpg
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image014.jpg b/main/project/webapp/lesson_solutions/JSONInjection_files/image014.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image014.jpg
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image014.jpg
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image015.jpg b/main/project/webapp/lesson_solutions/JSONInjection_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image015.jpg
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image016.jpg b/main/project/webapp/lesson_solutions/JSONInjection_files/image016.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image016.jpg
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image016.jpg
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image017.jpg b/main/project/webapp/lesson_solutions/JSONInjection_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image017.jpg
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/image018.jpg b/main/project/webapp/lesson_solutions/JSONInjection_files/image018.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/image018.jpg
rename to main/project/webapp/lesson_solutions/JSONInjection_files/image018.jpg
diff --git a/main/project/WebContent/lesson_solutions/JSONInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/JSONInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JSONInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/JSONInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation.html b/main/project/webapp/lesson_solutions/JavaScriptValidation.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation.html
rename to main/project/webapp/lesson_solutions/JavaScriptValidation.html
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/filelist.xml b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/filelist.xml
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image001.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image001.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image002.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image002.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image003.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image003.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image004.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image004.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image005.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image005.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image006.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image006.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image007.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image007.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image008.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image008.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image009.gif b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image009.gif
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image009.gif
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image009.gif
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image010.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image010.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image010.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image010.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image011.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image011.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image012.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image012.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image012.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image012.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image013.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image013.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image013.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image013.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image014.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image014.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image014.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image014.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image015.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image015.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image015.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image015.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image016.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image016.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image016.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image016.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image017.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image017.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image018.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image018.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image018.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image018.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image019.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image019.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image019.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image019.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image020.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image020.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image020.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image020.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image021.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image021.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image021.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image021.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image022.png b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image022.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image022.png
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image022.png
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image023.jpg b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/image023.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/image023.jpg
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/image023.jpg
diff --git a/main/project/WebContent/lesson_solutions/JavaScriptValidation_files/themedata.thmx b/main/project/webapp/lesson_solutions/JavaScriptValidation_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/JavaScriptValidation_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/JavaScriptValidation_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/Lab Access Control/Lab Add Business Layer Access Control.html b/main/project/webapp/lesson_solutions/Lab Access Control/Lab Add Business Layer Access Control.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab Access Control/Lab Add Business Layer Access Control.html
rename to main/project/webapp/lesson_solutions/Lab Access Control/Lab Add Business Layer Access Control.html
diff --git a/main/project/WebContent/lesson_solutions/Lab Access Control/Lab Add Data Layer Access Control.html b/main/project/webapp/lesson_solutions/Lab Access Control/Lab Add Data Layer Access Control.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab Access Control/Lab Add Data Layer Access Control.html
rename to main/project/webapp/lesson_solutions/Lab Access Control/Lab Add Data Layer Access Control.html
diff --git a/main/project/WebContent/lesson_solutions/Lab Access Control/Lab Bypass Business Layer Access Control.html b/main/project/webapp/lesson_solutions/Lab Access Control/Lab Bypass Business Layer Access Control.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab Access Control/Lab Bypass Business Layer Access Control.html
rename to main/project/webapp/lesson_solutions/Lab Access Control/Lab Bypass Business Layer Access Control.html
diff --git a/main/project/WebContent/lesson_solutions/Lab Access Control/Lab Bypass Data Layer Access Control.html b/main/project/webapp/lesson_solutions/Lab Access Control/Lab Bypass Data Layer Access Control.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab Access Control/Lab Bypass Data Layer Access Control.html
rename to main/project/webapp/lesson_solutions/Lab Access Control/Lab Bypass Data Layer Access Control.html
diff --git a/main/project/WebContent/lesson_solutions/Lab Access Control/images/access_control_stage1.png b/main/project/webapp/lesson_solutions/Lab Access Control/images/access_control_stage1.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab Access Control/images/access_control_stage1.png
rename to main/project/webapp/lesson_solutions/Lab Access Control/images/access_control_stage1.png
diff --git a/main/project/WebContent/lesson_solutions/Lab Access Control/images/access_control_stage3.png b/main/project/webapp/lesson_solutions/Lab Access Control/images/access_control_stage3.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab Access Control/images/access_control_stage3.png
rename to main/project/webapp/lesson_solutions/Lab Access Control/images/access_control_stage3.png
diff --git a/main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab Numeric SQL Injection.html b/main/project/webapp/lesson_solutions/Lab SQL Injection/Lab Numeric SQL Injection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab Numeric SQL Injection.html
rename to main/project/webapp/lesson_solutions/Lab SQL Injection/Lab Numeric SQL Injection.html
diff --git a/main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #1.html b/main/project/webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #1.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #1.html
rename to main/project/webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #1.html
diff --git a/main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #2.html b/main/project/webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #2.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #2.html
rename to main/project/webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #2.html
diff --git a/main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab String SQL Injection.html b/main/project/webapp/lesson_solutions/Lab SQL Injection/Lab String SQL Injection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab SQL Injection/Lab String SQL Injection.html
rename to main/project/webapp/lesson_solutions/Lab SQL Injection/Lab String SQL Injection.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/Lab Block Reflected XSS.html b/main/project/webapp/lesson_solutions/Lab XSS/Lab Block Reflected XSS.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/Lab Block Reflected XSS.html
rename to main/project/webapp/lesson_solutions/Lab XSS/Lab Block Reflected XSS.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/Lab Block Stored XSS using Input Validation.html b/main/project/webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Input Validation.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/Lab Block Stored XSS using Input Validation.html
rename to main/project/webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Input Validation.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/Lab Block Stored XSS using Output Encoding.html b/main/project/webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Output Encoding.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/Lab Block Stored XSS using Output Encoding.html
rename to main/project/webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Output Encoding.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/Lab Reflected XSS.html b/main/project/webapp/lesson_solutions/Lab XSS/Lab Reflected XSS.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/Lab Reflected XSS.html
rename to main/project/webapp/lesson_solutions/Lab XSS/Lab Reflected XSS.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/Lab Stored XSS Revisited.html b/main/project/webapp/lesson_solutions/Lab XSS/Lab Stored XSS Revisited.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/Lab Stored XSS Revisited.html
rename to main/project/webapp/lesson_solutions/Lab XSS/Lab Stored XSS Revisited.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/Lab Stored XSS.html b/main/project/webapp/lesson_solutions/Lab XSS/Lab Stored XSS.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/Lab Stored XSS.html
rename to main/project/webapp/lesson_solutions/Lab XSS/Lab Stored XSS.html
diff --git a/main/project/WebContent/lesson_solutions/Lab XSS/images/stored_xss.png b/main/project/webapp/lesson_solutions/Lab XSS/images/stored_xss.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Lab XSS/images/stored_xss.png
rename to main/project/webapp/lesson_solutions/Lab XSS/images/stored_xss.png
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing.html b/main/project/webapp/lesson_solutions/LogSpoofing.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing.html
rename to main/project/webapp/lesson_solutions/LogSpoofing.html
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/Thumbs.db b/main/project/webapp/lesson_solutions/LogSpoofing_files/Thumbs.db
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/Thumbs.db
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/Thumbs.db
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/LogSpoofing_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/filelist.xml b/main/project/webapp/lesson_solutions/LogSpoofing_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/filelist.xml
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/image001.png b/main/project/webapp/lesson_solutions/LogSpoofing_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/image001.png
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/image003.png b/main/project/webapp/lesson_solutions/LogSpoofing_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/image003.png
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/image005.png b/main/project/webapp/lesson_solutions/LogSpoofing_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/image005.png
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/image007.jpg b/main/project/webapp/lesson_solutions/LogSpoofing_files/image007.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/image007.jpg
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/image007.jpg
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/image008.jpg b/main/project/webapp/lesson_solutions/LogSpoofing_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/image008.jpg
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/image009.jpg b/main/project/webapp/lesson_solutions/LogSpoofing_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/image009.jpg
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/LogSpoofing_files/themedata.thmx b/main/project/webapp/lesson_solutions/LogSpoofing_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/LogSpoofing_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/LogSpoofing_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin1.html b/main/project/webapp/lesson_solutions/MultiLevelLogin1.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin1.html
rename to main/project/webapp/lesson_solutions/MultiLevelLogin1.html
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/login.png b/main/project/webapp/lesson_solutions/MultiLevelLogin1_files/login.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/login.png
rename to main/project/webapp/lesson_solutions/MultiLevelLogin1_files/login.png
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/success.png b/main/project/webapp/lesson_solutions/MultiLevelLogin1_files/success.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/success.png
rename to main/project/webapp/lesson_solutions/MultiLevelLogin1_files/success.png
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/tan.png b/main/project/webapp/lesson_solutions/MultiLevelLogin1_files/tan.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/tan.png
rename to main/project/webapp/lesson_solutions/MultiLevelLogin1_files/tan.png
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/webscarab.png b/main/project/webapp/lesson_solutions/MultiLevelLogin1_files/webscarab.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin1_files/webscarab.png
rename to main/project/webapp/lesson_solutions/MultiLevelLogin1_files/webscarab.png
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin2.html b/main/project/webapp/lesson_solutions/MultiLevelLogin2.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin2.html
rename to main/project/webapp/lesson_solutions/MultiLevelLogin2.html
diff --git a/main/project/WebContent/lesson_solutions/MultiLevelLogin2_files/success.png b/main/project/webapp/lesson_solutions/MultiLevelLogin2_files/success.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/MultiLevelLogin2_files/success.png
rename to main/project/webapp/lesson_solutions/MultiLevelLogin2_files/success.png
diff --git a/main/project/WebContent/lesson_solutions/PasswordStrength.html b/main/project/webapp/lesson_solutions/PasswordStrength.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PasswordStrength.html
rename to main/project/webapp/lesson_solutions/PasswordStrength.html
diff --git a/main/project/WebContent/lesson_solutions/PasswordStrength_files/image001.jpg b/main/project/webapp/lesson_solutions/PasswordStrength_files/image001.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PasswordStrength_files/image001.jpg
rename to main/project/webapp/lesson_solutions/PasswordStrength_files/image001.jpg
diff --git a/main/project/WebContent/lesson_solutions/PasswordStrength_files/image002.jpg b/main/project/webapp/lesson_solutions/PasswordStrength_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PasswordStrength_files/image002.jpg
rename to main/project/webapp/lesson_solutions/PasswordStrength_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/PasswordStrength_files/image003.jpg b/main/project/webapp/lesson_solutions/PasswordStrength_files/image003.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PasswordStrength_files/image003.jpg
rename to main/project/webapp/lesson_solutions/PasswordStrength_files/image003.jpg
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl.html b/main/project/webapp/lesson_solutions/PathBasedAccessControl.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl.html
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl.html
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/filelist.xml b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/filelist.xml
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image001.png b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image001.png
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image002.jpg b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image002.jpg
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image003.png b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image003.png
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image004.jpg b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image004.jpg
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image005.png b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image005.png
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image006.jpg b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/image006.jpg
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/themedata.thmx b/main/project/webapp/lesson_solutions/PathBasedAccessControl_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/PathBasedAccessControl_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/PathBasedAccessControl_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/Phishing.html b/main/project/webapp/lesson_solutions/Phishing.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/Phishing.html
rename to main/project/webapp/lesson_solutions/Phishing.html
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS.html b/main/project/webapp/lesson_solutions/ReflectedXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS.html
rename to main/project/webapp/lesson_solutions/ReflectedXSS.html
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/ReflectedXSS_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/filelist.xml b/main/project/webapp/lesson_solutions/ReflectedXSS_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/filelist.xml
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/image001.png b/main/project/webapp/lesson_solutions/ReflectedXSS_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/image001.png
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/image003.png b/main/project/webapp/lesson_solutions/ReflectedXSS_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/image003.png
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/image005.jpg b/main/project/webapp/lesson_solutions/ReflectedXSS_files/image005.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/image005.jpg
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/image005.jpg
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/image006.jpg b/main/project/webapp/lesson_solutions/ReflectedXSS_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/image006.jpg
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/ReflectedXSS_files/themedata.thmx b/main/project/webapp/lesson_solutions/ReflectedXSS_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ReflectedXSS_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/ReflectedXSS_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw.html b/main/project/webapp/lesson_solutions/RemoteAdminFlaw.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw.html
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw.html
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/filelist.xml b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/filelist.xml
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image001.png b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image001.png
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image002.jpg b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image002.jpg
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image003.png b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image003.png
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image004.jpg b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image004.jpg
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image005.png b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image005.png
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image006.jpg b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/image006.jpg
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/themedata.thmx b/main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/RemoteAdminFlaw_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/RemoteAdminFlaw_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation.html b/main/project/webapp/lesson_solutions/SessionFixation.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation.html
rename to main/project/webapp/lesson_solutions/SessionFixation.html
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage1.png b/main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage1.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage1.png
rename to main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage1.png
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage2.png b/main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage2.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage2.png
rename to main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage2.png
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage3.png b/main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage3.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage3.png
rename to main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage3.png
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage4_1.png b/main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage4_1.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage4_1.png
rename to main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage4_1.png
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage4_2.png b/main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage4_2.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation_files/sf_stage4_2.png
rename to main/project/webapp/lesson_solutions/SessionFixation_files/sf_stage4_2.png
diff --git a/main/project/WebContent/lesson_solutions/SessionFixation_files/sf_success.png b/main/project/webapp/lesson_solutions/SessionFixation_files/sf_success.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SessionFixation_files/sf_success.png
rename to main/project/webapp/lesson_solutions/SessionFixation_files/sf_success.png
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions.html b/main/project/webapp/lesson_solutions/SilentTransactions.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions.html
rename to main/project/webapp/lesson_solutions/SilentTransactions.html
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/SilentTransactions_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/filelist.xml b/main/project/webapp/lesson_solutions/SilentTransactions_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/filelist.xml
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image001.png b/main/project/webapp/lesson_solutions/SilentTransactions_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image001.png
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image003.png b/main/project/webapp/lesson_solutions/SilentTransactions_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image003.png
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image005.png b/main/project/webapp/lesson_solutions/SilentTransactions_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image005.png
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image007.png b/main/project/webapp/lesson_solutions/SilentTransactions_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image007.png
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image009.jpg b/main/project/webapp/lesson_solutions/SilentTransactions_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image009.jpg
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image010.jpg b/main/project/webapp/lesson_solutions/SilentTransactions_files/image010.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image010.jpg
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image010.jpg
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image011.jpg b/main/project/webapp/lesson_solutions/SilentTransactions_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image011.jpg
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/image012.jpg b/main/project/webapp/lesson_solutions/SilentTransactions_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/image012.jpg
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/SilentTransactions_files/themedata.thmx b/main/project/webapp/lesson_solutions/SilentTransactions_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SilentTransactions_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/SilentTransactions_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest.html b/main/project/webapp/lesson_solutions/SoapRequest.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest.html
rename to main/project/webapp/lesson_solutions/SoapRequest.html
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/SoapRequest_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/SoapRequest_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/filelist.xml b/main/project/webapp/lesson_solutions/SoapRequest_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/filelist.xml
rename to main/project/webapp/lesson_solutions/SoapRequest_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image001.png b/main/project/webapp/lesson_solutions/SoapRequest_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image001.png
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image002.jpg b/main/project/webapp/lesson_solutions/SoapRequest_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image002.jpg
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image003.png b/main/project/webapp/lesson_solutions/SoapRequest_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image003.png
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image004.jpg b/main/project/webapp/lesson_solutions/SoapRequest_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image004.jpg
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image005.png b/main/project/webapp/lesson_solutions/SoapRequest_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image005.png
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image006.jpg b/main/project/webapp/lesson_solutions/SoapRequest_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image006.jpg
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image007.png b/main/project/webapp/lesson_solutions/SoapRequest_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image007.png
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image008.jpg b/main/project/webapp/lesson_solutions/SoapRequest_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image008.jpg
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image009.png b/main/project/webapp/lesson_solutions/SoapRequest_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image009.png
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/image010.jpg b/main/project/webapp/lesson_solutions/SoapRequest_files/image010.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/image010.jpg
rename to main/project/webapp/lesson_solutions/SoapRequest_files/image010.jpg
diff --git a/main/project/WebContent/lesson_solutions/SoapRequest_files/themedata.thmx b/main/project/webapp/lesson_solutions/SoapRequest_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SoapRequest_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/SoapRequest_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection.html b/main/project/webapp/lesson_solutions/SqlNumericInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection.html
rename to main/project/webapp/lesson_solutions/SqlNumericInjection.html
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image001.png b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image002.jpg b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image002.jpg
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image003.png b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image004.jpg b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image004.jpg
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image005.png b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image006.jpg b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/image006.jpg
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/numericinjection.png b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/numericinjection.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/numericinjection.png
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/numericinjection.png
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/numericinjection_solved.png b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/numericinjection_solved.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/numericinjection_solved.png
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/numericinjection_solved.png
diff --git a/main/project/WebContent/lesson_solutions/SqlNumericInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/SqlNumericInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlNumericInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/SqlNumericInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection.html b/main/project/webapp/lesson_solutions/SqlStringInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection.html
rename to main/project/webapp/lesson_solutions/SqlStringInjection.html
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/SqlStringInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/SqlStringInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/image001.png b/main/project/webapp/lesson_solutions/SqlStringInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/image003.png b/main/project/webapp/lesson_solutions/SqlStringInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/image005.jpg b/main/project/webapp/lesson_solutions/SqlStringInjection_files/image005.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/image005.jpg
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/image005.jpg
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/image006.jpg b/main/project/webapp/lesson_solutions/SqlStringInjection_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/image006.jpg
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/SqlStringInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/SqlStringInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/SqlStringInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/SqlStringInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/StoredXSS_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/StoredXSS_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/filelist.xml b/main/project/webapp/lesson_solutions/StoredXSS_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/filelist.xml
rename to main/project/webapp/lesson_solutions/StoredXSS_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/image001.png b/main/project/webapp/lesson_solutions/StoredXSS_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/image001.png
rename to main/project/webapp/lesson_solutions/StoredXSS_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/image003.png b/main/project/webapp/lesson_solutions/StoredXSS_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/image003.png
rename to main/project/webapp/lesson_solutions/StoredXSS_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/image005.png b/main/project/webapp/lesson_solutions/StoredXSS_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/image005.png
rename to main/project/webapp/lesson_solutions/StoredXSS_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/image007.jpg b/main/project/webapp/lesson_solutions/StoredXSS_files/image007.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/image007.jpg
rename to main/project/webapp/lesson_solutions/StoredXSS_files/image007.jpg
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/image008.jpg b/main/project/webapp/lesson_solutions/StoredXSS_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/image008.jpg
rename to main/project/webapp/lesson_solutions/StoredXSS_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/image009.jpg b/main/project/webapp/lesson_solutions/StoredXSS_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/image009.jpg
rename to main/project/webapp/lesson_solutions/StoredXSS_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/StoredXSS_files/themedata.thmx b/main/project/webapp/lesson_solutions/StoredXSS_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXSS_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/StoredXSS_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/StoredXss.html b/main/project/webapp/lesson_solutions/StoredXss.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/StoredXss.html
rename to main/project/webapp/lesson_solutions/StoredXss.html
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem.html b/main/project/webapp/lesson_solutions/ThreadSafetyProblem.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem.html
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem.html
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/filelist.xml b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/filelist.xml
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image001.png b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image001.png
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image002.jpg b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image002.jpg
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image003.png b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image003.png
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image004.jpg b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image004.jpg
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image007.png b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image007.png
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image009.jpg b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/image009.jpg
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/themedata.thmx b/main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/ThreadSafetyProblem_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/ThreadSafetyProblem_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/TraceXSS.html b/main/project/webapp/lesson_solutions/TraceXSS.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/TraceXSS.html
rename to main/project/webapp/lesson_solutions/TraceXSS.html
diff --git a/main/project/WebContent/lesson_solutions/TraceXSS_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/TraceXSS_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/TraceXSS_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/TraceXSS_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/TraceXSS_files/filelist.xml b/main/project/webapp/lesson_solutions/TraceXSS_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/TraceXSS_files/filelist.xml
rename to main/project/webapp/lesson_solutions/TraceXSS_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/TraceXSS_files/image001.png b/main/project/webapp/lesson_solutions/TraceXSS_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/TraceXSS_files/image001.png
rename to main/project/webapp/lesson_solutions/TraceXSS_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/TraceXSS_files/image002.jpg b/main/project/webapp/lesson_solutions/TraceXSS_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/TraceXSS_files/image002.jpg
rename to main/project/webapp/lesson_solutions/TraceXSS_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/TraceXSS_files/themedata.thmx b/main/project/webapp/lesson_solutions/TraceXSS_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/TraceXSS_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/TraceXSS_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail.html b/main/project/webapp/lesson_solutions/UncheckedEmail.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail.html
rename to main/project/webapp/lesson_solutions/UncheckedEmail.html
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/UncheckedEmail_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/filelist.xml b/main/project/webapp/lesson_solutions/UncheckedEmail_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/filelist.xml
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image001.png b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image001.png
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image002.jpg b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image002.jpg
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image003.png b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image003.png
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image004.jpg b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image004.jpg
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image005.png b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image005.png
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image006.jpg b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image006.jpg
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image007.png b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image007.png
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/image008.jpg b/main/project/webapp/lesson_solutions/UncheckedEmail_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/image008.jpg
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/UncheckedEmail_files/themedata.thmx b/main/project/webapp/lesson_solutions/UncheckedEmail_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/UncheckedEmail_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/UncheckedEmail_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning.html b/main/project/webapp/lesson_solutions/WSDLScanning.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning.html
rename to main/project/webapp/lesson_solutions/WSDLScanning.html
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/WSDLScanning_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/filelist.xml b/main/project/webapp/lesson_solutions/WSDLScanning_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/filelist.xml
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image001.png b/main/project/webapp/lesson_solutions/WSDLScanning_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image001.png
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image003.png b/main/project/webapp/lesson_solutions/WSDLScanning_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image003.png
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image005.png b/main/project/webapp/lesson_solutions/WSDLScanning_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image005.png
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image007.png b/main/project/webapp/lesson_solutions/WSDLScanning_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image007.png
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image009.jpg b/main/project/webapp/lesson_solutions/WSDLScanning_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image009.jpg
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image010.jpg b/main/project/webapp/lesson_solutions/WSDLScanning_files/image010.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image010.jpg
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image010.jpg
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image011.jpg b/main/project/webapp/lesson_solutions/WSDLScanning_files/image011.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image011.jpg
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image011.jpg
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/image012.jpg b/main/project/webapp/lesson_solutions/WSDLScanning_files/image012.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/image012.jpg
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/image012.jpg
diff --git a/main/project/WebContent/lesson_solutions/WSDLScanning_files/themedata.thmx b/main/project/webapp/lesson_solutions/WSDLScanning_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WSDLScanning_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/WSDLScanning_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie.html b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie.html
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie.html
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/filelist.xml b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/filelist.xml
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image001.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image001.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image003.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image003.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image005.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image005.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image007.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image007.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image009.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image009.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image011.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image011.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image013.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image013.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image013.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image013.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image015.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image015.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image015.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image015.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image017.png b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image017.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image017.png
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image017.png
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image019.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image019.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image019.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image019.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image020.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image020.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image020.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image020.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image021.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image021.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image021.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image021.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image022.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image022.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image022.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image022.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image023.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image023.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image023.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image023.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image024.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image024.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image024.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image024.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image025.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image025.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image025.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image025.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image026.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image026.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image026.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image026.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image027.jpg b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image027.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/image027.jpg
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/image027.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/themedata.thmx b/main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakAuthenticationCookie_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/WeakAuthenticationCookie_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID.html b/main/project/webapp/lesson_solutions/WeakSessionID.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID.html
rename to main/project/webapp/lesson_solutions/WeakSessionID.html
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/WeakSessionID_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/filelist.xml b/main/project/webapp/lesson_solutions/WeakSessionID_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/filelist.xml
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image001.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image001.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image003.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image003.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image005.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image005.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image007.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image007.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image010.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image010.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image010.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image010.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image012.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image012.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image012.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image012.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image014.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image014.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image014.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image014.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image016.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image016.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image016.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image016.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image018.png b/main/project/webapp/lesson_solutions/WeakSessionID_files/image018.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image018.png
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image018.png
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image020.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image020.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image020.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image020.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image021.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image021.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image021.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image021.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image022.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image022.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image022.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image022.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image023.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image023.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image023.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image023.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image024.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image024.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image024.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image024.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image025.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image025.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image025.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image025.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image026.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image026.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image026.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image026.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image027.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image027.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image027.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image027.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image028.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image028.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image028.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image028.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/image029.jpg b/main/project/webapp/lesson_solutions/WeakSessionID_files/image029.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/image029.jpg
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/image029.jpg
diff --git a/main/project/WebContent/lesson_solutions/WeakSessionID_files/themedata.thmx b/main/project/webapp/lesson_solutions/WeakSessionID_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WeakSessionID_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/WeakSessionID_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection.html b/main/project/webapp/lesson_solutions/WsSAXInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection.html
rename to main/project/webapp/lesson_solutions/WsSAXInjection.html
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/WsSAXInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/WsSAXInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image001.png b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image002.jpg b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image002.jpg
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image003.png b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image004.jpg b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image004.jpg
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image005.png b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image006.jpg b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image006.jpg
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image007.png b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image007.png
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image008.jpg b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image008.jpg
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image009.png b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image009.png
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/image010.jpg b/main/project/webapp/lesson_solutions/WsSAXInjection_files/image010.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/image010.jpg
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/image010.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSAXInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/WsSAXInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSAXInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/WsSAXInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection.html b/main/project/webapp/lesson_solutions/WsSqlInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection.html
rename to main/project/webapp/lesson_solutions/WsSqlInjection.html
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/WsSqlInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/WsSqlInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image001.png b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image002.jpg b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image002.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image002.jpg
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image002.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image003.png b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image004.jpg b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image004.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image004.jpg
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image004.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image005.png b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image006.jpg b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image006.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image006.jpg
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image006.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image007.png b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image007.png
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/image008.jpg b/main/project/webapp/lesson_solutions/WsSqlInjection_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/image008.jpg
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/WsSqlInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/WsSqlInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/WsSqlInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/WsSqlInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection.html b/main/project/webapp/lesson_solutions/XMLInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection.html
rename to main/project/webapp/lesson_solutions/XMLInjection.html
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/XMLInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/XMLInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/XMLInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/XMLInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image001.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image003.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image005.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image007.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image007.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image007.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image007.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image009.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image009.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image009.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image009.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image011.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image011.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image011.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image011.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image013.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image013.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image013.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image013.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image015.png b/main/project/webapp/lesson_solutions/XMLInjection_files/image015.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image015.png
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image015.png
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image017.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image017.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image017.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image017.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image018.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image018.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image018.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image018.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image019.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image019.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image019.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image019.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image020.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image020.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image020.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image020.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image021.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image021.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image021.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image021.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image022.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image022.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image022.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image022.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image023.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image023.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image023.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image023.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/image024.jpg b/main/project/webapp/lesson_solutions/XMLInjection_files/image024.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/image024.jpg
rename to main/project/webapp/lesson_solutions/XMLInjection_files/image024.jpg
diff --git a/main/project/WebContent/lesson_solutions/XMLInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/XMLInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XMLInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/XMLInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection.html b/main/project/webapp/lesson_solutions/XPATHInjection.html
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection.html
rename to main/project/webapp/lesson_solutions/XPATHInjection.html
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/colorschememapping.xml b/main/project/webapp/lesson_solutions/XPATHInjection_files/colorschememapping.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/colorschememapping.xml
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/colorschememapping.xml
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/filelist.xml b/main/project/webapp/lesson_solutions/XPATHInjection_files/filelist.xml
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/filelist.xml
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/filelist.xml
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/image001.png b/main/project/webapp/lesson_solutions/XPATHInjection_files/image001.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/image001.png
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/image001.png
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/image003.png b/main/project/webapp/lesson_solutions/XPATHInjection_files/image003.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/image003.png
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/image003.png
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/image005.png b/main/project/webapp/lesson_solutions/XPATHInjection_files/image005.png
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/image005.png
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/image005.png
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/image007.jpg b/main/project/webapp/lesson_solutions/XPATHInjection_files/image007.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/image007.jpg
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/image007.jpg
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/image008.jpg b/main/project/webapp/lesson_solutions/XPATHInjection_files/image008.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/image008.jpg
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/image008.jpg
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/image009.jpg b/main/project/webapp/lesson_solutions/XPATHInjection_files/image009.jpg
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/image009.jpg
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/image009.jpg
diff --git a/main/project/WebContent/lesson_solutions/XPATHInjection_files/themedata.thmx b/main/project/webapp/lesson_solutions/XPATHInjection_files/themedata.thmx
similarity index 100%
rename from main/project/WebContent/lesson_solutions/XPATHInjection_files/themedata.thmx
rename to main/project/webapp/lesson_solutions/XPATHInjection_files/themedata.thmx
diff --git a/main/project/WebContent/lesson_solutions/formate.css b/main/project/webapp/lesson_solutions/formate.css
similarity index 100%
rename from main/project/WebContent/lesson_solutions/formate.css
rename to main/project/webapp/lesson_solutions/formate.css
diff --git a/main/project/WebContent/lessons/Ajax/clientSideFiltering.jsp b/main/project/webapp/lessons/Ajax/clientSideFiltering.jsp
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/clientSideFiltering.jsp
rename to main/project/webapp/lessons/Ajax/clientSideFiltering.jsp
diff --git a/main/project/WebContent/lessons/Ajax/clientSideFiltering_backup.jsp b/main/project/webapp/lessons/Ajax/clientSideFiltering_backup.jsp
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/clientSideFiltering_backup.jsp
rename to main/project/webapp/lessons/Ajax/clientSideFiltering_backup.jsp
diff --git a/main/project/WebContent/lessons/Ajax/clientSideValidation.jsp b/main/project/webapp/lessons/Ajax/clientSideValidation.jsp
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/clientSideValidation.jsp
rename to main/project/webapp/lessons/Ajax/clientSideValidation.jsp
diff --git a/main/project/WebContent/lessons/Ajax/employees.xml b/main/project/webapp/lessons/Ajax/employees.xml
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/employees.xml
rename to main/project/webapp/lessons/Ajax/employees.xml
diff --git a/main/project/WebContent/lessons/Ajax/eval.jsp b/main/project/webapp/lessons/Ajax/eval.jsp
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/eval.jsp
rename to main/project/webapp/lessons/Ajax/eval.jsp
diff --git a/main/project/WebContent/lessons/Ajax/images/lesson1_header.jpg b/main/project/webapp/lessons/Ajax/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/images/lesson1_header.jpg
rename to main/project/webapp/lessons/Ajax/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/Ajax/images/lesson1_workspace.jpg b/main/project/webapp/lessons/Ajax/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/Ajax/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/Ajax/instructor/clientSideFiltering_i.jsp b/main/project/webapp/lessons/Ajax/instructor/clientSideFiltering_i.jsp
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/instructor/clientSideFiltering_i.jsp
rename to main/project/webapp/lessons/Ajax/instructor/clientSideFiltering_i.jsp
diff --git a/main/project/WebContent/lessons/Ajax/sameOrigin.jsp b/main/project/webapp/lessons/Ajax/sameOrigin.jsp
similarity index 100%
rename from main/project/WebContent/lessons/Ajax/sameOrigin.jsp
rename to main/project/webapp/lessons/Ajax/sameOrigin.jsp
diff --git a/main/project/WebContent/lessons/ConfManagement/config.jsp b/main/project/webapp/lessons/ConfManagement/config.jsp
similarity index 100%
rename from main/project/WebContent/lessons/ConfManagement/config.jsp
rename to main/project/webapp/lessons/ConfManagement/config.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.css b/main/project/webapp/lessons/CrossSiteScripting/CrossSiteScripting.css
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.css
rename to main/project/webapp/lessons/CrossSiteScripting/CrossSiteScripting.css
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.jsp b/main/project/webapp/lessons/CrossSiteScripting/CrossSiteScripting.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/CrossSiteScripting.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/EditProfile.jsp b/main/project/webapp/lessons/CrossSiteScripting/EditProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/EditProfile.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/EditProfile.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/ListStaff.jsp b/main/project/webapp/lessons/CrossSiteScripting/ListStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/ListStaff.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/ListStaff.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/Login.jsp b/main/project/webapp/lessons/CrossSiteScripting/Login.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/Login.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/Login.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/SearchStaff.jsp b/main/project/webapp/lessons/CrossSiteScripting/SearchStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/SearchStaff.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/SearchStaff.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/ViewProfile.jsp b/main/project/webapp/lessons/CrossSiteScripting/ViewProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/ViewProfile.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/ViewProfile.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/error.jsp b/main/project/webapp/lessons/CrossSiteScripting/error.jsp
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/error.jsp
rename to main/project/webapp/lessons/CrossSiteScripting/error.jsp
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg b/main/project/webapp/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg
rename to main/project/webapp/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_header.jpg b/main/project/webapp/lessons/CrossSiteScripting/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_header.jpg
rename to main/project/webapp/lessons/CrossSiteScripting/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg b/main/project/webapp/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg
rename to main/project/webapp/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_menu.jpg b/main/project/webapp/lessons/CrossSiteScripting/images/lesson1_menu.jpg
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_menu.jpg
rename to main/project/webapp/lessons/CrossSiteScripting/images/lesson1_menu.jpg
diff --git a/main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_workspace.jpg b/main/project/webapp/lessons/CrossSiteScripting/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/CrossSiteScripting/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/CrossSiteScripting/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css b/main/project/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css
rename to main/project/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/EditProfile.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/EditProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/EditProfile.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/EditProfile.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/ListStaff.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/ListStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/ListStaff.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/ListStaff.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/Login.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/Login.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/Login.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/Login.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/SearchStaff.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/SearchStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/SearchStaff.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/SearchStaff.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/ViewProfile.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/ViewProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/ViewProfile.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/ViewProfile.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/error.jsp b/main/project/webapp/lessons/DBCrossSiteScripting/error.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/error.jsp
rename to main/project/webapp/lessons/DBCrossSiteScripting/error.jsp
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg b/main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg
rename to main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_header.jpg b/main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_header.jpg
rename to main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg b/main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg
rename to main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg b/main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg
rename to main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg
diff --git a/main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg b/main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/DBSQLInjection/DBSQLInjection.css b/main/project/webapp/lessons/DBSQLInjection/DBSQLInjection.css
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/DBSQLInjection.css
rename to main/project/webapp/lessons/DBSQLInjection/DBSQLInjection.css
diff --git a/main/project/WebContent/lessons/DBSQLInjection/DBSQLInjection.jsp b/main/project/webapp/lessons/DBSQLInjection/DBSQLInjection.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/DBSQLInjection.jsp
rename to main/project/webapp/lessons/DBSQLInjection/DBSQLInjection.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/EditProfile.jsp b/main/project/webapp/lessons/DBSQLInjection/EditProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/EditProfile.jsp
rename to main/project/webapp/lessons/DBSQLInjection/EditProfile.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/ListStaff.jsp b/main/project/webapp/lessons/DBSQLInjection/ListStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/ListStaff.jsp
rename to main/project/webapp/lessons/DBSQLInjection/ListStaff.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/Login.jsp b/main/project/webapp/lessons/DBSQLInjection/Login.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/Login.jsp
rename to main/project/webapp/lessons/DBSQLInjection/Login.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/SearchStaff.jsp b/main/project/webapp/lessons/DBSQLInjection/SearchStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/SearchStaff.jsp
rename to main/project/webapp/lessons/DBSQLInjection/SearchStaff.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/ViewProfile.jsp b/main/project/webapp/lessons/DBSQLInjection/ViewProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/ViewProfile.jsp
rename to main/project/webapp/lessons/DBSQLInjection/ViewProfile.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/error.jsp b/main/project/webapp/lessons/DBSQLInjection/error.jsp
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/error.jsp
rename to main/project/webapp/lessons/DBSQLInjection/error.jsp
diff --git a/main/project/WebContent/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg b/main/project/webapp/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg
rename to main/project/webapp/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg
diff --git a/main/project/WebContent/lessons/DBSQLInjection/images/lesson1_header.jpg b/main/project/webapp/lessons/DBSQLInjection/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/images/lesson1_header.jpg
rename to main/project/webapp/lessons/DBSQLInjection/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg b/main/project/webapp/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg
rename to main/project/webapp/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg
diff --git a/main/project/WebContent/lessons/DBSQLInjection/images/lesson1_menu.jpg b/main/project/webapp/lessons/DBSQLInjection/images/lesson1_menu.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/images/lesson1_menu.jpg
rename to main/project/webapp/lessons/DBSQLInjection/images/lesson1_menu.jpg
diff --git a/main/project/WebContent/lessons/DBSQLInjection/images/lesson1_workspace.jpg b/main/project/webapp/lessons/DBSQLInjection/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/DBSQLInjection/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/DBSQLInjection/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/General/redirect.jsp b/main/project/webapp/lessons/General/redirect.jsp
similarity index 100%
rename from main/project/WebContent/lessons/General/redirect.jsp
rename to main/project/webapp/lessons/General/redirect.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/EditProfile.jsp b/main/project/webapp/lessons/GoatHillsFinancial/EditProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/EditProfile.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/EditProfile.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/GoatHillsFinancial.css b/main/project/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.css
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/GoatHillsFinancial.css
rename to main/project/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.css
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp b/main/project/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/ListStaff.jsp b/main/project/webapp/lessons/GoatHillsFinancial/ListStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/ListStaff.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/ListStaff.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/Login.jsp b/main/project/webapp/lessons/GoatHillsFinancial/Login.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/Login.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/Login.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/SearchStaff.jsp b/main/project/webapp/lessons/GoatHillsFinancial/SearchStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/SearchStaff.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/SearchStaff.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/ViewProfile.jsp b/main/project/webapp/lessons/GoatHillsFinancial/ViewProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/ViewProfile.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/ViewProfile.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/error.jsp b/main/project/webapp/lessons/GoatHillsFinancial/error.jsp
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/error.jsp
rename to main/project/webapp/lessons/GoatHillsFinancial/error.jsp
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/accessControl.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/accessControl.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/accessControl.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/accessControl.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/dbSchema.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/dbSchema.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/dbSchema.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/dbSchema.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_header.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_header.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_menu.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_menu.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_menu.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_menu.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/GoatHillsFinancial/images/orgChart.jpg b/main/project/webapp/lessons/GoatHillsFinancial/images/orgChart.jpg
similarity index 100%
rename from main/project/WebContent/lessons/GoatHillsFinancial/images/orgChart.jpg
rename to main/project/webapp/lessons/GoatHillsFinancial/images/orgChart.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/EditProfile.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/EditProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/EditProfile.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/EditProfile.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/ListStaff.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/ListStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/ListStaff.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/ListStaff.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/Login.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/Login.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/Login.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/Login.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css b/main/project/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css
rename to main/project/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/SearchStaff.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/SearchStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/SearchStaff.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/SearchStaff.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/ViewProfile.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/ViewProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/ViewProfile.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/ViewProfile.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/error.jsp b/main/project/webapp/lessons/RoleBasedAccessControl/error.jsp
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/error.jsp
rename to main/project/webapp/lessons/RoleBasedAccessControl/error.jsp
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/accessControl.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/accessControl.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/accessControl.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/accessControl.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/dbSchema.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/dbSchema.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/dbSchema.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/dbSchema.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_header.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_header.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/RoleBasedAccessControl/images/orgChart.jpg b/main/project/webapp/lessons/RoleBasedAccessControl/images/orgChart.jpg
similarity index 100%
rename from main/project/WebContent/lessons/RoleBasedAccessControl/images/orgChart.jpg
rename to main/project/webapp/lessons/RoleBasedAccessControl/images/orgChart.jpg
diff --git a/main/project/WebContent/lessons/SQLInjection/EditProfile.jsp b/main/project/webapp/lessons/SQLInjection/EditProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/EditProfile.jsp
rename to main/project/webapp/lessons/SQLInjection/EditProfile.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/ListStaff.jsp b/main/project/webapp/lessons/SQLInjection/ListStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/ListStaff.jsp
rename to main/project/webapp/lessons/SQLInjection/ListStaff.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/Login.jsp b/main/project/webapp/lessons/SQLInjection/Login.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/Login.jsp
rename to main/project/webapp/lessons/SQLInjection/Login.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/SQLInjection.css b/main/project/webapp/lessons/SQLInjection/SQLInjection.css
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/SQLInjection.css
rename to main/project/webapp/lessons/SQLInjection/SQLInjection.css
diff --git a/main/project/WebContent/lessons/SQLInjection/SQLInjection.jsp b/main/project/webapp/lessons/SQLInjection/SQLInjection.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/SQLInjection.jsp
rename to main/project/webapp/lessons/SQLInjection/SQLInjection.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/SearchStaff.jsp b/main/project/webapp/lessons/SQLInjection/SearchStaff.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/SearchStaff.jsp
rename to main/project/webapp/lessons/SQLInjection/SearchStaff.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/ViewProfile.jsp b/main/project/webapp/lessons/SQLInjection/ViewProfile.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/ViewProfile.jsp
rename to main/project/webapp/lessons/SQLInjection/ViewProfile.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/error.jsp b/main/project/webapp/lessons/SQLInjection/error.jsp
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/error.jsp
rename to main/project/webapp/lessons/SQLInjection/error.jsp
diff --git a/main/project/WebContent/lessons/SQLInjection/images/lesson1_SearchWindow.jpg b/main/project/webapp/lessons/SQLInjection/images/lesson1_SearchWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/images/lesson1_SearchWindow.jpg
rename to main/project/webapp/lessons/SQLInjection/images/lesson1_SearchWindow.jpg
diff --git a/main/project/WebContent/lessons/SQLInjection/images/lesson1_header.jpg b/main/project/webapp/lessons/SQLInjection/images/lesson1_header.jpg
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/images/lesson1_header.jpg
rename to main/project/webapp/lessons/SQLInjection/images/lesson1_header.jpg
diff --git a/main/project/WebContent/lessons/SQLInjection/images/lesson1_loginWindow.jpg b/main/project/webapp/lessons/SQLInjection/images/lesson1_loginWindow.jpg
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/images/lesson1_loginWindow.jpg
rename to main/project/webapp/lessons/SQLInjection/images/lesson1_loginWindow.jpg
diff --git a/main/project/WebContent/lessons/SQLInjection/images/lesson1_menu.jpg b/main/project/webapp/lessons/SQLInjection/images/lesson1_menu.jpg
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/images/lesson1_menu.jpg
rename to main/project/webapp/lessons/SQLInjection/images/lesson1_menu.jpg
diff --git a/main/project/WebContent/lessons/SQLInjection/images/lesson1_workspace.jpg b/main/project/webapp/lessons/SQLInjection/images/lesson1_workspace.jpg
similarity index 100%
rename from main/project/WebContent/lessons/SQLInjection/images/lesson1_workspace.jpg
rename to main/project/webapp/lessons/SQLInjection/images/lesson1_workspace.jpg
diff --git a/main/project/WebContent/lessons/XPATHInjection/EmployeesData.xml b/main/project/webapp/lessons/XPATHInjection/EmployeesData.xml
similarity index 100%
rename from main/project/WebContent/lessons/XPATHInjection/EmployeesData.xml
rename to main/project/webapp/lessons/XPATHInjection/EmployeesData.xml
diff --git a/main/project/WebContent/main.jsp b/main/project/webapp/main.jsp
similarity index 100%
rename from main/project/WebContent/main.jsp
rename to main/project/webapp/main.jsp
diff --git a/main/project/WebContent/sideWindow.jsp b/main/project/webapp/sideWindow.jsp
similarity index 100%
rename from main/project/WebContent/sideWindow.jsp
rename to main/project/webapp/sideWindow.jsp
diff --git a/main/project/WebContent/users/ReadMe.txt b/main/project/webapp/users/ReadMe.txt
similarity index 100%
rename from main/project/WebContent/users/ReadMe.txt
rename to main/project/webapp/users/ReadMe.txt
diff --git a/main/project/WebContent/webgoat.jsp b/main/project/webapp/webgoat.jsp
similarity index 100%
rename from main/project/WebContent/webgoat.jsp
rename to main/project/webapp/webgoat.jsp
diff --git a/main/project/WebContent/webgoat_challenge.jsp b/main/project/webapp/webgoat_challenge.jsp
similarity index 100%
rename from main/project/WebContent/webgoat_challenge.jsp
rename to main/project/webapp/webgoat_challenge.jsp