diff --git a/src/main/java/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategy.java b/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java
similarity index 99%
rename from src/main/java/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategy.java
rename to src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java
index 6b30521..b0b5fb1 100644
--- a/src/main/java/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategy.java
+++ b/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package uk.org.iay.incommon.dom.saml;
+package uk.org.iay.incommon.mda.dom.saml;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/uk/org/iay/incommon/dom/saml/package-info.java b/src/main/java/uk/org/iay/incommon/mda/dom/saml/package-info.java
similarity index 93%
rename from src/main/java/uk/org/iay/incommon/dom/saml/package-info.java
rename to src/main/java/uk/org/iay/incommon/mda/dom/saml/package-info.java
index 675fd7d..9ee0605 100644
--- a/src/main/java/uk/org/iay/incommon/dom/saml/package-info.java
+++ b/src/main/java/uk/org/iay/incommon/mda/dom/saml/package-info.java
@@ -15,4 +15,4 @@
 /**
  * Aggregator beans dealing with SAML metadata.
  */
-package uk.org.iay.incommon.dom.saml;
+package uk.org.iay.incommon.mda.dom.saml;
diff --git a/src/main/java/uk/org/iay/incommon/package-info.java b/src/main/java/uk/org/iay/incommon/mda/package-info.java
similarity index 94%
rename from src/main/java/uk/org/iay/incommon/package-info.java
rename to src/main/java/uk/org/iay/incommon/mda/package-info.java
index 869eb71..e738dcf 100644
--- a/src/main/java/uk/org/iay/incommon/package-info.java
+++ b/src/main/java/uk/org/iay/incommon/mda/package-info.java
@@ -15,4 +15,4 @@
 /**
  * Aggregator beans for the InCommon federation.
  */
-package uk.org.iay.incommon;
+package uk.org.iay.incommon.mda;
diff --git a/src/test/java/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategyTest.java b/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java
similarity index 96%
rename from src/test/java/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategyTest.java
rename to src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java
index 0c148cd..184c774 100644
--- a/src/test/java/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategyTest.java
+++ b/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java
@@ -1,5 +1,5 @@
 
-package uk.org.iay.incommon.dom.saml;
+package uk.org.iay.incommon.mda.dom.saml;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,6 +12,7 @@
 import net.shibboleth.metadata.ItemId;
 import net.shibboleth.metadata.dom.DOMElementItem;
 import net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthority;
+import uk.org.iay.incommon.mda.dom.saml.InCommonEntityOrderingStrategy;
 import uk.org.ukfederation.mda.BaseDOMTest;
 
 public class InCommonEntityOrderingStrategyTest extends BaseDOMTest {
diff --git a/src/test/resources/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategy-trivial.xml b/src/test/resources/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy-trivial.xml
similarity index 100%
rename from src/test/resources/uk/org/iay/incommon/dom/saml/InCommonEntityOrderingStrategy-trivial.xml
rename to src/test/resources/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy-trivial.xml