diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/METS.xml b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/METS.xml
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/METS.xml
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/METS.xml
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/representations/rep1/data/.gitkeep b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/metadata/.gitkeep
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/representations/rep1/data/.gitkeep
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/metadata/.gitkeep
diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/metadata/.gitkeep b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/representations/rep1/data/.gitkeep
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/metadata/.gitkeep
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/representations/rep1/data/.gitkeep
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/CSIPExtensionMETS.xsd b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/CSIPExtensionMETS.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/CSIPExtensionMETS.xsd
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/CSIPExtensionMETS.xsd
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/XMLSchema.xsd b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/XMLSchema.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/XMLSchema.xsd
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/XMLSchema.xsd
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/mets.xsd b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/mets.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/mets.xsd
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/mets.xsd
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/xlink.xsd b/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/xlink.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/xlink.xsd
rename to corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_1/schemas/xlink.xsd
diff --git a/corpus/CSIP/CSIP20/testCase.xml b/corpus/CSIP/CSIP20/testCase.xml
index 766821c7b..f6b07c16a 100644
--- a/corpus/CSIP/CSIP20/testCase.xml
+++ b/corpus/CSIP/CSIP20/testCase.xml
@@ -40,8 +40,8 @@ XML lists -->
       </error>
       <corpusPackages>
         <!-- Details of corpus packages designed to test this validation rule. -->
-        <package name="IP_18000_CSIP20_1" isValid="TRUE" isImplemented="TRUE">
-          <path>valid/IP_18000_CSIP20_1</path>
+        <package name="IP_18000_CSIP20_1" isValid="FALSE" isImplemented="TRUE">
+          <path>invalid/IP_18000_CSIP20_1</path>
           <!-- Full description of corpus package features. -->
           <description>A package based on the minimal IP with schemas. Contains dmdSec without a STATUS attribute</description>
         </package>
@@ -70,7 +70,7 @@ XML lists -->
           <description>A package based on the minimal IP with schemas. Contains a dmdSec element in mets.xml. Contains a mets/dmd/@STATUS attribute with a valid value ("current" = lower case)</description>
         </package>
         <package name="IP_18000_CSIP20_4" isValid="TRUE" isImplemented="TRUE">
-          <path>invalid/IP_18000_CSIP20_4</path>
+          <path>valid/IP_18000_CSIP20_4</path>
           <!-- Full description of corpus package features. -->
           <description>A package based on the minimal IP with schemas. Contains a dmdSec element in mets.xml. Contains a mets/dmd/@STATUS attribute with a valid value ("CURRENT")</description>
         </package>
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/METS.xml b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/METS.xml
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/METS.xml
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/METS.xml
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/metadata/descriptive/EAD.xml b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/metadata/descriptive/EAD.xml
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/metadata/descriptive/EAD.xml
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/metadata/descriptive/EAD.xml
diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/representations/rep1/data/.gitkeep b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/representations/rep1/data/.gitkeep
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/representations/rep1/data/.gitkeep
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/representations/rep1/data/.gitkeep
diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/CSIPExtensionMETS.xsd b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/CSIPExtensionMETS.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/CSIPExtensionMETS.xsd
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/CSIPExtensionMETS.xsd
diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/XMLSchema.xsd b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/XMLSchema.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/XMLSchema.xsd
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/XMLSchema.xsd
diff --git a/corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/ead3.xsd b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/ead3.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/invalid/IP_18000_CSIP20_4/schemas/ead3.xsd
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/ead3.xsd
diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/mets.xsd b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/mets.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/mets.xsd
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/mets.xsd
diff --git a/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/xlink.xsd b/corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/xlink.xsd
similarity index 100%
rename from corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_1/schemas/xlink.xsd
rename to corpus/CSIP/CSIP20/valid/IP_18000_CSIP20_4/schemas/xlink.xsd