diff --git a/quickstart/pom.xml b/plugins/quickstart/pom.xml
similarity index 100%
rename from quickstart/pom.xml
rename to plugins/quickstart/pom.xml
diff --git a/quickstart/src/main/java/org/apache/struts2/Main.java b/plugins/quickstart/src/main/java/org/apache/struts2/Main.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/Main.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/Main.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
diff --git a/quickstart/src/main/java/org/apache/struts2/quickstart/QuickStart.java b/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/QuickStart.java
similarity index 100%
rename from quickstart/src/main/java/org/apache/struts2/quickstart/QuickStart.java
rename to plugins/quickstart/src/main/java/org/apache/struts2/quickstart/QuickStart.java
diff --git a/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
similarity index 100%
rename from sitegraph/pom.xml
rename to plugins/sitegraph/pom.xml
diff --git a/sitegraph/src/main/java/org/apache/struts2/Main.java b/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/Main.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/Main.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java
diff --git a/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
similarity index 100%
rename from sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
rename to plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
diff --git a/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
similarity index 100%
rename from sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
rename to plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
diff --git a/sitegraph/src/test/resources/org/apache/struts2/sitegraph/hello.jsp b/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/hello.jsp
similarity index 100%
rename from sitegraph/src/test/resources/org/apache/struts2/sitegraph/hello.jsp
rename to plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/hello.jsp
diff --git a/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt b/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
similarity index 100%
rename from sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
rename to plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
diff --git a/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml b/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
similarity index 100%
rename from sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
rename to plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
diff --git a/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl b/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
similarity index 100%
rename from sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
rename to plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
diff --git a/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl b/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
similarity index 100%
rename from sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
rename to plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
diff --git a/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-success.jsp b/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-success.jsp
similarity index 100%
rename from sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-success.jsp
rename to plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-success.jsp