diff --git a/docbook/images/admons/blank.png b/doc/docbook/images/admons/blank.png
similarity index 100%
rename from docbook/images/admons/blank.png
rename to doc/docbook/images/admons/blank.png
diff --git a/docbook/images/admons/caution.gif b/doc/docbook/images/admons/caution.gif
similarity index 100%
rename from docbook/images/admons/caution.gif
rename to doc/docbook/images/admons/caution.gif
diff --git a/docbook/images/admons/caution.png b/doc/docbook/images/admons/caution.png
similarity index 100%
rename from docbook/images/admons/caution.png
rename to doc/docbook/images/admons/caution.png
diff --git a/docbook/images/admons/caution.tif b/doc/docbook/images/admons/caution.tif
similarity index 100%
rename from docbook/images/admons/caution.tif
rename to doc/docbook/images/admons/caution.tif
diff --git a/docbook/images/admons/draft.png b/doc/docbook/images/admons/draft.png
similarity index 100%
rename from docbook/images/admons/draft.png
rename to doc/docbook/images/admons/draft.png
diff --git a/docbook/images/admons/home.gif b/doc/docbook/images/admons/home.gif
similarity index 100%
rename from docbook/images/admons/home.gif
rename to doc/docbook/images/admons/home.gif
diff --git a/docbook/images/admons/home.png b/doc/docbook/images/admons/home.png
similarity index 100%
rename from docbook/images/admons/home.png
rename to doc/docbook/images/admons/home.png
diff --git a/docbook/images/admons/important.gif b/doc/docbook/images/admons/important.gif
similarity index 100%
rename from docbook/images/admons/important.gif
rename to doc/docbook/images/admons/important.gif
diff --git a/docbook/images/admons/important.png b/doc/docbook/images/admons/important.png
similarity index 100%
rename from docbook/images/admons/important.png
rename to doc/docbook/images/admons/important.png
diff --git a/docbook/images/admons/important.tif b/doc/docbook/images/admons/important.tif
similarity index 100%
rename from docbook/images/admons/important.tif
rename to doc/docbook/images/admons/important.tif
diff --git a/docbook/images/admons/next.gif b/doc/docbook/images/admons/next.gif
similarity index 100%
rename from docbook/images/admons/next.gif
rename to doc/docbook/images/admons/next.gif
diff --git a/docbook/images/admons/next.png b/doc/docbook/images/admons/next.png
similarity index 100%
rename from docbook/images/admons/next.png
rename to doc/docbook/images/admons/next.png
diff --git a/docbook/images/admons/note.gif b/doc/docbook/images/admons/note.gif
similarity index 100%
rename from docbook/images/admons/note.gif
rename to doc/docbook/images/admons/note.gif
diff --git a/docbook/images/admons/note.png b/doc/docbook/images/admons/note.png
similarity index 100%
rename from docbook/images/admons/note.png
rename to doc/docbook/images/admons/note.png
diff --git a/docbook/images/admons/note.tif b/doc/docbook/images/admons/note.tif
similarity index 100%
rename from docbook/images/admons/note.tif
rename to doc/docbook/images/admons/note.tif
diff --git a/docbook/images/admons/prev.gif b/doc/docbook/images/admons/prev.gif
similarity index 100%
rename from docbook/images/admons/prev.gif
rename to doc/docbook/images/admons/prev.gif
diff --git a/docbook/images/admons/prev.png b/doc/docbook/images/admons/prev.png
similarity index 100%
rename from docbook/images/admons/prev.png
rename to doc/docbook/images/admons/prev.png
diff --git a/docbook/images/admons/tip.gif b/doc/docbook/images/admons/tip.gif
similarity index 100%
rename from docbook/images/admons/tip.gif
rename to doc/docbook/images/admons/tip.gif
diff --git a/docbook/images/admons/tip.png b/doc/docbook/images/admons/tip.png
similarity index 100%
rename from docbook/images/admons/tip.png
rename to doc/docbook/images/admons/tip.png
diff --git a/docbook/images/admons/tip.tif b/doc/docbook/images/admons/tip.tif
similarity index 100%
rename from docbook/images/admons/tip.tif
rename to doc/docbook/images/admons/tip.tif
diff --git a/docbook/images/admons/toc-blank.png b/doc/docbook/images/admons/toc-blank.png
similarity index 100%
rename from docbook/images/admons/toc-blank.png
rename to doc/docbook/images/admons/toc-blank.png
diff --git a/docbook/images/admons/toc-minus.png b/doc/docbook/images/admons/toc-minus.png
similarity index 100%
rename from docbook/images/admons/toc-minus.png
rename to doc/docbook/images/admons/toc-minus.png
diff --git a/docbook/images/admons/toc-plus.png b/doc/docbook/images/admons/toc-plus.png
similarity index 100%
rename from docbook/images/admons/toc-plus.png
rename to doc/docbook/images/admons/toc-plus.png
diff --git a/docbook/images/admons/up.gif b/doc/docbook/images/admons/up.gif
similarity index 100%
rename from docbook/images/admons/up.gif
rename to doc/docbook/images/admons/up.gif
diff --git a/docbook/images/admons/up.png b/doc/docbook/images/admons/up.png
similarity index 100%
rename from docbook/images/admons/up.png
rename to doc/docbook/images/admons/up.png
diff --git a/docbook/images/admons/warning.gif b/doc/docbook/images/admons/warning.gif
similarity index 100%
rename from docbook/images/admons/warning.gif
rename to doc/docbook/images/admons/warning.gif
diff --git a/docbook/images/admons/warning.png b/doc/docbook/images/admons/warning.png
similarity index 100%
rename from docbook/images/admons/warning.png
rename to doc/docbook/images/admons/warning.png
diff --git a/docbook/images/admons/warning.tif b/doc/docbook/images/admons/warning.tif
similarity index 100%
rename from docbook/images/admons/warning.tif
rename to doc/docbook/images/admons/warning.tif
diff --git a/docbook/images/callouts/1.gif b/doc/docbook/images/callouts/1.gif
similarity index 100%
rename from docbook/images/callouts/1.gif
rename to doc/docbook/images/callouts/1.gif
diff --git a/docbook/images/callouts/1.png b/doc/docbook/images/callouts/1.png
similarity index 100%
rename from docbook/images/callouts/1.png
rename to doc/docbook/images/callouts/1.png
diff --git a/docbook/images/callouts/10.gif b/doc/docbook/images/callouts/10.gif
similarity index 100%
rename from docbook/images/callouts/10.gif
rename to doc/docbook/images/callouts/10.gif
diff --git a/docbook/images/callouts/10.png b/doc/docbook/images/callouts/10.png
similarity index 100%
rename from docbook/images/callouts/10.png
rename to doc/docbook/images/callouts/10.png
diff --git a/docbook/images/callouts/11.gif b/doc/docbook/images/callouts/11.gif
similarity index 100%
rename from docbook/images/callouts/11.gif
rename to doc/docbook/images/callouts/11.gif
diff --git a/docbook/images/callouts/11.png b/doc/docbook/images/callouts/11.png
similarity index 100%
rename from docbook/images/callouts/11.png
rename to doc/docbook/images/callouts/11.png
diff --git a/docbook/images/callouts/12.gif b/doc/docbook/images/callouts/12.gif
similarity index 100%
rename from docbook/images/callouts/12.gif
rename to doc/docbook/images/callouts/12.gif
diff --git a/docbook/images/callouts/12.png b/doc/docbook/images/callouts/12.png
similarity index 100%
rename from docbook/images/callouts/12.png
rename to doc/docbook/images/callouts/12.png
diff --git a/docbook/images/callouts/13.gif b/doc/docbook/images/callouts/13.gif
similarity index 100%
rename from docbook/images/callouts/13.gif
rename to doc/docbook/images/callouts/13.gif
diff --git a/docbook/images/callouts/13.png b/doc/docbook/images/callouts/13.png
similarity index 100%
rename from docbook/images/callouts/13.png
rename to doc/docbook/images/callouts/13.png
diff --git a/docbook/images/callouts/14.gif b/doc/docbook/images/callouts/14.gif
similarity index 100%
rename from docbook/images/callouts/14.gif
rename to doc/docbook/images/callouts/14.gif
diff --git a/docbook/images/callouts/14.png b/doc/docbook/images/callouts/14.png
similarity index 100%
rename from docbook/images/callouts/14.png
rename to doc/docbook/images/callouts/14.png
diff --git a/docbook/images/callouts/15.gif b/doc/docbook/images/callouts/15.gif
similarity index 100%
rename from docbook/images/callouts/15.gif
rename to doc/docbook/images/callouts/15.gif
diff --git a/docbook/images/callouts/15.png b/doc/docbook/images/callouts/15.png
similarity index 100%
rename from docbook/images/callouts/15.png
rename to doc/docbook/images/callouts/15.png
diff --git a/docbook/images/callouts/2.gif b/doc/docbook/images/callouts/2.gif
similarity index 100%
rename from docbook/images/callouts/2.gif
rename to doc/docbook/images/callouts/2.gif
diff --git a/docbook/images/callouts/2.png b/doc/docbook/images/callouts/2.png
similarity index 100%
rename from docbook/images/callouts/2.png
rename to doc/docbook/images/callouts/2.png
diff --git a/docbook/images/callouts/3.gif b/doc/docbook/images/callouts/3.gif
similarity index 100%
rename from docbook/images/callouts/3.gif
rename to doc/docbook/images/callouts/3.gif
diff --git a/docbook/images/callouts/3.png b/doc/docbook/images/callouts/3.png
similarity index 100%
rename from docbook/images/callouts/3.png
rename to doc/docbook/images/callouts/3.png
diff --git a/docbook/images/callouts/4.gif b/doc/docbook/images/callouts/4.gif
similarity index 100%
rename from docbook/images/callouts/4.gif
rename to doc/docbook/images/callouts/4.gif
diff --git a/docbook/images/callouts/4.png b/doc/docbook/images/callouts/4.png
similarity index 100%
rename from docbook/images/callouts/4.png
rename to doc/docbook/images/callouts/4.png
diff --git a/docbook/images/callouts/5.gif b/doc/docbook/images/callouts/5.gif
similarity index 100%
rename from docbook/images/callouts/5.gif
rename to doc/docbook/images/callouts/5.gif
diff --git a/docbook/images/callouts/5.png b/doc/docbook/images/callouts/5.png
similarity index 100%
rename from docbook/images/callouts/5.png
rename to doc/docbook/images/callouts/5.png
diff --git a/docbook/images/callouts/6.gif b/doc/docbook/images/callouts/6.gif
similarity index 100%
rename from docbook/images/callouts/6.gif
rename to doc/docbook/images/callouts/6.gif
diff --git a/docbook/images/callouts/6.png b/doc/docbook/images/callouts/6.png
similarity index 100%
rename from docbook/images/callouts/6.png
rename to doc/docbook/images/callouts/6.png
diff --git a/docbook/images/callouts/7.gif b/doc/docbook/images/callouts/7.gif
similarity index 100%
rename from docbook/images/callouts/7.gif
rename to doc/docbook/images/callouts/7.gif
diff --git a/docbook/images/callouts/7.png b/doc/docbook/images/callouts/7.png
similarity index 100%
rename from docbook/images/callouts/7.png
rename to doc/docbook/images/callouts/7.png
diff --git a/docbook/images/callouts/8.gif b/doc/docbook/images/callouts/8.gif
similarity index 100%
rename from docbook/images/callouts/8.gif
rename to doc/docbook/images/callouts/8.gif
diff --git a/docbook/images/callouts/8.png b/doc/docbook/images/callouts/8.png
similarity index 100%
rename from docbook/images/callouts/8.png
rename to doc/docbook/images/callouts/8.png
diff --git a/docbook/images/callouts/9.gif b/doc/docbook/images/callouts/9.gif
similarity index 100%
rename from docbook/images/callouts/9.gif
rename to doc/docbook/images/callouts/9.gif
diff --git a/docbook/images/callouts/9.png b/doc/docbook/images/callouts/9.png
similarity index 100%
rename from docbook/images/callouts/9.png
rename to doc/docbook/images/callouts/9.png
diff --git a/docbook/images/logo.gif b/doc/docbook/images/logo.gif
similarity index 100%
rename from docbook/images/logo.gif
rename to doc/docbook/images/logo.gif
diff --git a/docbook/images/logo.psd b/doc/docbook/images/logo.psd
similarity index 100%
rename from docbook/images/logo.psd
rename to doc/docbook/images/logo.psd
diff --git a/docbook/index.xml b/doc/docbook/index.xml
similarity index 100%
rename from docbook/index.xml
rename to doc/docbook/index.xml
diff --git a/docbook/styles/fo/docbook.xsl b/doc/docbook/styles/fo/docbook.xsl
similarity index 100%
rename from docbook/styles/fo/docbook.xsl
rename to doc/docbook/styles/fo/docbook.xsl
diff --git a/docbook/styles/html.css b/doc/docbook/styles/html.css
similarity index 100%
rename from docbook/styles/html.css
rename to doc/docbook/styles/html.css
diff --git a/docbook/styles/html/docbook.xsl b/doc/docbook/styles/html/docbook.xsl
similarity index 100%
rename from docbook/styles/html/docbook.xsl
rename to doc/docbook/styles/html/docbook.xsl
diff --git a/docbook/styles/html_chunk.xsl b/doc/docbook/styles/html_chunk.xsl
similarity index 100%
rename from docbook/styles/html_chunk.xsl
rename to doc/docbook/styles/html_chunk.xsl
diff --git a/doc/maven.xml b/doc/maven.xml
new file mode 100644
index 0000000000..f1f1fd5c33
--- /dev/null
+++ b/doc/maven.xml
@@ -0,0 +1,38 @@
+<project
+   xmlns:j="jelly:core"
+   xmlns:ant="jelly:ant"
+   xmlns:util="jelly:util"
+   xmlns:maven="jelly:maven"
+  >
+
+    <postGoal name="sdocbook:prepare-filesystem">
+        <j:set var="unzipped" value="false" />
+        <util:available file="${maven.sdocbook.generated.fo}">
+            <j:set var="unzipped" value="true" />
+            <echo>Using previusly unzipped docbook files</echo>
+        </util:available>
+        <j:if test="${!unzipped}">
+            <!-- unzip docbook files -->
+            <ant:unzip dest="${maven.build.dir}"
+                src="${pom.getDependencyPath('docbook:docbook-xsl')}"/>
+                
+            <!-- use a custom fo stylesheet -->
+            <move file="${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl"
+                tofile="${maven.sdocbook.stylesheets.dir}/fo/docbook-bak.xsl"/>
+            <copy file="${maven.sdocbook.src.dir}/styles/fo/docbook.xsl"
+                todir="${maven.sdocbook.stylesheets.dir}/fo"/>
+
+            <!-- use a custom html stylesheet -->
+            <move file="${maven.sdocbook.stylesheets.dir}/html/docbook.xsl"
+                tofile="${maven.sdocbook.stylesheets.dir}/html/docbook-bak.xsl"/>
+            <copy file="${maven.sdocbook.src.dir}/styles/html/docbook.xsl"
+                todir="${maven.sdocbook.stylesheets.dir}/html"/>
+
+            <copy todir="${maven.sdocbook.stylesheets.dir}">
+                <fileset dir="${maven.sdocbook.src.dir}/images"/>
+            </copy>
+        </j:if>
+
+    </postGoal>
+
+</project>
diff --git a/doc/project.properties b/doc/project.properties
new file mode 100644
index 0000000000..18e06d7dc6
--- /dev/null
+++ b/doc/project.properties
@@ -0,0 +1,5 @@
+# sdocbook
+maven.sdocbook.fo.params=-PARAM paper.type A4 -PARAM use.extensions 1 -PARAM tablecolumns.extension 0 -PARAM callout.extensions 1 -PARAM fop.extensions=1
+maven.sdocbook.src.dir=${basedir}/docbook
+maven.sdocbook.resources.include=**/*.gif,**/*.svg,**/*.jpg
+maven.sdocbook.stylesheets.dir=${maven.build.dir}/docbook-xsl-1.66.1
diff --git a/doc/project.xml b/doc/project.xml
new file mode 100644
index 0000000000..0da526be9d
--- /dev/null
+++ b/doc/project.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <artifactId>acegi-security-doc</artifactId>
+  <name>Acegi Security System for Spring - Documentation</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>maven-plugins</groupId>
+      <artifactId>maven-sdocbook-plugin</artifactId>
+      <version>1.4-SNAPSHOT</version>
+      <type>plugin</type>
+    </dependency>
+
+    <!-- docbook -->
+    <dependency>
+      <groupId>docbook</groupId>
+      <artifactId>docbook-xsl</artifactId>
+      <version>1.66.1</version>
+      <url>http://docbook.sourceforge.net</url>
+      <type>zip</type>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/xdocs/faq.xml b/doc/xdocs/faq.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/faq.xml
rename to doc/xdocs/faq.xml
diff --git a/xdocs/index.html b/doc/xdocs/index.html
similarity index 100%
rename from xdocs/index.html
rename to doc/xdocs/index.html
diff --git a/xdocs/navigation.xml b/doc/xdocs/navigation.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/navigation.xml
rename to doc/xdocs/navigation.xml
diff --git a/xdocs/reference/index.xml b/doc/xdocs/reference/index.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/reference/index.xml
rename to doc/xdocs/reference/index.xml
diff --git a/xdocs/start/build.xml b/doc/xdocs/start/build.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/start/build.xml
rename to doc/xdocs/start/build.xml
diff --git a/xdocs/start/download.xml b/doc/xdocs/start/download.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/start/download.xml
rename to doc/xdocs/start/download.xml
diff --git a/xdocs/start/index.xml b/doc/xdocs/start/index.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/start/index.xml
rename to doc/xdocs/start/index.xml
diff --git a/xdocs/status.xml b/doc/xdocs/status.xml
old mode 100755
new mode 100644
similarity index 100%
rename from xdocs/status.xml
rename to doc/xdocs/status.xml
diff --git a/maven.xml b/maven.xml
index f8faf25867..5a8e529660 100755
--- a/maven.xml
+++ b/maven.xml
@@ -168,34 +168,4 @@
           tofile="${maven.build.dir}/docs/ref/acegi-security-reference.html"/>
    </goal>
 
-    <postGoal name="sdocbook:prepare-filesystem">
-        <j:set var="unzipped" value="false" />
-        <util:available file="${maven.sdocbook.generated.fo}">
-            <j:set var="unzipped" value="true" />
-            <echo>Using previusly unzipped docbook files</echo>
-        </util:available>
-        <j:if test="${!unzipped}">
-            <!-- unzip docbook files -->
-            <ant:unzip dest="${maven.build.dir}"
-                src="${pom.getDependencyPath('docbook:docbook-xsl')}"/>
-                
-            <!-- use a custom fo stylesheet -->
-            <move file="${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl"
-                tofile="${maven.sdocbook.stylesheets.dir}/fo/docbook-bak.xsl"/>
-            <copy file="${maven.sdocbook.src.dir}/styles/fo/docbook.xsl"
-                todir="${maven.sdocbook.stylesheets.dir}/fo"/>
-
-            <!-- use a custom html stylesheet -->
-            <move file="${maven.sdocbook.stylesheets.dir}/html/docbook.xsl"
-                tofile="${maven.sdocbook.stylesheets.dir}/html/docbook-bak.xsl"/>
-            <copy file="${maven.sdocbook.src.dir}/styles/html/docbook.xsl"
-                todir="${maven.sdocbook.stylesheets.dir}/html"/>
-
-            <copy todir="${maven.sdocbook.stylesheets.dir}">
-                <fileset dir="${maven.sdocbook.src.dir}/images"/>
-            </copy>
-        </j:if>
-
-    </postGoal>
-
 </project>
diff --git a/project.properties b/project.properties
index 46c8ec3e1f..daba568bcb 100644
--- a/project.properties
+++ b/project.properties
@@ -112,14 +112,6 @@ maven.site.deploy.method = fs
 maven.multiproject.basedir=.
 maven.multiproject.includes=core/project.xml,adapters/*/project.xml
 
-
-# sdocbook
-#maven.sdocbook.fo.params=-PARAM paper.type A4 -PARAM use.extensions 1 -PARAM tablecolumns.extension 0 -PARAM callout.extensions 1 -PARAM fop.extensions=1
-#maven.sdocbook.fo.params=draft.mode=no
-maven.sdocbook.src.dir=${basedir}/docbook
-maven.sdocbook.resources.include=**/*.gif,**/*.svg,**/*.jpg
-maven.sdocbook.stylesheets.dir=${maven.build.dir}/docbook-xsl-1.66.1
-
 #------------------------------------------------------------------------
 # Commons Attributes
 #------------------------------------------------------------------------
diff --git a/project.xml b/project.xml
index f20d4d57cc..79d67d16ed 100644
--- a/project.xml
+++ b/project.xml
@@ -247,21 +247,6 @@
       <version>2.5</version>
       <type>plugin</type>
     </dependency>
-    <dependency>
-      <groupId>maven-plugins</groupId>
-      <artifactId>maven-sdocbook-plugin</artifactId>
-      <version>1.4-SNAPSHOT</version>
-      <type>plugin</type>
-    </dependency>
-
-    <!-- docbook -->
-    <dependency>
-      <groupId>docbook</groupId>
-      <artifactId>docbook-xsl</artifactId>
-      <version>1.66.1</version>
-      <url>http://docbook.sourceforge.net</url>
-      <type>zip</type>
-    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>${basedir}/src/main/java</sourceDirectory>