diff --git a/build/check_framework.xsl b/build/check_framework.xsl
deleted file mode 100644
index 613c1b6a..00000000
--- a/build/check_framework.xsl
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	check_framework.xsl
-	
-	XSL stylesheet providing a framework for use by rule checking files.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
-
--->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<!--
-		The stylesheet output will be a text file, which will probably be thrown
-		away in any case.  The real output from the check is sent using the
-		xsl:message element.
-	-->
-	<xsl:output method="text"/>
-	
-
-	<!--
-		Common template to call to report an error on some element within an entity.
-	-->
-	<xsl:template name="error">
-		<xsl:param name="m"/>
-		<xsl:variable name="entity" select="ancestor-or-self::md:EntityDescriptor"/>
-		<xsl:message terminate='no'>
-			<xsl:text>[ERROR] </xsl:text>
-			<!--
-				If we're processing an aggregate, we need to indicate which
-				individual entity we're dealing with.
-			-->
-			<xsl:if test="ancestor-or-self::md:EntitiesDescriptor">
-				<!--
-					Use an ID if available, otherwise the entityID.
-				-->
-				<xsl:choose>
-					<xsl:when test="$entity/@ID">
-						<xsl:value-of select="$entity/@ID"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="$entity/@entityID"/>
-					</xsl:otherwise>
-				</xsl:choose>
-				<xsl:text>: </xsl:text>
-			</xsl:if>
-			<xsl:value-of select="$m"/>
-		</xsl:message>
-	</xsl:template>
-
-
-	<!--
-		Common template to call to report a warning on some element within an entity.
-	-->
-	<xsl:template name="warning">
-		<xsl:param name="m"/>
-		<xsl:variable name="entity" select="ancestor-or-self::md:EntityDescriptor"/>
-		<xsl:message terminate='no'>
-			<xsl:text>[WARN] </xsl:text>
-			<!--
-				If we're processing an aggregate, we need to indicate which
-				individual entity we're dealing with.
-			-->
-			<xsl:if test="ancestor-or-self::md:EntitiesDescriptor">
-				<!--
-					Use an ID if available, otherwise the entityID.
-				-->
-				<xsl:choose>
-					<xsl:when test="$entity/@ID">
-						<xsl:value-of select="$entity/@ID"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="$entity/@entityID"/>
-					</xsl:otherwise>
-				</xsl:choose>
-				<xsl:text>: </xsl:text>
-			</xsl:if>
-			<xsl:value-of select="$m"/>
-		</xsl:message>
-	</xsl:template>
-	
-	
-	<!--
-		Common template to call to report an informational message on some element within an entity.
-	-->
-	<xsl:template name="info">
-		<xsl:param name="m"/>
-		<xsl:variable name="entity" select="ancestor-or-self::md:EntityDescriptor"/>
-		<xsl:message terminate='no'>
-			<xsl:text>[INFO] </xsl:text>
-			<!--
-				If we're processing an aggregate, we need to indicate which
-				individual entity we're dealing with.
-			-->
-			<xsl:if test="ancestor-or-self::md:EntitiesDescriptor">
-				<!--
-					Use an ID if available, otherwise the entityID.
-				-->
-				<xsl:choose>
-					<xsl:when test="$entity/@ID">
-						<xsl:value-of select="$entity/@ID"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="$entity/@entityID"/>
-					</xsl:otherwise>
-				</xsl:choose>
-				<xsl:text>: </xsl:text>
-			</xsl:if>
-			<xsl:value-of select="$m"/>
-		</xsl:message>
-	</xsl:template>
-	
-	
-	<!-- Recurse down through all elements by default. -->
-	<xsl:template match="*">
-		<xsl:apply-templates select="node()|@*"/>
-	</xsl:template>
-	
-
-	<!-- Discard text blocks, comments and attributes by default. -->
-	<xsl:template match="text()|comment()|@*">
-		<!-- do nothing -->
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/check_adfs.xsl b/mdx/_rules/check_adfs.xsl
similarity index 100%
rename from build/check_adfs.xsl
rename to mdx/_rules/check_adfs.xsl
diff --git a/build/check_aggregate.xsl b/mdx/_rules/check_aggregate.xsl
similarity index 100%
rename from build/check_aggregate.xsl
rename to mdx/_rules/check_aggregate.xsl
diff --git a/build/check_filtered.xsl b/mdx/_rules/check_filtered.xsl
similarity index 100%
rename from build/check_filtered.xsl
rename to mdx/_rules/check_filtered.xsl
diff --git a/build/check_fixups.xsl b/mdx/_rules/check_fixups.xsl
similarity index 100%
rename from build/check_fixups.xsl
rename to mdx/_rules/check_fixups.xsl
diff --git a/build/check_idpdisc.xsl b/mdx/_rules/check_idpdisc.xsl
similarity index 100%
rename from build/check_idpdisc.xsl
rename to mdx/_rules/check_idpdisc.xsl
diff --git a/build/check_imported.xsl b/mdx/_rules/check_imported.xsl
similarity index 100%
rename from build/check_imported.xsl
rename to mdx/_rules/check_imported.xsl
diff --git a/build/check_init.xsl b/mdx/_rules/check_init.xsl
similarity index 100%
rename from build/check_init.xsl
rename to mdx/_rules/check_init.xsl
diff --git a/build/check_mdiop.xsl b/mdx/_rules/check_mdiop.xsl
similarity index 100%
rename from build/check_mdiop.xsl
rename to mdx/_rules/check_mdiop.xsl
diff --git a/build/check_mdrpi.xsl b/mdx/_rules/check_mdrpi.xsl
similarity index 100%
rename from build/check_mdrpi.xsl
rename to mdx/_rules/check_mdrpi.xsl
diff --git a/build/check_mdui.xsl b/mdx/_rules/check_mdui.xsl
similarity index 100%
rename from build/check_mdui.xsl
rename to mdx/_rules/check_mdui.xsl
diff --git a/build/check_misc.xsl b/mdx/_rules/check_misc.xsl
similarity index 100%
rename from build/check_misc.xsl
rename to mdx/_rules/check_misc.xsl
diff --git a/build/check_namespaces.xsl b/mdx/_rules/check_namespaces.xsl
similarity index 100%
rename from build/check_namespaces.xsl
rename to mdx/_rules/check_namespaces.xsl
diff --git a/build/check_nokeyname.xsl b/mdx/_rules/check_nokeyname.xsl
similarity index 100%
rename from build/check_nokeyname.xsl
rename to mdx/_rules/check_nokeyname.xsl
diff --git a/build/check_reqattr.xsl b/mdx/_rules/check_reqattr.xsl
similarity index 100%
rename from build/check_reqattr.xsl
rename to mdx/_rules/check_reqattr.xsl
diff --git a/build/check_saml1.xsl b/mdx/_rules/check_saml1.xsl
similarity index 100%
rename from build/check_saml1.xsl
rename to mdx/_rules/check_saml1.xsl
diff --git a/build/check_saml2.xsl b/mdx/_rules/check_saml2.xsl
similarity index 100%
rename from build/check_saml2.xsl
rename to mdx/_rules/check_saml2.xsl
diff --git a/build/check_saml2int.xsl b/mdx/_rules/check_saml2int.xsl
similarity index 100%
rename from build/check_saml2int.xsl
rename to mdx/_rules/check_saml2int.xsl
diff --git a/build/check_saml2meta.xsl b/mdx/_rules/check_saml2meta.xsl
similarity index 100%
rename from build/check_saml2meta.xsl
rename to mdx/_rules/check_saml2meta.xsl
diff --git a/build/check_shibboleth.xsl b/mdx/_rules/check_shibboleth.xsl
similarity index 100%
rename from build/check_shibboleth.xsl
rename to mdx/_rules/check_shibboleth.xsl
diff --git a/build/check_vhosts.xsl b/mdx/_rules/check_vhosts.xsl
similarity index 100%
rename from build/check_vhosts.xsl
rename to mdx/_rules/check_vhosts.xsl
diff --git a/mdx/_rules/extra_addresses.txt b/mdx/_rules/extra_addresses.txt
new file mode 100644
index 00000000..b75d075a
--- /dev/null
+++ b/mdx/_rules/extra_addresses.txt
@@ -0,0 +1,72 @@
+#
+# extra_addresses.txt
+#
+# This file lists addresses which should be sent federation
+# technical announcements even if they no longer have a role
+# as a contact on a registered entity.
+#
+# Blank lines, and lines starting with a '#', are ignored.
+#
+# Please add a '#'-style comment line in front of entries to
+# say when they were last verified as required.  We should
+# probably re-verify these once in a while.
+#
+
+#
+# Current UK federation team get technical announcements whether or
+# not they currently have entities.
+#
+ian@iay.org.uk
+Gary.Gray@ed.ac.uk
+rdw@steadingsoftware.com
+Sara.Hopkins@ed.ac.uk
+steve.glover@ed.ac.uk
+alex.stuart@ed.ac.uk
+
+# Henry Hughes, JANET(UK), verified 2011-12-12
+Henry.Hughes@ja.net
+
+# Josh Howlett, JANET(UK), verified 2011-12-08
+Josh.Howlett@ja.net
+
+# Simon Cooper, JANET(UK), verified 2011-12-07
+Simon.Cooper@ja.net
+
+# Andrew Cormack, JANET(UK), verified 2011-12-06
+Andrew.Cormack@ja.net
+
+# Nicole Harris, JISC Advance, by request, verified 2011-07-04
+nicole.harris@jiscadvance.ac.uk
+
+# David Orrell, Eduserv, verified 2011-12-06
+david.orrell@eduserv.org.uk
+
+# Edugate federation partner contacts, verified 2011-12-06
+glenn.wearen@heanet.ie
+janusz.ulanowski@heanet.ie
+
+# John Paschoud, TAG member, verified 2012-01-19
+john@paschoud.org
+
+# Simon Timms, Eduserv, verified 2012-10-24
+Simon.Timms@eduserv.org.uk
+
+# Eduserv helpdesk, verified 2012-10-24
+athenshelp@eduserv.org.uk
+
+# Miscellaneous entries follow
+
+j.farnhill@jisc.ac.uk
+Steven_Carmody@brown.edu
+cantor.2@osu.edu
+Richard.annett@eduserv.org.uk
+jspencer@eb.com
+jmathena@eb.com
+luke@positive-internet.com
+urgent@positive-internet.com
+
+# Lawrence Jones, St George's University of London
+# Call 3127
+ljones@sgul.ac.uk
+
+# END
diff --git a/build/extract_addresses.xsl b/mdx/_rules/extract_addresses.xsl
similarity index 100%
rename from build/extract_addresses.xsl
rename to mdx/_rules/extract_addresses.xsl
diff --git a/build/extract_authorities.xsl b/mdx/_rules/extract_authorities.xsl
similarity index 100%
rename from build/extract_authorities.xsl
rename to mdx/_rules/extract_authorities.xsl
diff --git a/build/extract_cert_locs.xsl b/mdx/_rules/extract_cert_locs.xsl
similarity index 100%
rename from build/extract_cert_locs.xsl
rename to mdx/_rules/extract_cert_locs.xsl
diff --git a/build/extract_embedded.xsl b/mdx/_rules/extract_embedded.xsl
similarity index 100%
rename from build/extract_embedded.xsl
rename to mdx/_rules/extract_embedded.xsl
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 86271d4a..13b0bbd9 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -191,7 +191,7 @@
         p:id="check_adfs">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_adfs.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_adfs.xsl"/>
             </bean>
         </property>
     </bean>
@@ -203,7 +203,7 @@
         p:id="check_aggregate">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_aggregate.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
             </bean>
         </property>
     </bean>
@@ -227,7 +227,7 @@
         p:id="check_filtered">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_filtered.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_filtered.xsl"/>
             </bean>
         </property>
     </bean>
@@ -239,7 +239,7 @@
         p:id="check_fixups">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_fixups.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_fixups.xsl"/>
             </bean>
         </property>
     </bean>
@@ -263,7 +263,7 @@
         p:id="check_idpdisc">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_idpdisc.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_idpdisc.xsl"/>
             </bean>
         </property>
     </bean>
@@ -275,7 +275,7 @@
         p:id="check_imported">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_imported.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_imported.xsl"/>
             </bean>
         </property>
     </bean>
@@ -287,7 +287,7 @@
         p:id="check_init">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_init.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_init.xsl"/>
             </bean>
         </property>
     </bean>
@@ -299,7 +299,7 @@
         p:id="check_mdiop">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_mdiop.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdiop.xsl"/>
             </bean>
         </property>
     </bean>
@@ -321,7 +321,7 @@
         p:id="check_mdrpi_xslt">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_mdrpi.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdrpi.xsl"/>
             </bean>
         </property>
     </bean>
@@ -383,7 +383,7 @@
         p:id="check_mdui_xslt">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_mdui.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdui.xsl"/>
             </bean>
         </property>
     </bean>
@@ -418,7 +418,7 @@
         p:id="check_misc">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_misc.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_misc.xsl"/>
             </bean>
         </property>
     </bean>
@@ -430,7 +430,7 @@
         p:id="check_namespaces">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_namespaces.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_namespaces.xsl"/>
             </bean>
         </property>
     </bean>
@@ -442,7 +442,7 @@
         p:id="check_nokeyname">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_nokeyname.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_nokeyname.xsl"/>
             </bean>
         </property>
     </bean>
@@ -468,7 +468,7 @@
         p:id="check_reqattr">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_reqattr.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_reqattr.xsl"/>
             </bean>
         </property>
     </bean>
@@ -480,7 +480,7 @@
         p:id="check_saml2int">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_saml2int.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2int.xsl"/>
             </bean>
         </property>
     </bean>
@@ -492,7 +492,7 @@
         p:id="check_saml1">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_saml1.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml1.xsl"/>
             </bean>
         </property>
     </bean>
@@ -504,7 +504,7 @@
         p:id="check_saml2">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_saml2.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2.xsl"/>
             </bean>
         </property>
     </bean>
@@ -516,7 +516,7 @@
         p:id="check_saml2meta">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_saml2meta.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2meta.xsl"/>
             </bean>
         </property>
     </bean>
@@ -528,7 +528,7 @@
         p:id="check_shibboleth">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_shibboleth.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_shibboleth.xsl"/>
             </bean>
         </property>
     </bean>
@@ -560,7 +560,7 @@
         p:id="check_vhosts">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_vhosts.xsl"/>
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_vhosts.xsl"/>
             </bean>
         </property>
     </bean>