diff --git a/README.txt b/README.txt index 9a8f9fa7a..443b635ba 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,6 @@ ********** -********** WebGoat 5.4 -********** April/27/2012 +********** WebGoat 6.0 +********** August 23, 2014 ********** ** ** Home Page: http://code.google.com/p/webgoat @@ -36,27 +36,43 @@ doing security research will not work as that is the first thing that all hackers claim. You can find more information about WebGoat at: -http://code.google.com/p/webgoat - +https://github.com/WebGoat/ ---------------------------------------------------------------------------------------- -Prerequisites for Developers (Skip to Option 3 for unzip and click to run configruation) +Easy Run Instructions ( For non-developers ) ---------------------------------------------------------------------------------------- +Follow these instructions if you simply wish to run WebGoat -These tools must be installed independent of the webgoat download. -- Java 1.6 - Java can ne downloaded at http://java.sun.com/javase/downloads/index.jsp - You only need to download and install the "Java SE Development Kit (JDK)" -- Maven > 2.0.9 - Maven can be downloaded at: http://maven.apache.org/ - In Ubuntu it can be installed with: - > apt-get install maven2 -- WebGoat source code - WebGoat source code can be downloaded at: - http://code.google.com/p/webgoat/source/checkout - Use an svn client (ex: Tortoise svn) to checkout the code in the trunk. - + Prerequisites: Java VM >= 1.6 installed ( JDK 1.7 recommended) + Download the executable jar file to any location of your choice from: + http://github.com/path/to/download/WebGoat-6.0-exec-war.jar + Run it using java: + java -jar WebGoat-6.0-exec-war.jar + + Then navigate in your browser to: + http://localhost:8080/WebGoat + + If you would like to change the port or other options, use: + java -jar WebGoat-6.0-exec-war.jar --help + +---------------------------------------------------------------------------------------- +For Developers +---------------------------------------------------------------------------------------- +Follow These instructions if you wish to run Webgoat and modify the source code as well. + + Prerequisites: + * Java >= 1.6 ( JDK 1.7 recommended ) + * Maven > 2.0.9 + *Your favorite IDE, with Maven awareness: Netbeans/IntelliJ/Eclipse with m2e installed + * Git, or Git support in your IDE + + WebGoat source code + WebGoat source code can be downloaded at: + https://github.com/WebGoat/WebGoat + + If you are setting up an IDE, Netbeans 8.0 contains the Maven and Git support you need: + https://netbeans.org/downloads/ --------------------------------- Building the project (Developers) @@ -65,132 +81,15 @@ Building the project (Developers) Using a command shell/window: > cd webgoat -> mvn compile +> mvn clean package -copy it to the local repository -> mvn install +After opening the project in Netbeans or Eclipse, you can easily run the project using maven: -delete artifacts from previous build: -> mvn clean +> mvn tomcat:run-war +Maven will run the project in an embedded tomcat. ------------------------------------------------ -Building the Eclipse project files (Developers) ------------------------------------------------ - -> mvn eclipse:clean -> mvn eclipse:eclipse - -Afterward the project can be imported within Eclipse: -File -> Import -> General -> Existing Projects into Workspace -and select the webgoat directory as the "root directory." A webgoat should appear in the Projects section of your dialogue window. - -Don't forget to declare a classpath variable named M2_REPO, pointing to ~/.m2/repository, otherwise many links to existing jars will be broken. -This folder is located in your username root folder, the same folder where "my documents" and "my pictures" are located. -You can declare new variables in Eclipse in Windows -> Preferences... and selecting Java -> Build Path -> Classpath Variables - - -------------------------------------------------------------------- -Option 1: (Developers) Run the project on Tomcat within Eclipse -------------------------------------------------------------------- - -Install a local Tomcat server (We use Tomcat 7) -1. Download and unzip Apache Tomcat from http://tomcat.apache.org. -2. Adapt the conf/tomcat-users.xml file of your Tomcat server: - - - - - - - - - - - -3. Open Eclipse (WTP version) -> File -> New -> Other -> Server -> Apache -4. Choose your Tomcat version --> Click next "browse" to your tomcat install. --> Make sure the "JRE" dropdown is pointing to your jdk. If it isn't listed, press -"Installed JREs" and add it. --> Click next and add "webgoat" to the list of configured applications --> Finish - - -3. Right Click on the webgoat project within eclipse -> Run As -> Run on server - -Point your browser to http://localhost:8080/webgoat/attack -** Note - When running in eclipse, the default url will be lowercase "webgoat" - - ------------------------------------------------------------ -Option 2: (Developers) Run the project on Tomcat with Maven ------------------------------------------------------------ - -1. mvn tomcat:run-war -2. http://localhost:8080/WebGoat/attack - - ------------------------------------------------------------------- -Option 3: Run from the WebGoat 5.X Standard distribution (Windows) ------------------------------------------------------------------- - -1. Download the WebGoat-5.X-OWASP_Standard_Win32.zip file from: - - http://code.google.com/p/webgoat/downloads/list -2. Unzip the file -3. Double click webgoat.bat -4. Browse to http://localhost/WebGoat/attack - -** Note: if you receive a bind address error use: - -3. Double click webgoat8080.bat -4. Browse to http://localhost:8080/WebGoat/attack - - ------------------------------------------------------------------- -Option 4: Run from the WebGoat 5.X Standard distribution (Ubuntu) ------------------------------------------------------------------- - -1. Download the WebGoat-5.X-OWASP_Standard_Ubuntu32.zip file from: - - http://code.google.com/p/webgoat/downloads/list -2. Unzip the file -3. run sudu ./webgoat.sh start80 -4. Browse to http://localhost/WebGoat/attack - -** Note: if you receive a bind address or privilege error: - -3. run ./webgoat.sh start8080 -4. Browse to http://localhost:8080/WebGoat/attack - -shutdown the server with: -./webgoat.sh stop - ------------------------------------------------------------------- -Option 5: Using the WebgGoat-5.X.war ------------------------------------------------------------------- - -Windows: - -1. Download and install Java 1.6 and Tomcat 7 if needed -2. Download the WebgGoat-5.X.war and README-5.X file from: - - http://code.google.com/p/webgoat/downloads/list -3. Rename WebgGoat-5.X.war to WebgGoat.war -4. Copy WebGoat.war to /webapps/WebGoat.war -5. Modify the /conf/tomcat-users.xml to add in WebGoat users and roles - - see the FAQ for directions -6. Start the tomcat server (default is usually port 8080) -7. Browse to http://localhost:8080/WebGoat/attack - -Ubuntu: - -1. Install Java 1.6 and Tomcat 7 if needed - - Install java using: sudo apt-get install openjdk-7-jre - - Download Tomcat 7 from http://tomcat.apache.org/download-70.cgi (core tar.gz) -2. Download the WebgGoat-5.X.war and README-5.X file from: - - http://code.google.com/p/webgoat/downloads/list -3. Rename WebgGoat-5.X.war to WebgGoat.war -4. Copy WebGoat.war to /webapps/WebGoat.war -5. Modify the /conf/tomcat-users.xml to add in WebGoat users and roles - - see the FAQ for directions -6. Start the tomcat server (default is usually port 8080) -7. Browse to http://localhost:8080/WebGoat/attack \ No newline at end of file +the package phase also builds an executable jar file. You can run it using: +cd target +java -jar WebGoat-6.0-exec-war.jar +http://localhost:8080/WebGoat diff --git a/build.xml b/build.xml deleted file mode 100644 index 278dfbb5c..000000000 --- a/build.xml +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 5f0b44745..883f265c5 100644 --- a/pom.xml +++ b/pom.xml @@ -22,15 +22,6 @@ - ${basedir}/java - - - ${basedir}/java - - - ${basedir}/resources - - org.apache.maven.plugins @@ -42,29 +33,24 @@ - maven-eclipse-plugin - - 1.5 - - ${basedir}/java/**/*.java - - - - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/webapp - - - - org.codehaus.mojo - tomcat-maven-plugin - + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.1 + + + tomcat-run + + exec-war-only + + package + http://localhost:8080/manager - ${basedir}/tomcatconf - - + /WebGoat + exec + + + + diff --git a/java/org/owasp/webgoat/Catcher.java b/src/main/java/org/owasp/webgoat/Catcher.java similarity index 100% rename from java/org/owasp/webgoat/Catcher.java rename to src/main/java/org/owasp/webgoat/Catcher.java diff --git a/java/org/owasp/webgoat/HammerHead.java b/src/main/java/org/owasp/webgoat/HammerHead.java similarity index 100% rename from java/org/owasp/webgoat/HammerHead.java rename to src/main/java/org/owasp/webgoat/HammerHead.java diff --git a/java/org/owasp/webgoat/LessonSource.java b/src/main/java/org/owasp/webgoat/LessonSource.java similarity index 100% rename from java/org/owasp/webgoat/LessonSource.java rename to src/main/java/org/owasp/webgoat/LessonSource.java diff --git a/java/org/owasp/webgoat/controller/Login.java b/src/main/java/org/owasp/webgoat/controller/Login.java similarity index 100% rename from java/org/owasp/webgoat/controller/Login.java rename to src/main/java/org/owasp/webgoat/controller/Login.java diff --git a/java/org/owasp/webgoat/controller/Logout.java b/src/main/java/org/owasp/webgoat/controller/Logout.java similarity index 100% rename from java/org/owasp/webgoat/controller/Logout.java rename to src/main/java/org/owasp/webgoat/controller/Logout.java diff --git a/java/org/owasp/webgoat/controller/Start.java b/src/main/java/org/owasp/webgoat/controller/Start.java similarity index 100% rename from java/org/owasp/webgoat/controller/Start.java rename to src/main/java/org/owasp/webgoat/controller/Start.java diff --git a/java/org/owasp/webgoat/controller/Welcome.java b/src/main/java/org/owasp/webgoat/controller/Welcome.java similarity index 100% rename from java/org/owasp/webgoat/controller/Welcome.java rename to src/main/java/org/owasp/webgoat/controller/Welcome.java diff --git a/java/org/owasp/webgoat/lessons/AbstractLesson.java b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java similarity index 100% rename from java/org/owasp/webgoat/lessons/AbstractLesson.java rename to src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java diff --git a/java/org/owasp/webgoat/lessons/AccessControlMatrix.java b/src/main/java/org/owasp/webgoat/lessons/AccessControlMatrix.java similarity index 100% rename from java/org/owasp/webgoat/lessons/AccessControlMatrix.java rename to src/main/java/org/owasp/webgoat/lessons/AccessControlMatrix.java diff --git a/java/org/owasp/webgoat/lessons/BackDoors.java b/src/main/java/org/owasp/webgoat/lessons/BackDoors.java similarity index 100% rename from java/org/owasp/webgoat/lessons/BackDoors.java rename to src/main/java/org/owasp/webgoat/lessons/BackDoors.java diff --git a/java/org/owasp/webgoat/lessons/BasicAuthentication.java b/src/main/java/org/owasp/webgoat/lessons/BasicAuthentication.java similarity index 100% rename from java/org/owasp/webgoat/lessons/BasicAuthentication.java rename to src/main/java/org/owasp/webgoat/lessons/BasicAuthentication.java diff --git a/java/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java b/src/main/java/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java rename to src/main/java/org/owasp/webgoat/lessons/BlindNumericSqlInjection.java diff --git a/java/org/owasp/webgoat/lessons/BlindScript.java b/src/main/java/org/owasp/webgoat/lessons/BlindScript.java similarity index 100% rename from java/org/owasp/webgoat/lessons/BlindScript.java rename to src/main/java/org/owasp/webgoat/lessons/BlindScript.java diff --git a/java/org/owasp/webgoat/lessons/BlindStringSqlInjection.java b/src/main/java/org/owasp/webgoat/lessons/BlindStringSqlInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/BlindStringSqlInjection.java rename to src/main/java/org/owasp/webgoat/lessons/BlindStringSqlInjection.java diff --git a/java/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java b/src/main/java/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java similarity index 100% rename from java/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java rename to src/main/java/org/owasp/webgoat/lessons/BypassHtmlFieldRestrictions.java diff --git a/java/org/owasp/webgoat/lessons/CSRF.java b/src/main/java/org/owasp/webgoat/lessons/CSRF.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CSRF.java rename to src/main/java/org/owasp/webgoat/lessons/CSRF.java diff --git a/java/org/owasp/webgoat/lessons/Category.java b/src/main/java/org/owasp/webgoat/lessons/Category.java similarity index 100% rename from java/org/owasp/webgoat/lessons/Category.java rename to src/main/java/org/owasp/webgoat/lessons/Category.java diff --git a/java/org/owasp/webgoat/lessons/Challenge2Screen.java b/src/main/java/org/owasp/webgoat/lessons/Challenge2Screen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/Challenge2Screen.java rename to src/main/java/org/owasp/webgoat/lessons/Challenge2Screen.java diff --git a/java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java b/src/main/java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java rename to src/main/java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java diff --git a/java/org/owasp/webgoat/lessons/ClientSideValidation.java b/src/main/java/org/owasp/webgoat/lessons/ClientSideValidation.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ClientSideValidation.java rename to src/main/java/org/owasp/webgoat/lessons/ClientSideValidation.java diff --git a/java/org/owasp/webgoat/lessons/CommandInjection.java b/src/main/java/org/owasp/webgoat/lessons/CommandInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CommandInjection.java rename to src/main/java/org/owasp/webgoat/lessons/CommandInjection.java diff --git a/java/org/owasp/webgoat/lessons/ConcurrencyCart.java b/src/main/java/org/owasp/webgoat/lessons/ConcurrencyCart.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ConcurrencyCart.java rename to src/main/java/org/owasp/webgoat/lessons/ConcurrencyCart.java diff --git a/java/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java b/src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java rename to src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java diff --git a/java/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java b/src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java rename to src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java diff --git a/java/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java b/src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java rename to src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java diff --git a/java/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java b/src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java rename to src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java diff --git a/java/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java b/src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java rename to src/main/java/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java diff --git a/java/org/owasp/webgoat/lessons/CsrfPromptByPass.java b/src/main/java/org/owasp/webgoat/lessons/CsrfPromptByPass.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CsrfPromptByPass.java rename to src/main/java/org/owasp/webgoat/lessons/CsrfPromptByPass.java diff --git a/java/org/owasp/webgoat/lessons/CsrfTokenByPass.java b/src/main/java/org/owasp/webgoat/lessons/CsrfTokenByPass.java similarity index 100% rename from java/org/owasp/webgoat/lessons/CsrfTokenByPass.java rename to src/main/java/org/owasp/webgoat/lessons/CsrfTokenByPass.java diff --git a/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java b/src/main/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java rename to src/main/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java diff --git a/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java b/src/main/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java rename to src/main/java/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java diff --git a/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java b/src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java rename to src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java diff --git a/java/org/owasp/webgoat/lessons/DBSQLInjection/Login.java b/src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/Login.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DBSQLInjection/Login.java rename to src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/Login.java diff --git a/java/org/owasp/webgoat/lessons/DOMInjection.java b/src/main/java/org/owasp/webgoat/lessons/DOMInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DOMInjection.java rename to src/main/java/org/owasp/webgoat/lessons/DOMInjection.java diff --git a/java/org/owasp/webgoat/lessons/DOMXSS.java b/src/main/java/org/owasp/webgoat/lessons/DOMXSS.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DOMXSS.java rename to src/main/java/org/owasp/webgoat/lessons/DOMXSS.java diff --git a/java/org/owasp/webgoat/lessons/DOS_Login.java b/src/main/java/org/owasp/webgoat/lessons/DOS_Login.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DOS_Login.java rename to src/main/java/org/owasp/webgoat/lessons/DOS_Login.java diff --git a/java/org/owasp/webgoat/lessons/DangerousEval.java b/src/main/java/org/owasp/webgoat/lessons/DangerousEval.java similarity index 100% rename from java/org/owasp/webgoat/lessons/DangerousEval.java rename to src/main/java/org/owasp/webgoat/lessons/DangerousEval.java diff --git a/java/org/owasp/webgoat/lessons/Encoding.java b/src/main/java/org/owasp/webgoat/lessons/Encoding.java similarity index 100% rename from java/org/owasp/webgoat/lessons/Encoding.java rename to src/main/java/org/owasp/webgoat/lessons/Encoding.java diff --git a/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java b/src/main/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java similarity index 100% rename from java/org/owasp/webgoat/lessons/FailOpenAuthentication.java rename to src/main/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java diff --git a/java/org/owasp/webgoat/lessons/ForcedBrowsing.java b/src/main/java/org/owasp/webgoat/lessons/ForcedBrowsing.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ForcedBrowsing.java rename to src/main/java/org/owasp/webgoat/lessons/ForcedBrowsing.java diff --git a/java/org/owasp/webgoat/lessons/ForgotPassword.java b/src/main/java/org/owasp/webgoat/lessons/ForgotPassword.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ForgotPassword.java rename to src/main/java/org/owasp/webgoat/lessons/ForgotPassword.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java diff --git a/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java b/src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java rename to src/main/java/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java diff --git a/java/org/owasp/webgoat/lessons/HiddenFieldTampering.java b/src/main/java/org/owasp/webgoat/lessons/HiddenFieldTampering.java similarity index 100% rename from java/org/owasp/webgoat/lessons/HiddenFieldTampering.java rename to src/main/java/org/owasp/webgoat/lessons/HiddenFieldTampering.java diff --git a/java/org/owasp/webgoat/lessons/HowToWork.java b/src/main/java/org/owasp/webgoat/lessons/HowToWork.java similarity index 100% rename from java/org/owasp/webgoat/lessons/HowToWork.java rename to src/main/java/org/owasp/webgoat/lessons/HowToWork.java diff --git a/java/org/owasp/webgoat/lessons/HtmlClues.java b/src/main/java/org/owasp/webgoat/lessons/HtmlClues.java similarity index 100% rename from java/org/owasp/webgoat/lessons/HtmlClues.java rename to src/main/java/org/owasp/webgoat/lessons/HtmlClues.java diff --git a/java/org/owasp/webgoat/lessons/HttpBasics.java b/src/main/java/org/owasp/webgoat/lessons/HttpBasics.java similarity index 100% rename from java/org/owasp/webgoat/lessons/HttpBasics.java rename to src/main/java/org/owasp/webgoat/lessons/HttpBasics.java diff --git a/java/org/owasp/webgoat/lessons/HttpOnly.java b/src/main/java/org/owasp/webgoat/lessons/HttpOnly.java similarity index 100% rename from java/org/owasp/webgoat/lessons/HttpOnly.java rename to src/main/java/org/owasp/webgoat/lessons/HttpOnly.java diff --git a/java/org/owasp/webgoat/lessons/HttpSplitting.java b/src/main/java/org/owasp/webgoat/lessons/HttpSplitting.java similarity index 100% rename from java/org/owasp/webgoat/lessons/HttpSplitting.java rename to src/main/java/org/owasp/webgoat/lessons/HttpSplitting.java diff --git a/java/org/owasp/webgoat/lessons/InsecureLogin.java b/src/main/java/org/owasp/webgoat/lessons/InsecureLogin.java similarity index 100% rename from java/org/owasp/webgoat/lessons/InsecureLogin.java rename to src/main/java/org/owasp/webgoat/lessons/InsecureLogin.java diff --git a/java/org/owasp/webgoat/lessons/JSONInjection.java b/src/main/java/org/owasp/webgoat/lessons/JSONInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/JSONInjection.java rename to src/main/java/org/owasp/webgoat/lessons/JSONInjection.java diff --git a/java/org/owasp/webgoat/lessons/JavaScriptValidation.java b/src/main/java/org/owasp/webgoat/lessons/JavaScriptValidation.java similarity index 100% rename from java/org/owasp/webgoat/lessons/JavaScriptValidation.java rename to src/main/java/org/owasp/webgoat/lessons/JavaScriptValidation.java diff --git a/java/org/owasp/webgoat/lessons/LessonAdapter.java b/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java similarity index 100% rename from java/org/owasp/webgoat/lessons/LessonAdapter.java rename to src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java diff --git a/java/org/owasp/webgoat/lessons/LogSpoofing.java b/src/main/java/org/owasp/webgoat/lessons/LogSpoofing.java similarity index 100% rename from java/org/owasp/webgoat/lessons/LogSpoofing.java rename to src/main/java/org/owasp/webgoat/lessons/LogSpoofing.java diff --git a/java/org/owasp/webgoat/lessons/MaliciousFileExecution.java b/src/main/java/org/owasp/webgoat/lessons/MaliciousFileExecution.java similarity index 100% rename from java/org/owasp/webgoat/lessons/MaliciousFileExecution.java rename to src/main/java/org/owasp/webgoat/lessons/MaliciousFileExecution.java diff --git a/java/org/owasp/webgoat/lessons/MultiLevelLogin1.java b/src/main/java/org/owasp/webgoat/lessons/MultiLevelLogin1.java similarity index 100% rename from java/org/owasp/webgoat/lessons/MultiLevelLogin1.java rename to src/main/java/org/owasp/webgoat/lessons/MultiLevelLogin1.java diff --git a/java/org/owasp/webgoat/lessons/MultiLevelLogin2.java b/src/main/java/org/owasp/webgoat/lessons/MultiLevelLogin2.java similarity index 100% rename from java/org/owasp/webgoat/lessons/MultiLevelLogin2.java rename to src/main/java/org/owasp/webgoat/lessons/MultiLevelLogin2.java diff --git a/java/org/owasp/webgoat/lessons/NewLesson.java b/src/main/java/org/owasp/webgoat/lessons/NewLesson.java similarity index 100% rename from java/org/owasp/webgoat/lessons/NewLesson.java rename to src/main/java/org/owasp/webgoat/lessons/NewLesson.java diff --git a/java/org/owasp/webgoat/lessons/OffByOne.java b/src/main/java/org/owasp/webgoat/lessons/OffByOne.java similarity index 100% rename from java/org/owasp/webgoat/lessons/OffByOne.java rename to src/main/java/org/owasp/webgoat/lessons/OffByOne.java diff --git a/java/org/owasp/webgoat/lessons/PasswordStrength.java b/src/main/java/org/owasp/webgoat/lessons/PasswordStrength.java similarity index 100% rename from java/org/owasp/webgoat/lessons/PasswordStrength.java rename to src/main/java/org/owasp/webgoat/lessons/PasswordStrength.java diff --git a/java/org/owasp/webgoat/lessons/PathBasedAccessControl.java b/src/main/java/org/owasp/webgoat/lessons/PathBasedAccessControl.java similarity index 100% rename from java/org/owasp/webgoat/lessons/PathBasedAccessControl.java rename to src/main/java/org/owasp/webgoat/lessons/PathBasedAccessControl.java diff --git a/java/org/owasp/webgoat/lessons/Phishing.java b/src/main/java/org/owasp/webgoat/lessons/Phishing.java similarity index 100% rename from java/org/owasp/webgoat/lessons/Phishing.java rename to src/main/java/org/owasp/webgoat/lessons/Phishing.java diff --git a/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java b/src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RandomLessonAdapter.java rename to src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java diff --git a/java/org/owasp/webgoat/lessons/ReflectedXSS.java b/src/main/java/org/owasp/webgoat/lessons/ReflectedXSS.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ReflectedXSS.java rename to src/main/java/org/owasp/webgoat/lessons/ReflectedXSS.java diff --git a/java/org/owasp/webgoat/lessons/RemoteAdminFlaw.java b/src/main/java/org/owasp/webgoat/lessons/RemoteAdminFlaw.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RemoteAdminFlaw.java rename to src/main/java/org/owasp/webgoat/lessons/RemoteAdminFlaw.java diff --git a/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java b/src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java rename to src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java diff --git a/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java b/src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java rename to src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java diff --git a/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java b/src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java rename to src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java diff --git a/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java b/src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java rename to src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java diff --git a/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java b/src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java rename to src/main/java/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java diff --git a/java/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java b/src/main/java/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java rename to src/main/java/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java diff --git a/java/org/owasp/webgoat/lessons/SQLInjection/Login.java b/src/main/java/org/owasp/webgoat/lessons/SQLInjection/Login.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SQLInjection/Login.java rename to src/main/java/org/owasp/webgoat/lessons/SQLInjection/Login.java diff --git a/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java b/src/main/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java rename to src/main/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java diff --git a/java/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java b/src/main/java/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java rename to src/main/java/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java diff --git a/java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java b/src/main/java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java rename to src/main/java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java diff --git a/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java b/src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java rename to src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java diff --git a/java/org/owasp/webgoat/lessons/SessionFixation.java b/src/main/java/org/owasp/webgoat/lessons/SessionFixation.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SessionFixation.java rename to src/main/java/org/owasp/webgoat/lessons/SessionFixation.java diff --git a/java/org/owasp/webgoat/lessons/SilentTransactions.java b/src/main/java/org/owasp/webgoat/lessons/SilentTransactions.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SilentTransactions.java rename to src/main/java/org/owasp/webgoat/lessons/SilentTransactions.java diff --git a/java/org/owasp/webgoat/lessons/SoapRequest.java b/src/main/java/org/owasp/webgoat/lessons/SoapRequest.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SoapRequest.java rename to src/main/java/org/owasp/webgoat/lessons/SoapRequest.java diff --git a/java/org/owasp/webgoat/lessons/SqlAddData.java b/src/main/java/org/owasp/webgoat/lessons/SqlAddData.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SqlAddData.java rename to src/main/java/org/owasp/webgoat/lessons/SqlAddData.java diff --git a/java/org/owasp/webgoat/lessons/SqlModifyData.java b/src/main/java/org/owasp/webgoat/lessons/SqlModifyData.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SqlModifyData.java rename to src/main/java/org/owasp/webgoat/lessons/SqlModifyData.java diff --git a/java/org/owasp/webgoat/lessons/SqlNumericInjection.java b/src/main/java/org/owasp/webgoat/lessons/SqlNumericInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SqlNumericInjection.java rename to src/main/java/org/owasp/webgoat/lessons/SqlNumericInjection.java diff --git a/java/org/owasp/webgoat/lessons/SqlStringInjection.java b/src/main/java/org/owasp/webgoat/lessons/SqlStringInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/SqlStringInjection.java rename to src/main/java/org/owasp/webgoat/lessons/SqlStringInjection.java diff --git a/java/org/owasp/webgoat/lessons/StoredXss.java b/src/main/java/org/owasp/webgoat/lessons/StoredXss.java similarity index 100% rename from java/org/owasp/webgoat/lessons/StoredXss.java rename to src/main/java/org/owasp/webgoat/lessons/StoredXss.java diff --git a/java/org/owasp/webgoat/lessons/ThreadSafetyProblem.java b/src/main/java/org/owasp/webgoat/lessons/ThreadSafetyProblem.java similarity index 100% rename from java/org/owasp/webgoat/lessons/ThreadSafetyProblem.java rename to src/main/java/org/owasp/webgoat/lessons/ThreadSafetyProblem.java diff --git a/java/org/owasp/webgoat/lessons/TomcatSetup.java b/src/main/java/org/owasp/webgoat/lessons/TomcatSetup.java similarity index 100% rename from java/org/owasp/webgoat/lessons/TomcatSetup.java rename to src/main/java/org/owasp/webgoat/lessons/TomcatSetup.java diff --git a/java/org/owasp/webgoat/lessons/TraceXSS.java b/src/main/java/org/owasp/webgoat/lessons/TraceXSS.java similarity index 100% rename from java/org/owasp/webgoat/lessons/TraceXSS.java rename to src/main/java/org/owasp/webgoat/lessons/TraceXSS.java diff --git a/java/org/owasp/webgoat/lessons/UncheckedEmail.java b/src/main/java/org/owasp/webgoat/lessons/UncheckedEmail.java similarity index 100% rename from java/org/owasp/webgoat/lessons/UncheckedEmail.java rename to src/main/java/org/owasp/webgoat/lessons/UncheckedEmail.java diff --git a/java/org/owasp/webgoat/lessons/UsefulTools.java b/src/main/java/org/owasp/webgoat/lessons/UsefulTools.java similarity index 100% rename from java/org/owasp/webgoat/lessons/UsefulTools.java rename to src/main/java/org/owasp/webgoat/lessons/UsefulTools.java diff --git a/java/org/owasp/webgoat/lessons/WSDLScanning.java b/src/main/java/org/owasp/webgoat/lessons/WSDLScanning.java similarity index 100% rename from java/org/owasp/webgoat/lessons/WSDLScanning.java rename to src/main/java/org/owasp/webgoat/lessons/WSDLScanning.java diff --git a/java/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java b/src/main/java/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java similarity index 100% rename from java/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java rename to src/main/java/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java diff --git a/java/org/owasp/webgoat/lessons/WeakSessionID.java b/src/main/java/org/owasp/webgoat/lessons/WeakSessionID.java similarity index 100% rename from java/org/owasp/webgoat/lessons/WeakSessionID.java rename to src/main/java/org/owasp/webgoat/lessons/WeakSessionID.java diff --git a/java/org/owasp/webgoat/lessons/WelcomeScreen.java b/src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/WelcomeScreen.java rename to src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java diff --git a/java/org/owasp/webgoat/lessons/WsSAXInjection.java b/src/main/java/org/owasp/webgoat/lessons/WsSAXInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/WsSAXInjection.java rename to src/main/java/org/owasp/webgoat/lessons/WsSAXInjection.java diff --git a/java/org/owasp/webgoat/lessons/WsSqlInjection.java b/src/main/java/org/owasp/webgoat/lessons/WsSqlInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/WsSqlInjection.java rename to src/main/java/org/owasp/webgoat/lessons/WsSqlInjection.java diff --git a/java/org/owasp/webgoat/lessons/XMLInjection.java b/src/main/java/org/owasp/webgoat/lessons/XMLInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/XMLInjection.java rename to src/main/java/org/owasp/webgoat/lessons/XMLInjection.java diff --git a/java/org/owasp/webgoat/lessons/XPATHInjection.java b/src/main/java/org/owasp/webgoat/lessons/XPATHInjection.java similarity index 100% rename from java/org/owasp/webgoat/lessons/XPATHInjection.java rename to src/main/java/org/owasp/webgoat/lessons/XPATHInjection.java diff --git a/java/org/owasp/webgoat/lessons/admin/AdminScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/AdminScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/AdminScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/AdminScreen.java diff --git a/java/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java diff --git a/java/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java diff --git a/java/org/owasp/webgoat/lessons/admin/ReportCardScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/ReportCardScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/ReportCardScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/ReportCardScreen.java diff --git a/java/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java diff --git a/java/org/owasp/webgoat/lessons/admin/UserAdminScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/UserAdminScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/UserAdminScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/UserAdminScreen.java diff --git a/java/org/owasp/webgoat/lessons/admin/ViewDatabase.java b/src/main/java/org/owasp/webgoat/lessons/admin/ViewDatabase.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/ViewDatabase.java rename to src/main/java/org/owasp/webgoat/lessons/admin/ViewDatabase.java diff --git a/java/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java b/src/main/java/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java similarity index 100% rename from java/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java rename to src/main/java/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java diff --git a/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs b/src/main/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs rename to src/main/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.cs diff --git a/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll b/src/main/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll rename to src/main/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/RegexMatch.dll diff --git a/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/DBCrossSiteScripting/UpdateProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/DBSQLInjection/Login_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java diff --git a/java/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java b/src/main/java/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java similarity index 100% rename from java/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java rename to src/main/java/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java diff --git a/java/org/owasp/webgoat/lessons/model/Hint.java b/src/main/java/org/owasp/webgoat/lessons/model/Hint.java similarity index 100% rename from java/org/owasp/webgoat/lessons/model/Hint.java rename to src/main/java/org/owasp/webgoat/lessons/model/Hint.java diff --git a/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java b/src/main/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java similarity index 100% rename from java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java rename to src/main/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java diff --git a/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java b/src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java similarity index 100% rename from java/org/owasp/webgoat/lessons/model/LessonMenuItem.java rename to src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java diff --git a/java/org/owasp/webgoat/lessons/model/LessonMenuItemType.java b/src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItemType.java similarity index 100% rename from java/org/owasp/webgoat/lessons/model/LessonMenuItemType.java rename to src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItemType.java diff --git a/java/org/owasp/webgoat/lessons/model/RequestParameter.java b/src/main/java/org/owasp/webgoat/lessons/model/RequestParameter.java similarity index 100% rename from java/org/owasp/webgoat/lessons/model/RequestParameter.java rename to src/main/java/org/owasp/webgoat/lessons/model/RequestParameter.java diff --git a/java/org/owasp/webgoat/lessons/model/SourceListing.java b/src/main/java/org/owasp/webgoat/lessons/model/SourceListing.java similarity index 100% rename from java/org/owasp/webgoat/lessons/model/SourceListing.java rename to src/main/java/org/owasp/webgoat/lessons/model/SourceListing.java diff --git a/java/org/owasp/webgoat/service/BaseService.java b/src/main/java/org/owasp/webgoat/service/BaseService.java similarity index 100% rename from java/org/owasp/webgoat/service/BaseService.java rename to src/main/java/org/owasp/webgoat/service/BaseService.java diff --git a/java/org/owasp/webgoat/service/CookieService.java b/src/main/java/org/owasp/webgoat/service/CookieService.java similarity index 100% rename from java/org/owasp/webgoat/service/CookieService.java rename to src/main/java/org/owasp/webgoat/service/CookieService.java diff --git a/java/org/owasp/webgoat/service/DummyService.java b/src/main/java/org/owasp/webgoat/service/DummyService.java similarity index 100% rename from java/org/owasp/webgoat/service/DummyService.java rename to src/main/java/org/owasp/webgoat/service/DummyService.java diff --git a/java/org/owasp/webgoat/service/ExceptionInfo.java b/src/main/java/org/owasp/webgoat/service/ExceptionInfo.java similarity index 100% rename from java/org/owasp/webgoat/service/ExceptionInfo.java rename to src/main/java/org/owasp/webgoat/service/ExceptionInfo.java diff --git a/java/org/owasp/webgoat/service/HintService.java b/src/main/java/org/owasp/webgoat/service/HintService.java similarity index 100% rename from java/org/owasp/webgoat/service/HintService.java rename to src/main/java/org/owasp/webgoat/service/HintService.java diff --git a/java/org/owasp/webgoat/service/LessonMenuService.java b/src/main/java/org/owasp/webgoat/service/LessonMenuService.java similarity index 100% rename from java/org/owasp/webgoat/service/LessonMenuService.java rename to src/main/java/org/owasp/webgoat/service/LessonMenuService.java diff --git a/java/org/owasp/webgoat/service/LessonPlanService.java b/src/main/java/org/owasp/webgoat/service/LessonPlanService.java similarity index 100% rename from java/org/owasp/webgoat/service/LessonPlanService.java rename to src/main/java/org/owasp/webgoat/service/LessonPlanService.java diff --git a/java/org/owasp/webgoat/service/ParameterService.java b/src/main/java/org/owasp/webgoat/service/ParameterService.java similarity index 100% rename from java/org/owasp/webgoat/service/ParameterService.java rename to src/main/java/org/owasp/webgoat/service/ParameterService.java diff --git a/java/org/owasp/webgoat/service/SessionService.java b/src/main/java/org/owasp/webgoat/service/SessionService.java similarity index 100% rename from java/org/owasp/webgoat/service/SessionService.java rename to src/main/java/org/owasp/webgoat/service/SessionService.java diff --git a/java/org/owasp/webgoat/service/SolutionService.java b/src/main/java/org/owasp/webgoat/service/SolutionService.java similarity index 100% rename from java/org/owasp/webgoat/service/SolutionService.java rename to src/main/java/org/owasp/webgoat/service/SolutionService.java diff --git a/java/org/owasp/webgoat/service/SourceService.java b/src/main/java/org/owasp/webgoat/service/SourceService.java similarity index 100% rename from java/org/owasp/webgoat/service/SourceService.java rename to src/main/java/org/owasp/webgoat/service/SourceService.java diff --git a/java/org/owasp/webgoat/servlets/Controller.java b/src/main/java/org/owasp/webgoat/servlets/Controller.java similarity index 100% rename from java/org/owasp/webgoat/servlets/Controller.java rename to src/main/java/org/owasp/webgoat/servlets/Controller.java diff --git a/java/org/owasp/webgoat/session/Authorization.java b/src/main/java/org/owasp/webgoat/session/Authorization.java similarity index 100% rename from java/org/owasp/webgoat/session/Authorization.java rename to src/main/java/org/owasp/webgoat/session/Authorization.java diff --git a/java/org/owasp/webgoat/session/Course.java b/src/main/java/org/owasp/webgoat/session/Course.java similarity index 100% rename from java/org/owasp/webgoat/session/Course.java rename to src/main/java/org/owasp/webgoat/session/Course.java diff --git a/java/org/owasp/webgoat/session/CreateDB.java b/src/main/java/org/owasp/webgoat/session/CreateDB.java similarity index 100% rename from java/org/owasp/webgoat/session/CreateDB.java rename to src/main/java/org/owasp/webgoat/session/CreateDB.java diff --git a/java/org/owasp/webgoat/session/DatabaseUtilities.java b/src/main/java/org/owasp/webgoat/session/DatabaseUtilities.java similarity index 100% rename from java/org/owasp/webgoat/session/DatabaseUtilities.java rename to src/main/java/org/owasp/webgoat/session/DatabaseUtilities.java diff --git a/java/org/owasp/webgoat/session/ECSFactory.java b/src/main/java/org/owasp/webgoat/session/ECSFactory.java similarity index 100% rename from java/org/owasp/webgoat/session/ECSFactory.java rename to src/main/java/org/owasp/webgoat/session/ECSFactory.java diff --git a/java/org/owasp/webgoat/session/Employee.java b/src/main/java/org/owasp/webgoat/session/Employee.java similarity index 100% rename from java/org/owasp/webgoat/session/Employee.java rename to src/main/java/org/owasp/webgoat/session/Employee.java diff --git a/java/org/owasp/webgoat/session/EmployeeStub.java b/src/main/java/org/owasp/webgoat/session/EmployeeStub.java similarity index 100% rename from java/org/owasp/webgoat/session/EmployeeStub.java rename to src/main/java/org/owasp/webgoat/session/EmployeeStub.java diff --git a/java/org/owasp/webgoat/session/ErrorScreen.java b/src/main/java/org/owasp/webgoat/session/ErrorScreen.java similarity index 100% rename from java/org/owasp/webgoat/session/ErrorScreen.java rename to src/main/java/org/owasp/webgoat/session/ErrorScreen.java diff --git a/java/org/owasp/webgoat/session/LessonSession.java b/src/main/java/org/owasp/webgoat/session/LessonSession.java similarity index 100% rename from java/org/owasp/webgoat/session/LessonSession.java rename to src/main/java/org/owasp/webgoat/session/LessonSession.java diff --git a/java/org/owasp/webgoat/session/LessonTracker.java b/src/main/java/org/owasp/webgoat/session/LessonTracker.java similarity index 100% rename from java/org/owasp/webgoat/session/LessonTracker.java rename to src/main/java/org/owasp/webgoat/session/LessonTracker.java diff --git a/java/org/owasp/webgoat/session/Parameter.java b/src/main/java/org/owasp/webgoat/session/Parameter.java similarity index 100% rename from java/org/owasp/webgoat/session/Parameter.java rename to src/main/java/org/owasp/webgoat/session/Parameter.java diff --git a/java/org/owasp/webgoat/session/ParameterNotFoundException.java b/src/main/java/org/owasp/webgoat/session/ParameterNotFoundException.java similarity index 100% rename from java/org/owasp/webgoat/session/ParameterNotFoundException.java rename to src/main/java/org/owasp/webgoat/session/ParameterNotFoundException.java diff --git a/java/org/owasp/webgoat/session/ParameterParser.java b/src/main/java/org/owasp/webgoat/session/ParameterParser.java similarity index 100% rename from java/org/owasp/webgoat/session/ParameterParser.java rename to src/main/java/org/owasp/webgoat/session/ParameterParser.java diff --git a/java/org/owasp/webgoat/session/RandomLessonTracker.java b/src/main/java/org/owasp/webgoat/session/RandomLessonTracker.java similarity index 100% rename from java/org/owasp/webgoat/session/RandomLessonTracker.java rename to src/main/java/org/owasp/webgoat/session/RandomLessonTracker.java diff --git a/java/org/owasp/webgoat/session/Screen.java b/src/main/java/org/owasp/webgoat/session/Screen.java similarity index 100% rename from java/org/owasp/webgoat/session/Screen.java rename to src/main/java/org/owasp/webgoat/session/Screen.java diff --git a/java/org/owasp/webgoat/session/SequentialLessonTracker.java b/src/main/java/org/owasp/webgoat/session/SequentialLessonTracker.java similarity index 100% rename from java/org/owasp/webgoat/session/SequentialLessonTracker.java rename to src/main/java/org/owasp/webgoat/session/SequentialLessonTracker.java diff --git a/java/org/owasp/webgoat/session/UnauthenticatedException.java b/src/main/java/org/owasp/webgoat/session/UnauthenticatedException.java similarity index 100% rename from java/org/owasp/webgoat/session/UnauthenticatedException.java rename to src/main/java/org/owasp/webgoat/session/UnauthenticatedException.java diff --git a/java/org/owasp/webgoat/session/UnauthorizedException.java b/src/main/java/org/owasp/webgoat/session/UnauthorizedException.java similarity index 100% rename from java/org/owasp/webgoat/session/UnauthorizedException.java rename to src/main/java/org/owasp/webgoat/session/UnauthorizedException.java diff --git a/java/org/owasp/webgoat/session/UserTracker.java b/src/main/java/org/owasp/webgoat/session/UserTracker.java similarity index 100% rename from java/org/owasp/webgoat/session/UserTracker.java rename to src/main/java/org/owasp/webgoat/session/UserTracker.java diff --git a/java/org/owasp/webgoat/session/ValidationException.java b/src/main/java/org/owasp/webgoat/session/ValidationException.java similarity index 100% rename from java/org/owasp/webgoat/session/ValidationException.java rename to src/main/java/org/owasp/webgoat/session/ValidationException.java diff --git a/java/org/owasp/webgoat/session/WebSession.java b/src/main/java/org/owasp/webgoat/session/WebSession.java similarity index 100% rename from java/org/owasp/webgoat/session/WebSession.java rename to src/main/java/org/owasp/webgoat/session/WebSession.java diff --git a/java/org/owasp/webgoat/session/WebgoatContext.java b/src/main/java/org/owasp/webgoat/session/WebgoatContext.java similarity index 100% rename from java/org/owasp/webgoat/session/WebgoatContext.java rename to src/main/java/org/owasp/webgoat/session/WebgoatContext.java diff --git a/java/org/owasp/webgoat/session/WebgoatProperties.java b/src/main/java/org/owasp/webgoat/session/WebgoatProperties.java similarity index 100% rename from java/org/owasp/webgoat/session/WebgoatProperties.java rename to src/main/java/org/owasp/webgoat/session/WebgoatProperties.java diff --git a/java/org/owasp/webgoat/util/Exec.java b/src/main/java/org/owasp/webgoat/util/Exec.java similarity index 100% rename from java/org/owasp/webgoat/util/Exec.java rename to src/main/java/org/owasp/webgoat/util/Exec.java diff --git a/java/org/owasp/webgoat/util/ExecResults.java b/src/main/java/org/owasp/webgoat/util/ExecResults.java similarity index 100% rename from java/org/owasp/webgoat/util/ExecResults.java rename to src/main/java/org/owasp/webgoat/util/ExecResults.java diff --git a/java/org/owasp/webgoat/util/ExecutionException.java b/src/main/java/org/owasp/webgoat/util/ExecutionException.java similarity index 100% rename from java/org/owasp/webgoat/util/ExecutionException.java rename to src/main/java/org/owasp/webgoat/util/ExecutionException.java diff --git a/java/org/owasp/webgoat/util/HtmlEncoder.java b/src/main/java/org/owasp/webgoat/util/HtmlEncoder.java similarity index 100% rename from java/org/owasp/webgoat/util/HtmlEncoder.java rename to src/main/java/org/owasp/webgoat/util/HtmlEncoder.java diff --git a/java/org/owasp/webgoat/util/Interceptor.java b/src/main/java/org/owasp/webgoat/util/Interceptor.java similarity index 100% rename from java/org/owasp/webgoat/util/Interceptor.java rename to src/main/java/org/owasp/webgoat/util/Interceptor.java diff --git a/java/org/owasp/webgoat/util/ThreadWatcher.java b/src/main/java/org/owasp/webgoat/util/ThreadWatcher.java similarity index 100% rename from java/org/owasp/webgoat/util/ThreadWatcher.java rename to src/main/java/org/owasp/webgoat/util/ThreadWatcher.java diff --git a/java/org/owasp/webgoat/util/WebGoatI18N.java b/src/main/java/org/owasp/webgoat/util/WebGoatI18N.java similarity index 100% rename from java/org/owasp/webgoat/util/WebGoatI18N.java rename to src/main/java/org/owasp/webgoat/util/WebGoatI18N.java diff --git a/resources/New Lesson Instructions.txt b/src/main/resources/New Lesson Instructions.txt similarity index 100% rename from resources/New Lesson Instructions.txt rename to src/main/resources/New Lesson Instructions.txt diff --git a/resources/WebGoatLabels_english.properties b/src/main/resources/WebGoatLabels_english.properties similarity index 100% rename from resources/WebGoatLabels_english.properties rename to src/main/resources/WebGoatLabels_english.properties diff --git a/resources/WebGoatLabels_german.properties b/src/main/resources/WebGoatLabels_german.properties similarity index 100% rename from resources/WebGoatLabels_german.properties rename to src/main/resources/WebGoatLabels_german.properties diff --git a/resources/WebGoatLabels_russian.properties b/src/main/resources/WebGoatLabels_russian.properties similarity index 100% rename from resources/WebGoatLabels_russian.properties rename to src/main/resources/WebGoatLabels_russian.properties diff --git a/resources/log4j.properties b/src/main/resources/log4j.properties similarity index 100% rename from resources/log4j.properties rename to src/main/resources/log4j.properties diff --git a/scripts/server_80.xml b/src/main/scripts/server_80.xml similarity index 100% rename from scripts/server_80.xml rename to src/main/scripts/server_80.xml diff --git a/scripts/server_8080.xml b/src/main/scripts/server_8080.xml similarity index 100% rename from scripts/server_8080.xml rename to src/main/scripts/server_8080.xml diff --git a/webgoat for SQL Server.bat b/src/main/scripts/webgoat for SQL Server.bat similarity index 100% rename from webgoat for SQL Server.bat rename to src/main/scripts/webgoat for SQL Server.bat diff --git a/scripts/webgoat for SQL Server.bat b/src/main/scripts/webgoat for SQL Server_1.bat similarity index 100% rename from scripts/webgoat for SQL Server.bat rename to src/main/scripts/webgoat for SQL Server_1.bat diff --git a/webgoat.bat b/src/main/scripts/webgoat.bat similarity index 100% rename from webgoat.bat rename to src/main/scripts/webgoat.bat diff --git a/webgoat.sh b/src/main/scripts/webgoat.sh similarity index 100% rename from webgoat.sh rename to src/main/scripts/webgoat.sh diff --git a/scripts/webgoat.bat b/src/main/scripts/webgoat_1.bat similarity index 100% rename from scripts/webgoat.bat rename to src/main/scripts/webgoat_1.bat diff --git a/scripts/webgoat.sh b/src/main/scripts/webgoat_1.sh similarity index 100% rename from scripts/webgoat.sh rename to src/main/scripts/webgoat_1.sh diff --git a/webgoat_8080.bat b/src/main/scripts/webgoat_8080.bat similarity index 100% rename from webgoat_8080.bat rename to src/main/scripts/webgoat_8080.bat diff --git a/scripts/webgoat_8080.bat b/src/main/scripts/webgoat_8080_1.bat similarity index 100% rename from scripts/webgoat_8080.bat rename to src/main/scripts/webgoat_8080_1.bat diff --git a/scripts/webscarab.bat b/src/main/scripts/webscarab.bat similarity index 100% rename from scripts/webscarab.bat rename to src/main/scripts/webscarab.bat diff --git a/webscarab.bat b/src/main/scripts/webscarab_1.bat similarity index 100% rename from webscarab.bat rename to src/main/scripts/webscarab_1.bat diff --git a/tomcatconf/tomcat-users.xml b/src/main/tomcatconf/tomcat-users.xml similarity index 100% rename from tomcatconf/tomcat-users.xml rename to src/main/tomcatconf/tomcat-users.xml diff --git a/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from webapp/META-INF/MANIFEST.MF rename to src/main/webapp/META-INF/MANIFEST.MF diff --git a/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml similarity index 100% rename from webapp/META-INF/context.xml rename to src/main/webapp/META-INF/context.xml diff --git a/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml similarity index 100% rename from webapp/WEB-INF/mvc-dispatcher-servlet.xml rename to src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml diff --git a/webapp/WEB-INF/pages/login.jsp b/src/main/webapp/WEB-INF/pages/login.jsp similarity index 100% rename from webapp/WEB-INF/pages/login.jsp rename to src/main/webapp/WEB-INF/pages/login.jsp diff --git a/webapp/WEB-INF/pages/logout.jsp b/src/main/webapp/WEB-INF/pages/logout.jsp similarity index 100% rename from webapp/WEB-INF/pages/logout.jsp rename to src/main/webapp/WEB-INF/pages/logout.jsp diff --git a/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp similarity index 100% rename from webapp/WEB-INF/pages/main_new.jsp rename to src/main/webapp/WEB-INF/pages/main_new.jsp diff --git a/webapp/WEB-INF/pages/welcome.jsp b/src/main/webapp/WEB-INF/pages/welcome.jsp similarity index 100% rename from webapp/WEB-INF/pages/welcome.jsp rename to src/main/webapp/WEB-INF/pages/welcome.jsp diff --git a/webapp/WEB-INF/server-config.wsdd b/src/main/webapp/WEB-INF/server-config.wsdd similarity index 100% rename from webapp/WEB-INF/server-config.wsdd rename to src/main/webapp/WEB-INF/server-config.wsdd diff --git a/webapp/WEB-INF/spring-security.xml b/src/main/webapp/WEB-INF/spring-security.xml similarity index 100% rename from webapp/WEB-INF/spring-security.xml rename to src/main/webapp/WEB-INF/spring-security.xml diff --git a/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from webapp/WEB-INF/web.xml rename to src/main/webapp/WEB-INF/web.xml diff --git a/webapp/WEB-INF/webgoat-class.properties b/src/main/webapp/WEB-INF/webgoat-class.properties similarity index 100% rename from webapp/WEB-INF/webgoat-class.properties rename to src/main/webapp/WEB-INF/webgoat-class.properties diff --git a/webapp/WEB-INF/webgoat-lab.properties b/src/main/webapp/WEB-INF/webgoat-lab.properties similarity index 100% rename from webapp/WEB-INF/webgoat-lab.properties rename to src/main/webapp/WEB-INF/webgoat-lab.properties diff --git a/webapp/WEB-INF/webgoat-owasp.properties b/src/main/webapp/WEB-INF/webgoat-owasp.properties similarity index 100% rename from webapp/WEB-INF/webgoat-owasp.properties rename to src/main/webapp/WEB-INF/webgoat-owasp.properties diff --git a/webapp/WEB-INF/webgoat.properties b/src/main/webapp/WEB-INF/webgoat.properties similarity index 100% rename from webapp/WEB-INF/webgoat.properties rename to src/main/webapp/WEB-INF/webgoat.properties diff --git a/webapp/WEB-INF/webgoat_oracle.sql b/src/main/webapp/WEB-INF/webgoat_oracle.sql similarity index 100% rename from webapp/WEB-INF/webgoat_oracle.sql rename to src/main/webapp/WEB-INF/webgoat_oracle.sql diff --git a/webapp/WEB-INF/webgoat_sqlserver.sql b/src/main/webapp/WEB-INF/webgoat_sqlserver.sql similarity index 100% rename from webapp/WEB-INF/webgoat_sqlserver.sql rename to src/main/webapp/WEB-INF/webgoat_sqlserver.sql diff --git a/webapp/css/animate.css b/src/main/webapp/css/animate.css similarity index 100% rename from webapp/css/animate.css rename to src/main/webapp/css/animate.css diff --git a/webapp/css/font-awesome.min.css b/src/main/webapp/css/font-awesome.min.css similarity index 100% rename from webapp/css/font-awesome.min.css rename to src/main/webapp/css/font-awesome.min.css diff --git a/webapp/css/img/logo.png b/src/main/webapp/css/img/logo.png similarity index 100% rename from webapp/css/img/logo.png rename to src/main/webapp/css/img/logo.png diff --git a/webapp/css/img/webBg.png b/src/main/webapp/css/img/webBg.png similarity index 100% rename from webapp/css/img/webBg.png rename to src/main/webapp/css/img/webBg.png diff --git a/webapp/css/layers.css b/src/main/webapp/css/layers.css similarity index 100% rename from webapp/css/layers.css rename to src/main/webapp/css/layers.css diff --git a/webapp/css/lesson.css b/src/main/webapp/css/lesson.css similarity index 100% rename from webapp/css/lesson.css rename to src/main/webapp/css/lesson.css diff --git a/webapp/css/main.css b/src/main/webapp/css/main.css similarity index 100% rename from webapp/css/main.css rename to src/main/webapp/css/main.css diff --git a/webapp/css/menu.css b/src/main/webapp/css/menu.css similarity index 100% rename from webapp/css/menu.css rename to src/main/webapp/css/menu.css diff --git a/webapp/css/webgoat.css b/src/main/webapp/css/webgoat.css similarity index 91% rename from webapp/css/webgoat.css rename to src/main/webapp/css/webgoat.css index bed18d8ab..0aae04d38 100644 --- a/webapp/css/webgoat.css +++ b/src/main/webapp/css/webgoat.css @@ -158,7 +158,7 @@ html>body #navBar li {} #topLinks a:link{ padding: 2px 0px 2px 10px; - width: 100%;voice-family: "\"}\""; + width: 100%; voice-family:inherit; width: auto; } diff --git a/webapp/css/webgoat_challenge.css b/src/main/webapp/css/webgoat_challenge.css similarity index 100% rename from webapp/css/webgoat_challenge.css rename to src/main/webapp/css/webgoat_challenge.css diff --git a/webapp/database/database.prp b/src/main/webapp/database/database.prp similarity index 100% rename from webapp/database/database.prp rename to src/main/webapp/database/database.prp diff --git a/webapp/fonts/FontAwesome.otf b/src/main/webapp/fonts/FontAwesome.otf similarity index 100% rename from webapp/fonts/FontAwesome.otf rename to src/main/webapp/fonts/FontAwesome.otf diff --git a/webapp/fonts/fontawesome-webfont.eot b/src/main/webapp/fonts/fontawesome-webfont.eot similarity index 100% rename from webapp/fonts/fontawesome-webfont.eot rename to src/main/webapp/fonts/fontawesome-webfont.eot diff --git a/webapp/fonts/fontawesome-webfont.svg b/src/main/webapp/fonts/fontawesome-webfont.svg similarity index 100% rename from webapp/fonts/fontawesome-webfont.svg rename to src/main/webapp/fonts/fontawesome-webfont.svg diff --git a/webapp/fonts/fontawesome-webfont.ttf b/src/main/webapp/fonts/fontawesome-webfont.ttf similarity index 100% rename from webapp/fonts/fontawesome-webfont.ttf rename to src/main/webapp/fonts/fontawesome-webfont.ttf diff --git a/webapp/fonts/fontawesome-webfont.woff b/src/main/webapp/fonts/fontawesome-webfont.woff similarity index 100% rename from webapp/fonts/fontawesome-webfont.woff rename to src/main/webapp/fonts/fontawesome-webfont.woff diff --git a/webapp/images/WebGoatFinancial/banklogo.jpg b/src/main/webapp/images/WebGoatFinancial/banklogo.jpg similarity index 100% rename from webapp/images/WebGoatFinancial/banklogo.jpg rename to src/main/webapp/images/WebGoatFinancial/banklogo.jpg diff --git a/webapp/images/buttons/catStarted.jpg b/src/main/webapp/images/buttons/catStarted.jpg similarity index 100% rename from webapp/images/buttons/catStarted.jpg rename to src/main/webapp/images/buttons/catStarted.jpg diff --git a/webapp/images/buttons/cookies.jpg b/src/main/webapp/images/buttons/cookies.jpg similarity index 100% rename from webapp/images/buttons/cookies.jpg rename to src/main/webapp/images/buttons/cookies.jpg diff --git a/webapp/images/buttons/cookiesOver.jpg b/src/main/webapp/images/buttons/cookiesOver.jpg similarity index 100% rename from webapp/images/buttons/cookiesOver.jpg rename to src/main/webapp/images/buttons/cookiesOver.jpg diff --git a/webapp/images/buttons/help.jpg b/src/main/webapp/images/buttons/help.jpg similarity index 100% rename from webapp/images/buttons/help.jpg rename to src/main/webapp/images/buttons/help.jpg diff --git a/webapp/images/buttons/helpOver.jpg b/src/main/webapp/images/buttons/helpOver.jpg similarity index 100% rename from webapp/images/buttons/helpOver.jpg rename to src/main/webapp/images/buttons/helpOver.jpg diff --git a/webapp/images/buttons/hint.jpg b/src/main/webapp/images/buttons/hint.jpg similarity index 100% rename from webapp/images/buttons/hint.jpg rename to src/main/webapp/images/buttons/hint.jpg diff --git a/webapp/images/buttons/hintLeft.jpg b/src/main/webapp/images/buttons/hintLeft.jpg similarity index 100% rename from webapp/images/buttons/hintLeft.jpg rename to src/main/webapp/images/buttons/hintLeft.jpg diff --git a/webapp/images/buttons/hintLeftOver.jpg b/src/main/webapp/images/buttons/hintLeftOver.jpg similarity index 100% rename from webapp/images/buttons/hintLeftOver.jpg rename to src/main/webapp/images/buttons/hintLeftOver.jpg diff --git a/webapp/images/buttons/hintOver.jpg b/src/main/webapp/images/buttons/hintOver.jpg similarity index 100% rename from webapp/images/buttons/hintOver.jpg rename to src/main/webapp/images/buttons/hintOver.jpg diff --git a/webapp/images/buttons/hintRight.jpg b/src/main/webapp/images/buttons/hintRight.jpg similarity index 100% rename from webapp/images/buttons/hintRight.jpg rename to src/main/webapp/images/buttons/hintRight.jpg diff --git a/webapp/images/buttons/hintRightOver.jpg b/src/main/webapp/images/buttons/hintRightOver.jpg similarity index 100% rename from webapp/images/buttons/hintRightOver.jpg rename to src/main/webapp/images/buttons/hintRightOver.jpg diff --git a/webapp/images/buttons/html.jpg b/src/main/webapp/images/buttons/html.jpg similarity index 100% rename from webapp/images/buttons/html.jpg rename to src/main/webapp/images/buttons/html.jpg diff --git a/webapp/images/buttons/htmlOver.jpg b/src/main/webapp/images/buttons/htmlOver.jpg similarity index 100% rename from webapp/images/buttons/htmlOver.jpg rename to src/main/webapp/images/buttons/htmlOver.jpg diff --git a/webapp/images/buttons/java.jpg b/src/main/webapp/images/buttons/java.jpg similarity index 100% rename from webapp/images/buttons/java.jpg rename to src/main/webapp/images/buttons/java.jpg diff --git a/webapp/images/buttons/javaOver.jpg b/src/main/webapp/images/buttons/javaOver.jpg similarity index 100% rename from webapp/images/buttons/javaOver.jpg rename to src/main/webapp/images/buttons/javaOver.jpg diff --git a/webapp/images/buttons/lessonComplete.jpg b/src/main/webapp/images/buttons/lessonComplete.jpg similarity index 100% rename from webapp/images/buttons/lessonComplete.jpg rename to src/main/webapp/images/buttons/lessonComplete.jpg diff --git a/webapp/images/buttons/logout.jpg b/src/main/webapp/images/buttons/logout.jpg similarity index 100% rename from webapp/images/buttons/logout.jpg rename to src/main/webapp/images/buttons/logout.jpg diff --git a/webapp/images/buttons/logoutOver.jpg b/src/main/webapp/images/buttons/logoutOver.jpg similarity index 100% rename from webapp/images/buttons/logoutOver.jpg rename to src/main/webapp/images/buttons/logoutOver.jpg diff --git a/webapp/images/buttons/params.jpg b/src/main/webapp/images/buttons/params.jpg similarity index 100% rename from webapp/images/buttons/params.jpg rename to src/main/webapp/images/buttons/params.jpg diff --git a/webapp/images/buttons/paramsOver.jpg b/src/main/webapp/images/buttons/paramsOver.jpg similarity index 100% rename from webapp/images/buttons/paramsOver.jpg rename to src/main/webapp/images/buttons/paramsOver.jpg diff --git a/webapp/images/buttons/plans.jpg b/src/main/webapp/images/buttons/plans.jpg similarity index 100% rename from webapp/images/buttons/plans.jpg rename to src/main/webapp/images/buttons/plans.jpg diff --git a/webapp/images/buttons/plansOver.jpg b/src/main/webapp/images/buttons/plansOver.jpg similarity index 100% rename from webapp/images/buttons/plansOver.jpg rename to src/main/webapp/images/buttons/plansOver.jpg diff --git a/webapp/images/buttons/solutions.jpg b/src/main/webapp/images/buttons/solutions.jpg similarity index 100% rename from webapp/images/buttons/solutions.jpg rename to src/main/webapp/images/buttons/solutions.jpg diff --git a/webapp/images/buttons/solutionsOver.jpg b/src/main/webapp/images/buttons/solutionsOver.jpg similarity index 100% rename from webapp/images/buttons/solutionsOver.jpg rename to src/main/webapp/images/buttons/solutionsOver.jpg diff --git a/webapp/images/header/header.jpg b/src/main/webapp/images/header/header.jpg similarity index 100% rename from webapp/images/header/header.jpg rename to src/main/webapp/images/header/header.jpg diff --git a/webapp/images/header/header_ASP.jpg b/src/main/webapp/images/header/header_ASP.jpg similarity index 100% rename from webapp/images/header/header_ASP.jpg rename to src/main/webapp/images/header/header_ASP.jpg diff --git a/webapp/images/header/header_CShrp.jpg b/src/main/webapp/images/header/header_CShrp.jpg similarity index 100% rename from webapp/images/header/header_CShrp.jpg rename to src/main/webapp/images/header/header_CShrp.jpg diff --git a/webapp/images/header/header_coldFusion.jpg b/src/main/webapp/images/header/header_coldFusion.jpg similarity index 100% rename from webapp/images/header/header_coldFusion.jpg rename to src/main/webapp/images/header/header_coldFusion.jpg diff --git a/webapp/images/header/header_dotNet.jpg b/src/main/webapp/images/header/header_dotNet.jpg similarity index 100% rename from webapp/images/header/header_dotNet.jpg rename to src/main/webapp/images/header/header_dotNet.jpg diff --git a/webapp/images/icons/rightArrow.jpg b/src/main/webapp/images/icons/rightArrow.jpg similarity index 100% rename from webapp/images/icons/rightArrow.jpg rename to src/main/webapp/images/icons/rightArrow.jpg diff --git a/webapp/images/introduction/HowToUse_1.jpg b/src/main/webapp/images/introduction/HowToUse_1.jpg similarity index 100% rename from webapp/images/introduction/HowToUse_1.jpg rename to src/main/webapp/images/introduction/HowToUse_1.jpg diff --git a/webapp/images/introduction/HowToUse_2.jpg b/src/main/webapp/images/introduction/HowToUse_2.jpg similarity index 100% rename from webapp/images/introduction/HowToUse_2.jpg rename to src/main/webapp/images/introduction/HowToUse_2.jpg diff --git a/webapp/images/introduction/HowToUse_3.jpg b/src/main/webapp/images/introduction/HowToUse_3.jpg similarity index 100% rename from webapp/images/introduction/HowToUse_3.jpg rename to src/main/webapp/images/introduction/HowToUse_3.jpg diff --git a/webapp/images/introduction/firebug.jpg b/src/main/webapp/images/introduction/firebug.jpg similarity index 100% rename from webapp/images/introduction/firebug.jpg rename to src/main/webapp/images/introduction/firebug.jpg diff --git a/webapp/images/introduction/iewatch.jpg b/src/main/webapp/images/introduction/iewatch.jpg similarity index 100% rename from webapp/images/introduction/iewatch.jpg rename to src/main/webapp/images/introduction/iewatch.jpg diff --git a/webapp/images/introduction/interface.jpg b/src/main/webapp/images/introduction/interface.jpg similarity index 100% rename from webapp/images/introduction/interface.jpg rename to src/main/webapp/images/introduction/interface.jpg diff --git a/webapp/images/introduction/webscarab.jpg b/src/main/webapp/images/introduction/webscarab.jpg similarity index 100% rename from webapp/images/introduction/webscarab.jpg rename to src/main/webapp/images/introduction/webscarab.jpg diff --git a/webapp/images/introduction/wireshark.png b/src/main/webapp/images/introduction/wireshark.png similarity index 100% rename from webapp/images/introduction/wireshark.png rename to src/main/webapp/images/introduction/wireshark.png diff --git a/webapp/images/logo.png b/src/main/webapp/images/logo.png similarity index 100% rename from webapp/images/logo.png rename to src/main/webapp/images/logo.png diff --git a/webapp/images/logos/Thumbs.db b/src/main/webapp/images/logos/Thumbs.db similarity index 100% rename from webapp/images/logos/Thumbs.db rename to src/main/webapp/images/logos/Thumbs.db diff --git a/webapp/images/logos/aspect.jpg b/src/main/webapp/images/logos/aspect.jpg similarity index 100% rename from webapp/images/logos/aspect.jpg rename to src/main/webapp/images/logos/aspect.jpg diff --git a/webapp/images/logos/macadamian.gif b/src/main/webapp/images/logos/macadamian.gif similarity index 100% rename from webapp/images/logos/macadamian.gif rename to src/main/webapp/images/logos/macadamian.gif diff --git a/webapp/images/logos/mandiant.png b/src/main/webapp/images/logos/mandiant.png similarity index 100% rename from webapp/images/logos/mandiant.png rename to src/main/webapp/images/logos/mandiant.png diff --git a/webapp/images/logos/ounce.jpg b/src/main/webapp/images/logos/ounce.jpg similarity index 100% rename from webapp/images/logos/ounce.jpg rename to src/main/webapp/images/logos/ounce.jpg diff --git a/webapp/images/logos/owasp.jpg b/src/main/webapp/images/logos/owasp.jpg similarity index 100% rename from webapp/images/logos/owasp.jpg rename to src/main/webapp/images/logos/owasp.jpg diff --git a/webapp/images/logos/parasoft.jpg b/src/main/webapp/images/logos/parasoft.jpg similarity index 100% rename from webapp/images/logos/parasoft.jpg rename to src/main/webapp/images/logos/parasoft.jpg diff --git a/webapp/images/logos/seleucus.png b/src/main/webapp/images/logos/seleucus.png similarity index 100% rename from webapp/images/logos/seleucus.png rename to src/main/webapp/images/logos/seleucus.png diff --git a/webapp/images/logos/softwaresecured.gif b/src/main/webapp/images/logos/softwaresecured.gif similarity index 100% rename from webapp/images/logos/softwaresecured.gif rename to src/main/webapp/images/logos/softwaresecured.gif diff --git a/webapp/images/logos/zionsecurity.gif b/src/main/webapp/images/logos/zionsecurity.gif similarity index 100% rename from webapp/images/logos/zionsecurity.gif rename to src/main/webapp/images/logos/zionsecurity.gif diff --git a/webapp/images/menu_images/1x1.gif b/src/main/webapp/images/menu_images/1x1.gif similarity index 100% rename from webapp/images/menu_images/1x1.gif rename to src/main/webapp/images/menu_images/1x1.gif diff --git a/webapp/images/webBg.png b/src/main/webapp/images/webBg.png similarity index 100% rename from webapp/images/webBg.png rename to src/main/webapp/images/webBg.png diff --git a/webapp/js/DOMXSS_backup.js b/src/main/webapp/js/DOMXSS_backup.js similarity index 100% rename from webapp/js/DOMXSS_backup.js rename to src/main/webapp/js/DOMXSS_backup.js diff --git a/webapp/js/angular/angular-animate.min.js b/src/main/webapp/js/angular/angular-animate.min.js similarity index 100% rename from webapp/js/angular/angular-animate.min.js rename to src/main/webapp/js/angular/angular-animate.min.js diff --git a/webapp/js/angular/angular-animate.min.js.map b/src/main/webapp/js/angular/angular-animate.min.js.map similarity index 100% rename from webapp/js/angular/angular-animate.min.js.map rename to src/main/webapp/js/angular/angular-animate.min.js.map diff --git a/webapp/js/angular/angular.js b/src/main/webapp/js/angular/angular.js similarity index 100% rename from webapp/js/angular/angular.js rename to src/main/webapp/js/angular/angular.js diff --git a/webapp/js/angular/angular.min.js b/src/main/webapp/js/angular/angular.min.js similarity index 100% rename from webapp/js/angular/angular.min.js rename to src/main/webapp/js/angular/angular.min.js diff --git a/webapp/js/application.js b/src/main/webapp/js/application.js similarity index 100% rename from webapp/js/application.js rename to src/main/webapp/js/application.js diff --git a/webapp/js/deprecated/javascript.js b/src/main/webapp/js/deprecated/javascript.js similarity index 100% rename from webapp/js/deprecated/javascript.js rename to src/main/webapp/js/deprecated/javascript.js diff --git a/webapp/js/deprecated/menu_system.js b/src/main/webapp/js/deprecated/menu_system.js similarity index 100% rename from webapp/js/deprecated/menu_system.js rename to src/main/webapp/js/deprecated/menu_system.js diff --git a/webapp/js/goat.js b/src/main/webapp/js/goat.js similarity index 100% rename from webapp/js/goat.js rename to src/main/webapp/js/goat.js diff --git a/webapp/js/goatConstants.js b/src/main/webapp/js/goatConstants.js similarity index 100% rename from webapp/js/goatConstants.js rename to src/main/webapp/js/goatConstants.js diff --git a/webapp/js/html5shiv.js b/src/main/webapp/js/html5shiv.js similarity index 100% rename from webapp/js/html5shiv.js rename to src/main/webapp/js/html5shiv.js diff --git a/webapp/js/instructor/DOMXSS_i.js b/src/main/webapp/js/instructor/DOMXSS_i.js similarity index 100% rename from webapp/js/instructor/DOMXSS_i.js rename to src/main/webapp/js/instructor/DOMXSS_i.js diff --git a/webapp/js/jquery/jquery-1.10.2.min.js b/src/main/webapp/js/jquery/jquery-1.10.2.min.js similarity index 100% rename from webapp/js/jquery/jquery-1.10.2.min.js rename to src/main/webapp/js/jquery/jquery-1.10.2.min.js diff --git a/webapp/js/lessonNav.js b/src/main/webapp/js/lessonNav.js similarity index 100% rename from webapp/js/lessonNav.js rename to src/main/webapp/js/lessonNav.js diff --git a/webapp/js/makeWindow.js b/src/main/webapp/js/makeWindow.js similarity index 100% rename from webapp/js/makeWindow.js rename to src/main/webapp/js/makeWindow.js diff --git a/webapp/js/modernizr-2.6.2.min.js b/src/main/webapp/js/modernizr-2.6.2.min.js similarity index 100% rename from webapp/js/modernizr-2.6.2.min.js rename to src/main/webapp/js/modernizr-2.6.2.min.js diff --git a/webapp/js/respond.min.js b/src/main/webapp/js/respond.min.js similarity index 100% rename from webapp/js/respond.min.js rename to src/main/webapp/js/respond.min.js diff --git a/webapp/js/toggle.js b/src/main/webapp/js/toggle.js similarity index 100% rename from webapp/js/toggle.js rename to src/main/webapp/js/toggle.js diff --git a/webapp/lessonJS/DOMXSS.js b/src/main/webapp/lessonJS/DOMXSS.js similarity index 100% rename from webapp/lessonJS/DOMXSS.js rename to src/main/webapp/lessonJS/DOMXSS.js diff --git a/webapp/lessonJS/clientSideFiltering.js b/src/main/webapp/lessonJS/clientSideFiltering.js similarity index 100% rename from webapp/lessonJS/clientSideFiltering.js rename to src/main/webapp/lessonJS/clientSideFiltering.js diff --git a/webapp/lessonJS/clientSideValidation.js b/src/main/webapp/lessonJS/clientSideValidation.js similarity index 100% rename from webapp/lessonJS/clientSideValidation.js rename to src/main/webapp/lessonJS/clientSideValidation.js diff --git a/webapp/lessonJS/escape.js b/src/main/webapp/lessonJS/escape.js similarity index 100% rename from webapp/lessonJS/escape.js rename to src/main/webapp/lessonJS/escape.js diff --git a/webapp/lessonJS/eval.js b/src/main/webapp/lessonJS/eval.js similarity index 100% rename from webapp/lessonJS/eval.js rename to src/main/webapp/lessonJS/eval.js diff --git a/webapp/lessonJS/sameOrigin.js b/src/main/webapp/lessonJS/sameOrigin.js similarity index 100% rename from webapp/lessonJS/sameOrigin.js rename to src/main/webapp/lessonJS/sameOrigin.js diff --git a/webapp/lesson_content.jsp b/src/main/webapp/lesson_content.jsp similarity index 100% rename from webapp/lesson_content.jsp rename to src/main/webapp/lesson_content.jsp diff --git a/webapp/lesson_plans/English/AccessControlMatrix.html b/src/main/webapp/lesson_plans/English/AccessControlMatrix.html similarity index 100% rename from webapp/lesson_plans/English/AccessControlMatrix.html rename to src/main/webapp/lesson_plans/English/AccessControlMatrix.html diff --git a/webapp/lesson_plans/English/BackDoors.html b/src/main/webapp/lesson_plans/English/BackDoors.html similarity index 100% rename from webapp/lesson_plans/English/BackDoors.html rename to src/main/webapp/lesson_plans/English/BackDoors.html diff --git a/webapp/lesson_plans/English/BasicAuthentication.html b/src/main/webapp/lesson_plans/English/BasicAuthentication.html similarity index 100% rename from webapp/lesson_plans/English/BasicAuthentication.html rename to src/main/webapp/lesson_plans/English/BasicAuthentication.html diff --git a/webapp/lesson_plans/English/BlindSqlInjection.html b/src/main/webapp/lesson_plans/English/BlindSqlInjection.html similarity index 100% rename from webapp/lesson_plans/English/BlindSqlInjection.html rename to src/main/webapp/lesson_plans/English/BlindSqlInjection.html diff --git a/webapp/lesson_plans/English/CSRF.html b/src/main/webapp/lesson_plans/English/CSRF.html similarity index 100% rename from webapp/lesson_plans/English/CSRF.html rename to src/main/webapp/lesson_plans/English/CSRF.html diff --git a/webapp/lesson_plans/English/ChallengeScreen.html b/src/main/webapp/lesson_plans/English/ChallengeScreen.html similarity index 100% rename from webapp/lesson_plans/English/ChallengeScreen.html rename to src/main/webapp/lesson_plans/English/ChallengeScreen.html diff --git a/webapp/lesson_plans/English/ClientSideFiltering.html b/src/main/webapp/lesson_plans/English/ClientSideFiltering.html similarity index 100% rename from webapp/lesson_plans/English/ClientSideFiltering.html rename to src/main/webapp/lesson_plans/English/ClientSideFiltering.html diff --git a/webapp/lesson_plans/English/ClientSideValidation.html b/src/main/webapp/lesson_plans/English/ClientSideValidation.html similarity index 100% rename from webapp/lesson_plans/English/ClientSideValidation.html rename to src/main/webapp/lesson_plans/English/ClientSideValidation.html diff --git a/webapp/lesson_plans/English/CommandInjection.html b/src/main/webapp/lesson_plans/English/CommandInjection.html similarity index 100% rename from webapp/lesson_plans/English/CommandInjection.html rename to src/main/webapp/lesson_plans/English/CommandInjection.html diff --git a/webapp/lesson_plans/English/ConcurrencyCart.html b/src/main/webapp/lesson_plans/English/ConcurrencyCart.html similarity index 100% rename from webapp/lesson_plans/English/ConcurrencyCart.html rename to src/main/webapp/lesson_plans/English/ConcurrencyCart.html diff --git a/webapp/lesson_plans/English/CrossSiteScripting.html b/src/main/webapp/lesson_plans/English/CrossSiteScripting.html similarity index 100% rename from webapp/lesson_plans/English/CrossSiteScripting.html rename to src/main/webapp/lesson_plans/English/CrossSiteScripting.html diff --git a/webapp/lesson_plans/English/CsrfPromptByPass.html b/src/main/webapp/lesson_plans/English/CsrfPromptByPass.html similarity index 100% rename from webapp/lesson_plans/English/CsrfPromptByPass.html rename to src/main/webapp/lesson_plans/English/CsrfPromptByPass.html diff --git a/webapp/lesson_plans/English/CsrfTokenByPass.html b/src/main/webapp/lesson_plans/English/CsrfTokenByPass.html similarity index 100% rename from webapp/lesson_plans/English/CsrfTokenByPass.html rename to src/main/webapp/lesson_plans/English/CsrfTokenByPass.html diff --git a/webapp/lesson_plans/English/DBCrossSiteScripting.html b/src/main/webapp/lesson_plans/English/DBCrossSiteScripting.html similarity index 100% rename from webapp/lesson_plans/English/DBCrossSiteScripting.html rename to src/main/webapp/lesson_plans/English/DBCrossSiteScripting.html diff --git a/webapp/lesson_plans/English/DBSQLInjection.html b/src/main/webapp/lesson_plans/English/DBSQLInjection.html similarity index 100% rename from webapp/lesson_plans/English/DBSQLInjection.html rename to src/main/webapp/lesson_plans/English/DBSQLInjection.html diff --git a/webapp/lesson_plans/English/DOMInjection.html b/src/main/webapp/lesson_plans/English/DOMInjection.html similarity index 100% rename from webapp/lesson_plans/English/DOMInjection.html rename to src/main/webapp/lesson_plans/English/DOMInjection.html diff --git a/webapp/lesson_plans/English/DOMXSS.html b/src/main/webapp/lesson_plans/English/DOMXSS.html similarity index 100% rename from webapp/lesson_plans/English/DOMXSS.html rename to src/main/webapp/lesson_plans/English/DOMXSS.html diff --git a/webapp/lesson_plans/English/DOS_Login.html b/src/main/webapp/lesson_plans/English/DOS_Login.html similarity index 100% rename from webapp/lesson_plans/English/DOS_Login.html rename to src/main/webapp/lesson_plans/English/DOS_Login.html diff --git a/webapp/lesson_plans/English/DangerousEval.html b/src/main/webapp/lesson_plans/English/DangerousEval.html similarity index 100% rename from webapp/lesson_plans/English/DangerousEval.html rename to src/main/webapp/lesson_plans/English/DangerousEval.html diff --git a/webapp/lesson_plans/English/Encoding.html b/src/main/webapp/lesson_plans/English/Encoding.html similarity index 100% rename from webapp/lesson_plans/English/Encoding.html rename to src/main/webapp/lesson_plans/English/Encoding.html diff --git a/webapp/lesson_plans/English/FailOpenAuthentication.html b/src/main/webapp/lesson_plans/English/FailOpenAuthentication.html similarity index 100% rename from webapp/lesson_plans/English/FailOpenAuthentication.html rename to src/main/webapp/lesson_plans/English/FailOpenAuthentication.html diff --git a/webapp/lesson_plans/English/ForcedBrowsing.html b/src/main/webapp/lesson_plans/English/ForcedBrowsing.html similarity index 100% rename from webapp/lesson_plans/English/ForcedBrowsing.html rename to src/main/webapp/lesson_plans/English/ForcedBrowsing.html diff --git a/webapp/lesson_plans/English/ForgotPassword.html b/src/main/webapp/lesson_plans/English/ForgotPassword.html similarity index 100% rename from webapp/lesson_plans/English/ForgotPassword.html rename to src/main/webapp/lesson_plans/English/ForgotPassword.html diff --git a/webapp/lesson_plans/English/HiddenFieldTampering.html b/src/main/webapp/lesson_plans/English/HiddenFieldTampering.html similarity index 100% rename from webapp/lesson_plans/English/HiddenFieldTampering.html rename to src/main/webapp/lesson_plans/English/HiddenFieldTampering.html diff --git a/webapp/lesson_plans/English/HowToWork.html b/src/main/webapp/lesson_plans/English/HowToWork.html similarity index 100% rename from webapp/lesson_plans/English/HowToWork.html rename to src/main/webapp/lesson_plans/English/HowToWork.html diff --git a/webapp/lesson_plans/English/HtmlClues.html b/src/main/webapp/lesson_plans/English/HtmlClues.html similarity index 100% rename from webapp/lesson_plans/English/HtmlClues.html rename to src/main/webapp/lesson_plans/English/HtmlClues.html diff --git a/webapp/lesson_plans/English/HttpBasics.html b/src/main/webapp/lesson_plans/English/HttpBasics.html similarity index 100% rename from webapp/lesson_plans/English/HttpBasics.html rename to src/main/webapp/lesson_plans/English/HttpBasics.html diff --git a/webapp/lesson_plans/English/HttpOnly.html b/src/main/webapp/lesson_plans/English/HttpOnly.html similarity index 100% rename from webapp/lesson_plans/English/HttpOnly.html rename to src/main/webapp/lesson_plans/English/HttpOnly.html diff --git a/webapp/lesson_plans/English/HttpSplitting.html b/src/main/webapp/lesson_plans/English/HttpSplitting.html similarity index 100% rename from webapp/lesson_plans/English/HttpSplitting.html rename to src/main/webapp/lesson_plans/English/HttpSplitting.html diff --git a/webapp/lesson_plans/English/InsecureLogin.html b/src/main/webapp/lesson_plans/English/InsecureLogin.html similarity index 100% rename from webapp/lesson_plans/English/InsecureLogin.html rename to src/main/webapp/lesson_plans/English/InsecureLogin.html diff --git a/webapp/lesson_plans/English/JSONInjection.html b/src/main/webapp/lesson_plans/English/JSONInjection.html similarity index 100% rename from webapp/lesson_plans/English/JSONInjection.html rename to src/main/webapp/lesson_plans/English/JSONInjection.html diff --git a/webapp/lesson_plans/English/JavaScriptValidation.html b/src/main/webapp/lesson_plans/English/JavaScriptValidation.html similarity index 100% rename from webapp/lesson_plans/English/JavaScriptValidation.html rename to src/main/webapp/lesson_plans/English/JavaScriptValidation.html diff --git a/webapp/lesson_plans/English/Lesson_Plan_Template.html b/src/main/webapp/lesson_plans/English/Lesson_Plan_Template.html similarity index 100% rename from webapp/lesson_plans/English/Lesson_Plan_Template.html rename to src/main/webapp/lesson_plans/English/Lesson_Plan_Template.html diff --git a/webapp/lesson_plans/English/LogSpoofing.html b/src/main/webapp/lesson_plans/English/LogSpoofing.html similarity index 100% rename from webapp/lesson_plans/English/LogSpoofing.html rename to src/main/webapp/lesson_plans/English/LogSpoofing.html diff --git a/webapp/lesson_plans/English/MultiLevelLogin1.html b/src/main/webapp/lesson_plans/English/MultiLevelLogin1.html similarity index 100% rename from webapp/lesson_plans/English/MultiLevelLogin1.html rename to src/main/webapp/lesson_plans/English/MultiLevelLogin1.html diff --git a/webapp/lesson_plans/English/MultiLevelLogin2.html b/src/main/webapp/lesson_plans/English/MultiLevelLogin2.html similarity index 100% rename from webapp/lesson_plans/English/MultiLevelLogin2.html rename to src/main/webapp/lesson_plans/English/MultiLevelLogin2.html diff --git a/webapp/lesson_plans/English/NewLesson.html b/src/main/webapp/lesson_plans/English/NewLesson.html similarity index 100% rename from webapp/lesson_plans/English/NewLesson.html rename to src/main/webapp/lesson_plans/English/NewLesson.html diff --git a/webapp/lesson_plans/English/OffByOne.html b/src/main/webapp/lesson_plans/English/OffByOne.html similarity index 100% rename from webapp/lesson_plans/English/OffByOne.html rename to src/main/webapp/lesson_plans/English/OffByOne.html diff --git a/webapp/lesson_plans/English/PasswordStrength.html b/src/main/webapp/lesson_plans/English/PasswordStrength.html similarity index 100% rename from webapp/lesson_plans/English/PasswordStrength.html rename to src/main/webapp/lesson_plans/English/PasswordStrength.html diff --git a/webapp/lesson_plans/English/PathBasedAccessControl.html b/src/main/webapp/lesson_plans/English/PathBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/English/PathBasedAccessControl.html rename to src/main/webapp/lesson_plans/English/PathBasedAccessControl.html diff --git a/webapp/lesson_plans/English/Phishing.html b/src/main/webapp/lesson_plans/English/Phishing.html similarity index 100% rename from webapp/lesson_plans/English/Phishing.html rename to src/main/webapp/lesson_plans/English/Phishing.html diff --git a/webapp/lesson_plans/English/ReflectedXSS.html b/src/main/webapp/lesson_plans/English/ReflectedXSS.html similarity index 100% rename from webapp/lesson_plans/English/ReflectedXSS.html rename to src/main/webapp/lesson_plans/English/ReflectedXSS.html diff --git a/webapp/lesson_plans/English/RemoteAdminFlaw.html b/src/main/webapp/lesson_plans/English/RemoteAdminFlaw.html similarity index 100% rename from webapp/lesson_plans/English/RemoteAdminFlaw.html rename to src/main/webapp/lesson_plans/English/RemoteAdminFlaw.html diff --git a/webapp/lesson_plans/English/RoleBasedAccessControl.html b/src/main/webapp/lesson_plans/English/RoleBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/English/RoleBasedAccessControl.html rename to src/main/webapp/lesson_plans/English/RoleBasedAccessControl.html diff --git a/webapp/lesson_plans/English/SQLInjection.html b/src/main/webapp/lesson_plans/English/SQLInjection.html similarity index 100% rename from webapp/lesson_plans/English/SQLInjection.html rename to src/main/webapp/lesson_plans/English/SQLInjection.html diff --git a/webapp/lesson_plans/English/SameOriginPolicyProtection.html b/src/main/webapp/lesson_plans/English/SameOriginPolicyProtection.html similarity index 100% rename from webapp/lesson_plans/English/SameOriginPolicyProtection.html rename to src/main/webapp/lesson_plans/English/SameOriginPolicyProtection.html diff --git a/webapp/lesson_plans/English/SessionFixation.html b/src/main/webapp/lesson_plans/English/SessionFixation.html similarity index 100% rename from webapp/lesson_plans/English/SessionFixation.html rename to src/main/webapp/lesson_plans/English/SessionFixation.html diff --git a/webapp/lesson_plans/English/SilentTransactions.html b/src/main/webapp/lesson_plans/English/SilentTransactions.html similarity index 100% rename from webapp/lesson_plans/English/SilentTransactions.html rename to src/main/webapp/lesson_plans/English/SilentTransactions.html diff --git a/webapp/lesson_plans/English/SoapRequest.html b/src/main/webapp/lesson_plans/English/SoapRequest.html similarity index 100% rename from webapp/lesson_plans/English/SoapRequest.html rename to src/main/webapp/lesson_plans/English/SoapRequest.html diff --git a/webapp/lesson_plans/English/SqlNumericInjection.html b/src/main/webapp/lesson_plans/English/SqlNumericInjection.html similarity index 100% rename from webapp/lesson_plans/English/SqlNumericInjection.html rename to src/main/webapp/lesson_plans/English/SqlNumericInjection.html diff --git a/webapp/lesson_plans/English/SqlStringInjection.html b/src/main/webapp/lesson_plans/English/SqlStringInjection.html similarity index 100% rename from webapp/lesson_plans/English/SqlStringInjection.html rename to src/main/webapp/lesson_plans/English/SqlStringInjection.html diff --git a/webapp/lesson_plans/English/StoredXss.html b/src/main/webapp/lesson_plans/English/StoredXss.html similarity index 100% rename from webapp/lesson_plans/English/StoredXss.html rename to src/main/webapp/lesson_plans/English/StoredXss.html diff --git a/webapp/lesson_plans/English/ThreadSafetyProblem.html b/src/main/webapp/lesson_plans/English/ThreadSafetyProblem.html similarity index 100% rename from webapp/lesson_plans/English/ThreadSafetyProblem.html rename to src/main/webapp/lesson_plans/English/ThreadSafetyProblem.html diff --git a/webapp/lesson_plans/English/TomcatSetup.html b/src/main/webapp/lesson_plans/English/TomcatSetup.html similarity index 100% rename from webapp/lesson_plans/English/TomcatSetup.html rename to src/main/webapp/lesson_plans/English/TomcatSetup.html diff --git a/webapp/lesson_plans/English/TraceXSS.html b/src/main/webapp/lesson_plans/English/TraceXSS.html similarity index 100% rename from webapp/lesson_plans/English/TraceXSS.html rename to src/main/webapp/lesson_plans/English/TraceXSS.html diff --git a/webapp/lesson_plans/English/UncheckedEmail.html b/src/main/webapp/lesson_plans/English/UncheckedEmail.html similarity index 100% rename from webapp/lesson_plans/English/UncheckedEmail.html rename to src/main/webapp/lesson_plans/English/UncheckedEmail.html diff --git a/webapp/lesson_plans/English/UsefulTools.html b/src/main/webapp/lesson_plans/English/UsefulTools.html similarity index 100% rename from webapp/lesson_plans/English/UsefulTools.html rename to src/main/webapp/lesson_plans/English/UsefulTools.html diff --git a/webapp/lesson_plans/English/WSDLScanning.html b/src/main/webapp/lesson_plans/English/WSDLScanning.html similarity index 100% rename from webapp/lesson_plans/English/WSDLScanning.html rename to src/main/webapp/lesson_plans/English/WSDLScanning.html diff --git a/webapp/lesson_plans/English/WeakAuthenticationCookie.html b/src/main/webapp/lesson_plans/English/WeakAuthenticationCookie.html similarity index 100% rename from webapp/lesson_plans/English/WeakAuthenticationCookie.html rename to src/main/webapp/lesson_plans/English/WeakAuthenticationCookie.html diff --git a/webapp/lesson_plans/English/WeakSessionID.html b/src/main/webapp/lesson_plans/English/WeakSessionID.html similarity index 100% rename from webapp/lesson_plans/English/WeakSessionID.html rename to src/main/webapp/lesson_plans/English/WeakSessionID.html diff --git a/webapp/lesson_plans/English/WelcomeScreeen.html b/src/main/webapp/lesson_plans/English/WelcomeScreeen.html similarity index 100% rename from webapp/lesson_plans/English/WelcomeScreeen.html rename to src/main/webapp/lesson_plans/English/WelcomeScreeen.html diff --git a/webapp/lesson_plans/English/WsSAXInjection.html b/src/main/webapp/lesson_plans/English/WsSAXInjection.html similarity index 100% rename from webapp/lesson_plans/English/WsSAXInjection.html rename to src/main/webapp/lesson_plans/English/WsSAXInjection.html diff --git a/webapp/lesson_plans/English/WsSqlInjection.html b/src/main/webapp/lesson_plans/English/WsSqlInjection.html similarity index 100% rename from webapp/lesson_plans/English/WsSqlInjection.html rename to src/main/webapp/lesson_plans/English/WsSqlInjection.html diff --git a/webapp/lesson_plans/English/XMLInjection.html b/src/main/webapp/lesson_plans/English/XMLInjection.html similarity index 100% rename from webapp/lesson_plans/English/XMLInjection.html rename to src/main/webapp/lesson_plans/English/XMLInjection.html diff --git a/webapp/lesson_plans/English/XPATHInjection.html b/src/main/webapp/lesson_plans/English/XPATHInjection.html similarity index 100% rename from webapp/lesson_plans/English/XPATHInjection.html rename to src/main/webapp/lesson_plans/English/XPATHInjection.html diff --git a/webapp/lesson_plans/German/BasicAuthentication.html b/src/main/webapp/lesson_plans/German/BasicAuthentication.html similarity index 100% rename from webapp/lesson_plans/German/BasicAuthentication.html rename to src/main/webapp/lesson_plans/German/BasicAuthentication.html diff --git a/webapp/lesson_plans/German/CommandInjection.html b/src/main/webapp/lesson_plans/German/CommandInjection.html similarity index 100% rename from webapp/lesson_plans/German/CommandInjection.html rename to src/main/webapp/lesson_plans/German/CommandInjection.html diff --git a/webapp/lesson_plans/German/HiddenFieldTampering.html b/src/main/webapp/lesson_plans/German/HiddenFieldTampering.html similarity index 100% rename from webapp/lesson_plans/German/HiddenFieldTampering.html rename to src/main/webapp/lesson_plans/German/HiddenFieldTampering.html diff --git a/webapp/lesson_plans/German/HtmlClues.html b/src/main/webapp/lesson_plans/German/HtmlClues.html similarity index 100% rename from webapp/lesson_plans/German/HtmlClues.html rename to src/main/webapp/lesson_plans/German/HtmlClues.html diff --git a/webapp/lesson_plans/German/HttpBasics.html b/src/main/webapp/lesson_plans/German/HttpBasics.html similarity index 100% rename from webapp/lesson_plans/German/HttpBasics.html rename to src/main/webapp/lesson_plans/German/HttpBasics.html diff --git a/webapp/lesson_plans/German/JavaScriptValidation.html b/src/main/webapp/lesson_plans/German/JavaScriptValidation.html similarity index 100% rename from webapp/lesson_plans/German/JavaScriptValidation.html rename to src/main/webapp/lesson_plans/German/JavaScriptValidation.html diff --git a/webapp/lesson_plans/German/LogSpoofing.html b/src/main/webapp/lesson_plans/German/LogSpoofing.html similarity index 100% rename from webapp/lesson_plans/German/LogSpoofing.html rename to src/main/webapp/lesson_plans/German/LogSpoofing.html diff --git a/webapp/lesson_plans/German/PathBasedAccessControl.html b/src/main/webapp/lesson_plans/German/PathBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/German/PathBasedAccessControl.html rename to src/main/webapp/lesson_plans/German/PathBasedAccessControl.html diff --git a/webapp/lesson_plans/German/ReflectedXSS.html b/src/main/webapp/lesson_plans/German/ReflectedXSS.html similarity index 100% rename from webapp/lesson_plans/German/ReflectedXSS.html rename to src/main/webapp/lesson_plans/German/ReflectedXSS.html diff --git a/webapp/lesson_plans/German/RemoteAdminFlaw.html b/src/main/webapp/lesson_plans/German/RemoteAdminFlaw.html similarity index 100% rename from webapp/lesson_plans/German/RemoteAdminFlaw.html rename to src/main/webapp/lesson_plans/German/RemoteAdminFlaw.html diff --git a/webapp/lesson_plans/German/SqlNumericInjection.html b/src/main/webapp/lesson_plans/German/SqlNumericInjection.html similarity index 100% rename from webapp/lesson_plans/German/SqlNumericInjection.html rename to src/main/webapp/lesson_plans/German/SqlNumericInjection.html diff --git a/webapp/lesson_plans/German/SqlStringInjection.html b/src/main/webapp/lesson_plans/German/SqlStringInjection.html similarity index 100% rename from webapp/lesson_plans/German/SqlStringInjection.html rename to src/main/webapp/lesson_plans/German/SqlStringInjection.html diff --git a/webapp/lesson_plans/German/StoredXss.html b/src/main/webapp/lesson_plans/German/StoredXss.html similarity index 100% rename from webapp/lesson_plans/German/StoredXss.html rename to src/main/webapp/lesson_plans/German/StoredXss.html diff --git a/webapp/lesson_plans/German/WeakAuthenticationCookie.html b/src/main/webapp/lesson_plans/German/WeakAuthenticationCookie.html similarity index 100% rename from webapp/lesson_plans/German/WeakAuthenticationCookie.html rename to src/main/webapp/lesson_plans/German/WeakAuthenticationCookie.html diff --git a/webapp/lesson_plans/de/BasicAuthentication.html b/src/main/webapp/lesson_plans/de/BasicAuthentication.html similarity index 100% rename from webapp/lesson_plans/de/BasicAuthentication.html rename to src/main/webapp/lesson_plans/de/BasicAuthentication.html diff --git a/webapp/lesson_plans/de/CommandInjection.html b/src/main/webapp/lesson_plans/de/CommandInjection.html similarity index 100% rename from webapp/lesson_plans/de/CommandInjection.html rename to src/main/webapp/lesson_plans/de/CommandInjection.html diff --git a/webapp/lesson_plans/de/HiddenFieldTampering.html b/src/main/webapp/lesson_plans/de/HiddenFieldTampering.html similarity index 100% rename from webapp/lesson_plans/de/HiddenFieldTampering.html rename to src/main/webapp/lesson_plans/de/HiddenFieldTampering.html diff --git a/webapp/lesson_plans/de/HtmlClues.html b/src/main/webapp/lesson_plans/de/HtmlClues.html similarity index 100% rename from webapp/lesson_plans/de/HtmlClues.html rename to src/main/webapp/lesson_plans/de/HtmlClues.html diff --git a/webapp/lesson_plans/de/HttpBasics.html b/src/main/webapp/lesson_plans/de/HttpBasics.html similarity index 100% rename from webapp/lesson_plans/de/HttpBasics.html rename to src/main/webapp/lesson_plans/de/HttpBasics.html diff --git a/webapp/lesson_plans/de/JavaScriptValidation.html b/src/main/webapp/lesson_plans/de/JavaScriptValidation.html similarity index 100% rename from webapp/lesson_plans/de/JavaScriptValidation.html rename to src/main/webapp/lesson_plans/de/JavaScriptValidation.html diff --git a/webapp/lesson_plans/de/LogSpoofing.html b/src/main/webapp/lesson_plans/de/LogSpoofing.html similarity index 100% rename from webapp/lesson_plans/de/LogSpoofing.html rename to src/main/webapp/lesson_plans/de/LogSpoofing.html diff --git a/webapp/lesson_plans/de/PathBasedAccessControl.html b/src/main/webapp/lesson_plans/de/PathBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/de/PathBasedAccessControl.html rename to src/main/webapp/lesson_plans/de/PathBasedAccessControl.html diff --git a/webapp/lesson_plans/de/ReflectedXSS.html b/src/main/webapp/lesson_plans/de/ReflectedXSS.html similarity index 100% rename from webapp/lesson_plans/de/ReflectedXSS.html rename to src/main/webapp/lesson_plans/de/ReflectedXSS.html diff --git a/webapp/lesson_plans/de/RemoteAdminFlaw.html b/src/main/webapp/lesson_plans/de/RemoteAdminFlaw.html similarity index 100% rename from webapp/lesson_plans/de/RemoteAdminFlaw.html rename to src/main/webapp/lesson_plans/de/RemoteAdminFlaw.html diff --git a/webapp/lesson_plans/de/SqlNumericInjection.html b/src/main/webapp/lesson_plans/de/SqlNumericInjection.html similarity index 100% rename from webapp/lesson_plans/de/SqlNumericInjection.html rename to src/main/webapp/lesson_plans/de/SqlNumericInjection.html diff --git a/webapp/lesson_plans/de/SqlStringInjection.html b/src/main/webapp/lesson_plans/de/SqlStringInjection.html similarity index 100% rename from webapp/lesson_plans/de/SqlStringInjection.html rename to src/main/webapp/lesson_plans/de/SqlStringInjection.html diff --git a/webapp/lesson_plans/de/StoredXss.html b/src/main/webapp/lesson_plans/de/StoredXss.html similarity index 100% rename from webapp/lesson_plans/de/StoredXss.html rename to src/main/webapp/lesson_plans/de/StoredXss.html diff --git a/webapp/lesson_plans/de/WeakAuthenticationCookie.html b/src/main/webapp/lesson_plans/de/WeakAuthenticationCookie.html similarity index 100% rename from webapp/lesson_plans/de/WeakAuthenticationCookie.html rename to src/main/webapp/lesson_plans/de/WeakAuthenticationCookie.html diff --git a/webapp/lesson_plans/en/AccessControlMatrix.html b/src/main/webapp/lesson_plans/en/AccessControlMatrix.html similarity index 100% rename from webapp/lesson_plans/en/AccessControlMatrix.html rename to src/main/webapp/lesson_plans/en/AccessControlMatrix.html diff --git a/webapp/lesson_plans/en/BackDoors.html b/src/main/webapp/lesson_plans/en/BackDoors.html similarity index 100% rename from webapp/lesson_plans/en/BackDoors.html rename to src/main/webapp/lesson_plans/en/BackDoors.html diff --git a/webapp/lesson_plans/en/BasicAuthentication.html b/src/main/webapp/lesson_plans/en/BasicAuthentication.html similarity index 100% rename from webapp/lesson_plans/en/BasicAuthentication.html rename to src/main/webapp/lesson_plans/en/BasicAuthentication.html diff --git a/webapp/lesson_plans/en/BlindSqlInjection.html b/src/main/webapp/lesson_plans/en/BlindSqlInjection.html similarity index 100% rename from webapp/lesson_plans/en/BlindSqlInjection.html rename to src/main/webapp/lesson_plans/en/BlindSqlInjection.html diff --git a/webapp/lesson_plans/en/BufferOverflow.html b/src/main/webapp/lesson_plans/en/BufferOverflow.html similarity index 100% rename from webapp/lesson_plans/en/BufferOverflow.html rename to src/main/webapp/lesson_plans/en/BufferOverflow.html diff --git a/webapp/lesson_plans/en/CSRF.html b/src/main/webapp/lesson_plans/en/CSRF.html similarity index 100% rename from webapp/lesson_plans/en/CSRF.html rename to src/main/webapp/lesson_plans/en/CSRF.html diff --git a/webapp/lesson_plans/en/ChallengeScreen.html b/src/main/webapp/lesson_plans/en/ChallengeScreen.html similarity index 100% rename from webapp/lesson_plans/en/ChallengeScreen.html rename to src/main/webapp/lesson_plans/en/ChallengeScreen.html diff --git a/webapp/lesson_plans/en/ClientSideFiltering.html b/src/main/webapp/lesson_plans/en/ClientSideFiltering.html similarity index 100% rename from webapp/lesson_plans/en/ClientSideFiltering.html rename to src/main/webapp/lesson_plans/en/ClientSideFiltering.html diff --git a/webapp/lesson_plans/en/ClientSideValidation.html b/src/main/webapp/lesson_plans/en/ClientSideValidation.html similarity index 100% rename from webapp/lesson_plans/en/ClientSideValidation.html rename to src/main/webapp/lesson_plans/en/ClientSideValidation.html diff --git a/webapp/lesson_plans/en/CommandInjection.html b/src/main/webapp/lesson_plans/en/CommandInjection.html similarity index 100% rename from webapp/lesson_plans/en/CommandInjection.html rename to src/main/webapp/lesson_plans/en/CommandInjection.html diff --git a/webapp/lesson_plans/en/ConcurrencyCart.html b/src/main/webapp/lesson_plans/en/ConcurrencyCart.html similarity index 100% rename from webapp/lesson_plans/en/ConcurrencyCart.html rename to src/main/webapp/lesson_plans/en/ConcurrencyCart.html diff --git a/webapp/lesson_plans/en/CrossSiteScripting.html b/src/main/webapp/lesson_plans/en/CrossSiteScripting.html similarity index 100% rename from webapp/lesson_plans/en/CrossSiteScripting.html rename to src/main/webapp/lesson_plans/en/CrossSiteScripting.html diff --git a/webapp/lesson_plans/en/CsrfPromptByPass.html b/src/main/webapp/lesson_plans/en/CsrfPromptByPass.html similarity index 100% rename from webapp/lesson_plans/en/CsrfPromptByPass.html rename to src/main/webapp/lesson_plans/en/CsrfPromptByPass.html diff --git a/webapp/lesson_plans/en/CsrfTokenByPass.html b/src/main/webapp/lesson_plans/en/CsrfTokenByPass.html similarity index 100% rename from webapp/lesson_plans/en/CsrfTokenByPass.html rename to src/main/webapp/lesson_plans/en/CsrfTokenByPass.html diff --git a/webapp/lesson_plans/en/DBCrossSiteScripting.html b/src/main/webapp/lesson_plans/en/DBCrossSiteScripting.html similarity index 100% rename from webapp/lesson_plans/en/DBCrossSiteScripting.html rename to src/main/webapp/lesson_plans/en/DBCrossSiteScripting.html diff --git a/webapp/lesson_plans/en/DBSQLInjection.html b/src/main/webapp/lesson_plans/en/DBSQLInjection.html similarity index 100% rename from webapp/lesson_plans/en/DBSQLInjection.html rename to src/main/webapp/lesson_plans/en/DBSQLInjection.html diff --git a/webapp/lesson_plans/en/DOMInjection.html b/src/main/webapp/lesson_plans/en/DOMInjection.html similarity index 100% rename from webapp/lesson_plans/en/DOMInjection.html rename to src/main/webapp/lesson_plans/en/DOMInjection.html diff --git a/webapp/lesson_plans/en/DOMXSS.html b/src/main/webapp/lesson_plans/en/DOMXSS.html similarity index 100% rename from webapp/lesson_plans/en/DOMXSS.html rename to src/main/webapp/lesson_plans/en/DOMXSS.html diff --git a/webapp/lesson_plans/en/DOS_Login.html b/src/main/webapp/lesson_plans/en/DOS_Login.html similarity index 100% rename from webapp/lesson_plans/en/DOS_Login.html rename to src/main/webapp/lesson_plans/en/DOS_Login.html diff --git a/webapp/lesson_plans/en/DangerousEval.html b/src/main/webapp/lesson_plans/en/DangerousEval.html similarity index 100% rename from webapp/lesson_plans/en/DangerousEval.html rename to src/main/webapp/lesson_plans/en/DangerousEval.html diff --git a/webapp/lesson_plans/en/Encoding.html b/src/main/webapp/lesson_plans/en/Encoding.html similarity index 100% rename from webapp/lesson_plans/en/Encoding.html rename to src/main/webapp/lesson_plans/en/Encoding.html diff --git a/webapp/lesson_plans/en/FailOpenAuthentication.html b/src/main/webapp/lesson_plans/en/FailOpenAuthentication.html similarity index 100% rename from webapp/lesson_plans/en/FailOpenAuthentication.html rename to src/main/webapp/lesson_plans/en/FailOpenAuthentication.html diff --git a/webapp/lesson_plans/en/ForcedBrowsing.html b/src/main/webapp/lesson_plans/en/ForcedBrowsing.html similarity index 100% rename from webapp/lesson_plans/en/ForcedBrowsing.html rename to src/main/webapp/lesson_plans/en/ForcedBrowsing.html diff --git a/webapp/lesson_plans/en/ForgotPassword.html b/src/main/webapp/lesson_plans/en/ForgotPassword.html similarity index 100% rename from webapp/lesson_plans/en/ForgotPassword.html rename to src/main/webapp/lesson_plans/en/ForgotPassword.html diff --git a/webapp/lesson_plans/en/HiddenFieldTampering.html b/src/main/webapp/lesson_plans/en/HiddenFieldTampering.html similarity index 100% rename from webapp/lesson_plans/en/HiddenFieldTampering.html rename to src/main/webapp/lesson_plans/en/HiddenFieldTampering.html diff --git a/webapp/lesson_plans/en/HowToWork.html b/src/main/webapp/lesson_plans/en/HowToWork.html similarity index 100% rename from webapp/lesson_plans/en/HowToWork.html rename to src/main/webapp/lesson_plans/en/HowToWork.html diff --git a/webapp/lesson_plans/en/HtmlClues.html b/src/main/webapp/lesson_plans/en/HtmlClues.html similarity index 100% rename from webapp/lesson_plans/en/HtmlClues.html rename to src/main/webapp/lesson_plans/en/HtmlClues.html diff --git a/webapp/lesson_plans/en/HttpBasics.html b/src/main/webapp/lesson_plans/en/HttpBasics.html similarity index 100% rename from webapp/lesson_plans/en/HttpBasics.html rename to src/main/webapp/lesson_plans/en/HttpBasics.html diff --git a/webapp/lesson_plans/en/HttpOnly.html b/src/main/webapp/lesson_plans/en/HttpOnly.html similarity index 100% rename from webapp/lesson_plans/en/HttpOnly.html rename to src/main/webapp/lesson_plans/en/HttpOnly.html diff --git a/webapp/lesson_plans/en/HttpSplitting.html b/src/main/webapp/lesson_plans/en/HttpSplitting.html similarity index 100% rename from webapp/lesson_plans/en/HttpSplitting.html rename to src/main/webapp/lesson_plans/en/HttpSplitting.html diff --git a/webapp/lesson_plans/en/InsecureLogin.html b/src/main/webapp/lesson_plans/en/InsecureLogin.html similarity index 100% rename from webapp/lesson_plans/en/InsecureLogin.html rename to src/main/webapp/lesson_plans/en/InsecureLogin.html diff --git a/webapp/lesson_plans/en/JSONInjection.html b/src/main/webapp/lesson_plans/en/JSONInjection.html similarity index 100% rename from webapp/lesson_plans/en/JSONInjection.html rename to src/main/webapp/lesson_plans/en/JSONInjection.html diff --git a/webapp/lesson_plans/en/JavaScriptValidation.html b/src/main/webapp/lesson_plans/en/JavaScriptValidation.html similarity index 100% rename from webapp/lesson_plans/en/JavaScriptValidation.html rename to src/main/webapp/lesson_plans/en/JavaScriptValidation.html diff --git a/webapp/lesson_plans/en/Lesson_Plan_Template.html b/src/main/webapp/lesson_plans/en/Lesson_Plan_Template.html similarity index 100% rename from webapp/lesson_plans/en/Lesson_Plan_Template.html rename to src/main/webapp/lesson_plans/en/Lesson_Plan_Template.html diff --git a/webapp/lesson_plans/en/LogSpoofing.html b/src/main/webapp/lesson_plans/en/LogSpoofing.html similarity index 100% rename from webapp/lesson_plans/en/LogSpoofing.html rename to src/main/webapp/lesson_plans/en/LogSpoofing.html diff --git a/webapp/lesson_plans/en/MultiLevelLogin1.html b/src/main/webapp/lesson_plans/en/MultiLevelLogin1.html similarity index 100% rename from webapp/lesson_plans/en/MultiLevelLogin1.html rename to src/main/webapp/lesson_plans/en/MultiLevelLogin1.html diff --git a/webapp/lesson_plans/en/MultiLevelLogin2.html b/src/main/webapp/lesson_plans/en/MultiLevelLogin2.html similarity index 100% rename from webapp/lesson_plans/en/MultiLevelLogin2.html rename to src/main/webapp/lesson_plans/en/MultiLevelLogin2.html diff --git a/webapp/lesson_plans/en/NewLesson.html b/src/main/webapp/lesson_plans/en/NewLesson.html similarity index 100% rename from webapp/lesson_plans/en/NewLesson.html rename to src/main/webapp/lesson_plans/en/NewLesson.html diff --git a/webapp/lesson_plans/en/PasswordStrength.html b/src/main/webapp/lesson_plans/en/PasswordStrength.html similarity index 100% rename from webapp/lesson_plans/en/PasswordStrength.html rename to src/main/webapp/lesson_plans/en/PasswordStrength.html diff --git a/webapp/lesson_plans/en/PathBasedAccessControl.html b/src/main/webapp/lesson_plans/en/PathBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/en/PathBasedAccessControl.html rename to src/main/webapp/lesson_plans/en/PathBasedAccessControl.html diff --git a/webapp/lesson_plans/en/Phishing.html b/src/main/webapp/lesson_plans/en/Phishing.html similarity index 100% rename from webapp/lesson_plans/en/Phishing.html rename to src/main/webapp/lesson_plans/en/Phishing.html diff --git a/webapp/lesson_plans/en/ReflectedXSS.html b/src/main/webapp/lesson_plans/en/ReflectedXSS.html similarity index 100% rename from webapp/lesson_plans/en/ReflectedXSS.html rename to src/main/webapp/lesson_plans/en/ReflectedXSS.html diff --git a/webapp/lesson_plans/en/RemoteAdminFlaw.html b/src/main/webapp/lesson_plans/en/RemoteAdminFlaw.html similarity index 100% rename from webapp/lesson_plans/en/RemoteAdminFlaw.html rename to src/main/webapp/lesson_plans/en/RemoteAdminFlaw.html diff --git a/webapp/lesson_plans/en/RoleBasedAccessControl.html b/src/main/webapp/lesson_plans/en/RoleBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/en/RoleBasedAccessControl.html rename to src/main/webapp/lesson_plans/en/RoleBasedAccessControl.html diff --git a/webapp/lesson_plans/en/SQLInjection.html b/src/main/webapp/lesson_plans/en/SQLInjection.html similarity index 100% rename from webapp/lesson_plans/en/SQLInjection.html rename to src/main/webapp/lesson_plans/en/SQLInjection.html diff --git a/webapp/lesson_plans/en/SameOriginPolicyProtection.html b/src/main/webapp/lesson_plans/en/SameOriginPolicyProtection.html similarity index 100% rename from webapp/lesson_plans/en/SameOriginPolicyProtection.html rename to src/main/webapp/lesson_plans/en/SameOriginPolicyProtection.html diff --git a/webapp/lesson_plans/en/SessionFixation.html b/src/main/webapp/lesson_plans/en/SessionFixation.html similarity index 100% rename from webapp/lesson_plans/en/SessionFixation.html rename to src/main/webapp/lesson_plans/en/SessionFixation.html diff --git a/webapp/lesson_plans/en/SilentTransactions.html b/src/main/webapp/lesson_plans/en/SilentTransactions.html similarity index 100% rename from webapp/lesson_plans/en/SilentTransactions.html rename to src/main/webapp/lesson_plans/en/SilentTransactions.html diff --git a/webapp/lesson_plans/en/SoapRequest.html b/src/main/webapp/lesson_plans/en/SoapRequest.html similarity index 100% rename from webapp/lesson_plans/en/SoapRequest.html rename to src/main/webapp/lesson_plans/en/SoapRequest.html diff --git a/webapp/lesson_plans/en/SqlNumericInjection.html b/src/main/webapp/lesson_plans/en/SqlNumericInjection.html similarity index 100% rename from webapp/lesson_plans/en/SqlNumericInjection.html rename to src/main/webapp/lesson_plans/en/SqlNumericInjection.html diff --git a/webapp/lesson_plans/en/SqlStringInjection.html b/src/main/webapp/lesson_plans/en/SqlStringInjection.html similarity index 100% rename from webapp/lesson_plans/en/SqlStringInjection.html rename to src/main/webapp/lesson_plans/en/SqlStringInjection.html diff --git a/webapp/lesson_plans/en/StoredXss.html b/src/main/webapp/lesson_plans/en/StoredXss.html similarity index 100% rename from webapp/lesson_plans/en/StoredXss.html rename to src/main/webapp/lesson_plans/en/StoredXss.html diff --git a/webapp/lesson_plans/en/ThreadSafetyProblem.html b/src/main/webapp/lesson_plans/en/ThreadSafetyProblem.html similarity index 100% rename from webapp/lesson_plans/en/ThreadSafetyProblem.html rename to src/main/webapp/lesson_plans/en/ThreadSafetyProblem.html diff --git a/webapp/lesson_plans/en/TomcatSetup.html b/src/main/webapp/lesson_plans/en/TomcatSetup.html similarity index 100% rename from webapp/lesson_plans/en/TomcatSetup.html rename to src/main/webapp/lesson_plans/en/TomcatSetup.html diff --git a/webapp/lesson_plans/en/TraceXSS.html b/src/main/webapp/lesson_plans/en/TraceXSS.html similarity index 100% rename from webapp/lesson_plans/en/TraceXSS.html rename to src/main/webapp/lesson_plans/en/TraceXSS.html diff --git a/webapp/lesson_plans/en/UncheckedEmail.html b/src/main/webapp/lesson_plans/en/UncheckedEmail.html similarity index 100% rename from webapp/lesson_plans/en/UncheckedEmail.html rename to src/main/webapp/lesson_plans/en/UncheckedEmail.html diff --git a/webapp/lesson_plans/en/UsefulTools.html b/src/main/webapp/lesson_plans/en/UsefulTools.html similarity index 100% rename from webapp/lesson_plans/en/UsefulTools.html rename to src/main/webapp/lesson_plans/en/UsefulTools.html diff --git a/webapp/lesson_plans/en/WSDLScanning.html b/src/main/webapp/lesson_plans/en/WSDLScanning.html similarity index 100% rename from webapp/lesson_plans/en/WSDLScanning.html rename to src/main/webapp/lesson_plans/en/WSDLScanning.html diff --git a/webapp/lesson_plans/en/WeakAuthenticationCookie.html b/src/main/webapp/lesson_plans/en/WeakAuthenticationCookie.html similarity index 100% rename from webapp/lesson_plans/en/WeakAuthenticationCookie.html rename to src/main/webapp/lesson_plans/en/WeakAuthenticationCookie.html diff --git a/webapp/lesson_plans/en/WeakSessionID.html b/src/main/webapp/lesson_plans/en/WeakSessionID.html similarity index 100% rename from webapp/lesson_plans/en/WeakSessionID.html rename to src/main/webapp/lesson_plans/en/WeakSessionID.html diff --git a/webapp/lesson_plans/en/WelcomeScreeen.html b/src/main/webapp/lesson_plans/en/WelcomeScreeen.html similarity index 100% rename from webapp/lesson_plans/en/WelcomeScreeen.html rename to src/main/webapp/lesson_plans/en/WelcomeScreeen.html diff --git a/webapp/lesson_plans/en/WsSAXInjection.html b/src/main/webapp/lesson_plans/en/WsSAXInjection.html similarity index 100% rename from webapp/lesson_plans/en/WsSAXInjection.html rename to src/main/webapp/lesson_plans/en/WsSAXInjection.html diff --git a/webapp/lesson_plans/en/WsSqlInjection.html b/src/main/webapp/lesson_plans/en/WsSqlInjection.html similarity index 100% rename from webapp/lesson_plans/en/WsSqlInjection.html rename to src/main/webapp/lesson_plans/en/WsSqlInjection.html diff --git a/webapp/lesson_plans/en/XMLInjection.html b/src/main/webapp/lesson_plans/en/XMLInjection.html similarity index 100% rename from webapp/lesson_plans/en/XMLInjection.html rename to src/main/webapp/lesson_plans/en/XMLInjection.html diff --git a/webapp/lesson_plans/en/XPATHInjection.html b/src/main/webapp/lesson_plans/en/XPATHInjection.html similarity index 100% rename from webapp/lesson_plans/en/XPATHInjection.html rename to src/main/webapp/lesson_plans/en/XPATHInjection.html diff --git a/webapp/lesson_plans/ru/AccessControlMatrix.html b/src/main/webapp/lesson_plans/ru/AccessControlMatrix.html similarity index 100% rename from webapp/lesson_plans/ru/AccessControlMatrix.html rename to src/main/webapp/lesson_plans/ru/AccessControlMatrix.html diff --git a/webapp/lesson_plans/ru/BackDoors.html b/src/main/webapp/lesson_plans/ru/BackDoors.html similarity index 100% rename from webapp/lesson_plans/ru/BackDoors.html rename to src/main/webapp/lesson_plans/ru/BackDoors.html diff --git a/webapp/lesson_plans/ru/BasicAuthentication.html b/src/main/webapp/lesson_plans/ru/BasicAuthentication.html similarity index 100% rename from webapp/lesson_plans/ru/BasicAuthentication.html rename to src/main/webapp/lesson_plans/ru/BasicAuthentication.html diff --git a/webapp/lesson_plans/ru/BlindSqlInjection.html b/src/main/webapp/lesson_plans/ru/BlindSqlInjection.html similarity index 100% rename from webapp/lesson_plans/ru/BlindSqlInjection.html rename to src/main/webapp/lesson_plans/ru/BlindSqlInjection.html diff --git a/webapp/lesson_plans/ru/BufferOverflow.html b/src/main/webapp/lesson_plans/ru/BufferOverflow.html similarity index 100% rename from webapp/lesson_plans/ru/BufferOverflow.html rename to src/main/webapp/lesson_plans/ru/BufferOverflow.html diff --git a/webapp/lesson_plans/ru/CSRF.html b/src/main/webapp/lesson_plans/ru/CSRF.html similarity index 100% rename from webapp/lesson_plans/ru/CSRF.html rename to src/main/webapp/lesson_plans/ru/CSRF.html diff --git a/webapp/lesson_plans/ru/ChallengeScreen.html b/src/main/webapp/lesson_plans/ru/ChallengeScreen.html similarity index 100% rename from webapp/lesson_plans/ru/ChallengeScreen.html rename to src/main/webapp/lesson_plans/ru/ChallengeScreen.html diff --git a/webapp/lesson_plans/ru/ClientSideFiltering.html b/src/main/webapp/lesson_plans/ru/ClientSideFiltering.html similarity index 100% rename from webapp/lesson_plans/ru/ClientSideFiltering.html rename to src/main/webapp/lesson_plans/ru/ClientSideFiltering.html diff --git a/webapp/lesson_plans/ru/ClientSideValidation.html b/src/main/webapp/lesson_plans/ru/ClientSideValidation.html similarity index 100% rename from webapp/lesson_plans/ru/ClientSideValidation.html rename to src/main/webapp/lesson_plans/ru/ClientSideValidation.html diff --git a/webapp/lesson_plans/ru/CommandInjection.html b/src/main/webapp/lesson_plans/ru/CommandInjection.html similarity index 100% rename from webapp/lesson_plans/ru/CommandInjection.html rename to src/main/webapp/lesson_plans/ru/CommandInjection.html diff --git a/webapp/lesson_plans/ru/ConcurrencyCart.html b/src/main/webapp/lesson_plans/ru/ConcurrencyCart.html similarity index 100% rename from webapp/lesson_plans/ru/ConcurrencyCart.html rename to src/main/webapp/lesson_plans/ru/ConcurrencyCart.html diff --git a/webapp/lesson_plans/ru/CrossSiteScripting.html b/src/main/webapp/lesson_plans/ru/CrossSiteScripting.html similarity index 100% rename from webapp/lesson_plans/ru/CrossSiteScripting.html rename to src/main/webapp/lesson_plans/ru/CrossSiteScripting.html diff --git a/webapp/lesson_plans/ru/CsrfPromptByPass.html b/src/main/webapp/lesson_plans/ru/CsrfPromptByPass.html similarity index 100% rename from webapp/lesson_plans/ru/CsrfPromptByPass.html rename to src/main/webapp/lesson_plans/ru/CsrfPromptByPass.html diff --git a/webapp/lesson_plans/ru/CsrfTokenByPass.html b/src/main/webapp/lesson_plans/ru/CsrfTokenByPass.html similarity index 100% rename from webapp/lesson_plans/ru/CsrfTokenByPass.html rename to src/main/webapp/lesson_plans/ru/CsrfTokenByPass.html diff --git a/webapp/lesson_plans/ru/DBCrossSiteScripting.html b/src/main/webapp/lesson_plans/ru/DBCrossSiteScripting.html similarity index 100% rename from webapp/lesson_plans/ru/DBCrossSiteScripting.html rename to src/main/webapp/lesson_plans/ru/DBCrossSiteScripting.html diff --git a/webapp/lesson_plans/ru/DBSQLInjection.html b/src/main/webapp/lesson_plans/ru/DBSQLInjection.html similarity index 100% rename from webapp/lesson_plans/ru/DBSQLInjection.html rename to src/main/webapp/lesson_plans/ru/DBSQLInjection.html diff --git a/webapp/lesson_plans/ru/DOMInjection.html b/src/main/webapp/lesson_plans/ru/DOMInjection.html similarity index 100% rename from webapp/lesson_plans/ru/DOMInjection.html rename to src/main/webapp/lesson_plans/ru/DOMInjection.html diff --git a/webapp/lesson_plans/ru/DOMXSS.html b/src/main/webapp/lesson_plans/ru/DOMXSS.html similarity index 100% rename from webapp/lesson_plans/ru/DOMXSS.html rename to src/main/webapp/lesson_plans/ru/DOMXSS.html diff --git a/webapp/lesson_plans/ru/DOS_Login.html b/src/main/webapp/lesson_plans/ru/DOS_Login.html similarity index 100% rename from webapp/lesson_plans/ru/DOS_Login.html rename to src/main/webapp/lesson_plans/ru/DOS_Login.html diff --git a/webapp/lesson_plans/ru/DangerousEval.html b/src/main/webapp/lesson_plans/ru/DangerousEval.html similarity index 100% rename from webapp/lesson_plans/ru/DangerousEval.html rename to src/main/webapp/lesson_plans/ru/DangerousEval.html diff --git a/webapp/lesson_plans/ru/Encoding.html b/src/main/webapp/lesson_plans/ru/Encoding.html similarity index 100% rename from webapp/lesson_plans/ru/Encoding.html rename to src/main/webapp/lesson_plans/ru/Encoding.html diff --git a/webapp/lesson_plans/ru/FailOpenAuthentication.html b/src/main/webapp/lesson_plans/ru/FailOpenAuthentication.html similarity index 100% rename from webapp/lesson_plans/ru/FailOpenAuthentication.html rename to src/main/webapp/lesson_plans/ru/FailOpenAuthentication.html diff --git a/webapp/lesson_plans/ru/ForcedBrowsing.html b/src/main/webapp/lesson_plans/ru/ForcedBrowsing.html similarity index 100% rename from webapp/lesson_plans/ru/ForcedBrowsing.html rename to src/main/webapp/lesson_plans/ru/ForcedBrowsing.html diff --git a/webapp/lesson_plans/ru/ForgotPassword.html b/src/main/webapp/lesson_plans/ru/ForgotPassword.html similarity index 100% rename from webapp/lesson_plans/ru/ForgotPassword.html rename to src/main/webapp/lesson_plans/ru/ForgotPassword.html diff --git a/webapp/lesson_plans/ru/HiddenFieldTampering.html b/src/main/webapp/lesson_plans/ru/HiddenFieldTampering.html similarity index 100% rename from webapp/lesson_plans/ru/HiddenFieldTampering.html rename to src/main/webapp/lesson_plans/ru/HiddenFieldTampering.html diff --git a/webapp/lesson_plans/ru/HowToWork.html b/src/main/webapp/lesson_plans/ru/HowToWork.html similarity index 100% rename from webapp/lesson_plans/ru/HowToWork.html rename to src/main/webapp/lesson_plans/ru/HowToWork.html diff --git a/webapp/lesson_plans/ru/HtmlClues.html b/src/main/webapp/lesson_plans/ru/HtmlClues.html similarity index 100% rename from webapp/lesson_plans/ru/HtmlClues.html rename to src/main/webapp/lesson_plans/ru/HtmlClues.html diff --git a/webapp/lesson_plans/ru/HttpBasics.html b/src/main/webapp/lesson_plans/ru/HttpBasics.html similarity index 100% rename from webapp/lesson_plans/ru/HttpBasics.html rename to src/main/webapp/lesson_plans/ru/HttpBasics.html diff --git a/webapp/lesson_plans/ru/HttpOnly.html b/src/main/webapp/lesson_plans/ru/HttpOnly.html similarity index 100% rename from webapp/lesson_plans/ru/HttpOnly.html rename to src/main/webapp/lesson_plans/ru/HttpOnly.html diff --git a/webapp/lesson_plans/ru/HttpSplitting.html b/src/main/webapp/lesson_plans/ru/HttpSplitting.html similarity index 100% rename from webapp/lesson_plans/ru/HttpSplitting.html rename to src/main/webapp/lesson_plans/ru/HttpSplitting.html diff --git a/webapp/lesson_plans/ru/InsecureLogin.html b/src/main/webapp/lesson_plans/ru/InsecureLogin.html similarity index 100% rename from webapp/lesson_plans/ru/InsecureLogin.html rename to src/main/webapp/lesson_plans/ru/InsecureLogin.html diff --git a/webapp/lesson_plans/ru/JSONInjection.html b/src/main/webapp/lesson_plans/ru/JSONInjection.html similarity index 100% rename from webapp/lesson_plans/ru/JSONInjection.html rename to src/main/webapp/lesson_plans/ru/JSONInjection.html diff --git a/webapp/lesson_plans/ru/JavaScriptValidation.html b/src/main/webapp/lesson_plans/ru/JavaScriptValidation.html similarity index 100% rename from webapp/lesson_plans/ru/JavaScriptValidation.html rename to src/main/webapp/lesson_plans/ru/JavaScriptValidation.html diff --git a/webapp/lesson_plans/ru/Lesson_Plan_Template.html b/src/main/webapp/lesson_plans/ru/Lesson_Plan_Template.html similarity index 100% rename from webapp/lesson_plans/ru/Lesson_Plan_Template.html rename to src/main/webapp/lesson_plans/ru/Lesson_Plan_Template.html diff --git a/webapp/lesson_plans/ru/LogSpoofing.html b/src/main/webapp/lesson_plans/ru/LogSpoofing.html similarity index 100% rename from webapp/lesson_plans/ru/LogSpoofing.html rename to src/main/webapp/lesson_plans/ru/LogSpoofing.html diff --git a/webapp/lesson_plans/ru/MultiLevelLogin1.html b/src/main/webapp/lesson_plans/ru/MultiLevelLogin1.html similarity index 100% rename from webapp/lesson_plans/ru/MultiLevelLogin1.html rename to src/main/webapp/lesson_plans/ru/MultiLevelLogin1.html diff --git a/webapp/lesson_plans/ru/MultiLevelLogin2.html b/src/main/webapp/lesson_plans/ru/MultiLevelLogin2.html similarity index 100% rename from webapp/lesson_plans/ru/MultiLevelLogin2.html rename to src/main/webapp/lesson_plans/ru/MultiLevelLogin2.html diff --git a/webapp/lesson_plans/ru/NewLesson.html b/src/main/webapp/lesson_plans/ru/NewLesson.html similarity index 100% rename from webapp/lesson_plans/ru/NewLesson.html rename to src/main/webapp/lesson_plans/ru/NewLesson.html diff --git a/webapp/lesson_plans/ru/PasswordStrength.html b/src/main/webapp/lesson_plans/ru/PasswordStrength.html similarity index 100% rename from webapp/lesson_plans/ru/PasswordStrength.html rename to src/main/webapp/lesson_plans/ru/PasswordStrength.html diff --git a/webapp/lesson_plans/ru/PathBasedAccessControl.html b/src/main/webapp/lesson_plans/ru/PathBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/ru/PathBasedAccessControl.html rename to src/main/webapp/lesson_plans/ru/PathBasedAccessControl.html diff --git a/webapp/lesson_plans/ru/Phishing.html b/src/main/webapp/lesson_plans/ru/Phishing.html similarity index 100% rename from webapp/lesson_plans/ru/Phishing.html rename to src/main/webapp/lesson_plans/ru/Phishing.html diff --git a/webapp/lesson_plans/ru/ReflectedXSS.html b/src/main/webapp/lesson_plans/ru/ReflectedXSS.html similarity index 100% rename from webapp/lesson_plans/ru/ReflectedXSS.html rename to src/main/webapp/lesson_plans/ru/ReflectedXSS.html diff --git a/webapp/lesson_plans/ru/RemoteAdminFlaw.html b/src/main/webapp/lesson_plans/ru/RemoteAdminFlaw.html similarity index 100% rename from webapp/lesson_plans/ru/RemoteAdminFlaw.html rename to src/main/webapp/lesson_plans/ru/RemoteAdminFlaw.html diff --git a/webapp/lesson_plans/ru/RoleBasedAccessControl.html b/src/main/webapp/lesson_plans/ru/RoleBasedAccessControl.html similarity index 100% rename from webapp/lesson_plans/ru/RoleBasedAccessControl.html rename to src/main/webapp/lesson_plans/ru/RoleBasedAccessControl.html diff --git a/webapp/lesson_plans/ru/SQLInjection.html b/src/main/webapp/lesson_plans/ru/SQLInjection.html similarity index 100% rename from webapp/lesson_plans/ru/SQLInjection.html rename to src/main/webapp/lesson_plans/ru/SQLInjection.html diff --git a/webapp/lesson_plans/ru/SameOriginPolicyProtection.html b/src/main/webapp/lesson_plans/ru/SameOriginPolicyProtection.html similarity index 100% rename from webapp/lesson_plans/ru/SameOriginPolicyProtection.html rename to src/main/webapp/lesson_plans/ru/SameOriginPolicyProtection.html diff --git a/webapp/lesson_plans/ru/SessionFixation.html b/src/main/webapp/lesson_plans/ru/SessionFixation.html similarity index 100% rename from webapp/lesson_plans/ru/SessionFixation.html rename to src/main/webapp/lesson_plans/ru/SessionFixation.html diff --git a/webapp/lesson_plans/ru/SilentTransactions.html b/src/main/webapp/lesson_plans/ru/SilentTransactions.html similarity index 100% rename from webapp/lesson_plans/ru/SilentTransactions.html rename to src/main/webapp/lesson_plans/ru/SilentTransactions.html diff --git a/webapp/lesson_plans/ru/SoapRequest.html b/src/main/webapp/lesson_plans/ru/SoapRequest.html similarity index 100% rename from webapp/lesson_plans/ru/SoapRequest.html rename to src/main/webapp/lesson_plans/ru/SoapRequest.html diff --git a/webapp/lesson_plans/ru/SqlNumericInjection.html b/src/main/webapp/lesson_plans/ru/SqlNumericInjection.html similarity index 100% rename from webapp/lesson_plans/ru/SqlNumericInjection.html rename to src/main/webapp/lesson_plans/ru/SqlNumericInjection.html diff --git a/webapp/lesson_plans/ru/SqlStringInjection.html b/src/main/webapp/lesson_plans/ru/SqlStringInjection.html similarity index 100% rename from webapp/lesson_plans/ru/SqlStringInjection.html rename to src/main/webapp/lesson_plans/ru/SqlStringInjection.html diff --git a/webapp/lesson_plans/ru/StoredXss.html b/src/main/webapp/lesson_plans/ru/StoredXss.html similarity index 100% rename from webapp/lesson_plans/ru/StoredXss.html rename to src/main/webapp/lesson_plans/ru/StoredXss.html diff --git a/webapp/lesson_plans/ru/ThreadSafetyProblem.html b/src/main/webapp/lesson_plans/ru/ThreadSafetyProblem.html similarity index 100% rename from webapp/lesson_plans/ru/ThreadSafetyProblem.html rename to src/main/webapp/lesson_plans/ru/ThreadSafetyProblem.html diff --git a/webapp/lesson_plans/ru/TomcatSetup.html b/src/main/webapp/lesson_plans/ru/TomcatSetup.html similarity index 100% rename from webapp/lesson_plans/ru/TomcatSetup.html rename to src/main/webapp/lesson_plans/ru/TomcatSetup.html diff --git a/webapp/lesson_plans/ru/TraceXSS.html b/src/main/webapp/lesson_plans/ru/TraceXSS.html similarity index 100% rename from webapp/lesson_plans/ru/TraceXSS.html rename to src/main/webapp/lesson_plans/ru/TraceXSS.html diff --git a/webapp/lesson_plans/ru/UncheckedEmail.html b/src/main/webapp/lesson_plans/ru/UncheckedEmail.html similarity index 100% rename from webapp/lesson_plans/ru/UncheckedEmail.html rename to src/main/webapp/lesson_plans/ru/UncheckedEmail.html diff --git a/webapp/lesson_plans/ru/UsefulTools.html b/src/main/webapp/lesson_plans/ru/UsefulTools.html similarity index 100% rename from webapp/lesson_plans/ru/UsefulTools.html rename to src/main/webapp/lesson_plans/ru/UsefulTools.html diff --git a/webapp/lesson_plans/ru/WSDLScanning.html b/src/main/webapp/lesson_plans/ru/WSDLScanning.html similarity index 100% rename from webapp/lesson_plans/ru/WSDLScanning.html rename to src/main/webapp/lesson_plans/ru/WSDLScanning.html diff --git a/webapp/lesson_plans/ru/WeakAuthenticationCookie.html b/src/main/webapp/lesson_plans/ru/WeakAuthenticationCookie.html similarity index 100% rename from webapp/lesson_plans/ru/WeakAuthenticationCookie.html rename to src/main/webapp/lesson_plans/ru/WeakAuthenticationCookie.html diff --git a/webapp/lesson_plans/ru/WeakSessionID.html b/src/main/webapp/lesson_plans/ru/WeakSessionID.html similarity index 100% rename from webapp/lesson_plans/ru/WeakSessionID.html rename to src/main/webapp/lesson_plans/ru/WeakSessionID.html diff --git a/webapp/lesson_plans/ru/WelcomeScreeen.html b/src/main/webapp/lesson_plans/ru/WelcomeScreeen.html similarity index 100% rename from webapp/lesson_plans/ru/WelcomeScreeen.html rename to src/main/webapp/lesson_plans/ru/WelcomeScreeen.html diff --git a/webapp/lesson_plans/ru/WsSAXInjection.html b/src/main/webapp/lesson_plans/ru/WsSAXInjection.html similarity index 100% rename from webapp/lesson_plans/ru/WsSAXInjection.html rename to src/main/webapp/lesson_plans/ru/WsSAXInjection.html diff --git a/webapp/lesson_plans/ru/WsSqlInjection.html b/src/main/webapp/lesson_plans/ru/WsSqlInjection.html similarity index 100% rename from webapp/lesson_plans/ru/WsSqlInjection.html rename to src/main/webapp/lesson_plans/ru/WsSqlInjection.html diff --git a/webapp/lesson_plans/ru/XMLInjection.html b/src/main/webapp/lesson_plans/ru/XMLInjection.html similarity index 100% rename from webapp/lesson_plans/ru/XMLInjection.html rename to src/main/webapp/lesson_plans/ru/XMLInjection.html diff --git a/webapp/lesson_plans/ru/XPATHInjection.html b/src/main/webapp/lesson_plans/ru/XPATHInjection.html similarity index 100% rename from webapp/lesson_plans/ru/XPATHInjection.html rename to src/main/webapp/lesson_plans/ru/XPATHInjection.html diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/Thumbs.db b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/Thumbs.db similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/Thumbs.db rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/Thumbs.db diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/filelist.xml b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/filelist.xml rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/filelist.xml diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/image001.png b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/image001.png similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/image001.png rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/image001.png diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/image002.jpg b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/image002.jpg rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/image002.jpg diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/image003.png b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/image003.png similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/image003.png rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/image003.png diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/image004.jpg b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/image004.jpg rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/image004.jpg diff --git a/webapp/lesson_solutions/AccessControlMatrix_files/themedata.thmx b/src/main/webapp/lesson_solutions/AccessControlMatrix_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix_files/themedata.thmx rename to src/main/webapp/lesson_solutions/AccessControlMatrix_files/themedata.thmx diff --git a/webapp/lesson_solutions/BackDoors_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/BackDoors_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/BackDoors_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/BackDoors_files/filelist.xml b/src/main/webapp/lesson_solutions/BackDoors_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/filelist.xml rename to src/main/webapp/lesson_solutions/BackDoors_files/filelist.xml diff --git a/webapp/lesson_solutions/BackDoors_files/image001.png b/src/main/webapp/lesson_solutions/BackDoors_files/image001.png similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image001.png rename to src/main/webapp/lesson_solutions/BackDoors_files/image001.png diff --git a/webapp/lesson_solutions/BackDoors_files/image003.png b/src/main/webapp/lesson_solutions/BackDoors_files/image003.png similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image003.png rename to src/main/webapp/lesson_solutions/BackDoors_files/image003.png diff --git a/webapp/lesson_solutions/BackDoors_files/image005.png b/src/main/webapp/lesson_solutions/BackDoors_files/image005.png similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image005.png rename to src/main/webapp/lesson_solutions/BackDoors_files/image005.png diff --git a/webapp/lesson_solutions/BackDoors_files/image007.png b/src/main/webapp/lesson_solutions/BackDoors_files/image007.png similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image007.png rename to src/main/webapp/lesson_solutions/BackDoors_files/image007.png diff --git a/webapp/lesson_solutions/BackDoors_files/image009.png b/src/main/webapp/lesson_solutions/BackDoors_files/image009.png similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image009.png rename to src/main/webapp/lesson_solutions/BackDoors_files/image009.png diff --git a/webapp/lesson_solutions/BackDoors_files/image011.png b/src/main/webapp/lesson_solutions/BackDoors_files/image011.png similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image011.png rename to src/main/webapp/lesson_solutions/BackDoors_files/image011.png diff --git a/webapp/lesson_solutions/BackDoors_files/image013.jpg b/src/main/webapp/lesson_solutions/BackDoors_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image013.jpg rename to src/main/webapp/lesson_solutions/BackDoors_files/image013.jpg diff --git a/webapp/lesson_solutions/BackDoors_files/image014.jpg b/src/main/webapp/lesson_solutions/BackDoors_files/image014.jpg similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image014.jpg rename to src/main/webapp/lesson_solutions/BackDoors_files/image014.jpg diff --git a/webapp/lesson_solutions/BackDoors_files/image015.jpg b/src/main/webapp/lesson_solutions/BackDoors_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image015.jpg rename to src/main/webapp/lesson_solutions/BackDoors_files/image015.jpg diff --git a/webapp/lesson_solutions/BackDoors_files/image016.jpg b/src/main/webapp/lesson_solutions/BackDoors_files/image016.jpg similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image016.jpg rename to src/main/webapp/lesson_solutions/BackDoors_files/image016.jpg diff --git a/webapp/lesson_solutions/BackDoors_files/image017.jpg b/src/main/webapp/lesson_solutions/BackDoors_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image017.jpg rename to src/main/webapp/lesson_solutions/BackDoors_files/image017.jpg diff --git a/webapp/lesson_solutions/BackDoors_files/image018.jpg b/src/main/webapp/lesson_solutions/BackDoors_files/image018.jpg similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/image018.jpg rename to src/main/webapp/lesson_solutions/BackDoors_files/image018.jpg diff --git a/webapp/lesson_solutions/BackDoors_files/themedata.thmx b/src/main/webapp/lesson_solutions/BackDoors_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/BackDoors_files/themedata.thmx rename to src/main/webapp/lesson_solutions/BackDoors_files/themedata.thmx diff --git a/webapp/lesson_solutions/BasicAuthentication_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/BasicAuthentication_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/BasicAuthentication_files/filelist.xml b/src/main/webapp/lesson_solutions/BasicAuthentication_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/filelist.xml rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/filelist.xml diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image001.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image001.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image001.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image001.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image003.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image003.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image003.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image003.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image005.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image005.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image005.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image005.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image007.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image007.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image007.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image007.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image009.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image009.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image009.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image009.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image011.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image011.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image011.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image011.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image013.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image013.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image013.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image013.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image015.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image015.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image015.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image015.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image017.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image017.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image017.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image017.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image019.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image019.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image019.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image019.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image021.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image021.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image021.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image021.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image023.png b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image023.png similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image023.png rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image023.png diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image025.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image025.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image025.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image025.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image026.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image026.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image026.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image026.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image027.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image027.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image027.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image027.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image028.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image028.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image028.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image028.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image029.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image029.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image029.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image029.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image030.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image030.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image030.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image030.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image031.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image031.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image031.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image031.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image032.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image032.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image032.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image032.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image033.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image033.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image033.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image033.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image034.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image034.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image034.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image034.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image035.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image035.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image035.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image035.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/image036.jpg b/src/main/webapp/lesson_solutions/BasicAuthentication_files/image036.jpg similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/image036.jpg rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/image036.jpg diff --git a/webapp/lesson_solutions/BasicAuthentication_files/themedata.thmx b/src/main/webapp/lesson_solutions/BasicAuthentication_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication_files/themedata.thmx rename to src/main/webapp/lesson_solutions/BasicAuthentication_files/themedata.thmx diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/BlindStringSqlInjection.htmlSOLBAK b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/BlindStringSqlInjection.htmlSOLBAK similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/BlindStringSqlInjection.htmlSOLBAK rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/BlindStringSqlInjection.htmlSOLBAK diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/filelist.xml b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image001.png b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image001.png rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image001.png diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image003.png b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image003.png rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image003.png diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image005.png b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image005.png rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image005.png diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image007.png b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image007.png similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image007.png rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image007.png diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image009.png b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image009.png similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image009.png rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image009.png diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image011.png b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image011.png similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image011.png rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image011.png diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image013.jpg b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image013.jpg rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image013.jpg diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image014.jpg b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image014.jpg similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image014.jpg rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image014.jpg diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image015.jpg b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image015.jpg rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image015.jpg diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image016.jpg b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image016.jpg similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image016.jpg rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image016.jpg diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image017.jpg b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image017.jpg rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image017.jpg diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/image018.jpg b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/image018.jpg similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/image018.jpg rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/image018.jpg diff --git a/webapp/lesson_solutions/BlindSqlInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions/BlindSqlInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/BlindSqlInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions/BlindSqlInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image001.jpg b/src/main/webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image001.jpg rename to src/main/webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image001.jpg diff --git a/webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image002.jpg b/src/main/webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image002.jpg rename to src/main/webapp/lesson_solutions/BypassHtmlFieldRestrictions_files/image002.jpg diff --git a/webapp/lesson_solutions/CSRF_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/CSRF_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/CSRF_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/CSRF_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/CSRF_files/filelist.xml b/src/main/webapp/lesson_solutions/CSRF_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/CSRF_files/filelist.xml rename to src/main/webapp/lesson_solutions/CSRF_files/filelist.xml diff --git a/webapp/lesson_solutions/CSRF_files/image001.png b/src/main/webapp/lesson_solutions/CSRF_files/image001.png similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image001.png rename to src/main/webapp/lesson_solutions/CSRF_files/image001.png diff --git a/webapp/lesson_solutions/CSRF_files/image003.png b/src/main/webapp/lesson_solutions/CSRF_files/image003.png similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image003.png rename to src/main/webapp/lesson_solutions/CSRF_files/image003.png diff --git a/webapp/lesson_solutions/CSRF_files/image005.png b/src/main/webapp/lesson_solutions/CSRF_files/image005.png similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image005.png rename to src/main/webapp/lesson_solutions/CSRF_files/image005.png diff --git a/webapp/lesson_solutions/CSRF_files/image007.png b/src/main/webapp/lesson_solutions/CSRF_files/image007.png similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image007.png rename to src/main/webapp/lesson_solutions/CSRF_files/image007.png diff --git a/webapp/lesson_solutions/CSRF_files/image009.png b/src/main/webapp/lesson_solutions/CSRF_files/image009.png similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image009.png rename to src/main/webapp/lesson_solutions/CSRF_files/image009.png diff --git a/webapp/lesson_solutions/CSRF_files/image011.jpg b/src/main/webapp/lesson_solutions/CSRF_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image011.jpg rename to src/main/webapp/lesson_solutions/CSRF_files/image011.jpg diff --git a/webapp/lesson_solutions/CSRF_files/image012.jpg b/src/main/webapp/lesson_solutions/CSRF_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image012.jpg rename to src/main/webapp/lesson_solutions/CSRF_files/image012.jpg diff --git a/webapp/lesson_solutions/CSRF_files/image013.jpg b/src/main/webapp/lesson_solutions/CSRF_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image013.jpg rename to src/main/webapp/lesson_solutions/CSRF_files/image013.jpg diff --git a/webapp/lesson_solutions/CSRF_files/image014.jpg b/src/main/webapp/lesson_solutions/CSRF_files/image014.jpg similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image014.jpg rename to src/main/webapp/lesson_solutions/CSRF_files/image014.jpg diff --git a/webapp/lesson_solutions/CSRF_files/image015.jpg b/src/main/webapp/lesson_solutions/CSRF_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/CSRF_files/image015.jpg rename to src/main/webapp/lesson_solutions/CSRF_files/image015.jpg diff --git a/webapp/lesson_solutions/CSRF_files/themedata.thmx b/src/main/webapp/lesson_solutions/CSRF_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/CSRF_files/themedata.thmx rename to src/main/webapp/lesson_solutions/CSRF_files/themedata.thmx diff --git a/webapp/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg b/src/main/webapp/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg similarity index 100% rename from webapp/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg rename to src/main/webapp/lesson_solutions/ClientSideFiltering_files/clientside_firebug.jpg diff --git a/webapp/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png b/src/main/webapp/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png similarity index 100% rename from webapp/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png rename to src/main/webapp/lesson_solutions/ClientSideValidation_files/ClientSideValidation_stage1.png diff --git a/webapp/lesson_solutions/CommandInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/CommandInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/CommandInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/CommandInjection_files/filelist.xml b/src/main/webapp/lesson_solutions/CommandInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions/CommandInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/CommandInjection_files/image001.png b/src/main/webapp/lesson_solutions/CommandInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/image001.png rename to src/main/webapp/lesson_solutions/CommandInjection_files/image001.png diff --git a/webapp/lesson_solutions/CommandInjection_files/image003.png b/src/main/webapp/lesson_solutions/CommandInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/image003.png rename to src/main/webapp/lesson_solutions/CommandInjection_files/image003.png diff --git a/webapp/lesson_solutions/CommandInjection_files/image005.png b/src/main/webapp/lesson_solutions/CommandInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/image005.png rename to src/main/webapp/lesson_solutions/CommandInjection_files/image005.png diff --git a/webapp/lesson_solutions/CommandInjection_files/image007.jpg b/src/main/webapp/lesson_solutions/CommandInjection_files/image007.jpg similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/image007.jpg rename to src/main/webapp/lesson_solutions/CommandInjection_files/image007.jpg diff --git a/webapp/lesson_solutions/CommandInjection_files/image008.jpg b/src/main/webapp/lesson_solutions/CommandInjection_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/image008.jpg rename to src/main/webapp/lesson_solutions/CommandInjection_files/image008.jpg diff --git a/webapp/lesson_solutions/CommandInjection_files/image009.jpg b/src/main/webapp/lesson_solutions/CommandInjection_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/image009.jpg rename to src/main/webapp/lesson_solutions/CommandInjection_files/image009.jpg diff --git a/webapp/lesson_solutions/CommandInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions/CommandInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/CommandInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions/CommandInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/ConcurrencyCart_files/image001.jpg b/src/main/webapp/lesson_solutions/ConcurrencyCart_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/ConcurrencyCart_files/image001.jpg rename to src/main/webapp/lesson_solutions/ConcurrencyCart_files/image001.jpg diff --git a/webapp/lesson_solutions/ConcurrencyCart_files/image002.jpg b/src/main/webapp/lesson_solutions/ConcurrencyCart_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/ConcurrencyCart_files/image002.jpg rename to src/main/webapp/lesson_solutions/ConcurrencyCart_files/image002.jpg diff --git a/webapp/lesson_solutions/ConcurrencyCart_files/image003.jpg b/src/main/webapp/lesson_solutions/ConcurrencyCart_files/image003.jpg similarity index 100% rename from webapp/lesson_solutions/ConcurrencyCart_files/image003.jpg rename to src/main/webapp/lesson_solutions/ConcurrencyCart_files/image003.jpg diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHack.png diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/iframePromptHacked.png diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/imgPromptHack.png diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsComplete.png diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsHack.png diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPage.png diff --git a/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png b/src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png rename to src/main/webapp/lesson_solutions/CsrfPromptByPass_files/transferFundsPrompt.png diff --git a/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHack.png b/src/main/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHack.png similarity index 100% rename from webapp/lesson_solutions/CsrfTokenByPass_files/tokenHack.png rename to src/main/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHack.png diff --git a/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png b/src/main/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png similarity index 100% rename from webapp/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png rename to src/main/webapp/lesson_solutions/CsrfTokenByPass_files/tokenHacked.png diff --git a/webapp/lesson_solutions/CsrfTokenByPass_files/tokenPage.png b/src/main/webapp/lesson_solutions/CsrfTokenByPass_files/tokenPage.png similarity index 100% rename from webapp/lesson_solutions/CsrfTokenByPass_files/tokenPage.png rename to src/main/webapp/lesson_solutions/CsrfTokenByPass_files/tokenPage.png diff --git a/webapp/lesson_solutions/DOMInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/DOMInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/DOMInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/DOMInjection_files/filelist.xml b/src/main/webapp/lesson_solutions/DOMInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions/DOMInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/DOMInjection_files/image001.png b/src/main/webapp/lesson_solutions/DOMInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image001.png rename to src/main/webapp/lesson_solutions/DOMInjection_files/image001.png diff --git a/webapp/lesson_solutions/DOMInjection_files/image002.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image002.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image002.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/image003.png b/src/main/webapp/lesson_solutions/DOMInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image003.png rename to src/main/webapp/lesson_solutions/DOMInjection_files/image003.png diff --git a/webapp/lesson_solutions/DOMInjection_files/image004.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image004.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image004.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/image005.png b/src/main/webapp/lesson_solutions/DOMInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image005.png rename to src/main/webapp/lesson_solutions/DOMInjection_files/image005.png diff --git a/webapp/lesson_solutions/DOMInjection_files/image006.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image006.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image006.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/image007.png b/src/main/webapp/lesson_solutions/DOMInjection_files/image007.png similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image007.png rename to src/main/webapp/lesson_solutions/DOMInjection_files/image007.png diff --git a/webapp/lesson_solutions/DOMInjection_files/image008.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image008.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image008.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/image008fix.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image008fix.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image008fix.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image008fix.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/image009.png b/src/main/webapp/lesson_solutions/DOMInjection_files/image009.png similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image009.png rename to src/main/webapp/lesson_solutions/DOMInjection_files/image009.png diff --git a/webapp/lesson_solutions/DOMInjection_files/image010.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image010.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image010.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image010.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/image011.png b/src/main/webapp/lesson_solutions/DOMInjection_files/image011.png similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image011.png rename to src/main/webapp/lesson_solutions/DOMInjection_files/image011.png diff --git a/webapp/lesson_solutions/DOMInjection_files/image012.jpg b/src/main/webapp/lesson_solutions/DOMInjection_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/image012.jpg rename to src/main/webapp/lesson_solutions/DOMInjection_files/image012.jpg diff --git a/webapp/lesson_solutions/DOMInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions/DOMInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/DOMInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions/DOMInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/DOMXSS_files/Thumbs.db b/src/main/webapp/lesson_solutions/DOMXSS_files/Thumbs.db similarity index 100% rename from webapp/lesson_solutions/DOMXSS_files/Thumbs.db rename to src/main/webapp/lesson_solutions/DOMXSS_files/Thumbs.db diff --git a/webapp/lesson_solutions/DOMXSS_files/image001.jpg b/src/main/webapp/lesson_solutions/DOMXSS_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/DOMXSS_files/image001.jpg rename to src/main/webapp/lesson_solutions/DOMXSS_files/image001.jpg diff --git a/webapp/lesson_solutions/DOMXSS_files/image002.jpg b/src/main/webapp/lesson_solutions/DOMXSS_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/DOMXSS_files/image002.jpg rename to src/main/webapp/lesson_solutions/DOMXSS_files/image002.jpg diff --git a/webapp/lesson_solutions/DOMXSS_files/image003.jpg b/src/main/webapp/lesson_solutions/DOMXSS_files/image003.jpg similarity index 100% rename from webapp/lesson_solutions/DOMXSS_files/image003.jpg rename to src/main/webapp/lesson_solutions/DOMXSS_files/image003.jpg diff --git a/webapp/lesson_solutions/DOMXSS_files/image004.jpg b/src/main/webapp/lesson_solutions/DOMXSS_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/DOMXSS_files/image004.jpg rename to src/main/webapp/lesson_solutions/DOMXSS_files/image004.jpg diff --git a/webapp/lesson_solutions/DOS_Login_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/DOS_Login_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/DOS_Login_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/DOS_Login_files/filelist.xml b/src/main/webapp/lesson_solutions/DOS_Login_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/filelist.xml rename to src/main/webapp/lesson_solutions/DOS_Login_files/filelist.xml diff --git a/webapp/lesson_solutions/DOS_Login_files/image001.png b/src/main/webapp/lesson_solutions/DOS_Login_files/image001.png similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/image001.png rename to src/main/webapp/lesson_solutions/DOS_Login_files/image001.png diff --git a/webapp/lesson_solutions/DOS_Login_files/image002.jpg b/src/main/webapp/lesson_solutions/DOS_Login_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/image002.jpg rename to src/main/webapp/lesson_solutions/DOS_Login_files/image002.jpg diff --git a/webapp/lesson_solutions/DOS_Login_files/image003.png b/src/main/webapp/lesson_solutions/DOS_Login_files/image003.png similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/image003.png rename to src/main/webapp/lesson_solutions/DOS_Login_files/image003.png diff --git a/webapp/lesson_solutions/DOS_Login_files/image004.jpg b/src/main/webapp/lesson_solutions/DOS_Login_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/image004.jpg rename to src/main/webapp/lesson_solutions/DOS_Login_files/image004.jpg diff --git a/webapp/lesson_solutions/DOS_Login_files/themedata.thmx b/src/main/webapp/lesson_solutions/DOS_Login_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/DOS_Login_files/themedata.thmx rename to src/main/webapp/lesson_solutions/DOS_Login_files/themedata.thmx diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/filelist.xml b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/filelist.xml rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/filelist.xml diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image001.png b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image001.png similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image001.png rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image001.png diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image003.png b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image003.png similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image003.png rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image003.png diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image005.png b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image005.png similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image005.png rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image005.png diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image007.png b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image007.png similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image007.png rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image007.png diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image009.jpg b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image009.jpg rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image009.jpg diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image010.jpg b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image010.jpg similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image010.jpg rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image010.jpg diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image011.jpg b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image011.jpg rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image011.jpg diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/image012.jpg b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/image012.jpg rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/image012.jpg diff --git a/webapp/lesson_solutions/FailOpenAuthentication_files/themedata.thmx b/src/main/webapp/lesson_solutions/FailOpenAuthentication_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication_files/themedata.thmx rename to src/main/webapp/lesson_solutions/FailOpenAuthentication_files/themedata.thmx diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/filelist.xml b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/filelist.xml rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/filelist.xml diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image001.png b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image001.png similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image001.png rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image001.png diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image002.jpg b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image002.jpg rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image002.jpg diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image003.png b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image003.png similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image003.png rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image003.png diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image004.jpg b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image004.jpg rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image004.jpg diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image005.png b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image005.png similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image005.png rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image005.png diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image006.jpg b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image006.jpg rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image006.jpg diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image007.png b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image007.png similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image007.png rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image007.png diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/image008.jpg b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/image008.jpg rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/image008.jpg diff --git a/webapp/lesson_solutions/ForcedBrowsing_files/themedata.thmx b/src/main/webapp/lesson_solutions/ForcedBrowsing_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing_files/themedata.thmx rename to src/main/webapp/lesson_solutions/ForcedBrowsing_files/themedata.thmx diff --git a/webapp/lesson_solutions/ForgotPassword_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/ForgotPassword_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/ForgotPassword_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/ForgotPassword_files/filelist.xml b/src/main/webapp/lesson_solutions/ForgotPassword_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/filelist.xml rename to src/main/webapp/lesson_solutions/ForgotPassword_files/filelist.xml diff --git a/webapp/lesson_solutions/ForgotPassword_files/image001.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image001.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image001.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image001.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image003.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image003.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image003.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image003.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image005.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image005.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image005.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image005.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image007.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image007.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image007.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image007.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image009.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image009.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image009.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image009.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image011.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image011.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image011.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image011.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image013.png b/src/main/webapp/lesson_solutions/ForgotPassword_files/image013.png similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image013.png rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image013.png diff --git a/webapp/lesson_solutions/ForgotPassword_files/image015.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image015.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image015.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/image016.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image016.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image016.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image016.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/image017.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image017.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image017.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/image018.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image018.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image018.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image018.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/image019.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image019.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image019.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image019.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/image020.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image020.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image020.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image020.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/image021.jpg b/src/main/webapp/lesson_solutions/ForgotPassword_files/image021.jpg similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/image021.jpg rename to src/main/webapp/lesson_solutions/ForgotPassword_files/image021.jpg diff --git a/webapp/lesson_solutions/ForgotPassword_files/themedata.thmx b/src/main/webapp/lesson_solutions/ForgotPassword_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/ForgotPassword_files/themedata.thmx rename to src/main/webapp/lesson_solutions/ForgotPassword_files/themedata.thmx diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/Thumbs.db b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/Thumbs.db similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/Thumbs.db rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/Thumbs.db diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/filelist.xml b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/filelist.xml rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/filelist.xml diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image001.png b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image001.png similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image001.png rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image001.png diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image003.png b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image003.png similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image003.png rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image003.png diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image005.png b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image005.png similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image005.png rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image005.png diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image007.png b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image007.png similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image007.png rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image007.png diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image009.png b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image009.png similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image009.png rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image009.png diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image011.jpg b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image011.jpg rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image011.jpg diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image012.jpg b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image012.jpg rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image012.jpg diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image013.jpg b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image013.jpg rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image013.jpg diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image014.jpg b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image014.jpg similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image014.jpg rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image014.jpg diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/image015.jpg b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/image015.jpg rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/image015.jpg diff --git a/webapp/lesson_solutions/HiddenFieldTampering_files/themedata.thmx b/src/main/webapp/lesson_solutions/HiddenFieldTampering_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering_files/themedata.thmx rename to src/main/webapp/lesson_solutions/HiddenFieldTampering_files/themedata.thmx diff --git a/webapp/lesson_solutions/HtmlClues_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/HtmlClues_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/HtmlClues_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/HtmlClues_files/filelist.xml b/src/main/webapp/lesson_solutions/HtmlClues_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/filelist.xml rename to src/main/webapp/lesson_solutions/HtmlClues_files/filelist.xml diff --git a/webapp/lesson_solutions/HtmlClues_files/image001.png b/src/main/webapp/lesson_solutions/HtmlClues_files/image001.png similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image001.png rename to src/main/webapp/lesson_solutions/HtmlClues_files/image001.png diff --git a/webapp/lesson_solutions/HtmlClues_files/image003.png b/src/main/webapp/lesson_solutions/HtmlClues_files/image003.png similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image003.png rename to src/main/webapp/lesson_solutions/HtmlClues_files/image003.png diff --git a/webapp/lesson_solutions/HtmlClues_files/image005.png b/src/main/webapp/lesson_solutions/HtmlClues_files/image005.png similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image005.png rename to src/main/webapp/lesson_solutions/HtmlClues_files/image005.png diff --git a/webapp/lesson_solutions/HtmlClues_files/image007.png b/src/main/webapp/lesson_solutions/HtmlClues_files/image007.png similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image007.png rename to src/main/webapp/lesson_solutions/HtmlClues_files/image007.png diff --git a/webapp/lesson_solutions/HtmlClues_files/image009.png b/src/main/webapp/lesson_solutions/HtmlClues_files/image009.png similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image009.png rename to src/main/webapp/lesson_solutions/HtmlClues_files/image009.png diff --git a/webapp/lesson_solutions/HtmlClues_files/image011.jpg b/src/main/webapp/lesson_solutions/HtmlClues_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image011.jpg rename to src/main/webapp/lesson_solutions/HtmlClues_files/image011.jpg diff --git a/webapp/lesson_solutions/HtmlClues_files/image012.jpg b/src/main/webapp/lesson_solutions/HtmlClues_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image012.jpg rename to src/main/webapp/lesson_solutions/HtmlClues_files/image012.jpg diff --git a/webapp/lesson_solutions/HtmlClues_files/image013.jpg b/src/main/webapp/lesson_solutions/HtmlClues_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image013.jpg rename to src/main/webapp/lesson_solutions/HtmlClues_files/image013.jpg diff --git a/webapp/lesson_solutions/HtmlClues_files/image014.jpg b/src/main/webapp/lesson_solutions/HtmlClues_files/image014.jpg similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image014.jpg rename to src/main/webapp/lesson_solutions/HtmlClues_files/image014.jpg diff --git a/webapp/lesson_solutions/HtmlClues_files/image015.jpg b/src/main/webapp/lesson_solutions/HtmlClues_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/image015.jpg rename to src/main/webapp/lesson_solutions/HtmlClues_files/image015.jpg diff --git a/webapp/lesson_solutions/HtmlClues_files/themedata.thmx b/src/main/webapp/lesson_solutions/HtmlClues_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/HtmlClues_files/themedata.thmx rename to src/main/webapp/lesson_solutions/HtmlClues_files/themedata.thmx diff --git a/webapp/lesson_solutions/HttpBasics_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/HttpBasics_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/HttpBasics_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/HttpBasics_files/filelist.xml b/src/main/webapp/lesson_solutions/HttpBasics_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/filelist.xml rename to src/main/webapp/lesson_solutions/HttpBasics_files/filelist.xml diff --git a/webapp/lesson_solutions/HttpBasics_files/image001.png b/src/main/webapp/lesson_solutions/HttpBasics_files/image001.png similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/image001.png rename to src/main/webapp/lesson_solutions/HttpBasics_files/image001.png diff --git a/webapp/lesson_solutions/HttpBasics_files/image003.png b/src/main/webapp/lesson_solutions/HttpBasics_files/image003.png similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/image003.png rename to src/main/webapp/lesson_solutions/HttpBasics_files/image003.png diff --git a/webapp/lesson_solutions/HttpBasics_files/image005.jpg b/src/main/webapp/lesson_solutions/HttpBasics_files/image005.jpg similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/image005.jpg rename to src/main/webapp/lesson_solutions/HttpBasics_files/image005.jpg diff --git a/webapp/lesson_solutions/HttpBasics_files/image006.jpg b/src/main/webapp/lesson_solutions/HttpBasics_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/image006.jpg rename to src/main/webapp/lesson_solutions/HttpBasics_files/image006.jpg diff --git a/webapp/lesson_solutions/HttpBasics_files/themedata.thmx b/src/main/webapp/lesson_solutions/HttpBasics_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/themedata.thmx rename to src/main/webapp/lesson_solutions/HttpBasics_files/themedata.thmx diff --git a/webapp/lesson_solutions/HttpBasics_files/webscarab1.jpg b/src/main/webapp/lesson_solutions/HttpBasics_files/webscarab1.jpg similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/webscarab1.jpg rename to src/main/webapp/lesson_solutions/HttpBasics_files/webscarab1.jpg diff --git a/webapp/lesson_solutions/HttpBasics_files/webscarab2.jpg b/src/main/webapp/lesson_solutions/HttpBasics_files/webscarab2.jpg similarity index 100% rename from webapp/lesson_solutions/HttpBasics_files/webscarab2.jpg rename to src/main/webapp/lesson_solutions/HttpBasics_files/webscarab2.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/colorschememapping.xml b/src/main/webapp/lesson_solutions/HttpOnly_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions/HttpOnly_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/HttpOnly_files/filelist.xml b/src/main/webapp/lesson_solutions/HttpOnly_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/filelist.xml rename to src/main/webapp/lesson_solutions/HttpOnly_files/filelist.xml diff --git a/webapp/lesson_solutions/HttpOnly_files/image001.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image001.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image001.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image001.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image003.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image003.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image003.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image003.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image005.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image005.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image005.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image005.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image007.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image007.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image007.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image007.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image009.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image009.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image009.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image009.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image011.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image011.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image011.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image011.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image013.png b/src/main/webapp/lesson_solutions/HttpOnly_files/image013.png similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image013.png rename to src/main/webapp/lesson_solutions/HttpOnly_files/image013.png diff --git a/webapp/lesson_solutions/HttpOnly_files/image015.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image015.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image015.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/image016.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image016.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image016.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image016.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/image017.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image017.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image017.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/image018.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image018.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image018.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image018.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/image019.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image019.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image019.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image019.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/image020.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image020.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image020.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image020.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/image021.jpg b/src/main/webapp/lesson_solutions/HttpOnly_files/image021.jpg similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/image021.jpg rename to src/main/webapp/lesson_solutions/HttpOnly_files/image021.jpg diff --git a/webapp/lesson_solutions/HttpOnly_files/themedata.thmx b/src/main/webapp/lesson_solutions/HttpOnly_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/HttpOnly_files/themedata.thmx rename to src/main/webapp/lesson_solutions/HttpOnly_files/themedata.thmx diff --git a/webapp/lesson_solutions/AccessControlMatrix.html b/src/main/webapp/lesson_solutions_1/AccessControlMatrix.html similarity index 100% rename from webapp/lesson_solutions/AccessControlMatrix.html rename to src/main/webapp/lesson_solutions_1/AccessControlMatrix.html diff --git a/webapp/lesson_solutions/BackDoors.html b/src/main/webapp/lesson_solutions_1/BackDoors.html similarity index 100% rename from webapp/lesson_solutions/BackDoors.html rename to src/main/webapp/lesson_solutions_1/BackDoors.html diff --git a/webapp/lesson_solutions/BasicAuthentication.html b/src/main/webapp/lesson_solutions_1/BasicAuthentication.html similarity index 100% rename from webapp/lesson_solutions/BasicAuthentication.html rename to src/main/webapp/lesson_solutions_1/BasicAuthentication.html diff --git a/webapp/lesson_solutions/BlindNumericSqlInjection.html b/src/main/webapp/lesson_solutions_1/BlindNumericSqlInjection.html similarity index 100% rename from webapp/lesson_solutions/BlindNumericSqlInjection.html rename to src/main/webapp/lesson_solutions_1/BlindNumericSqlInjection.html diff --git a/webapp/lesson_solutions/BlindStringSqlInjection.html b/src/main/webapp/lesson_solutions_1/BlindStringSqlInjection.html similarity index 100% rename from webapp/lesson_solutions/BlindStringSqlInjection.html rename to src/main/webapp/lesson_solutions_1/BlindStringSqlInjection.html diff --git a/webapp/lesson_solutions/BypassHtmlFieldRestrictions.html b/src/main/webapp/lesson_solutions_1/BypassHtmlFieldRestrictions.html similarity index 100% rename from webapp/lesson_solutions/BypassHtmlFieldRestrictions.html rename to src/main/webapp/lesson_solutions_1/BypassHtmlFieldRestrictions.html diff --git a/webapp/lesson_solutions/CSRF.html b/src/main/webapp/lesson_solutions_1/CSRF.html similarity index 100% rename from webapp/lesson_solutions/CSRF.html rename to src/main/webapp/lesson_solutions_1/CSRF.html diff --git a/webapp/lesson_solutions/ClientSideFiltering.html b/src/main/webapp/lesson_solutions_1/ClientSideFiltering.html similarity index 100% rename from webapp/lesson_solutions/ClientSideFiltering.html rename to src/main/webapp/lesson_solutions_1/ClientSideFiltering.html diff --git a/webapp/lesson_solutions/ClientSideValidation.html b/src/main/webapp/lesson_solutions_1/ClientSideValidation.html similarity index 100% rename from webapp/lesson_solutions/ClientSideValidation.html rename to src/main/webapp/lesson_solutions_1/ClientSideValidation.html diff --git a/webapp/lesson_solutions/CommandInjection.html b/src/main/webapp/lesson_solutions_1/CommandInjection.html similarity index 100% rename from webapp/lesson_solutions/CommandInjection.html rename to src/main/webapp/lesson_solutions_1/CommandInjection.html diff --git a/webapp/lesson_solutions/ConcurrencyCart.html b/src/main/webapp/lesson_solutions_1/ConcurrencyCart.html similarity index 100% rename from webapp/lesson_solutions/ConcurrencyCart.html rename to src/main/webapp/lesson_solutions_1/ConcurrencyCart.html diff --git a/webapp/lesson_solutions/CsrfPromptByPass.html b/src/main/webapp/lesson_solutions_1/CsrfPromptByPass.html similarity index 100% rename from webapp/lesson_solutions/CsrfPromptByPass.html rename to src/main/webapp/lesson_solutions_1/CsrfPromptByPass.html diff --git a/webapp/lesson_solutions/CsrfTokenByPass.html b/src/main/webapp/lesson_solutions_1/CsrfTokenByPass.html similarity index 100% rename from webapp/lesson_solutions/CsrfTokenByPass.html rename to src/main/webapp/lesson_solutions_1/CsrfTokenByPass.html diff --git a/webapp/lesson_solutions/DOMInjection.html b/src/main/webapp/lesson_solutions_1/DOMInjection.html similarity index 100% rename from webapp/lesson_solutions/DOMInjection.html rename to src/main/webapp/lesson_solutions_1/DOMInjection.html diff --git a/webapp/lesson_solutions/DOMXSS.html b/src/main/webapp/lesson_solutions_1/DOMXSS.html similarity index 100% rename from webapp/lesson_solutions/DOMXSS.html rename to src/main/webapp/lesson_solutions_1/DOMXSS.html diff --git a/webapp/lesson_solutions/DOS_Login.html b/src/main/webapp/lesson_solutions_1/DOS_Login.html similarity index 100% rename from webapp/lesson_solutions/DOS_Login.html rename to src/main/webapp/lesson_solutions_1/DOS_Login.html diff --git a/webapp/lesson_solutions/DangerousEval.html b/src/main/webapp/lesson_solutions_1/DangerousEval.html similarity index 100% rename from webapp/lesson_solutions/DangerousEval.html rename to src/main/webapp/lesson_solutions_1/DangerousEval.html diff --git a/webapp/lesson_solutions/Encoding.html b/src/main/webapp/lesson_solutions_1/Encoding.html similarity index 100% rename from webapp/lesson_solutions/Encoding.html rename to src/main/webapp/lesson_solutions_1/Encoding.html diff --git a/webapp/lesson_solutions/FailOpenAuthentication.html b/src/main/webapp/lesson_solutions_1/FailOpenAuthentication.html similarity index 100% rename from webapp/lesson_solutions/FailOpenAuthentication.html rename to src/main/webapp/lesson_solutions_1/FailOpenAuthentication.html diff --git a/webapp/lesson_solutions/ForcedBrowsing.html b/src/main/webapp/lesson_solutions_1/ForcedBrowsing.html similarity index 100% rename from webapp/lesson_solutions/ForcedBrowsing.html rename to src/main/webapp/lesson_solutions_1/ForcedBrowsing.html diff --git a/webapp/lesson_solutions/ForgotPassword.html b/src/main/webapp/lesson_solutions_1/ForgotPassword.html similarity index 100% rename from webapp/lesson_solutions/ForgotPassword.html rename to src/main/webapp/lesson_solutions_1/ForgotPassword.html diff --git a/webapp/lesson_solutions/HiddenFieldTampering.html b/src/main/webapp/lesson_solutions_1/HiddenFieldTampering.html similarity index 100% rename from webapp/lesson_solutions/HiddenFieldTampering.html rename to src/main/webapp/lesson_solutions_1/HiddenFieldTampering.html diff --git a/webapp/lesson_solutions/HtmlClues.html b/src/main/webapp/lesson_solutions_1/HtmlClues.html similarity index 100% rename from webapp/lesson_solutions/HtmlClues.html rename to src/main/webapp/lesson_solutions_1/HtmlClues.html diff --git a/webapp/lesson_solutions/HttpBasics.html b/src/main/webapp/lesson_solutions_1/HttpBasics.html similarity index 100% rename from webapp/lesson_solutions/HttpBasics.html rename to src/main/webapp/lesson_solutions_1/HttpBasics.html diff --git a/webapp/lesson_solutions/HttpOnly.html b/src/main/webapp/lesson_solutions_1/HttpOnly.html similarity index 100% rename from webapp/lesson_solutions/HttpOnly.html rename to src/main/webapp/lesson_solutions_1/HttpOnly.html diff --git a/webapp/lesson_solutions/HttpSplitting.html b/src/main/webapp/lesson_solutions_1/HttpSplitting.html similarity index 100% rename from webapp/lesson_solutions/HttpSplitting.html rename to src/main/webapp/lesson_solutions_1/HttpSplitting.html diff --git a/webapp/lesson_solutions/HttpSplitting_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/HttpSplitting_files/filelist.xml b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/filelist.xml diff --git a/webapp/lesson_solutions/HttpSplitting_files/image001.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image001.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image001.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image001.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image003.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image003.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image003.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image003.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image005.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image005.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image005.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image005.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image007.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image007.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image007.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image007.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image009.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image009.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image009.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image009.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image011.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image011.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image011.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image011.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image013.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image013.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image013.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image013.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image015.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image015.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image015.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image015.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image017.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image017.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image017.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image017.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image019.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image019.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image019.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image019.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image021.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image021.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image021.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image021.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image023.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image023.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image023.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image023.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image025.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image025.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image025.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image025.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image027.png b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image027.png similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image027.png rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image027.png diff --git a/webapp/lesson_solutions/HttpSplitting_files/image029.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image029.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image029.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image029.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image030.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image030.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image030.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image030.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image031.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image031.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image031.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image031.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image032.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image032.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image032.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image032.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image033.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image033.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image033.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image033.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image034.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image034.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image034.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image034.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image035.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image035.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image035.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image035.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image036.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image036.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image036.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image036.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image037.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image037.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image037.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image037.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image038.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image038.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image038.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image038.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image039.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image039.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image039.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image039.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image040.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image040.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image040.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image040.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image041.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image041.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image041.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image041.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/image042.jpg b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/image042.jpg similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/image042.jpg rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/image042.jpg diff --git a/webapp/lesson_solutions/HttpSplitting_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/HttpSplitting_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/HttpSplitting_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/HttpSplitting_files/themedata.thmx diff --git a/webapp/lesson_solutions/InsecureLogin.html b/src/main/webapp/lesson_solutions_1/InsecureLogin.html similarity index 100% rename from webapp/lesson_solutions/InsecureLogin.html rename to src/main/webapp/lesson_solutions_1/InsecureLogin.html diff --git a/webapp/lesson_solutions/InsecureLogin_files/wireshark1.png b/src/main/webapp/lesson_solutions_1/InsecureLogin_files/wireshark1.png similarity index 100% rename from webapp/lesson_solutions/InsecureLogin_files/wireshark1.png rename to src/main/webapp/lesson_solutions_1/InsecureLogin_files/wireshark1.png diff --git a/webapp/lesson_solutions/JSONInjection.html b/src/main/webapp/lesson_solutions_1/JSONInjection.html similarity index 100% rename from webapp/lesson_solutions/JSONInjection.html rename to src/main/webapp/lesson_solutions_1/JSONInjection.html diff --git a/webapp/lesson_solutions/JSONInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/JSONInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/JSONInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/JSONInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/JSONInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image001.png diff --git a/webapp/lesson_solutions/JSONInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image003.png diff --git a/webapp/lesson_solutions/JSONInjection_files/image005.png b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image005.png rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image005.png diff --git a/webapp/lesson_solutions/JSONInjection_files/image007.png b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image007.png similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image007.png rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image007.png diff --git a/webapp/lesson_solutions/JSONInjection_files/image009.png b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image009.png similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image009.png rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image009.png diff --git a/webapp/lesson_solutions/JSONInjection_files/image011.png b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image011.png similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image011.png rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image011.png diff --git a/webapp/lesson_solutions/JSONInjection_files/image013.jpg b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image013.jpg rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image013.jpg diff --git a/webapp/lesson_solutions/JSONInjection_files/image014.jpg b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image014.jpg similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image014.jpg rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image014.jpg diff --git a/webapp/lesson_solutions/JSONInjection_files/image015.jpg b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image015.jpg rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image015.jpg diff --git a/webapp/lesson_solutions/JSONInjection_files/image016.jpg b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image016.jpg similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image016.jpg rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image016.jpg diff --git a/webapp/lesson_solutions/JSONInjection_files/image017.jpg b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image017.jpg rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image017.jpg diff --git a/webapp/lesson_solutions/JSONInjection_files/image018.jpg b/src/main/webapp/lesson_solutions_1/JSONInjection_files/image018.jpg similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/image018.jpg rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/image018.jpg diff --git a/webapp/lesson_solutions/JSONInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/JSONInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/JSONInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/JSONInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/JavaScriptValidation.html b/src/main/webapp/lesson_solutions_1/JavaScriptValidation.html similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation.html rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation.html diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/filelist.xml b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/filelist.xml diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image001.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image001.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image001.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image001.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image002.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image002.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image003.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image003.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image003.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image003.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image004.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image004.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image005.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image005.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image005.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image005.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image006.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image006.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image007.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image007.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image007.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image007.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image008.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image008.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image009.gif b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image009.gif similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image009.gif rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image009.gif diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image010.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image010.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image010.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image010.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image011.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image011.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image011.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image012.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image012.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image012.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image012.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image013.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image013.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image013.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image013.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image014.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image014.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image014.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image014.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image015.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image015.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image015.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image015.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image016.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image016.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image016.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image016.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image017.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image017.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image017.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image018.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image018.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image018.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image018.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image019.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image019.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image019.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image019.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image020.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image020.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image020.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image020.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image021.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image021.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image021.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image021.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image022.png b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image022.png similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image022.png rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image022.png diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/image023.jpg b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image023.jpg similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/image023.jpg rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/image023.jpg diff --git a/webapp/lesson_solutions/JavaScriptValidation_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/JavaScriptValidation_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/JavaScriptValidation_files/themedata.thmx diff --git a/webapp/lesson_solutions/Lab Access Control/Lab Add Business Layer Access Control.html b/src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Add Business Layer Access Control.html similarity index 100% rename from webapp/lesson_solutions/Lab Access Control/Lab Add Business Layer Access Control.html rename to src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Add Business Layer Access Control.html diff --git a/webapp/lesson_solutions/Lab Access Control/Lab Add Data Layer Access Control.html b/src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Add Data Layer Access Control.html similarity index 100% rename from webapp/lesson_solutions/Lab Access Control/Lab Add Data Layer Access Control.html rename to src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Add Data Layer Access Control.html diff --git a/webapp/lesson_solutions/Lab Access Control/Lab Bypass Business Layer Access Control.html b/src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Bypass Business Layer Access Control.html similarity index 100% rename from webapp/lesson_solutions/Lab Access Control/Lab Bypass Business Layer Access Control.html rename to src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Bypass Business Layer Access Control.html diff --git a/webapp/lesson_solutions/Lab Access Control/Lab Bypass Data Layer Access Control.html b/src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Bypass Data Layer Access Control.html similarity index 100% rename from webapp/lesson_solutions/Lab Access Control/Lab Bypass Data Layer Access Control.html rename to src/main/webapp/lesson_solutions_1/Lab Access Control/Lab Bypass Data Layer Access Control.html diff --git a/webapp/lesson_solutions/Lab Access Control/images/access_control_stage1.png b/src/main/webapp/lesson_solutions_1/Lab Access Control/images/access_control_stage1.png similarity index 100% rename from webapp/lesson_solutions/Lab Access Control/images/access_control_stage1.png rename to src/main/webapp/lesson_solutions_1/Lab Access Control/images/access_control_stage1.png diff --git a/webapp/lesson_solutions/Lab Access Control/images/access_control_stage3.png b/src/main/webapp/lesson_solutions_1/Lab Access Control/images/access_control_stage3.png similarity index 100% rename from webapp/lesson_solutions/Lab Access Control/images/access_control_stage3.png rename to src/main/webapp/lesson_solutions_1/Lab Access Control/images/access_control_stage3.png diff --git a/webapp/lesson_solutions/Lab SQL Injection/Lab Numeric SQL Injection.html b/src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab Numeric SQL Injection.html similarity index 100% rename from webapp/lesson_solutions/Lab SQL Injection/Lab Numeric SQL Injection.html rename to src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab Numeric SQL Injection.html diff --git a/webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #1.html b/src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab Parameterized Query #1.html similarity index 100% rename from webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #1.html rename to src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab Parameterized Query #1.html diff --git a/webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #2.html b/src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab Parameterized Query #2.html similarity index 100% rename from webapp/lesson_solutions/Lab SQL Injection/Lab Parameterized Query #2.html rename to src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab Parameterized Query #2.html diff --git a/webapp/lesson_solutions/Lab SQL Injection/Lab String SQL Injection.html b/src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab String SQL Injection.html similarity index 100% rename from webapp/lesson_solutions/Lab SQL Injection/Lab String SQL Injection.html rename to src/main/webapp/lesson_solutions_1/Lab SQL Injection/Lab String SQL Injection.html diff --git a/webapp/lesson_solutions/Lab XSS/Lab Block Reflected XSS.html b/src/main/webapp/lesson_solutions_1/Lab XSS/Lab Block Reflected XSS.html similarity index 100% rename from webapp/lesson_solutions/Lab XSS/Lab Block Reflected XSS.html rename to src/main/webapp/lesson_solutions_1/Lab XSS/Lab Block Reflected XSS.html diff --git a/webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Input Validation.html b/src/main/webapp/lesson_solutions_1/Lab XSS/Lab Block Stored XSS using Input Validation.html similarity index 100% rename from webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Input Validation.html rename to src/main/webapp/lesson_solutions_1/Lab XSS/Lab Block Stored XSS using Input Validation.html diff --git a/webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Output Encoding.html b/src/main/webapp/lesson_solutions_1/Lab XSS/Lab Block Stored XSS using Output Encoding.html similarity index 100% rename from webapp/lesson_solutions/Lab XSS/Lab Block Stored XSS using Output Encoding.html rename to src/main/webapp/lesson_solutions_1/Lab XSS/Lab Block Stored XSS using Output Encoding.html diff --git a/webapp/lesson_solutions/Lab XSS/Lab Reflected XSS.html b/src/main/webapp/lesson_solutions_1/Lab XSS/Lab Reflected XSS.html similarity index 100% rename from webapp/lesson_solutions/Lab XSS/Lab Reflected XSS.html rename to src/main/webapp/lesson_solutions_1/Lab XSS/Lab Reflected XSS.html diff --git a/webapp/lesson_solutions/Lab XSS/Lab Stored XSS Revisited.html b/src/main/webapp/lesson_solutions_1/Lab XSS/Lab Stored XSS Revisited.html similarity index 100% rename from webapp/lesson_solutions/Lab XSS/Lab Stored XSS Revisited.html rename to src/main/webapp/lesson_solutions_1/Lab XSS/Lab Stored XSS Revisited.html diff --git a/webapp/lesson_solutions/Lab XSS/Lab Stored XSS.html b/src/main/webapp/lesson_solutions_1/Lab XSS/Lab Stored XSS.html similarity index 100% rename from webapp/lesson_solutions/Lab XSS/Lab Stored XSS.html rename to src/main/webapp/lesson_solutions_1/Lab XSS/Lab Stored XSS.html diff --git a/webapp/lesson_solutions/Lab XSS/images/stored_xss.png b/src/main/webapp/lesson_solutions_1/Lab XSS/images/stored_xss.png similarity index 100% rename from webapp/lesson_solutions/Lab XSS/images/stored_xss.png rename to src/main/webapp/lesson_solutions_1/Lab XSS/images/stored_xss.png diff --git a/webapp/lesson_solutions/LogSpoofing.html b/src/main/webapp/lesson_solutions_1/LogSpoofing.html similarity index 100% rename from webapp/lesson_solutions/LogSpoofing.html rename to src/main/webapp/lesson_solutions_1/LogSpoofing.html diff --git a/webapp/lesson_solutions/LogSpoofing_files/Thumbs.db b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/Thumbs.db similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/Thumbs.db rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/Thumbs.db diff --git a/webapp/lesson_solutions/LogSpoofing_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/LogSpoofing_files/filelist.xml b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/filelist.xml diff --git a/webapp/lesson_solutions/LogSpoofing_files/image001.png b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/image001.png similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/image001.png rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/image001.png diff --git a/webapp/lesson_solutions/LogSpoofing_files/image003.png b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/image003.png similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/image003.png rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/image003.png diff --git a/webapp/lesson_solutions/LogSpoofing_files/image005.png b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/image005.png similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/image005.png rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/image005.png diff --git a/webapp/lesson_solutions/LogSpoofing_files/image007.jpg b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/image007.jpg similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/image007.jpg rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/image007.jpg diff --git a/webapp/lesson_solutions/LogSpoofing_files/image008.jpg b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/image008.jpg diff --git a/webapp/lesson_solutions/LogSpoofing_files/image009.jpg b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/image009.jpg rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/image009.jpg diff --git a/webapp/lesson_solutions/LogSpoofing_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/LogSpoofing_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/LogSpoofing_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/LogSpoofing_files/themedata.thmx diff --git a/webapp/lesson_solutions/MaliciousFileExecution.html b/src/main/webapp/lesson_solutions_1/MaliciousFileExecution.html similarity index 100% rename from webapp/lesson_solutions/MaliciousFileExecution.html rename to src/main/webapp/lesson_solutions_1/MaliciousFileExecution.html diff --git a/webapp/lesson_solutions/MaliciousFileExecution_files/image001.jpg b/src/main/webapp/lesson_solutions_1/MaliciousFileExecution_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/MaliciousFileExecution_files/image001.jpg rename to src/main/webapp/lesson_solutions_1/MaliciousFileExecution_files/image001.jpg diff --git a/webapp/lesson_solutions/MaliciousFileExecution_files/image002.jpg b/src/main/webapp/lesson_solutions_1/MaliciousFileExecution_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/MaliciousFileExecution_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/MaliciousFileExecution_files/image002.jpg diff --git a/webapp/lesson_solutions/MultiLevelLogin1.html b/src/main/webapp/lesson_solutions_1/MultiLevelLogin1.html similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin1.html rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin1.html diff --git a/webapp/lesson_solutions/MultiLevelLogin1_files/login.png b/src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/login.png similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin1_files/login.png rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/login.png diff --git a/webapp/lesson_solutions/MultiLevelLogin1_files/success.png b/src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/success.png similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin1_files/success.png rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/success.png diff --git a/webapp/lesson_solutions/MultiLevelLogin1_files/tan.png b/src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/tan.png similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin1_files/tan.png rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/tan.png diff --git a/webapp/lesson_solutions/MultiLevelLogin1_files/webscarab.png b/src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/webscarab.png similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin1_files/webscarab.png rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin1_files/webscarab.png diff --git a/webapp/lesson_solutions/MultiLevelLogin2.html b/src/main/webapp/lesson_solutions_1/MultiLevelLogin2.html similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin2.html rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin2.html diff --git a/webapp/lesson_solutions/MultiLevelLogin2_files/success.png b/src/main/webapp/lesson_solutions_1/MultiLevelLogin2_files/success.png similarity index 100% rename from webapp/lesson_solutions/MultiLevelLogin2_files/success.png rename to src/main/webapp/lesson_solutions_1/MultiLevelLogin2_files/success.png diff --git a/webapp/lesson_solutions/OffByOne.html b/src/main/webapp/lesson_solutions_1/OffByOne.html similarity index 100% rename from webapp/lesson_solutions/OffByOne.html rename to src/main/webapp/lesson_solutions_1/OffByOne.html diff --git a/webapp/lesson_solutions/PasswordStrength.html b/src/main/webapp/lesson_solutions_1/PasswordStrength.html similarity index 100% rename from webapp/lesson_solutions/PasswordStrength.html rename to src/main/webapp/lesson_solutions_1/PasswordStrength.html diff --git a/webapp/lesson_solutions/PasswordStrength_files/image001.jpg b/src/main/webapp/lesson_solutions_1/PasswordStrength_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/PasswordStrength_files/image001.jpg rename to src/main/webapp/lesson_solutions_1/PasswordStrength_files/image001.jpg diff --git a/webapp/lesson_solutions/PasswordStrength_files/image002.jpg b/src/main/webapp/lesson_solutions_1/PasswordStrength_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/PasswordStrength_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/PasswordStrength_files/image002.jpg diff --git a/webapp/lesson_solutions/PasswordStrength_files/image003.jpg b/src/main/webapp/lesson_solutions_1/PasswordStrength_files/image003.jpg similarity index 100% rename from webapp/lesson_solutions/PasswordStrength_files/image003.jpg rename to src/main/webapp/lesson_solutions_1/PasswordStrength_files/image003.jpg diff --git a/webapp/lesson_solutions/PathBasedAccessControl.html b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl.html similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl.html rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl.html diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/filelist.xml b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/filelist.xml diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/image001.png b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image001.png similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/image001.png rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image001.png diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/image002.jpg b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image002.jpg diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/image003.png b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image003.png similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/image003.png rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image003.png diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/image004.jpg b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image004.jpg diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/image005.png b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image005.png similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/image005.png rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image005.png diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/image006.jpg b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/image006.jpg diff --git a/webapp/lesson_solutions/PathBasedAccessControl_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/PathBasedAccessControl_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/PathBasedAccessControl_files/themedata.thmx diff --git a/webapp/lesson_solutions/Phishing.html b/src/main/webapp/lesson_solutions_1/Phishing.html similarity index 100% rename from webapp/lesson_solutions/Phishing.html rename to src/main/webapp/lesson_solutions_1/Phishing.html diff --git a/webapp/lesson_solutions/Phishing_files/image001.jpg b/src/main/webapp/lesson_solutions_1/Phishing_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/Phishing_files/image001.jpg rename to src/main/webapp/lesson_solutions_1/Phishing_files/image001.jpg diff --git a/webapp/lesson_solutions/ReflectedXSS.html b/src/main/webapp/lesson_solutions_1/ReflectedXSS.html similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS.html rename to src/main/webapp/lesson_solutions_1/ReflectedXSS.html diff --git a/webapp/lesson_solutions/ReflectedXSS_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/ReflectedXSS_files/filelist.xml b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/filelist.xml diff --git a/webapp/lesson_solutions/ReflectedXSS_files/image001.png b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image001.png similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/image001.png rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image001.png diff --git a/webapp/lesson_solutions/ReflectedXSS_files/image003.png b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image003.png similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/image003.png rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image003.png diff --git a/webapp/lesson_solutions/ReflectedXSS_files/image005.jpg b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image005.jpg similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/image005.jpg rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image005.jpg diff --git a/webapp/lesson_solutions/ReflectedXSS_files/image006.jpg b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/image006.jpg diff --git a/webapp/lesson_solutions/ReflectedXSS_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/ReflectedXSS_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/ReflectedXSS_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/ReflectedXSS_files/themedata.thmx diff --git a/webapp/lesson_solutions/RemoteAdminFlaw.html b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw.html similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw.html rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw.html diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/filelist.xml b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/filelist.xml diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/image001.png b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image001.png similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/image001.png rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image001.png diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/image002.jpg b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image002.jpg diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/image003.png b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image003.png similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/image003.png rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image003.png diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/image004.jpg b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image004.jpg diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/image005.png b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image005.png similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/image005.png rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image005.png diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/image006.jpg b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/image006.jpg diff --git a/webapp/lesson_solutions/RemoteAdminFlaw_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/RemoteAdminFlaw_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/RemoteAdminFlaw_files/themedata.thmx diff --git a/webapp/lesson_solutions/SameOriginPolicyProtection.html b/src/main/webapp/lesson_solutions_1/SameOriginPolicyProtection.html similarity index 100% rename from webapp/lesson_solutions/SameOriginPolicyProtection.html rename to src/main/webapp/lesson_solutions_1/SameOriginPolicyProtection.html diff --git a/webapp/lesson_solutions/SessionFixation.html b/src/main/webapp/lesson_solutions_1/SessionFixation.html similarity index 100% rename from webapp/lesson_solutions/SessionFixation.html rename to src/main/webapp/lesson_solutions_1/SessionFixation.html diff --git a/webapp/lesson_solutions/SessionFixation_files/sf_stage1.png b/src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage1.png similarity index 100% rename from webapp/lesson_solutions/SessionFixation_files/sf_stage1.png rename to src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage1.png diff --git a/webapp/lesson_solutions/SessionFixation_files/sf_stage2.png b/src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage2.png similarity index 100% rename from webapp/lesson_solutions/SessionFixation_files/sf_stage2.png rename to src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage2.png diff --git a/webapp/lesson_solutions/SessionFixation_files/sf_stage3.png b/src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage3.png similarity index 100% rename from webapp/lesson_solutions/SessionFixation_files/sf_stage3.png rename to src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage3.png diff --git a/webapp/lesson_solutions/SessionFixation_files/sf_stage4_1.png b/src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage4_1.png similarity index 100% rename from webapp/lesson_solutions/SessionFixation_files/sf_stage4_1.png rename to src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage4_1.png diff --git a/webapp/lesson_solutions/SessionFixation_files/sf_stage4_2.png b/src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage4_2.png similarity index 100% rename from webapp/lesson_solutions/SessionFixation_files/sf_stage4_2.png rename to src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_stage4_2.png diff --git a/webapp/lesson_solutions/SessionFixation_files/sf_success.png b/src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_success.png similarity index 100% rename from webapp/lesson_solutions/SessionFixation_files/sf_success.png rename to src/main/webapp/lesson_solutions_1/SessionFixation_files/sf_success.png diff --git a/webapp/lesson_solutions/SilentTransactions.html b/src/main/webapp/lesson_solutions_1/SilentTransactions.html similarity index 100% rename from webapp/lesson_solutions/SilentTransactions.html rename to src/main/webapp/lesson_solutions_1/SilentTransactions.html diff --git a/webapp/lesson_solutions/SilentTransactions_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/SilentTransactions_files/filelist.xml b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/filelist.xml diff --git a/webapp/lesson_solutions/SilentTransactions_files/image001.png b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image001.png similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image001.png rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image001.png diff --git a/webapp/lesson_solutions/SilentTransactions_files/image003.png b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image003.png similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image003.png rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image003.png diff --git a/webapp/lesson_solutions/SilentTransactions_files/image005.png b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image005.png similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image005.png rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image005.png diff --git a/webapp/lesson_solutions/SilentTransactions_files/image007.png b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image007.png similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image007.png rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image007.png diff --git a/webapp/lesson_solutions/SilentTransactions_files/image009.jpg b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image009.jpg rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image009.jpg diff --git a/webapp/lesson_solutions/SilentTransactions_files/image010.jpg b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image010.jpg similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image010.jpg rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image010.jpg diff --git a/webapp/lesson_solutions/SilentTransactions_files/image011.jpg b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image011.jpg rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image011.jpg diff --git a/webapp/lesson_solutions/SilentTransactions_files/image012.jpg b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/image012.jpg rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/image012.jpg diff --git a/webapp/lesson_solutions/SilentTransactions_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/SilentTransactions_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/SilentTransactions_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/SilentTransactions_files/themedata.thmx diff --git a/webapp/lesson_solutions/SoapRequest.html b/src/main/webapp/lesson_solutions_1/SoapRequest.html similarity index 100% rename from webapp/lesson_solutions/SoapRequest.html rename to src/main/webapp/lesson_solutions_1/SoapRequest.html diff --git a/webapp/lesson_solutions/SoapRequest_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/SoapRequest_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/SoapRequest_files/filelist.xml b/src/main/webapp/lesson_solutions_1/SoapRequest_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/filelist.xml diff --git a/webapp/lesson_solutions/SoapRequest_files/image001.png b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image001.png similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image001.png rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image001.png diff --git a/webapp/lesson_solutions/SoapRequest_files/image002.jpg b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image002.jpg diff --git a/webapp/lesson_solutions/SoapRequest_files/image003.png b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image003.png similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image003.png rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image003.png diff --git a/webapp/lesson_solutions/SoapRequest_files/image004.jpg b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image004.jpg diff --git a/webapp/lesson_solutions/SoapRequest_files/image005.png b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image005.png similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image005.png rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image005.png diff --git a/webapp/lesson_solutions/SoapRequest_files/image006.jpg b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image006.jpg diff --git a/webapp/lesson_solutions/SoapRequest_files/image007.png b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image007.png similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image007.png rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image007.png diff --git a/webapp/lesson_solutions/SoapRequest_files/image008.jpg b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image008.jpg diff --git a/webapp/lesson_solutions/SoapRequest_files/image009.png b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image009.png similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image009.png rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image009.png diff --git a/webapp/lesson_solutions/SoapRequest_files/image010.jpg b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image010.jpg similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image010.jpg rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image010.jpg diff --git a/webapp/lesson_solutions/SoapRequest_files/image011.jpg b/src/main/webapp/lesson_solutions_1/SoapRequest_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/image011.jpg rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/image011.jpg diff --git a/webapp/lesson_solutions/SoapRequest_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/SoapRequest_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/SoapRequest_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/SoapRequest_files/themedata.thmx diff --git a/webapp/lesson_solutions/SqlAddData.html b/src/main/webapp/lesson_solutions_1/SqlAddData.html similarity index 100% rename from webapp/lesson_solutions/SqlAddData.html rename to src/main/webapp/lesson_solutions_1/SqlAddData.html diff --git a/webapp/lesson_solutions/SqlAddData_files/image001.jpg b/src/main/webapp/lesson_solutions_1/SqlAddData_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/SqlAddData_files/image001.jpg rename to src/main/webapp/lesson_solutions_1/SqlAddData_files/image001.jpg diff --git a/webapp/lesson_solutions/SqlModifyData.html b/src/main/webapp/lesson_solutions_1/SqlModifyData.html similarity index 100% rename from webapp/lesson_solutions/SqlModifyData.html rename to src/main/webapp/lesson_solutions_1/SqlModifyData.html diff --git a/webapp/lesson_solutions/SqlModifyData_files/image001.jpg b/src/main/webapp/lesson_solutions_1/SqlModifyData_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/SqlModifyData_files/image001.jpg rename to src/main/webapp/lesson_solutions_1/SqlModifyData_files/image001.jpg diff --git a/webapp/lesson_solutions/SqlNumericInjection.html b/src/main/webapp/lesson_solutions_1/SqlNumericInjection.html similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection.html rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection.html diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image001.png diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/image002.jpg b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image002.jpg diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image003.png diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/image004.jpg b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image004.jpg diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/image005.png b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/image005.png rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image005.png diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/image006.jpg b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/image006.jpg diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/numericinjection.png b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/numericinjection.png similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/numericinjection.png rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/numericinjection.png diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/numericinjection_solved.png b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/numericinjection_solved.png similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/numericinjection_solved.png rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/numericinjection_solved.png diff --git a/webapp/lesson_solutions/SqlNumericInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/SqlNumericInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/SqlNumericInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/SqlStringInjection.html b/src/main/webapp/lesson_solutions_1/SqlStringInjection.html similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection.html rename to src/main/webapp/lesson_solutions_1/SqlStringInjection.html diff --git a/webapp/lesson_solutions/SqlStringInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/SqlStringInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/SqlStringInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image001.png diff --git a/webapp/lesson_solutions/SqlStringInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image003.png diff --git a/webapp/lesson_solutions/SqlStringInjection_files/image005.jpg b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image005.jpg similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/image005.jpg rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image005.jpg diff --git a/webapp/lesson_solutions/SqlStringInjection_files/image006.jpg b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/image006.jpg diff --git a/webapp/lesson_solutions/SqlStringInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/SqlStringInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/SqlStringInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/SqlStringInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/StoredXSS_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/StoredXSS_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/StoredXSS_files/filelist.xml b/src/main/webapp/lesson_solutions_1/StoredXSS_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/filelist.xml diff --git a/webapp/lesson_solutions/StoredXSS_files/image001.png b/src/main/webapp/lesson_solutions_1/StoredXSS_files/image001.png similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/image001.png rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/image001.png diff --git a/webapp/lesson_solutions/StoredXSS_files/image003.png b/src/main/webapp/lesson_solutions_1/StoredXSS_files/image003.png similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/image003.png rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/image003.png diff --git a/webapp/lesson_solutions/StoredXSS_files/image005.png b/src/main/webapp/lesson_solutions_1/StoredXSS_files/image005.png similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/image005.png rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/image005.png diff --git a/webapp/lesson_solutions/StoredXSS_files/image007.jpg b/src/main/webapp/lesson_solutions_1/StoredXSS_files/image007.jpg similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/image007.jpg rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/image007.jpg diff --git a/webapp/lesson_solutions/StoredXSS_files/image008.jpg b/src/main/webapp/lesson_solutions_1/StoredXSS_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/image008.jpg diff --git a/webapp/lesson_solutions/StoredXSS_files/image009.jpg b/src/main/webapp/lesson_solutions_1/StoredXSS_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/image009.jpg rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/image009.jpg diff --git a/webapp/lesson_solutions/StoredXSS_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/StoredXSS_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/StoredXSS_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/StoredXSS_files/themedata.thmx diff --git a/webapp/lesson_solutions/StoredXss.html b/src/main/webapp/lesson_solutions_1/StoredXss.html similarity index 100% rename from webapp/lesson_solutions/StoredXss.html rename to src/main/webapp/lesson_solutions_1/StoredXss.html diff --git a/webapp/lesson_solutions/ThreadSafetyProblem.html b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem.html similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem.html rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem.html diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/filelist.xml b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/filelist.xml diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/image001.png b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image001.png similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/image001.png rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image001.png diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/image002.jpg b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image002.jpg diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/image003.png b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image003.png similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/image003.png rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image003.png diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/image004.jpg b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image004.jpg diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/image007.png b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image007.png similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/image007.png rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image007.png diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/image009.jpg b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/image009.jpg rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/image009.jpg diff --git a/webapp/lesson_solutions/ThreadSafetyProblem_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/ThreadSafetyProblem_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/ThreadSafetyProblem_files/themedata.thmx diff --git a/webapp/lesson_solutions/TraceXSS.html b/src/main/webapp/lesson_solutions_1/TraceXSS.html similarity index 100% rename from webapp/lesson_solutions/TraceXSS.html rename to src/main/webapp/lesson_solutions_1/TraceXSS.html diff --git a/webapp/lesson_solutions/TraceXSS_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/TraceXSS_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/TraceXSS_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/TraceXSS_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/TraceXSS_files/filelist.xml b/src/main/webapp/lesson_solutions_1/TraceXSS_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/TraceXSS_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/TraceXSS_files/filelist.xml diff --git a/webapp/lesson_solutions/TraceXSS_files/image001.png b/src/main/webapp/lesson_solutions_1/TraceXSS_files/image001.png similarity index 100% rename from webapp/lesson_solutions/TraceXSS_files/image001.png rename to src/main/webapp/lesson_solutions_1/TraceXSS_files/image001.png diff --git a/webapp/lesson_solutions/TraceXSS_files/image002.jpg b/src/main/webapp/lesson_solutions_1/TraceXSS_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/TraceXSS_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/TraceXSS_files/image002.jpg diff --git a/webapp/lesson_solutions/TraceXSS_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/TraceXSS_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/TraceXSS_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/TraceXSS_files/themedata.thmx diff --git a/webapp/lesson_solutions/UncheckedEmail.html b/src/main/webapp/lesson_solutions_1/UncheckedEmail.html similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail.html rename to src/main/webapp/lesson_solutions_1/UncheckedEmail.html diff --git a/webapp/lesson_solutions/UncheckedEmail_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/UncheckedEmail_files/filelist.xml b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/filelist.xml diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image001.png b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image001.png similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image001.png rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image001.png diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image002.jpg b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image002.jpg diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image003.png b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image003.png similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image003.png rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image003.png diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image004.jpg b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image004.jpg diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image005.png b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image005.png similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image005.png rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image005.png diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image006.jpg b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image006.jpg diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image007.png b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image007.png similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image007.png rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image007.png diff --git a/webapp/lesson_solutions/UncheckedEmail_files/image008.jpg b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/image008.jpg diff --git a/webapp/lesson_solutions/UncheckedEmail_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/UncheckedEmail_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/UncheckedEmail_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/UncheckedEmail_files/themedata.thmx diff --git a/webapp/lesson_solutions/WSDLScanning.html b/src/main/webapp/lesson_solutions_1/WSDLScanning.html similarity index 100% rename from webapp/lesson_solutions/WSDLScanning.html rename to src/main/webapp/lesson_solutions_1/WSDLScanning.html diff --git a/webapp/lesson_solutions/WSDLScanning_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/WSDLScanning_files/filelist.xml b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/filelist.xml diff --git a/webapp/lesson_solutions/WSDLScanning_files/image001.png b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image001.png similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image001.png rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image001.png diff --git a/webapp/lesson_solutions/WSDLScanning_files/image003.png b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image003.png similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image003.png rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image003.png diff --git a/webapp/lesson_solutions/WSDLScanning_files/image005.png b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image005.png similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image005.png rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image005.png diff --git a/webapp/lesson_solutions/WSDLScanning_files/image007.png b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image007.png similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image007.png rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image007.png diff --git a/webapp/lesson_solutions/WSDLScanning_files/image009.jpg b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image009.jpg rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image009.jpg diff --git a/webapp/lesson_solutions/WSDLScanning_files/image010.jpg b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image010.jpg similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image010.jpg rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image010.jpg diff --git a/webapp/lesson_solutions/WSDLScanning_files/image011.jpg b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image011.jpg similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image011.jpg rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image011.jpg diff --git a/webapp/lesson_solutions/WSDLScanning_files/image012.jpg b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/image012.jpg similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/image012.jpg rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/image012.jpg diff --git a/webapp/lesson_solutions/WSDLScanning_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/WSDLScanning_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/WSDLScanning_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/WSDLScanning_files/themedata.thmx diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie.html b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie.html similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie.html rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie.html diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/filelist.xml b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/filelist.xml diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image001.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image001.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image001.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image001.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image003.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image003.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image003.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image003.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image005.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image005.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image005.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image005.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image007.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image007.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image007.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image007.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image009.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image009.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image009.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image009.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image011.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image011.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image011.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image011.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image013.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image013.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image013.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image013.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image015.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image015.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image015.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image015.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image017.png b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image017.png similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image017.png rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image017.png diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image019.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image019.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image019.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image019.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image020.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image020.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image020.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image020.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image021.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image021.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image021.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image021.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image022.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image022.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image022.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image022.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image023.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image023.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image023.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image023.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image024.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image024.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image024.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image024.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image025.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image025.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image025.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image025.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image026.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image026.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image026.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image026.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/image027.jpg b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image027.jpg similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/image027.jpg rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/image027.jpg diff --git a/webapp/lesson_solutions/WeakAuthenticationCookie_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/WeakAuthenticationCookie_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/WeakAuthenticationCookie_files/themedata.thmx diff --git a/webapp/lesson_solutions/WeakSessionID.html b/src/main/webapp/lesson_solutions_1/WeakSessionID.html similarity index 100% rename from webapp/lesson_solutions/WeakSessionID.html rename to src/main/webapp/lesson_solutions_1/WeakSessionID.html diff --git a/webapp/lesson_solutions/WeakSessionID.htmlBAK b/src/main/webapp/lesson_solutions_1/WeakSessionID.htmlBAK similarity index 100% rename from webapp/lesson_solutions/WeakSessionID.htmlBAK rename to src/main/webapp/lesson_solutions_1/WeakSessionID.htmlBAK diff --git a/webapp/lesson_solutions/WeakSessionID_files/image001.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_files/image001.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_files/image001.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_files/image001.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_files/image002.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_files/image002.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_files/image003.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_files/image003.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_files/image003.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_files/image003.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_files/image004.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_files/image004.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_files/image005.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_files/image005.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_files/image005.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_files/image005.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_files/image006.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_files/image006.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/colorschememapping.xml diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/filelist.xml b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/filelist.xml similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/filelist.xml rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/filelist.xml diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image001.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image001.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image001.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image001.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image003.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image003.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image003.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image003.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image005.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image005.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image005.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image005.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image007.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image007.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image007.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image007.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image010.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image010.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image010.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image010.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image012.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image012.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image012.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image012.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image014.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image014.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image014.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image014.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image016.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image016.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image016.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image016.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image018.png b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image018.png similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image018.png rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image018.png diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image020.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image020.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image020.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image020.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image021.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image021.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image021.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image021.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image022.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image022.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image022.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image022.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image023.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image023.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image023.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image023.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image024.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image024.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image024.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image024.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image025.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image025.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image025.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image025.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image026.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image026.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image026.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image026.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image027.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image027.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image027.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image027.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image028.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image028.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image028.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image028.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/image029.jpg b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image029.jpg similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/image029.jpg rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/image029.jpg diff --git a/webapp/lesson_solutions/WeakSessionID_filesBAK/themedata.thmx b/src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/WeakSessionID_filesBAK/themedata.thmx rename to src/main/webapp/lesson_solutions_1/WeakSessionID_filesBAK/themedata.thmx diff --git a/webapp/lesson_solutions/WsSAXInjection.html b/src/main/webapp/lesson_solutions_1/WsSAXInjection.html similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection.html rename to src/main/webapp/lesson_solutions_1/WsSAXInjection.html diff --git a/webapp/lesson_solutions/WsSAXInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/WsSAXInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image001.png diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image002.jpg b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image002.jpg diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image003.png diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image004.jpg b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image004.jpg diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image005.png b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image005.png rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image005.png diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image006.jpg b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image006.jpg diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image007.png b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image007.png similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image007.png rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image007.png diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image008.jpg b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image008.jpg diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image009.png b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image009.png similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image009.png rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image009.png diff --git a/webapp/lesson_solutions/WsSAXInjection_files/image010.jpg b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image010.jpg similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/image010.jpg rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/image010.jpg diff --git a/webapp/lesson_solutions/WsSAXInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/WsSAXInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/WsSAXInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/WsSAXInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/WsSqlInjection.html b/src/main/webapp/lesson_solutions_1/WsSqlInjection.html similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection.html rename to src/main/webapp/lesson_solutions_1/WsSqlInjection.html diff --git a/webapp/lesson_solutions/WsSqlInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/WsSqlInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image001.png diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image002.jpg b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image002.jpg similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image002.jpg rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image002.jpg diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image003.png diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image004.jpg b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image004.jpg similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image004.jpg rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image004.jpg diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image005.png b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image005.png rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image005.png diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image006.jpg b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image006.jpg similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image006.jpg rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image006.jpg diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image007.png b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image007.png similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image007.png rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image007.png diff --git a/webapp/lesson_solutions/WsSqlInjection_files/image008.jpg b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/image008.jpg diff --git a/webapp/lesson_solutions/WsSqlInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/WsSqlInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/WsSqlInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/WsSqlInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/XMLInjection.html b/src/main/webapp/lesson_solutions_1/XMLInjection.html similarity index 100% rename from webapp/lesson_solutions/XMLInjection.html rename to src/main/webapp/lesson_solutions_1/XMLInjection.html diff --git a/webapp/lesson_solutions/XMLInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/XMLInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/XMLInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/XMLInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/XMLInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image001.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image003.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image005.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image005.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image005.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image007.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image007.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image007.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image007.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image009.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image009.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image009.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image009.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image011.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image011.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image011.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image011.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image013.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image013.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image013.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image013.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image015.png b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image015.png similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image015.png rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image015.png diff --git a/webapp/lesson_solutions/XMLInjection_files/image017.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image017.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image017.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image017.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image018.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image018.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image018.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image018.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image019.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image019.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image019.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image019.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image020.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image020.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image020.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image020.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image021.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image021.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image021.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image021.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image022.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image022.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image022.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image022.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image023.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image023.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image023.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image023.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/image024.jpg b/src/main/webapp/lesson_solutions_1/XMLInjection_files/image024.jpg similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/image024.jpg rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/image024.jpg diff --git a/webapp/lesson_solutions/XMLInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/XMLInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/XMLInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/XMLInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/XPATHInjection.html b/src/main/webapp/lesson_solutions_1/XPATHInjection.html similarity index 100% rename from webapp/lesson_solutions/XPATHInjection.html rename to src/main/webapp/lesson_solutions_1/XPATHInjection.html diff --git a/webapp/lesson_solutions/XPATHInjection_files/colorschememapping.xml b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/colorschememapping.xml similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/colorschememapping.xml rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/colorschememapping.xml diff --git a/webapp/lesson_solutions/XPATHInjection_files/filelist.xml b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/filelist.xml similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/filelist.xml rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/filelist.xml diff --git a/webapp/lesson_solutions/XPATHInjection_files/image001.png b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/image001.png similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/image001.png rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/image001.png diff --git a/webapp/lesson_solutions/XPATHInjection_files/image003.png b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/image003.png similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/image003.png rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/image003.png diff --git a/webapp/lesson_solutions/XPATHInjection_files/image005.png b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/image005.png similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/image005.png rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/image005.png diff --git a/webapp/lesson_solutions/XPATHInjection_files/image007.jpg b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/image007.jpg similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/image007.jpg rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/image007.jpg diff --git a/webapp/lesson_solutions/XPATHInjection_files/image008.jpg b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/image008.jpg similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/image008.jpg rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/image008.jpg diff --git a/webapp/lesson_solutions/XPATHInjection_files/image009.jpg b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/image009.jpg similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/image009.jpg rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/image009.jpg diff --git a/webapp/lesson_solutions/XPATHInjection_files/themedata.thmx b/src/main/webapp/lesson_solutions_1/XPATHInjection_files/themedata.thmx similarity index 100% rename from webapp/lesson_solutions/XPATHInjection_files/themedata.thmx rename to src/main/webapp/lesson_solutions_1/XPATHInjection_files/themedata.thmx diff --git a/webapp/lesson_solutions/formate.css b/src/main/webapp/lesson_solutions_1/formate.css similarity index 100% rename from webapp/lesson_solutions/formate.css rename to src/main/webapp/lesson_solutions_1/formate.css diff --git a/webapp/lessons/Ajax/clientSideFiltering.jsp b/src/main/webapp/lessons/Ajax/clientSideFiltering.jsp similarity index 100% rename from webapp/lessons/Ajax/clientSideFiltering.jsp rename to src/main/webapp/lessons/Ajax/clientSideFiltering.jsp diff --git a/webapp/lessons/Ajax/clientSideFiltering_backup.jsp b/src/main/webapp/lessons/Ajax/clientSideFiltering_backup.jsp similarity index 100% rename from webapp/lessons/Ajax/clientSideFiltering_backup.jsp rename to src/main/webapp/lessons/Ajax/clientSideFiltering_backup.jsp diff --git a/webapp/lessons/Ajax/clientSideValidation.jsp b/src/main/webapp/lessons/Ajax/clientSideValidation.jsp similarity index 100% rename from webapp/lessons/Ajax/clientSideValidation.jsp rename to src/main/webapp/lessons/Ajax/clientSideValidation.jsp diff --git a/webapp/lessons/Ajax/employees.xml b/src/main/webapp/lessons/Ajax/employees.xml similarity index 100% rename from webapp/lessons/Ajax/employees.xml rename to src/main/webapp/lessons/Ajax/employees.xml diff --git a/webapp/lessons/Ajax/eval.jsp b/src/main/webapp/lessons/Ajax/eval.jsp similarity index 100% rename from webapp/lessons/Ajax/eval.jsp rename to src/main/webapp/lessons/Ajax/eval.jsp diff --git a/webapp/lessons/Ajax/images/lesson1_header.jpg b/src/main/webapp/lessons/Ajax/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/Ajax/images/lesson1_header.jpg rename to src/main/webapp/lessons/Ajax/images/lesson1_header.jpg diff --git a/webapp/lessons/Ajax/images/lesson1_workspace.jpg b/src/main/webapp/lessons/Ajax/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/Ajax/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/Ajax/images/lesson1_workspace.jpg diff --git a/webapp/lessons/Ajax/instructor/clientSideFiltering_i.jsp b/src/main/webapp/lessons/Ajax/instructor/clientSideFiltering_i.jsp similarity index 100% rename from webapp/lessons/Ajax/instructor/clientSideFiltering_i.jsp rename to src/main/webapp/lessons/Ajax/instructor/clientSideFiltering_i.jsp diff --git a/webapp/lessons/Ajax/sameOrigin.jsp b/src/main/webapp/lessons/Ajax/sameOrigin.jsp similarity index 100% rename from webapp/lessons/Ajax/sameOrigin.jsp rename to src/main/webapp/lessons/Ajax/sameOrigin.jsp diff --git a/webapp/lessons/ConfManagement/config.jsp b/src/main/webapp/lessons/ConfManagement/config.jsp similarity index 100% rename from webapp/lessons/ConfManagement/config.jsp rename to src/main/webapp/lessons/ConfManagement/config.jsp diff --git a/webapp/lessons/CrossSiteScripting/CrossSiteScripting.css b/src/main/webapp/lessons/CrossSiteScripting/CrossSiteScripting.css similarity index 100% rename from webapp/lessons/CrossSiteScripting/CrossSiteScripting.css rename to src/main/webapp/lessons/CrossSiteScripting/CrossSiteScripting.css diff --git a/webapp/lessons/CrossSiteScripting/CrossSiteScripting.jsp b/src/main/webapp/lessons/CrossSiteScripting/CrossSiteScripting.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/CrossSiteScripting.jsp rename to src/main/webapp/lessons/CrossSiteScripting/CrossSiteScripting.jsp diff --git a/webapp/lessons/CrossSiteScripting/EditProfile.jsp b/src/main/webapp/lessons/CrossSiteScripting/EditProfile.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/EditProfile.jsp rename to src/main/webapp/lessons/CrossSiteScripting/EditProfile.jsp diff --git a/webapp/lessons/CrossSiteScripting/ListStaff.jsp b/src/main/webapp/lessons/CrossSiteScripting/ListStaff.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/ListStaff.jsp rename to src/main/webapp/lessons/CrossSiteScripting/ListStaff.jsp diff --git a/webapp/lessons/CrossSiteScripting/Login.jsp b/src/main/webapp/lessons/CrossSiteScripting/Login.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/Login.jsp rename to src/main/webapp/lessons/CrossSiteScripting/Login.jsp diff --git a/webapp/lessons/CrossSiteScripting/SearchStaff.jsp b/src/main/webapp/lessons/CrossSiteScripting/SearchStaff.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/SearchStaff.jsp rename to src/main/webapp/lessons/CrossSiteScripting/SearchStaff.jsp diff --git a/webapp/lessons/CrossSiteScripting/ViewProfile.jsp b/src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/ViewProfile.jsp rename to src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp diff --git a/webapp/lessons/CrossSiteScripting/error.jsp b/src/main/webapp/lessons/CrossSiteScripting/error.jsp similarity index 100% rename from webapp/lessons/CrossSiteScripting/error.jsp rename to src/main/webapp/lessons/CrossSiteScripting/error.jsp diff --git a/webapp/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg b/src/main/webapp/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg similarity index 100% rename from webapp/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg rename to src/main/webapp/lessons/CrossSiteScripting/images/lesson1_SearchWindow.jpg diff --git a/webapp/lessons/CrossSiteScripting/images/lesson1_header.jpg b/src/main/webapp/lessons/CrossSiteScripting/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/CrossSiteScripting/images/lesson1_header.jpg rename to src/main/webapp/lessons/CrossSiteScripting/images/lesson1_header.jpg diff --git a/webapp/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg b/src/main/webapp/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg similarity index 100% rename from webapp/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg rename to src/main/webapp/lessons/CrossSiteScripting/images/lesson1_loginWindow.jpg diff --git a/webapp/lessons/CrossSiteScripting/images/lesson1_menu.jpg b/src/main/webapp/lessons/CrossSiteScripting/images/lesson1_menu.jpg similarity index 100% rename from webapp/lessons/CrossSiteScripting/images/lesson1_menu.jpg rename to src/main/webapp/lessons/CrossSiteScripting/images/lesson1_menu.jpg diff --git a/webapp/lessons/CrossSiteScripting/images/lesson1_workspace.jpg b/src/main/webapp/lessons/CrossSiteScripting/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/CrossSiteScripting/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/CrossSiteScripting/images/lesson1_workspace.jpg diff --git a/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css b/src/main/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css rename to src/main/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.css diff --git a/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/DBCrossSiteScripting.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/EditProfile.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/EditProfile.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/EditProfile.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/EditProfile.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/ListStaff.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/ListStaff.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/ListStaff.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/ListStaff.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/Login.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/Login.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/Login.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/Login.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/SearchStaff.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/SearchStaff.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/SearchStaff.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/SearchStaff.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/ViewProfile.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/ViewProfile.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/ViewProfile.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/ViewProfile.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/error.jsp b/src/main/webapp/lessons/DBCrossSiteScripting/error.jsp similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/error.jsp rename to src/main/webapp/lessons/DBCrossSiteScripting/error.jsp diff --git a/webapp/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg b/src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg rename to src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_SearchWindow.jpg diff --git a/webapp/lessons/DBCrossSiteScripting/images/lesson1_header.jpg b/src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/images/lesson1_header.jpg rename to src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_header.jpg diff --git a/webapp/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg b/src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg rename to src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_loginWindow.jpg diff --git a/webapp/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg b/src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg rename to src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_menu.jpg diff --git a/webapp/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg b/src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/DBCrossSiteScripting/images/lesson1_workspace.jpg diff --git a/webapp/lessons/DBSQLInjection/DBSQLInjection.css b/src/main/webapp/lessons/DBSQLInjection/DBSQLInjection.css similarity index 100% rename from webapp/lessons/DBSQLInjection/DBSQLInjection.css rename to src/main/webapp/lessons/DBSQLInjection/DBSQLInjection.css diff --git a/webapp/lessons/DBSQLInjection/DBSQLInjection.jsp b/src/main/webapp/lessons/DBSQLInjection/DBSQLInjection.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/DBSQLInjection.jsp rename to src/main/webapp/lessons/DBSQLInjection/DBSQLInjection.jsp diff --git a/webapp/lessons/DBSQLInjection/EditProfile.jsp b/src/main/webapp/lessons/DBSQLInjection/EditProfile.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/EditProfile.jsp rename to src/main/webapp/lessons/DBSQLInjection/EditProfile.jsp diff --git a/webapp/lessons/DBSQLInjection/ListStaff.jsp b/src/main/webapp/lessons/DBSQLInjection/ListStaff.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/ListStaff.jsp rename to src/main/webapp/lessons/DBSQLInjection/ListStaff.jsp diff --git a/webapp/lessons/DBSQLInjection/Login.jsp b/src/main/webapp/lessons/DBSQLInjection/Login.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/Login.jsp rename to src/main/webapp/lessons/DBSQLInjection/Login.jsp diff --git a/webapp/lessons/DBSQLInjection/SearchStaff.jsp b/src/main/webapp/lessons/DBSQLInjection/SearchStaff.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/SearchStaff.jsp rename to src/main/webapp/lessons/DBSQLInjection/SearchStaff.jsp diff --git a/webapp/lessons/DBSQLInjection/ViewProfile.jsp b/src/main/webapp/lessons/DBSQLInjection/ViewProfile.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/ViewProfile.jsp rename to src/main/webapp/lessons/DBSQLInjection/ViewProfile.jsp diff --git a/webapp/lessons/DBSQLInjection/error.jsp b/src/main/webapp/lessons/DBSQLInjection/error.jsp similarity index 100% rename from webapp/lessons/DBSQLInjection/error.jsp rename to src/main/webapp/lessons/DBSQLInjection/error.jsp diff --git a/webapp/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg b/src/main/webapp/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg similarity index 100% rename from webapp/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg rename to src/main/webapp/lessons/DBSQLInjection/images/lesson1_SearchWindow.jpg diff --git a/webapp/lessons/DBSQLInjection/images/lesson1_header.jpg b/src/main/webapp/lessons/DBSQLInjection/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/DBSQLInjection/images/lesson1_header.jpg rename to src/main/webapp/lessons/DBSQLInjection/images/lesson1_header.jpg diff --git a/webapp/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg b/src/main/webapp/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg similarity index 100% rename from webapp/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg rename to src/main/webapp/lessons/DBSQLInjection/images/lesson1_loginWindow.jpg diff --git a/webapp/lessons/DBSQLInjection/images/lesson1_menu.jpg b/src/main/webapp/lessons/DBSQLInjection/images/lesson1_menu.jpg similarity index 100% rename from webapp/lessons/DBSQLInjection/images/lesson1_menu.jpg rename to src/main/webapp/lessons/DBSQLInjection/images/lesson1_menu.jpg diff --git a/webapp/lessons/DBSQLInjection/images/lesson1_workspace.jpg b/src/main/webapp/lessons/DBSQLInjection/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/DBSQLInjection/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/DBSQLInjection/images/lesson1_workspace.jpg diff --git a/webapp/lessons/General/redirect.jsp b/src/main/webapp/lessons/General/redirect.jsp similarity index 100% rename from webapp/lessons/General/redirect.jsp rename to src/main/webapp/lessons/General/redirect.jsp diff --git a/webapp/lessons/GoatHillsFinancial/EditProfile.jsp b/src/main/webapp/lessons/GoatHillsFinancial/EditProfile.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/EditProfile.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/EditProfile.jsp diff --git a/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.css b/src/main/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.css similarity index 100% rename from webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.css rename to src/main/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.css diff --git a/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp b/src/main/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/GoatHillsFinancial.jsp diff --git a/webapp/lessons/GoatHillsFinancial/ListStaff.jsp b/src/main/webapp/lessons/GoatHillsFinancial/ListStaff.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/ListStaff.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/ListStaff.jsp diff --git a/webapp/lessons/GoatHillsFinancial/Login.jsp b/src/main/webapp/lessons/GoatHillsFinancial/Login.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/Login.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/Login.jsp diff --git a/webapp/lessons/GoatHillsFinancial/SearchStaff.jsp b/src/main/webapp/lessons/GoatHillsFinancial/SearchStaff.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/SearchStaff.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/SearchStaff.jsp diff --git a/webapp/lessons/GoatHillsFinancial/ViewProfile.jsp b/src/main/webapp/lessons/GoatHillsFinancial/ViewProfile.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/ViewProfile.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/ViewProfile.jsp diff --git a/webapp/lessons/GoatHillsFinancial/error.jsp b/src/main/webapp/lessons/GoatHillsFinancial/error.jsp similarity index 100% rename from webapp/lessons/GoatHillsFinancial/error.jsp rename to src/main/webapp/lessons/GoatHillsFinancial/error.jsp diff --git a/webapp/lessons/GoatHillsFinancial/images/accessControl.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/accessControl.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/accessControl.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/accessControl.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/dbSchema.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/dbSchema.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/dbSchema.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/dbSchema.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_SearchWindow.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/lesson1_header.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/lesson1_header.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_header.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_loginWindow.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/lesson1_menu.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_menu.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/lesson1_menu.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_menu.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/lesson1_workspace.jpg diff --git a/webapp/lessons/GoatHillsFinancial/images/orgChart.jpg b/src/main/webapp/lessons/GoatHillsFinancial/images/orgChart.jpg similarity index 100% rename from webapp/lessons/GoatHillsFinancial/images/orgChart.jpg rename to src/main/webapp/lessons/GoatHillsFinancial/images/orgChart.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/EditProfile.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/EditProfile.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/EditProfile.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/EditProfile.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/ListStaff.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/ListStaff.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/ListStaff.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/ListStaff.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/Login.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/Login.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/Login.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/Login.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css b/src/main/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css rename to src/main/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.css diff --git a/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/SearchStaff.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/SearchStaff.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/SearchStaff.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/SearchStaff.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/ViewProfile.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/ViewProfile.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/ViewProfile.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/ViewProfile.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/error.jsp b/src/main/webapp/lessons/RoleBasedAccessControl/error.jsp similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/error.jsp rename to src/main/webapp/lessons/RoleBasedAccessControl/error.jsp diff --git a/webapp/lessons/RoleBasedAccessControl/images/accessControl.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/accessControl.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/accessControl.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/accessControl.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/dbSchema.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/dbSchema.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/dbSchema.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/dbSchema.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_SearchWindow.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/lesson1_header.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/lesson1_header.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_header.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_loginWindow.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_menu.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/lesson1_workspace.jpg diff --git a/webapp/lessons/RoleBasedAccessControl/images/orgChart.jpg b/src/main/webapp/lessons/RoleBasedAccessControl/images/orgChart.jpg similarity index 100% rename from webapp/lessons/RoleBasedAccessControl/images/orgChart.jpg rename to src/main/webapp/lessons/RoleBasedAccessControl/images/orgChart.jpg diff --git a/webapp/lessons/SQLInjection/EditProfile.jsp b/src/main/webapp/lessons/SQLInjection/EditProfile.jsp similarity index 100% rename from webapp/lessons/SQLInjection/EditProfile.jsp rename to src/main/webapp/lessons/SQLInjection/EditProfile.jsp diff --git a/webapp/lessons/SQLInjection/ListStaff.jsp b/src/main/webapp/lessons/SQLInjection/ListStaff.jsp similarity index 100% rename from webapp/lessons/SQLInjection/ListStaff.jsp rename to src/main/webapp/lessons/SQLInjection/ListStaff.jsp diff --git a/webapp/lessons/SQLInjection/Login.jsp b/src/main/webapp/lessons/SQLInjection/Login.jsp similarity index 100% rename from webapp/lessons/SQLInjection/Login.jsp rename to src/main/webapp/lessons/SQLInjection/Login.jsp diff --git a/webapp/lessons/SQLInjection/SQLInjection.css b/src/main/webapp/lessons/SQLInjection/SQLInjection.css similarity index 100% rename from webapp/lessons/SQLInjection/SQLInjection.css rename to src/main/webapp/lessons/SQLInjection/SQLInjection.css diff --git a/webapp/lessons/SQLInjection/SQLInjection.jsp b/src/main/webapp/lessons/SQLInjection/SQLInjection.jsp similarity index 100% rename from webapp/lessons/SQLInjection/SQLInjection.jsp rename to src/main/webapp/lessons/SQLInjection/SQLInjection.jsp diff --git a/webapp/lessons/SQLInjection/SearchStaff.jsp b/src/main/webapp/lessons/SQLInjection/SearchStaff.jsp similarity index 100% rename from webapp/lessons/SQLInjection/SearchStaff.jsp rename to src/main/webapp/lessons/SQLInjection/SearchStaff.jsp diff --git a/webapp/lessons/SQLInjection/ViewProfile.jsp b/src/main/webapp/lessons/SQLInjection/ViewProfile.jsp similarity index 100% rename from webapp/lessons/SQLInjection/ViewProfile.jsp rename to src/main/webapp/lessons/SQLInjection/ViewProfile.jsp diff --git a/webapp/lessons/SQLInjection/error.jsp b/src/main/webapp/lessons/SQLInjection/error.jsp similarity index 100% rename from webapp/lessons/SQLInjection/error.jsp rename to src/main/webapp/lessons/SQLInjection/error.jsp diff --git a/webapp/lessons/SQLInjection/images/lesson1_SearchWindow.jpg b/src/main/webapp/lessons/SQLInjection/images/lesson1_SearchWindow.jpg similarity index 100% rename from webapp/lessons/SQLInjection/images/lesson1_SearchWindow.jpg rename to src/main/webapp/lessons/SQLInjection/images/lesson1_SearchWindow.jpg diff --git a/webapp/lessons/SQLInjection/images/lesson1_header.jpg b/src/main/webapp/lessons/SQLInjection/images/lesson1_header.jpg similarity index 100% rename from webapp/lessons/SQLInjection/images/lesson1_header.jpg rename to src/main/webapp/lessons/SQLInjection/images/lesson1_header.jpg diff --git a/webapp/lessons/SQLInjection/images/lesson1_loginWindow.jpg b/src/main/webapp/lessons/SQLInjection/images/lesson1_loginWindow.jpg similarity index 100% rename from webapp/lessons/SQLInjection/images/lesson1_loginWindow.jpg rename to src/main/webapp/lessons/SQLInjection/images/lesson1_loginWindow.jpg diff --git a/webapp/lessons/SQLInjection/images/lesson1_menu.jpg b/src/main/webapp/lessons/SQLInjection/images/lesson1_menu.jpg similarity index 100% rename from webapp/lessons/SQLInjection/images/lesson1_menu.jpg rename to src/main/webapp/lessons/SQLInjection/images/lesson1_menu.jpg diff --git a/webapp/lessons/SQLInjection/images/lesson1_workspace.jpg b/src/main/webapp/lessons/SQLInjection/images/lesson1_workspace.jpg similarity index 100% rename from webapp/lessons/SQLInjection/images/lesson1_workspace.jpg rename to src/main/webapp/lessons/SQLInjection/images/lesson1_workspace.jpg diff --git a/webapp/lessons/XPATHInjection/EmployeesData.xml b/src/main/webapp/lessons/XPATHInjection/EmployeesData.xml similarity index 100% rename from webapp/lessons/XPATHInjection/EmployeesData.xml rename to src/main/webapp/lessons/XPATHInjection/EmployeesData.xml diff --git a/webapp/main.jsp b/src/main/webapp/main.jsp similarity index 100% rename from webapp/main.jsp rename to src/main/webapp/main.jsp diff --git a/webapp/plugins/bootstrap-slider/css/slider.css b/src/main/webapp/plugins/bootstrap-slider/css/slider.css similarity index 100% rename from webapp/plugins/bootstrap-slider/css/slider.css rename to src/main/webapp/plugins/bootstrap-slider/css/slider.css diff --git a/webapp/plugins/bootstrap-slider/js/bootstrap-slider.js b/src/main/webapp/plugins/bootstrap-slider/js/bootstrap-slider.js similarity index 100% rename from webapp/plugins/bootstrap-slider/js/bootstrap-slider.js rename to src/main/webapp/plugins/bootstrap-slider/js/bootstrap-slider.js diff --git a/webapp/plugins/bootstrap-wysihtml5/css/bootstrap-wysihtml5.css b/src/main/webapp/plugins/bootstrap-wysihtml5/css/bootstrap-wysihtml5.css similarity index 100% rename from webapp/plugins/bootstrap-wysihtml5/css/bootstrap-wysihtml5.css rename to src/main/webapp/plugins/bootstrap-wysihtml5/css/bootstrap-wysihtml5.css diff --git a/webapp/plugins/bootstrap-wysihtml5/css/bootstrap3-wysiwyg5-color.css b/src/main/webapp/plugins/bootstrap-wysihtml5/css/bootstrap3-wysiwyg5-color.css similarity index 100% rename from webapp/plugins/bootstrap-wysihtml5/css/bootstrap3-wysiwyg5-color.css rename to src/main/webapp/plugins/bootstrap-wysihtml5/css/bootstrap3-wysiwyg5-color.css diff --git a/webapp/plugins/bootstrap-wysihtml5/js/bootstrap3-wysihtml5.js b/src/main/webapp/plugins/bootstrap-wysihtml5/js/bootstrap3-wysihtml5.js similarity index 100% rename from webapp/plugins/bootstrap-wysihtml5/js/bootstrap3-wysihtml5.js rename to src/main/webapp/plugins/bootstrap-wysihtml5/js/bootstrap3-wysihtml5.js diff --git a/webapp/plugins/bootstrap-wysihtml5/js/wysihtml5-0.3.0.js b/src/main/webapp/plugins/bootstrap-wysihtml5/js/wysihtml5-0.3.0.js similarity index 100% rename from webapp/plugins/bootstrap-wysihtml5/js/wysihtml5-0.3.0.js rename to src/main/webapp/plugins/bootstrap-wysihtml5/js/wysihtml5-0.3.0.js diff --git a/webapp/plugins/bootstrap/css/bootstrap.min.css b/src/main/webapp/plugins/bootstrap/css/bootstrap.min.css similarity index 100% rename from webapp/plugins/bootstrap/css/bootstrap.min.css rename to src/main/webapp/plugins/bootstrap/css/bootstrap.min.css diff --git a/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot b/src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot rename to src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg b/src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg rename to src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf b/src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff b/src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff rename to src/main/webapp/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/webapp/plugins/bootstrap/js/bootstrap.min.js b/src/main/webapp/plugins/bootstrap/js/bootstrap.min.js similarity index 100% rename from webapp/plugins/bootstrap/js/bootstrap.min.js rename to src/main/webapp/plugins/bootstrap/js/bootstrap.min.js diff --git a/webapp/plugins/nanoScroller/jquery.nanoscroller.min.js b/src/main/webapp/plugins/nanoScroller/jquery.nanoscroller.min.js similarity index 100% rename from webapp/plugins/nanoScroller/jquery.nanoscroller.min.js rename to src/main/webapp/plugins/nanoScroller/jquery.nanoscroller.min.js diff --git a/webapp/reportBug.jsp b/src/main/webapp/reportBug.jsp similarity index 100% rename from webapp/reportBug.jsp rename to src/main/webapp/reportBug.jsp diff --git a/webapp/sideWindow.jsp b/src/main/webapp/sideWindow.jsp similarity index 100% rename from webapp/sideWindow.jsp rename to src/main/webapp/sideWindow.jsp diff --git a/webapp/users/ReadMe.txt b/src/main/webapp/users/ReadMe.txt similarity index 100% rename from webapp/users/ReadMe.txt rename to src/main/webapp/users/ReadMe.txt diff --git a/webapp/webgoat.jsp b/src/main/webapp/webgoat.jsp similarity index 100% rename from webapp/webgoat.jsp rename to src/main/webapp/webgoat.jsp diff --git a/webapp/webgoat_challenge.jsp b/src/main/webapp/webgoat_challenge.jsp similarity index 100% rename from webapp/webgoat_challenge.jsp rename to src/main/webapp/webgoat_challenge.jsp