diff --git a/build.gradle b/build.gradle
index 9d455541..3dc71f4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,11 @@ version = "2.1-SNAPSHOT"
 
 subprojects {
     apply plugin: 'java-library'
-    apply plugin: 'osgi'
 
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
-    
+
+    group = rootProject.group
     version = rootProject.version
 
     repositories {
@@ -24,19 +24,6 @@ subprojects {
         }
     }
 
-    jar {
-        manifest {
-            attributes 'Implementation-Title': project.name,
-                    'Implementation-Vendor': 'hamcrest.org',
-                    'Implementation-Version': version,
-                    'Automatic-Module-Name': 'org.hamcrest'
-            instruction 'Import-Package', '''javax.xml.namespace; resolution:=optional,
-                                         javax.xml.xpath; resolution:=optional,
-                                         org.w3c.dom; resolution:=optional,
-                                         *'''
-        }
-    }
-
     task sourcesJar(type: Jar) {
         classifier = 'sources'
         from sourceSets.main.allSource
@@ -83,13 +70,6 @@ def pomConfigurationFor(String pomName, String pomDescription) {
     }
 }
 
-def appendDependency(Object dependencies, String artifactId) {
-    def dependency = dependencies.appendNode('dependency')
-    dependency.appendNode('groupId',    'org.hamcrest')
-    dependency.appendNode('artifactId', artifactId)
-    dependency.appendNode('version',    rootProject.version)
-}
-
 def publishToOssrh = project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
 
 publishing {
@@ -105,26 +85,26 @@ publishing {
                     'Core API and libraries of hamcrest matcher framework.')
         }
 
+        def hamcrestCoreProject = project(':hamcrest-core')
         hamcrestCore(MavenPublication) {
-            artifactId 'hamcrest-core'
+            from hamcrestCoreProject.components.java
+            artifactId hamcrestCoreProject.name
+            artifact hamcrestCoreProject.sourcesJar
+            artifact hamcrestCoreProject.javadocJar
             pom pomConfigurationFor(
                     'Hamcrest Core',
                     'Core Hamcrest API - deprecated, please use "hamcrest" instead')
-            pom.withXml {
-                def dependencies = asNode().appendNode('dependencies')
-                appendDependency(dependencies, 'hamcrest')
-            }
         }
 
+        def hamcrestLibraryProject = project(':hamcrest-library')
         hamcrestLibrary(MavenPublication) {
-            artifactId 'hamcrest-library'
+            from hamcrestLibraryProject.components.java
+            artifactId hamcrestLibraryProject.name
+            artifact hamcrestLibraryProject.sourcesJar
+            artifact hamcrestLibraryProject.javadocJar
             pom pomConfigurationFor(
                     'Hamcrest Library',
                     'A library of Hamcrest matchers - deprecated, please use "hamcrest" instead')
-            pom.withXml {
-                def dependencies = asNode().appendNode('dependencies')
-                appendDependency(dependencies, 'hamcrest-core')
-            }
         }
     }
     repositories {
diff --git a/hamcrest-core/hamcrest-core.gradle b/hamcrest-core/hamcrest-core.gradle
new file mode 100644
index 00000000..962c4917
--- /dev/null
+++ b/hamcrest-core/hamcrest-core.gradle
@@ -0,0 +1,18 @@
+dependencies {
+    api project(':hamcrest')
+}
+
+jar {
+    manifest {
+        attributes 'Implementation-Title': project.name,
+                'Implementation-Vendor': 'hamcrest.org',
+                'Implementation-Version': version,
+                'Automatic-Module-Name': 'org.hamcrest'
+    }
+}
+
+javadoc {
+    title = "Hamcrest Core $version API"
+    options.showFromPackage()
+    options.showFromPrivate()
+}
diff --git a/hamcrest-core/src/main/java/org/hamcrest/HamcrestCoreIsDeprecated.java b/hamcrest-core/src/main/java/org/hamcrest/HamcrestCoreIsDeprecated.java
new file mode 100644
index 00000000..53a4d904
--- /dev/null
+++ b/hamcrest-core/src/main/java/org/hamcrest/HamcrestCoreIsDeprecated.java
@@ -0,0 +1,9 @@
+package org.hamcrest;
+
+/**
+ * All the classes in <code>hamcrest-core.jar</code> have moved to
+ * <code>hamcrest.jar</code>. Please use that dependency instead.
+ */
+@Deprecated
+class HamcrestCoreIsDeprecated {
+}
diff --git a/hamcrest-core/src/main/java/org/hamcrest/package-info.java b/hamcrest-core/src/main/java/org/hamcrest/package-info.java
new file mode 100644
index 00000000..4b9bbffe
--- /dev/null
+++ b/hamcrest-core/src/main/java/org/hamcrest/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * All classes in <code>hamcrest-core.jar</code> have been migrated to
+ * <code>hamcrest.jar</code>. Please use that dependency instead.
+ */
+package org.hamcrest;
\ No newline at end of file
diff --git a/hamcrest-core/src/main/resources/README.txt b/hamcrest-core/src/main/resources/README.txt
new file mode 100644
index 00000000..4c860f0c
--- /dev/null
+++ b/hamcrest-core/src/main/resources/README.txt
@@ -0,0 +1,5 @@
+Hamcrest Core
+=============
+
+All the classes in hamcrest-core.jar and hamcrest-library.jar has moved
+into hamcrest.jar. Please update your dependencies.
\ No newline at end of file
diff --git a/hamcrest-library/hamcrest-library.gradle b/hamcrest-library/hamcrest-library.gradle
new file mode 100644
index 00000000..1ca40d51
--- /dev/null
+++ b/hamcrest-library/hamcrest-library.gradle
@@ -0,0 +1,17 @@
+dependencies {
+    api project(':hamcrest-core')
+}
+
+jar {
+    manifest {
+        attributes 'Implementation-Title': project.name,
+                'Implementation-Vendor': 'hamcrest.org',
+                'Implementation-Version': version,
+                'Automatic-Module-Name': 'org.hamcrest'
+    }
+}
+
+javadoc {
+    title = "Hamcrest Library $version API"
+    options.showFromPackage()
+}
diff --git a/hamcrest-library/src/main/java/org/hamcrest/HamcrestLibraryIsDeprecated.java b/hamcrest-library/src/main/java/org/hamcrest/HamcrestLibraryIsDeprecated.java
new file mode 100644
index 00000000..4f45311d
--- /dev/null
+++ b/hamcrest-library/src/main/java/org/hamcrest/HamcrestLibraryIsDeprecated.java
@@ -0,0 +1,9 @@
+package org.hamcrest;
+
+/**
+ * All the classes in <code>hamcrest-library.jar</code> have moved to
+ * <code>hamcrest.jar</code>. Please use that dependency instead.
+ */
+@Deprecated
+class HamcrestLibraryIsDeprecated {
+}
diff --git a/hamcrest-library/src/main/java/org/hamcrest/package-info.java b/hamcrest-library/src/main/java/org/hamcrest/package-info.java
new file mode 100644
index 00000000..9e73d768
--- /dev/null
+++ b/hamcrest-library/src/main/java/org/hamcrest/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * All classes in <code>hamcrest-library.jar</code> have been migrated to
+ * <code>hamcrest.jar</code>. Please use that dependency instead.
+ */
+package org.hamcrest;
\ No newline at end of file
diff --git a/hamcrest-library/src/main/resources/README.txt b/hamcrest-library/src/main/resources/README.txt
new file mode 100644
index 00000000..038467d2
--- /dev/null
+++ b/hamcrest-library/src/main/resources/README.txt
@@ -0,0 +1,5 @@
+Hamcrest Library
+================
+
+All the classes in hamcrest-core.jar and hamcrest-library.jar has moved
+into hamcrest.jar. Please update your dependencies.
\ No newline at end of file
diff --git a/hamcrest/hamcrest.gradle b/hamcrest/hamcrest.gradle
index e7035ad9..932990e9 100644
--- a/hamcrest/hamcrest.gradle
+++ b/hamcrest/hamcrest.gradle
@@ -1,19 +1,6 @@
-version = rootProject.version
+apply plugin: 'osgi'
 
-sourceSets {
-    main {
-        java {
-            srcDirs rootProject.file('hamcrest-core/src/main/java'),
-                    rootProject.file('hamcrest-library/src/main/java')
-        }
-    }
-    test {
-        java {
-            srcDirs rootProject.file('hamcrest-core/src/test/java'),
-                    rootProject.file('hamcrest-library/src/test/java')
-        }
-    }
-}
+version = rootProject.version
 
 dependencies {
     testImplementation(group: 'junit', name: 'junit', version: '4.12') {
@@ -21,4 +8,17 @@ dependencies {
     }
 }
 
+jar {
+    manifest {
+        attributes 'Implementation-Title': project.name,
+                'Implementation-Vendor': 'hamcrest.org',
+                'Implementation-Version': version,
+                'Automatic-Module-Name': 'org.hamcrest'
+        instruction 'Import-Package', '''javax.xml.namespace; resolution:=optional,
+                                         javax.xml.xpath; resolution:=optional,
+                                         org.w3c.dom; resolution:=optional,
+                                         *'''
+    }
+}
+
 javadoc.title = "Hamcrest $version API"
diff --git a/hamcrest-core/src/main/java/org/hamcrest/BaseDescription.java b/hamcrest/src/main/java/org/hamcrest/BaseDescription.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/BaseDescription.java
rename to hamcrest/src/main/java/org/hamcrest/BaseDescription.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/BaseMatcher.java b/hamcrest/src/main/java/org/hamcrest/BaseMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/BaseMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/BaseMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/Condition.java b/hamcrest/src/main/java/org/hamcrest/Condition.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/Condition.java
rename to hamcrest/src/main/java/org/hamcrest/Condition.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java b/hamcrest/src/main/java/org/hamcrest/CoreMatchers.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java
rename to hamcrest/src/main/java/org/hamcrest/CoreMatchers.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/CustomMatcher.java b/hamcrest/src/main/java/org/hamcrest/CustomMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/CustomMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/CustomMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/CustomTypeSafeMatcher.java b/hamcrest/src/main/java/org/hamcrest/CustomTypeSafeMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/CustomTypeSafeMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/CustomTypeSafeMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/Description.java b/hamcrest/src/main/java/org/hamcrest/Description.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/Description.java
rename to hamcrest/src/main/java/org/hamcrest/Description.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/DiagnosingMatcher.java b/hamcrest/src/main/java/org/hamcrest/DiagnosingMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/DiagnosingMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/DiagnosingMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java b/hamcrest/src/main/java/org/hamcrest/FeatureMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/FeatureMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/Matcher.java b/hamcrest/src/main/java/org/hamcrest/Matcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/Matcher.java
rename to hamcrest/src/main/java/org/hamcrest/Matcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/MatcherAssert.java b/hamcrest/src/main/java/org/hamcrest/MatcherAssert.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/MatcherAssert.java
rename to hamcrest/src/main/java/org/hamcrest/MatcherAssert.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest/src/main/java/org/hamcrest/Matchers.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/Matchers.java
rename to hamcrest/src/main/java/org/hamcrest/Matchers.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/SelfDescribing.java b/hamcrest/src/main/java/org/hamcrest/SelfDescribing.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/SelfDescribing.java
rename to hamcrest/src/main/java/org/hamcrest/SelfDescribing.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/StringDescription.java b/hamcrest/src/main/java/org/hamcrest/StringDescription.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/StringDescription.java
rename to hamcrest/src/main/java/org/hamcrest/StringDescription.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java b/hamcrest/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java b/hamcrest/src/main/java/org/hamcrest/TypeSafeMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/TypeSafeMatcher.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java b/hamcrest/src/main/java/org/hamcrest/beans/HasProperty.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java
rename to hamcrest/src/main/java/org/hamcrest/beans/HasProperty.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java b/hamcrest/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java
rename to hamcrest/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/PropertyUtil.java b/hamcrest/src/main/java/org/hamcrest/beans/PropertyUtil.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/beans/PropertyUtil.java
rename to hamcrest/src/main/java/org/hamcrest/beans/PropertyUtil.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java b/hamcrest/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java
rename to hamcrest/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/package.html b/hamcrest/src/main/java/org/hamcrest/beans/package.html
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/beans/package.html
rename to hamcrest/src/main/java/org/hamcrest/beans/package.html
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/ArrayAsIterableMatcher.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayAsIterableMatcher.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/ArrayAsIterableMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/collection/ArrayAsIterableMatcher.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/ArrayMatching.java
rename to hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/HasItemInArray.java b/hamcrest/src/main/java/org/hamcrest/collection/HasItemInArray.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/HasItemInArray.java
rename to hamcrest/src/main/java/org/hamcrest/collection/HasItemInArray.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArray.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsArray.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayWithSize.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayWithSize.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayWithSize.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsArrayWithSize.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java b/hamcrest/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java b/hamcrest/src/main/java/org/hamcrest/collection/IsEmptyCollection.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsEmptyCollection.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyIterable.java b/hamcrest/src/main/java/org/hamcrest/collection/IsEmptyIterable.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyIterable.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsEmptyIterable.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIn.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsIn.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableWithSize.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableWithSize.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableWithSize.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsIterableWithSize.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java b/hamcrest/src/main/java/org/hamcrest/collection/IsMapContaining.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsMapContaining.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapWithSize.java b/hamcrest/src/main/java/org/hamcrest/collection/IsMapWithSize.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/IsMapWithSize.java
rename to hamcrest/src/main/java/org/hamcrest/collection/IsMapWithSize.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/package.html b/hamcrest/src/main/java/org/hamcrest/collection/package.html
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/collection/package.html
rename to hamcrest/src/main/java/org/hamcrest/collection/package.html
diff --git a/hamcrest-library/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java b/hamcrest/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java
rename to hamcrest/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
rename to hamcrest/src/main/java/org/hamcrest/core/AllOf.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
rename to hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/CombinableMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java b/hamcrest/src/main/java/org/hamcrest/core/DescribedAs.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java
rename to hamcrest/src/main/java/org/hamcrest/core/DescribedAs.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/Every.java b/hamcrest/src/main/java/org/hamcrest/core/Every.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/Every.java
rename to hamcrest/src/main/java/org/hamcrest/core/Every.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/Is.java b/hamcrest/src/main/java/org/hamcrest/core/Is.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/Is.java
rename to hamcrest/src/main/java/org/hamcrest/core/Is.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java b/hamcrest/src/main/java/org/hamcrest/core/IsAnything.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsAnything.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java b/hamcrest/src/main/java/org/hamcrest/core/IsEqual.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsEqual.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java b/hamcrest/src/main/java/org/hamcrest/core/IsInstanceOf.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsInstanceOf.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsIterableContaining.java b/hamcrest/src/main/java/org/hamcrest/core/IsIterableContaining.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsIterableContaining.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsIterableContaining.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java b/hamcrest/src/main/java/org/hamcrest/core/IsNot.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsNot.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java b/hamcrest/src/main/java/org/hamcrest/core/IsNull.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsNull.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java b/hamcrest/src/main/java/org/hamcrest/core/IsSame.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java
rename to hamcrest/src/main/java/org/hamcrest/core/IsSame.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/ShortcutCombination.java b/hamcrest/src/main/java/org/hamcrest/core/ShortcutCombination.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/ShortcutCombination.java
rename to hamcrest/src/main/java/org/hamcrest/core/ShortcutCombination.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/StringContains.java b/hamcrest/src/main/java/org/hamcrest/core/StringContains.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/StringContains.java
rename to hamcrest/src/main/java/org/hamcrest/core/StringContains.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/StringEndsWith.java b/hamcrest/src/main/java/org/hamcrest/core/StringEndsWith.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/StringEndsWith.java
rename to hamcrest/src/main/java/org/hamcrest/core/StringEndsWith.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/StringRegularExpression.java b/hamcrest/src/main/java/org/hamcrest/core/StringRegularExpression.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/StringRegularExpression.java
rename to hamcrest/src/main/java/org/hamcrest/core/StringRegularExpression.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/StringStartsWith.java b/hamcrest/src/main/java/org/hamcrest/core/StringStartsWith.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/StringStartsWith.java
rename to hamcrest/src/main/java/org/hamcrest/core/StringStartsWith.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/SubstringMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/SubstringMatcher.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/SubstringMatcher.java
rename to hamcrest/src/main/java/org/hamcrest/core/SubstringMatcher.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/package.html b/hamcrest/src/main/java/org/hamcrest/core/package.html
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/core/package.html
rename to hamcrest/src/main/java/org/hamcrest/core/package.html
diff --git a/hamcrest-core/src/main/java/org/hamcrest/internal/ArrayIterator.java b/hamcrest/src/main/java/org/hamcrest/internal/ArrayIterator.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/internal/ArrayIterator.java
rename to hamcrest/src/main/java/org/hamcrest/internal/ArrayIterator.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/internal/NullSafety.java b/hamcrest/src/main/java/org/hamcrest/internal/NullSafety.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/internal/NullSafety.java
rename to hamcrest/src/main/java/org/hamcrest/internal/NullSafety.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/internal/ReflectiveTypeFinder.java b/hamcrest/src/main/java/org/hamcrest/internal/ReflectiveTypeFinder.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/internal/ReflectiveTypeFinder.java
rename to hamcrest/src/main/java/org/hamcrest/internal/ReflectiveTypeFinder.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValue.java b/hamcrest/src/main/java/org/hamcrest/internal/SelfDescribingValue.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValue.java
rename to hamcrest/src/main/java/org/hamcrest/internal/SelfDescribingValue.java
diff --git a/hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValueIterator.java b/hamcrest/src/main/java/org/hamcrest/internal/SelfDescribingValueIterator.java
similarity index 100%
rename from hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValueIterator.java
rename to hamcrest/src/main/java/org/hamcrest/internal/SelfDescribingValueIterator.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/io/FileMatchers.java b/hamcrest/src/main/java/org/hamcrest/io/FileMatchers.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/io/FileMatchers.java
rename to hamcrest/src/main/java/org/hamcrest/io/FileMatchers.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/BigDecimalCloseTo.java b/hamcrest/src/main/java/org/hamcrest/number/BigDecimalCloseTo.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/number/BigDecimalCloseTo.java
rename to hamcrest/src/main/java/org/hamcrest/number/BigDecimalCloseTo.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java b/hamcrest/src/main/java/org/hamcrest/number/IsCloseTo.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java
rename to hamcrest/src/main/java/org/hamcrest/number/IsCloseTo.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/IsNaN.java b/hamcrest/src/main/java/org/hamcrest/number/IsNaN.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/number/IsNaN.java
rename to hamcrest/src/main/java/org/hamcrest/number/IsNaN.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest/src/main/java/org/hamcrest/number/OrderingComparison.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
rename to hamcrest/src/main/java/org/hamcrest/number/OrderingComparison.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/package.html b/hamcrest/src/main/java/org/hamcrest/number/package.html
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/number/package.html
rename to hamcrest/src/main/java/org/hamcrest/number/package.html
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/HasEqualValues.java b/hamcrest/src/main/java/org/hamcrest/object/HasEqualValues.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/object/HasEqualValues.java
rename to hamcrest/src/main/java/org/hamcrest/object/HasEqualValues.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java b/hamcrest/src/main/java/org/hamcrest/object/HasToString.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java
rename to hamcrest/src/main/java/org/hamcrest/object/HasToString.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/IsCompatibleType.java b/hamcrest/src/main/java/org/hamcrest/object/IsCompatibleType.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/object/IsCompatibleType.java
rename to hamcrest/src/main/java/org/hamcrest/object/IsCompatibleType.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java b/hamcrest/src/main/java/org/hamcrest/object/IsEventFrom.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java
rename to hamcrest/src/main/java/org/hamcrest/object/IsEventFrom.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/package.html b/hamcrest/src/main/java/org/hamcrest/object/package.html
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/object/package.html
rename to hamcrest/src/main/java/org/hamcrest/object/package.html
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/CharSequenceLength.java b/hamcrest/src/main/java/org/hamcrest/text/CharSequenceLength.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/CharSequenceLength.java
rename to hamcrest/src/main/java/org/hamcrest/text/CharSequenceLength.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsBlankString.java b/hamcrest/src/main/java/org/hamcrest/text/IsBlankString.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/IsBlankString.java
rename to hamcrest/src/main/java/org/hamcrest/text/IsBlankString.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEmptyString.java b/hamcrest/src/main/java/org/hamcrest/text/IsEmptyString.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/IsEmptyString.java
rename to hamcrest/src/main/java/org/hamcrest/text/IsEmptyString.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualCompressingWhiteSpace.java b/hamcrest/src/main/java/org/hamcrest/text/IsEqualCompressingWhiteSpace.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/IsEqualCompressingWhiteSpace.java
rename to hamcrest/src/main/java/org/hamcrest/text/IsEqualCompressingWhiteSpace.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java b/hamcrest/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
rename to hamcrest/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/MatchesPattern.java b/hamcrest/src/main/java/org/hamcrest/text/MatchesPattern.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/MatchesPattern.java
rename to hamcrest/src/main/java/org/hamcrest/text/MatchesPattern.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java b/hamcrest/src/main/java/org/hamcrest/text/StringContainsInOrder.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java
rename to hamcrest/src/main/java/org/hamcrest/text/StringContainsInOrder.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/package.html b/hamcrest/src/main/java/org/hamcrest/text/package.html
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/text/package.html
rename to hamcrest/src/main/java/org/hamcrest/text/package.html
diff --git a/hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java b/hamcrest/src/main/java/org/hamcrest/xml/HasXPath.java
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java
rename to hamcrest/src/main/java/org/hamcrest/xml/HasXPath.java
diff --git a/hamcrest-library/src/main/java/org/hamcrest/xml/package.html b/hamcrest/src/main/java/org/hamcrest/xml/package.html
similarity index 100%
rename from hamcrest-library/src/main/java/org/hamcrest/xml/package.html
rename to hamcrest/src/main/java/org/hamcrest/xml/package.html
diff --git a/hamcrest-core/src/test/java/org/hamcrest/AbstractMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/AbstractMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/AbstractMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/AbstractMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/BaseDescriptionTest.java b/hamcrest/src/test/java/org/hamcrest/BaseDescriptionTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/BaseDescriptionTest.java
rename to hamcrest/src/test/java/org/hamcrest/BaseDescriptionTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/BaseMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/BaseMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/BaseMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/BaseMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/CustomMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/CustomMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/CustomMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/CustomMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/CustomTypeSafeMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/CustomTypeSafeMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/CustomTypeSafeMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/CustomTypeSafeMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/FeatureMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/FeatureMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/FeatureMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/FeatureMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/MatcherAssertTest.java b/hamcrest/src/test/java/org/hamcrest/MatcherAssertTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/MatcherAssertTest.java
rename to hamcrest/src/test/java/org/hamcrest/MatcherAssertTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/NullDescriptionTest.java b/hamcrest/src/test/java/org/hamcrest/NullDescriptionTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/NullDescriptionTest.java
rename to hamcrest/src/test/java/org/hamcrest/NullDescriptionTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/TypeSafeDiagnosingMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/TypeSafeDiagnosingMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/TypeSafeDiagnosingMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/TypeSafeDiagnosingMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/TypeSafeMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/TypeSafeMatcherTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/TypeSafeMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/TypeSafeMatcherTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/HasPropertyTest.java b/hamcrest/src/test/java/org/hamcrest/beans/HasPropertyTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/beans/HasPropertyTest.java
rename to hamcrest/src/test/java/org/hamcrest/beans/HasPropertyTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/HasPropertyWithValueTest.java b/hamcrest/src/test/java/org/hamcrest/beans/HasPropertyWithValueTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/beans/HasPropertyWithValueTest.java
rename to hamcrest/src/test/java/org/hamcrest/beans/HasPropertyWithValueTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java b/hamcrest/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java
rename to hamcrest/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/HasItemInArrayTest.java b/hamcrest/src/test/java/org/hamcrest/collection/HasItemInArrayTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/HasItemInArrayTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/HasItemInArrayTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInAnyOrderTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsArrayContainingInAnyOrderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInAnyOrderTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsArrayContainingInAnyOrderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsArrayTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsArrayTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayWithSizeTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsArrayWithSizeTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayWithSizeTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsArrayWithSizeTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsCollectionWithSizeTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsCollectionWithSizeTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsCollectionWithSizeTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsCollectionWithSizeTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsInTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsInTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsInTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsInTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsMapContainingTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsMapContainingTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingValueTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsMapContainingValueTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingValueTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsMapContainingValueTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapWithSizeTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsMapWithSizeTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/collection/IsMapWithSizeTest.java
rename to hamcrest/src/test/java/org/hamcrest/collection/IsMapWithSizeTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java b/hamcrest/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java
rename to hamcrest/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherTest.java b/hamcrest/src/test/java/org/hamcrest/comparator/ComparatorMatcherTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherTest.java
rename to hamcrest/src/test/java/org/hamcrest/comparator/ComparatorMatcherTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/AllOfTest.java b/hamcrest/src/test/java/org/hamcrest/core/AllOfTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/AllOfTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/AllOfTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/AnyOfTest.java b/hamcrest/src/test/java/org/hamcrest/core/AnyOfTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/AnyOfTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/AnyOfTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/CombinableTest.java b/hamcrest/src/test/java/org/hamcrest/core/CombinableTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/CombinableTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/CombinableTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/DescribedAsTest.java b/hamcrest/src/test/java/org/hamcrest/core/DescribedAsTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/DescribedAsTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/DescribedAsTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/EveryTest.java b/hamcrest/src/test/java/org/hamcrest/core/EveryTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/EveryTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/EveryTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsAnythingTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsAnythingTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsAnythingTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsAnythingTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsEqualTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsEqualTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsEqualTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsEqualTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsInstanceOfTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsInstanceOfTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsInstanceOfTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsInstanceOfTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsIterableContainingTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsIterableContainingTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsIterableContainingTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsIterableContainingTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsNotTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsNotTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsNotTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsNotTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsNullTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsNullTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsNullTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsNullTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsSameTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsSameTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsSameTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsSameTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsTest.java b/hamcrest/src/test/java/org/hamcrest/core/IsTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/IsTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/IsTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/SampleBaseClass.java b/hamcrest/src/test/java/org/hamcrest/core/SampleBaseClass.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/SampleBaseClass.java
rename to hamcrest/src/test/java/org/hamcrest/core/SampleBaseClass.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/SampleSubClass.java b/hamcrest/src/test/java/org/hamcrest/core/SampleSubClass.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/SampleSubClass.java
rename to hamcrest/src/test/java/org/hamcrest/core/SampleSubClass.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/StringContainsTest.java b/hamcrest/src/test/java/org/hamcrest/core/StringContainsTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/StringContainsTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/StringContainsTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/StringEndsWithTest.java b/hamcrest/src/test/java/org/hamcrest/core/StringEndsWithTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/StringEndsWithTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/StringEndsWithTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/StringMatchingTest.java b/hamcrest/src/test/java/org/hamcrest/core/StringMatchingTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/StringMatchingTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/StringMatchingTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/StringRegularExpressionTest.java b/hamcrest/src/test/java/org/hamcrest/core/StringRegularExpressionTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/StringRegularExpressionTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/StringRegularExpressionTest.java
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/StringStartsWithTest.java b/hamcrest/src/test/java/org/hamcrest/core/StringStartsWithTest.java
similarity index 100%
rename from hamcrest-core/src/test/java/org/hamcrest/core/StringStartsWithTest.java
rename to hamcrest/src/test/java/org/hamcrest/core/StringStartsWithTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/io/FileMatchersTest.java b/hamcrest/src/test/java/org/hamcrest/io/FileMatchersTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/io/FileMatchersTest.java
rename to hamcrest/src/test/java/org/hamcrest/io/FileMatchersTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/BigDecimalCloseToTest.java b/hamcrest/src/test/java/org/hamcrest/number/BigDecimalCloseToTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/number/BigDecimalCloseToTest.java
rename to hamcrest/src/test/java/org/hamcrest/number/BigDecimalCloseToTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/IsCloseToTest.java b/hamcrest/src/test/java/org/hamcrest/number/IsCloseToTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/number/IsCloseToTest.java
rename to hamcrest/src/test/java/org/hamcrest/number/IsCloseToTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/IsNanTest.java b/hamcrest/src/test/java/org/hamcrest/number/IsNanTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/number/IsNanTest.java
rename to hamcrest/src/test/java/org/hamcrest/number/IsNanTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java b/hamcrest/src/test/java/org/hamcrest/number/OrderingComparisonTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java
rename to hamcrest/src/test/java/org/hamcrest/number/OrderingComparisonTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/object/HasEqualsValuesTest.java b/hamcrest/src/test/java/org/hamcrest/object/HasEqualsValuesTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/object/HasEqualsValuesTest.java
rename to hamcrest/src/test/java/org/hamcrest/object/HasEqualsValuesTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/object/HasToStringTest.java b/hamcrest/src/test/java/org/hamcrest/object/HasToStringTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/object/HasToStringTest.java
rename to hamcrest/src/test/java/org/hamcrest/object/HasToStringTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/object/IsCompatibleTypeTest.java b/hamcrest/src/test/java/org/hamcrest/object/IsCompatibleTypeTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/object/IsCompatibleTypeTest.java
rename to hamcrest/src/test/java/org/hamcrest/object/IsCompatibleTypeTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/object/IsEventFromTest.java b/hamcrest/src/test/java/org/hamcrest/object/IsEventFromTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/object/IsEventFromTest.java
rename to hamcrest/src/test/java/org/hamcrest/object/IsEventFromTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/object/MatchesPatternTest.java b/hamcrest/src/test/java/org/hamcrest/object/MatchesPatternTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/object/MatchesPatternTest.java
rename to hamcrest/src/test/java/org/hamcrest/object/MatchesPatternTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/CharSequenceLengthTest.java b/hamcrest/src/test/java/org/hamcrest/text/CharSequenceLengthTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/text/CharSequenceLengthTest.java
rename to hamcrest/src/test/java/org/hamcrest/text/CharSequenceLengthTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsBlankStringTest.java b/hamcrest/src/test/java/org/hamcrest/text/IsBlankStringTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/text/IsBlankStringTest.java
rename to hamcrest/src/test/java/org/hamcrest/text/IsBlankStringTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsEmptyStringTest.java b/hamcrest/src/test/java/org/hamcrest/text/IsEmptyStringTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/text/IsEmptyStringTest.java
rename to hamcrest/src/test/java/org/hamcrest/text/IsEmptyStringTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualCompressingWhiteSpaceTest.java b/hamcrest/src/test/java/org/hamcrest/text/IsEqualCompressingWhiteSpaceTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/text/IsEqualCompressingWhiteSpaceTest.java
rename to hamcrest/src/test/java/org/hamcrest/text/IsEqualCompressingWhiteSpaceTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/IsEqualIgnoringCaseTest.java b/hamcrest/src/test/java/org/hamcrest/text/IsEqualIgnoringCaseTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/text/IsEqualIgnoringCaseTest.java
rename to hamcrest/src/test/java/org/hamcrest/text/IsEqualIgnoringCaseTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/StringContainsInOrderTest.java b/hamcrest/src/test/java/org/hamcrest/text/StringContainsInOrderTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/text/StringContainsInOrderTest.java
rename to hamcrest/src/test/java/org/hamcrest/text/StringContainsInOrderTest.java
diff --git a/hamcrest-library/src/test/java/org/hamcrest/xml/HasXPathTest.java b/hamcrest/src/test/java/org/hamcrest/xml/HasXPathTest.java
similarity index 100%
rename from hamcrest-library/src/test/java/org/hamcrest/xml/HasXPathTest.java
rename to hamcrest/src/test/java/org/hamcrest/xml/HasXPathTest.java
diff --git a/settings.gradle b/settings.gradle
index 95f83c8c..b2cd43d7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,8 @@
 enableFeaturePreview('STABLE_PUBLISHING')
 
 include 'hamcrest',
+        'hamcrest-core',
+        'hamcrest-library',
         'hamcrest-integration'
 
 rootProject.name = 'JavaHamcrest'