diff --git a/ webgoat/main/project/org/owasp/webgoat/HammerHead.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/HammerHead.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/HammerHead.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/HammerHead.java diff --git a/ webgoat/main/project/org/owasp/webgoat/LessonSource.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/LessonSource.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/AbstractLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/AbstractLesson.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/AccessControlMatrix.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/AccessControlMatrix.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/BasicAuthentication.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/BasicAuthentication.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/BlindSqlInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/BlindSqlInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/BufferOverflow.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/BufferOverflow.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/Category.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/Category.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/Challenge2Screen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/Challenge2Screen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/CommandInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/CommandInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/DOS_Login.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/DOS_Login.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/DefaultLessonAction.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DefaultLessonAction.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/DefaultLessonAction.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DefaultLessonAction.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/Encoding.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/Encoding.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/FailOpenAuthentication.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/FailOpenAuthentication.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/ForcedBrowsing.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/ForcedBrowsing.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/ForgotPassword.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/ForgotPassword.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/HiddenFieldTampering.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/HiddenFieldTampering.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/HtmlClues.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/HtmlClues.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/HttpBasics.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/HttpBasics.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/HttpOnly.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/HttpOnly.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/JavaScriptValidation.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/JavaScriptValidation.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/LessonAction.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAction.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/LessonAction.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAction.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/LessonAdapter.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/LessonAdapter.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/ParameterInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ParameterInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/ParameterInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ParameterInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/PathBasedAccessControl.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/PathBasedAccessControl.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/ReflectedXSS.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/ReflectedXSS.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RemoteAdminFlaw.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RemoteAdminFlaw.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/FindProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/FindProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/FindProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/FindProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/ListStaff.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ListStaff.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/ListStaff.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ListStaff.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/Login.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/Login.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/Login.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/Login.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/Logout.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/Logout.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/Logout.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/Logout.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/SearchStaff.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/SearchStaff.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/SearchStaff.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/SearchStaff.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/Login.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/Login.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SoapRequest.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SoapRequest.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SqlNumericInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SqlNumericInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/SqlStringInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/SqlStringInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/StoredXss.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/StoredXss.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/ThreadSafetyProblem.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/ThreadSafetyProblem.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/TraceXSS.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/TraceXSS.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/UncheckedEmail.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/UncheckedEmail.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/WSDLScanning.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/WSDLScanning.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/WeakSessionID.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/WeakSessionID.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/WelcomeScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WelcomeScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/WelcomeScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WelcomeScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/WsSAXInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/WsSAXInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/WsSqlInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/WsSqlInjection.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/AdminScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/AdminScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/AdminScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/AdminScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/ReportCardScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/ReportCardScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/UserAdminScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/UserAdminScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/ViewDatabase.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/ViewDatabase.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/FindProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/UpdateProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/CrossSiteScripting/ViewProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/DeleteProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/EditProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/RoleBasedAccessControl_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/UpdateProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/RoleBasedAccessControl/ViewProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/Login_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/instructor/SQLInjection/ViewProfile_i.java diff --git a/ webgoat/main/project/org/owasp/webgoat/servlets/Controller.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/servlets/Controller.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/servlets/Controller.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/servlets/Controller.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/Authorization.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/Authorization.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/Course.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Course.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/Course.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/Course.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/CreateDB.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/CreateDB.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/CreateDB.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/CreateDB.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/DatabaseUtilities.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/DatabaseUtilities.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/ECSFactory.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/ECSFactory.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/Employee.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Employee.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/Employee.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/Employee.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/EmployeeStub.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/EmployeeStub.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/ErrorScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ErrorScreen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/ErrorScreen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/ErrorScreen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/LessonSession.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/LessonSession.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/LessonSession.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/LessonSession.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/LessonTracker.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/LessonTracker.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/LessonTracker.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/LessonTracker.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/Parameter.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Parameter.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/Parameter.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/Parameter.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/ParameterNotFoundException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/ParameterNotFoundException.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/ParameterParser.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/ParameterParser.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/Screen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Screen.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/Screen.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/Screen.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/UnauthenticatedException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/UnauthenticatedException.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/UnauthorizedException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/UnauthorizedException.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/UserTracker.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/UserTracker.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/ValidationException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/ValidationException.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/WebSession.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/WebSession.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java diff --git a/ webgoat/main/project/org/owasp/webgoat/session/WebgoatProperties.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/session/WebgoatProperties.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java diff --git a/ webgoat/main/project/org/owasp/webgoat/util/Exec.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/Exec.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/util/Exec.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/util/Exec.java diff --git a/ webgoat/main/project/org/owasp/webgoat/util/ExecResults.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecResults.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/util/ExecResults.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecResults.java diff --git a/ webgoat/main/project/org/owasp/webgoat/util/ExecutionException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/util/ExecutionException.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java diff --git a/ webgoat/main/project/org/owasp/webgoat/util/HtmlEncoder.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/util/HtmlEncoder.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java diff --git a/ webgoat/main/project/org/owasp/webgoat/util/ThreadWatcher.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ThreadWatcher.java similarity index 100% rename from webgoat/main/project/org/owasp/webgoat/util/ThreadWatcher.java rename to webgoat/main/project/JavaSource/org/owasp/webgoat/util/ThreadWatcher.java