diff --git a/guava-io/README.md b/guava-io/README.md
new file mode 100644
index 0000000000..df7775a36d
--- /dev/null
+++ b/guava-io/README.md
@@ -0,0 +1,4 @@
+### Relevant Articles:
+
+- [Using Guava CountingOutputStream](http://www.baeldung.com/guava-counting-outputstream)
+- [Guava – Write to File, Read from File](http://www.baeldung.com/guava-write-to-file-read-from-file)
diff --git a/guava-io/pom.xml b/guava-io/pom.xml
new file mode 100644
index 0000000000..2a66baba80
--- /dev/null
+++ b/guava-io/pom.xml
@@ -0,0 +1,26 @@
+
+ 4.0.0
+ com.baeldung
+ guava-io
+ 0.1.0-SNAPSHOT
+ guava-io
+
+
+ com.baeldung
+ parent-java
+ 0.0.1-SNAPSHOT
+ ../parent-java
+
+
+
+ guava-io
+
+
+ src/main/resources
+ true
+
+
+
+
+
\ No newline at end of file
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCountingOutputStreamUnitTest.java b/guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
rename to guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaIOUnitTest.java b/guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/guava/GuavaIOUnitTest.java
rename to guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java
diff --git a/guava/README.md b/guava/README.md
index 60754dbe57..d3bbbf6de5 100644
--- a/guava/README.md
+++ b/guava/README.md
@@ -1,11 +1,8 @@
-=========
-
-## Guava and Hamcrest Cookbooks and Examples
+## Guava Examples
### Relevant Articles:
- [Guava Functional Cookbook](http://www.baeldung.com/guava-functions-predicates)
-- [Guava – Write to File, Read from File](http://www.baeldung.com/guava-write-to-file-read-from-file)
- [Guide to Guava’s Ordering](http://www.baeldung.com/guava-ordering)
- [Guide to Guava’s PreConditions](http://www.baeldung.com/guava-preconditions)
- [Introduction to Guava CacheLoader](http://www.baeldung.com/guava-cacheloader)
@@ -14,7 +11,5 @@
- [Guide to Guava’s Reflection Utilities](http://www.baeldung.com/guava-reflection)
- [Guide to Mathematical Utilities in Guava](http://www.baeldung.com/guava-math)
- [Bloom Filter in Java using Guava](http://www.baeldung.com/guava-bloom-filter)
-- [Using Guava CountingOutputStream](http://www.baeldung.com/guava-counting-outputstream)
-- [Hamcrest Text Matchers](http://www.baeldung.com/hamcrest-text-matchers)
- [Quick Guide to the Guava RateLimiter](http://www.baeldung.com/guava-rate-limiter)
-- [Hamcrest File Matchers](https://www.baeldung.com/hamcrest-file-matchers)
+
diff --git a/guava/pom.xml b/guava/pom.xml
index 34eb7eafa6..3a19901a02 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -27,13 +27,7 @@
test
-
-
- org.hamcrest
- java-hamcrest
- ${java-hamcrest.version}
- test
-
+
@@ -52,7 +46,6 @@
3.6.1
- 2.0.0.0
\ No newline at end of file
diff --git a/libraries-testing/README.md b/libraries-testing/README.md
index 6b25a3b875..b4010056f7 100644
--- a/libraries-testing/README.md
+++ b/libraries-testing/README.md
@@ -5,4 +5,6 @@
- [Serenity BDD and Screenplay](http://www.baeldung.com/serenity-screenplay)
- [Serenity BDD with Spring and JBehave](http://www.baeldung.com/serenity-spring-jbehave)
- [Introduction to Awaitlity](http://www.baeldung.com/awaitlity-testing)
-- [Introduction to Hoverfly in Java](http://www.baeldung.com/hoverfly)
\ No newline at end of file
+- [Introduction to Hoverfly in Java](http://www.baeldung.com/hoverfly)
+- [Hamcrest File Matchers](https://www.baeldung.com/hamcrest-file-matchers)
+- [Hamcrest Text Matchers](http://www.baeldung.com/hamcrest-text-matchers)
\ No newline at end of file
diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
index 8f7a27bbfa..7cc5a8f775 100644
--- a/libraries-testing/pom.xml
+++ b/libraries-testing/pom.xml
@@ -112,6 +112,13 @@
assertj-core
${assertj.version}
+
+
+ org.hamcrest
+ java-hamcrest
+ ${java-hamcrest.version}
+ test
+
net.serenity-bdd
@@ -165,6 +172,7 @@
4.3.8.RELEASE
3.0.3
3.6.2
+ 2.0.0.0
diff --git a/guava/src/test/java/org/baeldung/hamcrest/Animal.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/Animal.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/hamcrest/Animal.java
rename to libraries-testing/src/test/java/com/baeldung/hamcrest/Animal.java
diff --git a/guava/src/test/java/org/baeldung/hamcrest/Cat.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/Cat.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/hamcrest/Cat.java
rename to libraries-testing/src/test/java/com/baeldung/hamcrest/Cat.java
diff --git a/guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherUnitTest.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/HamcrestMatcherUnitTest.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherUnitTest.java
rename to libraries-testing/src/test/java/com/baeldung/hamcrest/HamcrestMatcherUnitTest.java
diff --git a/guava/src/test/java/org/baeldung/hamcrest/IsPositiveInteger.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/IsPositiveInteger.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/hamcrest/IsPositiveInteger.java
rename to libraries-testing/src/test/java/com/baeldung/hamcrest/IsPositiveInteger.java
diff --git a/guava/src/test/java/org/baeldung/hamcrest/Person.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/Person.java
similarity index 100%
rename from guava/src/test/java/org/baeldung/hamcrest/Person.java
rename to libraries-testing/src/test/java/com/baeldung/hamcrest/Person.java
diff --git a/guava/src/test/java/org/baeldung/hamcrest/README.md b/libraries-testing/src/test/java/com/baeldung/hamcrest/README.md
similarity index 100%
rename from guava/src/test/java/org/baeldung/hamcrest/README.md
rename to libraries-testing/src/test/java/com/baeldung/hamcrest/README.md
diff --git a/pom.xml b/pom.xml
index 7f92acef6c..bec3d1a01a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,6 +442,7 @@
grpc
gson
guava
+ guava-io
guava-collections
guava-collections-set
guava-modules
@@ -1166,6 +1167,7 @@
grpc
gson
guava
+ guava-io
guava-collections
guava-collections-set
guava-modules