diff --git a/build.xml b/build.xml
index 6903ab3d..93d2c909 100644
--- a/build.xml
+++ b/build.xml
@@ -410,6 +410,10 @@
             <java classname="net.shibboleth.metadata.cli.SimpleCommandLine"
                 fork="true" failonerror="true" maxmemory="${java.max.memory}">
                 <classpath>
+                	<!-- Spring "classpath:" imports can be under the MDX directory --> 
+                	<pathelement path="${mdx.dir}"/>
+                	
+                	<!-- Include all APIs we may want to use. -->
                     <fileset dir="${tools.mda}/lib">
                         <include name="*.jar"/>
                     </fileset>
@@ -897,7 +901,6 @@
         <CHANNEL.import channel="ie_edugate"/>
 		<CHANNEL.do channel="ie_edugate" verb="importAll"/>
         <CHANNEL.import channel="int_edugain"/>
-		<CHANNEL.do channel="int_edugain" verb="testImport"/>
         <CHANNEL.import channel="jp_gakunin"/>
 		<CHANNEL.import channel="nl_surfconext"/>
 		<CHANNEL.import channel="nz_tuakiri"/>
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index ff4520f0..0f538c6f 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:at_aconet/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
index fa5b32c8..c12ade25 100644
--- a/mdx/au_aaf/verbs.xml
+++ b/mdx/au_aaf/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:au_aaf/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
index 8b714be6..229fa12a 100644
--- a/mdx/be_belnet/verbs.xml
+++ b/mdx/be_belnet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:be_belnet/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
index bcafc354..cf2bde82 100644
--- a/mdx/br_cafe/verbs.xml
+++ b/mdx/br_cafe/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:br_cafe/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
index 3b7e8e6a..4e3835dd 100644
--- a/mdx/ca_caf/verbs.xml
+++ b/mdx/ca_caf/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:ca_caf/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
index 3e32741b..aac8f2e2 100644
--- a/mdx/ch_switchaai/verbs.xml
+++ b/mdx/ch_switchaai/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:ch_switchaai/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index aaa01b69..22d1d085 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -281,7 +281,7 @@
     <!--
         Import beans that perform individual validation checks.
     -->
-    <import resource="validation-beans.xml"/>
+    <import resource="classpath:validation-beans.xml"/>
     
     <!--
         identifierStrategy
diff --git a/mdx/conventions.md b/mdx/conventions.md
index 2f4adc6e..6a04f6fe 100644
--- a/mdx/conventions.md
+++ b/mdx/conventions.md
@@ -83,7 +83,7 @@ Thus, most channels would be expected to contain the following beans as part of
 * `channel_exportedAggregate`
 * `channel_exportedEntities`
 
-In older channels, these are explicit bean definitions.  In newer channels, the convention is to use the Spring <alias> feature to designate the existing aggregate-specific beans.
+In older channels, these are explicit bean definitions.  In newer channels, the convention is to use the Spring `<alias>` feature to designate the existing aggregate-specific beans.
 
 ## Common `beans.xml` channel beans
 
@@ -119,8 +119,10 @@ The verbs `import` and `importRaw` are intended to be a synonym for `importExpor
 ## `verbs.xml` and `<verb>.xml` conventions
 
 Verb definition files should import the channel's `beans.xml` file as well as
-the `common-beans.xml` file from the parent `/mdx/` directory through a relative
-path.
+the `common-beans.xml` file from the parent `/mdx/` directory.  Non-relative classpath references should be used, for example:
+
+    <import resource="classpath:se_swamid/beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
 Verb definition files should not import each other; any beans required to be
 shared between verb definition files should be moved into the channel's
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
index cc56185e..be8174f2 100644
--- a/mdx/cz_eduid/verbs.xml
+++ b/mdx/cz_eduid/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:cz_eduid/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
index 4e1c8b0e..1a225067 100644
--- a/mdx/de_dfnaai/verbs.xml
+++ b/mdx/de_dfnaai/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:de_dfnaai/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/dk_wayf/verbs.xml b/mdx/dk_wayf/verbs.xml
index 6021dbb2..8c4d47fb 100644
--- a/mdx/dk_wayf/verbs.xml
+++ b/mdx/dk_wayf/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:dk_wayf/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
index 772ad5bd..4699f745 100644
--- a/mdx/es_sir/verbs.xml
+++ b/mdx/es_sir/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:es_sir/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/eu_clarin/verbs.xml b/mdx/eu_clarin/verbs.xml
index 45de0f1a..b42b959d 100644
--- a/mdx/eu_clarin/verbs.xml
+++ b/mdx/eu_clarin/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:eu_clarin/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
index 6a48fb8d..066d4a2b 100644
--- a/mdx/fi_haka/verbs.xml
+++ b/mdx/fi_haka/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:fi_haka/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/fr_renater/verbs.xml b/mdx/fr_renater/verbs.xml
index afb4cf4d..1f9ff350 100644
--- a/mdx/fr_renater/verbs.xml
+++ b/mdx/fr_renater/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:fr_renater/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
index eb15e7ce..ce852fcb 100644
--- a/mdx/gr_grnet/verbs.xml
+++ b/mdx/gr_grnet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:gr_grnet/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/hr_eduhr/verbs.xml b/mdx/hr_eduhr/verbs.xml
index b8da5bb7..46c8dfdb 100644
--- a/mdx/hr_eduhr/verbs.xml
+++ b/mdx/hr_eduhr/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:hr_eduhr/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
index 1ccf0227..82bf4c9e 100644
--- a/mdx/hu_eduid/verbs.xml
+++ b/mdx/hu_eduid/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:hu_eduid/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
index 6c6c550b..80711b33 100644
--- a/mdx/ie_edugate/verbs.xml
+++ b/mdx/ie_edugate/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:ie_edugate/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/in_infed/verbs.xml b/mdx/in_infed/verbs.xml
index 18a87002..a02e988e 100644
--- a/mdx/in_infed/verbs.xml
+++ b/mdx/in_infed/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:in_infed/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 040e9445..58e18d5d 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -15,8 +15,8 @@
     <!--
         Import eduGAIN participant beans for namespace stripping stages.
     -->
-    <import resource="../cz_eduid/beans.xml"/>
-    <import resource="../hu_eduid/beans.xml"/>
+    <import resource="classpath:cz_eduid/beans.xml"/>
+    <import resource="classpath:hu_eduid/beans.xml"/>
     
     <!--
         Fetch the eduGAIN test aggregate.
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index c82a9358..9cc5f724 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
     
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:int_edugain/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
index 13cc8036..0c928a19 100644
--- a/mdx/int_testshib/verbs.xml
+++ b/mdx/int_testshib/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:int_testshib/beans.xml"/>
     
     <!--
         Serialise into this channel's "imported" aggregate file.
diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
index 24e2d456..2f5abbee 100644
--- a/mdx/it_idem/verbs.xml
+++ b/mdx/it_idem/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:it_idem/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/jp_gakunin/verbs.xml b/mdx/jp_gakunin/verbs.xml
index 9319ff2f..0b05de12 100644
--- a/mdx/jp_gakunin/verbs.xml
+++ b/mdx/jp_gakunin/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:jp_gakunin/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/lv_laife/verbs.xml b/mdx/lv_laife/verbs.xml
index 59665433..f3cd2204 100644
--- a/mdx/lv_laife/verbs.xml
+++ b/mdx/lv_laife/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:lv_laife/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/nl_surfconext/verbs.xml b/mdx/nl_surfconext/verbs.xml
index 3f013a31..d86d34bc 100644
--- a/mdx/nl_surfconext/verbs.xml
+++ b/mdx/nl_surfconext/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:nl_surfconext/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
index 3baa8e9d..cbeffebd 100644
--- a/mdx/nl_surfnet/verbs.xml
+++ b/mdx/nl_surfnet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:nl_surfnet/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/no_feide/verbs.xml b/mdx/no_feide/verbs.xml
index d8506121..06fa72af 100644
--- a/mdx/no_feide/verbs.xml
+++ b/mdx/no_feide/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:no_feide/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/nz_tuakiri/verbs.xml b/mdx/nz_tuakiri/verbs.xml
index 826f44bf..c1cd8578 100644
--- a/mdx/nz_tuakiri/verbs.xml
+++ b/mdx/nz_tuakiri/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:nz_tuakiri/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 45939f0a..8adfec9a 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -15,8 +15,8 @@
     <!--
         Import eduGAIN participant beans for namespace stripping stages.
     -->
-    <import resource="../cz_eduid/beans.xml"/>
-    <import resource="../hu_eduid/beans.xml"/>
+    <import resource="classpath:cz_eduid/beans.xml"/>
+    <import resource="classpath:hu_eduid/beans.xml"/>
     
     <!--
         Location of various resources.
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index d76f1458..af94a689 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:se_swamid/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/si_arnes/verbs.xml b/mdx/si_arnes/verbs.xml
index 05a35a05..cc986497 100644
--- a/mdx/si_arnes/verbs.xml
+++ b/mdx/si_arnes/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import ARNES-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:si_arnes/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index 07be2f1b..ae3b66f7 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:test/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index 66da10f6..ba6d8ccd 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
     
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:uk/beans.xml"/>
 
     <bean id="serializeCollected" parent="serialize_parent"
         p:id="serializeCollected">
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 274c238e..42eaa68d 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -15,19 +15,19 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
     
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:uk/beans.xml"/>
     
     <!--
         Import beans from other channels.
     -->
-    <import resource="../ie_edugate/beans.xml"/>
-    <import resource="../se_swamid/beans.xml"/>
-    <import resource="../us_incommon/beans.xml"/>
+    <import resource="classpath:ie_edugate/beans.xml"/>
+    <import resource="classpath:se_swamid/beans.xml"/>
+    <import resource="classpath:us_incommon/beans.xml"/>
 
 
     <!--
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index a2c52b3d..606a952e 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
     
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:uk/beans.xml"/>
     
     <!--
         ***************************************
diff --git a/mdx/uk_eduserv/verbs.xml b/mdx/uk_eduserv/verbs.xml
index d6da5ff6..f2da55de 100644
--- a/mdx/uk_eduserv/verbs.xml
+++ b/mdx/uk_eduserv/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:uk_eduserv/beans.xml"/>
     
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index a1227c57..0dd44f01 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
         
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:us_incommon/beans.xml"/>
     
     <!--
         Serialise into this channel's "imported" aggregate file.