diff --git a/apache-httpclient/.gitignore b/apache/apache-httpclient/.gitignore
similarity index 100%
rename from apache-httpclient/.gitignore
rename to apache/apache-httpclient/.gitignore
diff --git a/apache-httpclient/README.md b/apache/apache-httpclient/README.md
similarity index 100%
rename from apache-httpclient/README.md
rename to apache/apache-httpclient/README.md
diff --git a/apache-httpclient/pom.xml b/apache/apache-httpclient/pom.xml
similarity index 95%
rename from apache-httpclient/pom.xml
rename to apache/apache-httpclient/pom.xml
index b44df09dd3..3164c6253e 100644
--- a/apache-httpclient/pom.xml
+++ b/apache/apache-httpclient/pom.xml
@@ -8,9 +8,9 @@
     <name>apache-httpclient</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.ossez.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/apache-httpclient/src/main/resources/logback.xml b/apache/apache-httpclient/src/main/resources/logback.xml
similarity index 100%
rename from apache-httpclient/src/main/resources/logback.xml
rename to apache/apache-httpclient/src/main/resources/logback.xml
diff --git a/apache-httpclient/src/main/resources/temp.txt b/apache/apache-httpclient/src/main/resources/temp.txt
similarity index 100%
rename from apache-httpclient/src/main/resources/temp.txt
rename to apache/apache-httpclient/src/main/resources/temp.txt
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
diff --git a/apache-httpclient/src/test/resources/.gitignore b/apache/apache-httpclient/src/test/resources/.gitignore
similarity index 100%
rename from apache-httpclient/src/test/resources/.gitignore
rename to apache/apache-httpclient/src/test/resources/.gitignore
diff --git a/apache-httpclient/src/test/resources/test.in b/apache/apache-httpclient/src/test/resources/test.in
similarity index 100%
rename from apache-httpclient/src/test/resources/test.in
rename to apache/apache-httpclient/src/test/resources/test.in
diff --git a/apache-httpclient/src/test/resources/uploads/image.jpg b/apache/apache-httpclient/src/test/resources/uploads/image.jpg
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/image.jpg
rename to apache/apache-httpclient/src/test/resources/uploads/image.jpg
diff --git a/apache-httpclient/src/test/resources/uploads/sandbox.txt b/apache/apache-httpclient/src/test/resources/uploads/sandbox.txt
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/sandbox.txt
rename to apache/apache-httpclient/src/test/resources/uploads/sandbox.txt
diff --git a/apache-httpclient/src/test/resources/uploads/temp.txt b/apache/apache-httpclient/src/test/resources/uploads/temp.txt
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/temp.txt
rename to apache/apache-httpclient/src/test/resources/uploads/temp.txt
diff --git a/apache-httpclient/src/test/resources/uploads/zipFile.zip b/apache/apache-httpclient/src/test/resources/uploads/zipFile.zip
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/zipFile.zip
rename to apache/apache-httpclient/src/test/resources/uploads/zipFile.zip