diff --git a/caching/src/main/java/com/wssia/caching/App.java b/caching/src/main/java/com/iluwatar/caching/App.java
similarity index 86%
rename from caching/src/main/java/com/wssia/caching/App.java
rename to caching/src/main/java/com/iluwatar/caching/App.java
index afdbd7d58..423e0ee80 100644
--- a/caching/src/main/java/com/wssia/caching/App.java
+++ b/caching/src/main/java/com/iluwatar/caching/App.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 /**
  *
@@ -37,6 +37,23 @@ package main.java.com.wssia.caching;
  */
 public class App {
 
+  /**
+   * Program entry point
+   *
+   * @param args command line args
+   */
+  public static void main(String[] args) {
+    AppManager.initDB(false); // VirtualDB (instead of MongoDB) was used in running the JUnit tests
+                              // and the App class to avoid Maven compilation errors. Set flag to
+                              // true to run the tests with MongoDB (provided that MongoDB is
+                              // installed and socket connection is open).
+    AppManager.initCacheCapacity(3);
+    App app = new App();
+    app.useReadAndWriteThroughStrategy();
+    app.useReadThroughAndWriteAroundStrategy();
+    app.useReadThroughAndWriteBehindStrategy();
+  }
+
   /**
    * Read-through and write-through
    */
diff --git a/caching/src/main/java/com/wssia/caching/AppManager.java b/caching/src/main/java/com/iluwatar/caching/AppManager.java
similarity index 98%
rename from caching/src/main/java/com/wssia/caching/AppManager.java
rename to caching/src/main/java/com/iluwatar/caching/AppManager.java
index cc3c665c8..08132e327 100644
--- a/caching/src/main/java/com/wssia/caching/AppManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/AppManager.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 import java.text.ParseException;
 
diff --git a/caching/src/main/java/com/wssia/caching/CacheStore.java b/caching/src/main/java/com/iluwatar/caching/CacheStore.java
similarity index 98%
rename from caching/src/main/java/com/wssia/caching/CacheStore.java
rename to caching/src/main/java/com/iluwatar/caching/CacheStore.java
index 5eb231cc5..2041ac14f 100644
--- a/caching/src/main/java/com/wssia/caching/CacheStore.java
+++ b/caching/src/main/java/com/iluwatar/caching/CacheStore.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 import java.util.ArrayList;
 
diff --git a/caching/src/main/java/com/wssia/caching/CachingPolicy.java b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
similarity index 90%
rename from caching/src/main/java/com/wssia/caching/CachingPolicy.java
rename to caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
index ee51c0361..314cfaa36 100644
--- a/caching/src/main/java/com/wssia/caching/CachingPolicy.java
+++ b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 /**
  *
diff --git a/caching/src/main/java/com/wssia/caching/DBManager.java b/caching/src/main/java/com/iluwatar/caching/DBManager.java
similarity index 98%
rename from caching/src/main/java/com/wssia/caching/DBManager.java
rename to caching/src/main/java/com/iluwatar/caching/DBManager.java
index 0222b5956..d30ad756b 100644
--- a/caching/src/main/java/com/wssia/caching/DBManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/DBManager.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 import java.text.ParseException;
 import java.util.HashMap;
@@ -12,13 +12,16 @@ import com.mongodb.client.model.UpdateOptions;
 
 /**
  *
+ * <p>
  * DBManager handles the communication with the underlying data store i.e. Database. It contains the
  * implemented methods for querying, inserting, and updating data. MongoDB was used as the database
  * for the application.
- *
+ * </p>
+ * <p>
  * Developer/Tester is able to choose whether the application should use MongoDB as its underlying
  * data storage (connect()) or a simple Java data structure to (temporarily) store the data/objects
  * during runtime (createVirtualDB()).
+ * </p>
  */
 public class DBManager {
 
diff --git a/caching/src/main/java/com/wssia/caching/LRUCache.java b/caching/src/main/java/com/iluwatar/caching/LRUCache.java
similarity index 98%
rename from caching/src/main/java/com/wssia/caching/LRUCache.java
rename to caching/src/main/java/com/iluwatar/caching/LRUCache.java
index 1389a9bca..872f97256 100644
--- a/caching/src/main/java/com/wssia/caching/LRUCache.java
+++ b/caching/src/main/java/com/iluwatar/caching/LRUCache.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/caching/src/main/java/com/wssia/caching/UserAccount.java b/caching/src/main/java/com/iluwatar/caching/UserAccount.java
similarity index 96%
rename from caching/src/main/java/com/wssia/caching/UserAccount.java
rename to caching/src/main/java/com/iluwatar/caching/UserAccount.java
index a9fe36f7a..eff0878ad 100644
--- a/caching/src/main/java/com/wssia/caching/UserAccount.java
+++ b/caching/src/main/java/com/iluwatar/caching/UserAccount.java
@@ -1,4 +1,4 @@
-package main.java.com.wssia.caching;
+package com.iluwatar.caching;
 
 /**
  *
diff --git a/caching/src/test/java/com/wssia/caching/AppTest.java b/caching/src/test/java/com/iluwatar/caching/AppTest.java
similarity index 88%
rename from caching/src/test/java/com/wssia/caching/AppTest.java
rename to caching/src/test/java/com/iluwatar/caching/AppTest.java
index c2d13ce03..ce5cddf08 100644
--- a/caching/src/test/java/com/wssia/caching/AppTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/AppTest.java
@@ -1,7 +1,4 @@
-package test.java.com.wssia.caching;
-
-import main.java.com.wssia.caching.App;
-import main.java.com.wssia.caching.AppManager;
+package com.iluwatar.caching;
 
 import org.junit.Before;
 import org.junit.Test;