diff --git a/apps/showcase/quickstart.xml b/apps/showcase/quickstart.xml
index 80b8993ec..aab3fd45a 100644
--- a/apps/showcase/quickstart.xml
+++ b/apps/showcase/quickstart.xml
@@ -12,7 +12,7 @@
     users who don't have a single directory in their project that
     contains all the libraries they need.
     -->
-    <ideaConfig>../../../xwork/xwork.iml,../../action/action.iml,../../thirdparty/jasperreports/action-jasperreports.iml,webapp-showcase.iml</ideaConfig>
+    <ideaConfig>../../../xwork/xwork.iml,../../core/struts-core.iml,../../extras/struts-extras.iml,struts-showcase.iml</ideaConfig>
 
     <!-- The context in which to deploy the web application -->
     <context>/showcase</context>
@@ -45,8 +45,8 @@
     -->
     <classDirs>
         <dir>src/main/webapp/WEB-INF/classes</dir>
-        <dir>../../thirdparty/jasperreports/target/classes</dir>
-        <dir>../../action/target/classes</dir>
+        <dir>../../extras/target/classes</dir>
+        <dir>../../core/target/classes</dir>
     </classDirs>
 
     <!--
diff --git a/src/main/idea/workspace.xml b/src/main/idea/workspace.xml
index f80cef670..e71761dee 100644
--- a/src/main/idea/workspace.xml
+++ b/src/main/idea/workspace.xml
@@ -46,8 +46,8 @@
             <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
             <option name="ALTERNATIVE_JRE_PATH"/>
         </configuration>
-        <configuration selected="false" default="false" name="All Tests" type="JUnit" factoryName="JUnit">
-            <module name="action"/>
+        <configuration selected="true" default="false" name="Struts Core Tests" type="JUnit" factoryName="JUnit">
+            <module name="struts-core"/>
             <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
             <option name="ALTERNATIVE_JRE_PATH" value=""/>
             <option name="PACKAGE_NAME" value="org.apache.struts.action2"/>
@@ -64,16 +64,15 @@
             <RunnerSettings RunnerId="Run"/>
             <ConfigurationWrapper RunnerId="Run"/>
         </configuration>
-        <configuration selected="true" default="false" name="Showcase" type="Application" factoryName="Application">
+        <configuration selected="true" default="false" name="Struts Showcase" type="Application"
+                       factoryName="Application">
             <option name="MAIN_CLASS_NAME" value="org.apache.struts.action2.Main"/>
             <option name="VM_PARAMETERS" value=""/>
             <option name="PROGRAM_PARAMETERS" value="quickstart"/>
-            <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/webapps/showcase"/>
+            <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/apps/showcase"/>
             <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
             <option name="ALTERNATIVE_JRE_PATH" value=""/>
-            <module name="webapp-showcase"/>
-            <RunnerSettings RunnerId="Run"/>
-            <ConfigurationWrapper RunnerId="Run"/>
+            <module name="struts-showcase"/>
         </configuration>
     </component>
 </project>